From dea25935ebe99542d9505fbe1be8919c59c91e47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Bonhomme?= Date: Mon, 4 Jul 2022 10:50:03 +0200 Subject: [PATCH] chg: [dependencies] Updated zm-core to v2.12.1-p1. Fixed the bug when we try to instantiate a global operational risk and it was already linked to the same anr before. (https://github.com/monarc-project/zm-core/commit/98c096f) --- composer.lock | 93 ++++++++++++++++++++++++++------------------------- 1 file changed, 48 insertions(+), 45 deletions(-) diff --git a/composer.lock b/composer.lock index 9b735f5..d4245a0 100644 --- a/composer.lock +++ b/composer.lock @@ -122,16 +122,16 @@ }, { "name": "brick/varexporter", - "version": "0.3.6", + "version": "0.3.7", "source": { "type": "git", "url": "https://github.com/brick/varexporter.git", - "reference": "3361a8a30e807c0841a7ca98e5c72b6bffc73463" + "reference": "3e263cd718d242594c52963760fee2059fd5833c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/brick/varexporter/zipball/3361a8a30e807c0841a7ca98e5c72b6bffc73463", - "reference": "3361a8a30e807c0841a7ca98e5c72b6bffc73463", + "url": "https://api.github.com/repos/brick/varexporter/zipball/3e263cd718d242594c52963760fee2059fd5833c", + "reference": "3e263cd718d242594c52963760fee2059fd5833c", "shasum": "" }, "require": { @@ -159,7 +159,7 @@ ], "support": { "issues": "https://github.com/brick/varexporter/issues", - "source": "https://github.com/brick/varexporter/tree/0.3.6" + "source": "https://github.com/brick/varexporter/tree/0.3.7" }, "funding": [ { @@ -167,7 +167,7 @@ "type": "github" } ], - "time": "2022-06-15T23:51:29+00:00" + "time": "2022-06-29T23:37:57+00:00" }, { "name": "cakephp/cache", @@ -596,16 +596,16 @@ }, { "name": "doctrine/annotations", - "version": "1.13.2", + "version": "1.13.3", "source": { "type": "git", "url": "https://github.com/doctrine/annotations.git", - "reference": "5b668aef16090008790395c02c893b1ba13f7e08" + "reference": "648b0343343565c4a056bfc8392201385e8d89f0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/annotations/zipball/5b668aef16090008790395c02c893b1ba13f7e08", - "reference": "5b668aef16090008790395c02c893b1ba13f7e08", + "url": "https://api.github.com/repos/doctrine/annotations/zipball/648b0343343565c4a056bfc8392201385e8d89f0", + "reference": "648b0343343565c4a056bfc8392201385e8d89f0", "shasum": "" }, "require": { @@ -617,9 +617,10 @@ "require-dev": { "doctrine/cache": "^1.11 || ^2.0", "doctrine/coding-standard": "^6.0 || ^8.1", - "phpstan/phpstan": "^0.12.20", + "phpstan/phpstan": "^1.4.10 || ^1.8.0", "phpunit/phpunit": "^7.5 || ^8.0 || ^9.1.5", - "symfony/cache": "^4.4 || ^5.2" + "symfony/cache": "^4.4 || ^5.2", + "vimeo/psalm": "^4.10" }, "type": "library", "autoload": { @@ -662,9 +663,9 @@ ], "support": { "issues": "https://github.com/doctrine/annotations/issues", - "source": "https://github.com/doctrine/annotations/tree/1.13.2" + "source": "https://github.com/doctrine/annotations/tree/1.13.3" }, - "time": "2021-08-05T19:00:23+00:00" + "time": "2022-07-02T10:48:51+00:00" }, { "name": "doctrine/cache", @@ -2748,36 +2749,36 @@ }, { "name": "laminas/laminas-di", - "version": "3.7.0", + "version": "3.9.1", "source": { "type": "git", "url": "https://github.com/laminas/laminas-di.git", - "reference": "80c90d68bc15d4e094a609760144ce1d1aad0a79" + "reference": "9b7091c50587f7ded53519d229421a02532feb9a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-di/zipball/80c90d68bc15d4e094a609760144ce1d1aad0a79", - "reference": "80c90d68bc15d4e094a609760144ce1d1aad0a79", + "url": "https://api.github.com/repos/laminas/laminas-di/zipball/9b7091c50587f7ded53519d229421a02532feb9a", + "reference": "9b7091c50587f7ded53519d229421a02532feb9a", "shasum": "" }, "require": { "laminas/laminas-stdlib": "^3.6", "php": ">=7.4, <8.2", "psr/container": "^1.1.1", - "psr/log": "^1.1.4" + "psr/log": "^1.1.4 || ^3.0.0" }, "conflict": { + "laminas/laminas-servicemanager": "<3.13.0", "laminas/laminas-servicemanager-di": "*", "phpspec/prophecy": "<1.9.0", "zendframework/zend-di": "*" }, "require-dev": { - "container-interop/container-interop": "^1.2.0", "laminas/laminas-coding-standard": "~2.3.0", - "laminas/laminas-servicemanager": "^3.7", + "laminas/laminas-servicemanager": "^3.12", "mikey179/vfsstream": "^1.6.10@alpha", + "phpbench/phpbench": "^1.2", "phpspec/prophecy-phpunit": "^2.0", - "phpstan/phpstan": "^0.12.64", "phpunit/phpunit": "^9.5.5", "squizlabs/php_codesniffer": "^3.6" }, @@ -2821,7 +2822,7 @@ "type": "community_bridge" } ], - "time": "2022-05-15T18:19:36+00:00" + "time": "2022-06-30T12:29:26+00:00" }, { "name": "laminas/laminas-escaper", @@ -4232,16 +4233,16 @@ }, { "name": "laminas/laminas-servicemanager", - "version": "3.12.0", + "version": "3.13.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-servicemanager.git", - "reference": "05ac4b1fb1fe9333313eeafced9b6c7946589487" + "reference": "6f96556ee314f9e0d57d83967c0087332836c31d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-servicemanager/zipball/05ac4b1fb1fe9333313eeafced9b6c7946589487", - "reference": "05ac4b1fb1fe9333313eeafced9b6c7946589487", + "url": "https://api.github.com/repos/laminas/laminas-servicemanager/zipball/6f96556ee314f9e0d57d83967c0087332836c31d", + "reference": "6f96556ee314f9e0d57d83967c0087332836c31d", "shasum": "" }, "require": { @@ -4271,7 +4272,7 @@ "phpbench/phpbench": "^1.1", "phpspec/prophecy-phpunit": "^2.0", "phpunit/phpunit": "^9.5.5", - "psalm/plugin-phpunit": "^0.16.1", + "psalm/plugin-phpunit": "^0.17.0", "vimeo/psalm": "^4.8" }, "suggest": { @@ -4319,7 +4320,7 @@ "type": "community_bridge" } ], - "time": "2022-06-13T16:20:56+00:00" + "time": "2022-06-29T08:01:37+00:00" }, { "name": "laminas/laminas-stdlib", @@ -4498,16 +4499,16 @@ }, { "name": "laminas/laminas-validator", - "version": "2.20.0", + "version": "2.20.1", "source": { "type": "git", "url": "https://github.com/laminas/laminas-validator.git", - "reference": "ba665f5a52763dda5a747c4ad826d2adf1510486" + "reference": "90304417929a51e42999b115907a39f4b658c131" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-validator/zipball/ba665f5a52763dda5a747c4ad826d2adf1510486", - "reference": "ba665f5a52763dda5a747c4ad826d2adf1510486", + "url": "https://api.github.com/repos/laminas/laminas-validator/zipball/90304417929a51e42999b115907a39f4b658c131", + "reference": "90304417929a51e42999b115907a39f4b658c131", "shasum": "" }, "require": { @@ -4581,7 +4582,7 @@ "type": "community_bridge" } ], - "time": "2022-06-14T12:31:18+00:00" + "time": "2022-07-01T07:39:15+00:00" }, { "name": "laminas/laminas-view", @@ -4754,16 +4755,16 @@ }, { "name": "monarc/core", - "version": "v2.12.1", + "version": "v2.12.1-p1", "source": { "type": "git", "url": "https://github.com/monarc-project/zm-core.git", - "reference": "f8ac72323545ab4d0a501b18c83f7b82d159493d" + "reference": "98c096f369b68b627ab540bcbb7db6688b1140fc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/monarc-project/zm-core/zipball/f8ac72323545ab4d0a501b18c83f7b82d159493d", - "reference": "f8ac72323545ab4d0a501b18c83f7b82d159493d", + "url": "https://api.github.com/repos/monarc-project/zm-core/zipball/98c096f369b68b627ab540bcbb7db6688b1140fc", + "reference": "98c096f369b68b627ab540bcbb7db6688b1140fc", "shasum": "" }, "require": { @@ -4840,9 +4841,9 @@ "description": "Core for monarc/monarc application", "support": { "issues": "https://github.com/monarc-project/zm-core/issues", - "source": "https://github.com/monarc-project/zm-core/tree/v2.12.1" + "source": "https://github.com/monarc-project/zm-core/tree/v2.12.1-p1" }, - "time": "2022-06-29T06:00:44+00:00" + "time": "2022-07-01T14:22:07+00:00" }, { "name": "monarc/frontoffice", @@ -8172,12 +8173,12 @@ "source": { "type": "git", "url": "https://github.com/Roave/SecurityAdvisories.git", - "reference": "82cfc4675f037cf8145d640a3f6da62dca474eb1" + "reference": "7a8c86df136ffe6bd7bc4655d15629a87e5bd022" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/82cfc4675f037cf8145d640a3f6da62dca474eb1", - "reference": "82cfc4675f037cf8145d640a3f6da62dca474eb1", + "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/7a8c86df136ffe6bd7bc4655d15629a87e5bd022", + "reference": "7a8c86df136ffe6bd7bc4655d15629a87e5bd022", "shasum": "" }, "conflict": { @@ -8230,7 +8231,7 @@ "codiad/codiad": "<=2.8.4", "composer/composer": "<1.10.26|>=2-alpha.1,<2.2.12|>=2.3,<2.3.5", "concrete5/concrete5": "<9", - "concrete5/core": "<8.5.7", + "concrete5/core": "<8.5.8|>=9,<9.1", "contao-components/mediaelement": ">=2.14.2,<2.21.1", "contao/contao": ">=4,<4.4.56|>=4.5,<4.9.18|>=4.10,<4.11.7|>=4.13,<4.13.3", "contao/core": ">=2,<3.5.39", @@ -8262,6 +8263,7 @@ "dweeves/magmi": "<=0.7.24", "ecodev/newsletter": "<=4", "ectouch/ectouch": "<=2.7.2", + "elefant/cms": "<1.3.13", "elgg/elgg": "<3.3.24|>=4,<4.0.5", "endroid/qr-code-bundle": "<3.4.2", "enshrined/svg-sanitize": "<0.15", @@ -8559,6 +8561,7 @@ "thelia/backoffice-default-template": ">=2.1,<2.1.2", "thelia/thelia": ">=2.1-beta.1,<2.1.3", "theonedemon/phpwhois": "<=4.2.5", + "thinkcmf/thinkcmf": "<=5.1.7", "tinymce/tinymce": "<5.10", "titon/framework": ">=0,<9.9.99", "topthink/framework": "<6.0.12", @@ -8667,7 +8670,7 @@ "type": "tidelift" } ], - "time": "2022-06-28T09:04:11+00:00" + "time": "2022-06-29T23:04:12+00:00" }, { "name": "sebastian/code-unit-reverse-lookup",