From 3c1122fd0a7e09d4a40b431a19e98623448ef33f Mon Sep 17 00:00:00 2001 From: Ruslan Baidan Date: Thu, 24 Jun 2021 13:37:09 +0200 Subject: [PATCH] Updated the project with the new release. --- CHANGELOG.md | 10 +++++++ VERSION.json | 2 +- composer.lock | 83 ++++++++++++++++++++++++++++----------------------- package.json | 2 +- 4 files changed, 57 insertions(+), 40 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 622b490..9dc2d9b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,16 @@ MONARC Changelog ================ +## 2.10.4 (2021-06-24) Includes bug-fixes. + +### Fix + +- [FrontOffice] Snapshots creation error. + ([#362](https://github.com/monarc-project/MonarcAppFO/issues/362)) +- Foreign Key Error by when deactivating information security risks. + ([#358](https://github.com/monarc-project/MonarcAppFO/issues/358)) + + ## 2.10.3 (2021-05-12) Includes bug-fixes, new features and an enhancement. ### New diff --git a/VERSION.json b/VERSION.json index 9118dc9..7d834d1 100644 --- a/VERSION.json +++ b/VERSION.json @@ -1 +1 @@ -{"major":2, "minor":10, "hotfix":3} +{"major":2, "minor":10, "hotfix":4} diff --git a/composer.lock b/composer.lock index 04bc58d..393de21 100644 --- a/composer.lock +++ b/composer.lock @@ -935,31 +935,32 @@ }, { "name": "doctrine/dbal", - "version": "2.13.1", + "version": "2.13.2", "source": { "type": "git", "url": "https://github.com/doctrine/dbal.git", - "reference": "c800380457948e65bbd30ba92cc17cda108bf8c9" + "reference": "8dd39d2ead4409ce652fd4f02621060f009ea5e4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/dbal/zipball/c800380457948e65bbd30ba92cc17cda108bf8c9", - "reference": "c800380457948e65bbd30ba92cc17cda108bf8c9", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/8dd39d2ead4409ce652fd4f02621060f009ea5e4", + "reference": "8dd39d2ead4409ce652fd4f02621060f009ea5e4", "shasum": "" }, "require": { - "doctrine/cache": "^1.0", + "doctrine/cache": "^1.0|^2.0", "doctrine/deprecations": "^0.5.3", "doctrine/event-manager": "^1.0", "ext-pdo": "*", "php": "^7.1 || ^8" }, "require-dev": { - "doctrine/coding-standard": "8.2.0", + "doctrine/coding-standard": "9.0.0", "jetbrains/phpstorm-stubs": "2020.2", "phpstan/phpstan": "0.12.81", - "phpunit/phpunit": "^7.5.20|^8.5|9.5.0", + "phpunit/phpunit": "^7.5.20|^8.5|9.5.5", "squizlabs/php_codesniffer": "3.6.0", + "symfony/cache": "^4.4", "symfony/console": "^2.0.5|^3.0|^4.0|^5.0", "vimeo/psalm": "4.6.4" }, @@ -1022,7 +1023,7 @@ ], "support": { "issues": "https://github.com/doctrine/dbal/issues", - "source": "https://github.com/doctrine/dbal/tree/2.13.1" + "source": "https://github.com/doctrine/dbal/tree/2.13.2" }, "funding": [ { @@ -1038,7 +1039,7 @@ "type": "tidelift" } ], - "time": "2021-04-17T17:30:19+00:00" + "time": "2021-06-18T21:48:39+00:00" }, { "name": "doctrine/deprecations", @@ -4462,16 +4463,16 @@ }, { "name": "laminas/laminas-zendframework-bridge", - "version": "1.2.0", + "version": "1.2.1", "source": { "type": "git", "url": "https://github.com/laminas/laminas-zendframework-bridge.git", - "reference": "6cccbddfcfc742eb02158d6137ca5687d92cee32" + "reference": "9aaa3fde4a184c53f893d938ea9d3f9375cd0622" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-zendframework-bridge/zipball/6cccbddfcfc742eb02158d6137ca5687d92cee32", - "reference": "6cccbddfcfc742eb02158d6137ca5687d92cee32", + "url": "https://api.github.com/repos/laminas/laminas-zendframework-bridge/zipball/9aaa3fde4a184c53f893d938ea9d3f9375cd0622", + "reference": "9aaa3fde4a184c53f893d938ea9d3f9375cd0622", "shasum": "" }, "require": { @@ -4520,20 +4521,20 @@ "type": "community_bridge" } ], - "time": "2021-02-25T21:54:58+00:00" + "time": "2021-06-24T10:54:07+00:00" }, { "name": "monarc/core", - "version": "v2.10.3", + "version": "v2.10.4", "source": { "type": "git", "url": "https://github.com/monarc-project/zm-core.git", - "reference": "302439d6460b98ada2a2b9d7d7b0036da278caac" + "reference": "209d2584252efed0aa68f87b94b63cfcb3cd5c45" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/monarc-project/zm-core/zipball/302439d6460b98ada2a2b9d7d7b0036da278caac", - "reference": "302439d6460b98ada2a2b9d7d7b0036da278caac", + "url": "https://api.github.com/repos/monarc-project/zm-core/zipball/209d2584252efed0aa68f87b94b63cfcb3cd5c45", + "reference": "209d2584252efed0aa68f87b94b63cfcb3cd5c45", "shasum": "" }, "require": { @@ -4609,22 +4610,22 @@ "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.10.3" + "source": "https://github.com/monarc-project/zm-core/tree/v2.10.4" }, - "time": "2021-06-14T10:11:28+00:00" + "time": "2021-06-24T11:23:41+00:00" }, { "name": "monarc/frontoffice", - "version": "v2.10.3", + "version": "v2.10.4", "source": { "type": "git", "url": "https://github.com/monarc-project/zm-client.git", - "reference": "3cffd949e46ca2869e3183143fa11291a7ae84dc" + "reference": "b0d7f8eb2e210887597c00ff29fd8ad28a9ca203" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/monarc-project/zm-client/zipball/3cffd949e46ca2869e3183143fa11291a7ae84dc", - "reference": "3cffd949e46ca2869e3183143fa11291a7ae84dc", + "url": "https://api.github.com/repos/monarc-project/zm-client/zipball/b0d7f8eb2e210887597c00ff29fd8ad28a9ca203", + "reference": "b0d7f8eb2e210887597c00ff29fd8ad28a9ca203", "shasum": "" }, "require": { @@ -4705,9 +4706,9 @@ "description": "Frontoffice for monarc/monarc application", "support": { "issues": "https://github.com/monarc-project/zm-client/issues", - "source": "https://github.com/monarc-project/zm-client/tree/v2.10.3" + "source": "https://github.com/monarc-project/zm-client/tree/v2.10.4" }, - "time": "2021-06-22T10:37:56+00:00" + "time": "2021-06-24T11:24:03+00:00" }, { "name": "monarc/phpword", @@ -7884,16 +7885,16 @@ }, { "name": "phpunit/phpunit", - "version": "8.5.16", + "version": "8.5.17", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "cc66f2fc61296be66c99931a862200e7456b9a01" + "reference": "79067856d85421c56d413bd238d4e2cd6b0e54da" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/cc66f2fc61296be66c99931a862200e7456b9a01", - "reference": "cc66f2fc61296be66c99931a862200e7456b9a01", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/79067856d85421c56d413bd238d4e2cd6b0e54da", + "reference": "79067856d85421c56d413bd238d4e2cd6b0e54da", "shasum": "" }, "require": { @@ -7965,7 +7966,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", - "source": "https://github.com/sebastianbergmann/phpunit/tree/8.5.16" + "source": "https://github.com/sebastianbergmann/phpunit/tree/8.5.17" }, "funding": [ { @@ -7977,7 +7978,7 @@ "type": "github" } ], - "time": "2021-06-05T04:46:20+00:00" + "time": "2021-06-23T05:12:43+00:00" }, { "name": "roave/security-advisories", @@ -7985,12 +7986,12 @@ "source": { "type": "git", "url": "https://github.com/Roave/SecurityAdvisories.git", - "reference": "ac3658667fbbdd16f2be6f0976b8527f5f9ddf6d" + "reference": "ac0d045cdd1a9f1c87a0225a1dcda2bfb71be924" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/ac3658667fbbdd16f2be6f0976b8527f5f9ddf6d", - "reference": "ac3658667fbbdd16f2be6f0976b8527f5f9ddf6d", + "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/ac0d045cdd1a9f1c87a0225a1dcda2bfb71be924", + "reference": "ac0d045cdd1a9f1c87a0225a1dcda2bfb71be924", "shasum": "" }, "conflict": { @@ -8023,8 +8024,9 @@ "composer/composer": "<1.10.22|>=2-alpha.1,<2.0.13", "contao-components/mediaelement": ">=2.14.2,<2.21.1", "contao/core": ">=2,<3.5.39", - "contao/core-bundle": ">=4,<4.4.52|>=4.5,<4.9.6|= 4.10.0", + "contao/core-bundle": ">=4,<4.4.52|>=4.5,<4.9.16|>=4.10,<4.11.5|= 4.10.0", "contao/listing-bundle": ">=4,<4.4.8", + "croogo/croogo": "<3.0.7", "datadog/dd-trace": ">=0.30,<0.30.2", "david-garcia/phpwhois": "<=4.3.1", "derhansen/sf_event_mgt": "<4.3.1|>=5,<5.1.1", @@ -8090,6 +8092,7 @@ "illuminate/encryption": ">=4,<=4.0.11|>=4.1,<=4.1.31|>=4.2,<=4.2.22|>=5,<=5.0.35|>=5.1,<=5.1.46|>=5.2,<=5.2.45|>=5.3,<=5.3.31|>=5.4,<=5.4.36|>=5.5,<5.5.40|>=5.6,<5.6.15", "illuminate/view": ">=7,<7.1.2", "impresscms/impresscms": "<=1.4.2", + "intelliants/subrion": "<=4.2.1", "ivankristianto/phpwhois": "<=4.3", "james-heinrich/getid3": "<1.9.9", "joomla/archive": "<1.1.10", @@ -8104,6 +8107,7 @@ "laravel/framework": "<6.20.26|>=7,<8.40", "laravel/socialite": ">=1,<1.0.99|>=2,<2.0.10", "league/commonmark": "<0.18.3", + "league/flysystem": "<1.1.4|>=2,<2.1.1", "lexik/jwt-authentication-bundle": "<2.10.7|>=2.11,<2.11.3", "librenms/librenms": "<21.1", "livewire/livewire": ">2.2.4,<2.2.6", @@ -8119,10 +8123,12 @@ "moodle/moodle": "<3.5.17|>=3.7,<3.7.9|>=3.8,<3.8.8|>=3.9,<3.9.5|>=3.10,<3.10.2", "namshi/jose": "<2.2", "neos/flow": ">=1,<1.0.4|>=1.1,<1.1.1|>=2,<2.0.1|>=2.3,<2.3.16|>=3,<3.0.12|>=3.1,<3.1.10|>=3.2,<3.2.13|>=3.3,<3.3.13|>=4,<4.0.6", + "neos/form": ">=1.2,<4.3.3|>=5,<5.0.9|>=5.1,<5.1.3", "neos/neos": ">=1.1,<1.1.3|>=1.2,<1.2.13|>=2,<2.0.4|>=2.3,<2.9.99|>=3,<3.0.20|>=3.1,<3.1.18|>=3.2,<3.2.14|>=3.3,<3.3.23|>=4,<4.0.17|>=4.1,<4.1.16|>=4.2,<4.2.12|>=4.3,<4.3.3", "neos/swiftmailer": ">=4.1,<4.1.99|>=5.4,<5.4.5", "nette/application": ">=2,<2.0.19|>=2.1,<2.1.13|>=2.2,<2.2.10|>=2.3,<2.3.14|>=2.4,<2.4.16|>=3,<3.0.6", "nette/nette": ">=2,<2.0.19|>=2.1,<2.1.13", + "nukeviet/nukeviet": "<4.3.4", "nystudio107/craft-seomatic": "<3.3", "nzo/url-encryptor-bundle": ">=4,<4.3.2|>=5,<5.0.1", "october/backend": "<1.1.2", @@ -8139,6 +8145,7 @@ "oro/platform": ">=1.7,<1.7.4", "padraic/humbug_get_contents": "<1.1.2", "pagarme/pagarme-php": ">=0,<3", + "pagekit/pagekit": "<=1.0.18", "paragonie/random_compat": "<2", "passbolt/passbolt_api": "<2.11", "paypal/merchant-sdk-php": "<3.12", @@ -8273,6 +8280,7 @@ "wikimedia/parsoid": "<0.12.2", "willdurand/js-translation-bundle": "<2.1.1", "wp-cli/wp-cli": "<2.5", + "yidashi/yii2cmf": "<=2", "yii2mod/yii2-cms": "<1.9.2", "yiisoft/yii": ">=1.1.14,<1.1.15", "yiisoft/yii2": "<2.0.38", @@ -8344,7 +8352,7 @@ "type": "tidelift" } ], - "time": "2021-06-17T16:09:58+00:00" + "time": "2021-06-24T09:02:34+00:00" }, { "name": "sebastian/code-unit-reverse-lookup", @@ -8970,7 +8978,6 @@ "type": "github" } ], - "abandoned": true, "time": "2020-11-30T07:30:19+00:00" }, { diff --git a/package.json b/package.json index 092b7cf..d664f57 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "MONARC", - "version": "2.10.3", + "version": "2.10.4", "description": "Monarc front office application", "private": true, "repository": {