From 36cf3ce94c567c7569270cdbefe7501949895d92 Mon Sep 17 00:00:00 2001 From: Ruslan Baidan Date: Wed, 18 Dec 2019 11:39:02 +0100 Subject: [PATCH] Updated the release 2.9.5 related files. --- CHANGELOG.md | 8 ++ VERSION.json | 2 +- composer.lock | 176 +++++++++++++++++++++--------------------- package.json | 2 +- scripts/update-all.sh | 2 +- 5 files changed, 101 insertions(+), 89 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e745a7c..77a0a8d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,14 @@ MONARC Changelog ================ +## 2.9.5 (2019-12-18) + +### Fix + +- Fixed the creation of the snapshots with empty comment. +- Fixed the library categories management (creation of the new ones under root and sub categories). +([#212](https://github.com/monarc-project/MonarcAppFO/issues/216)); + ## 2.9.4 (2019-12-11) ### Fix diff --git a/VERSION.json b/VERSION.json index 1d98385..7118989 100644 --- a/VERSION.json +++ b/VERSION.json @@ -1 +1 @@ -{"major":2, "minor":9, "hotfix":4} +{"major":2, "minor":9, "hotfix":5} diff --git a/composer.lock b/composer.lock index 607ef35..5c3d9e4 100644 --- a/composer.lock +++ b/composer.lock @@ -1309,16 +1309,16 @@ }, { "name": "doctrine/persistence", - "version": "1.2.0", + "version": "1.3.3", "source": { "type": "git", "url": "https://github.com/doctrine/persistence.git", - "reference": "43526ae63312942e5316100bb3ed589ba1aba491" + "reference": "99b196bbd4715a94fa100fac664a351ffa46d6a5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/persistence/zipball/43526ae63312942e5316100bb3ed589ba1aba491", - "reference": "43526ae63312942e5316100bb3ed589ba1aba491", + "url": "https://api.github.com/repos/doctrine/persistence/zipball/99b196bbd4715a94fa100fac664a351ffa46d6a5", + "reference": "99b196bbd4715a94fa100fac664a351ffa46d6a5", "shasum": "" }, "require": { @@ -1333,19 +1333,20 @@ "doctrine/common": "<2.10@dev" }, "require-dev": { - "doctrine/coding-standard": "^5.0", - "phpstan/phpstan": "^0.8", + "doctrine/coding-standard": "^6.0", + "phpstan/phpstan": "^0.11", "phpunit/phpunit": "^7.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.2.x-dev" + "dev-master": "1.3.x-dev" } }, "autoload": { "psr-4": { - "Doctrine\\Common\\": "lib/Doctrine/Common" + "Doctrine\\Common\\": "lib/Doctrine/Common", + "Doctrine\\Persistence\\": "lib/Doctrine/Persistence" } }, "notification-url": "https://packagist.org/downloads/", @@ -1387,7 +1388,7 @@ "orm", "persistence" ], - "time": "2019-04-23T12:39:21+00:00" + "time": "2019-12-13T10:43:02+00:00" }, { "name": "doctrine/reflection", @@ -1466,16 +1467,16 @@ }, { "name": "monarc/core", - "version": "2.9.3", + "version": "2.9.4", "source": { "type": "git", "url": "https://github.com/monarc-project/zm-core.git", - "reference": "5f2828c7051caf79827579516837b92b52773a76" + "reference": "3597c76cb817d2088bf3afd7e4e4bc4a39a70398" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/monarc-project/zm-core/zipball/5f2828c7051caf79827579516837b92b52773a76", - "reference": "5f2828c7051caf79827579516837b92b52773a76", + "url": "https://api.github.com/repos/monarc-project/zm-core/zipball/3597c76cb817d2088bf3afd7e4e4bc4a39a70398", + "reference": "3597c76cb817d2088bf3afd7e4e4bc4a39a70398", "shasum": "" }, "require": { @@ -1547,20 +1548,20 @@ } ], "description": "Core for monarc/monarc application", - "time": "2019-12-09T10:56:13+00:00" + "time": "2019-12-18T10:12:09+00:00" }, { "name": "monarc/frontoffice", - "version": "2.9.4", + "version": "2.9.5", "source": { "type": "git", "url": "https://github.com/monarc-project/zm-client.git", - "reference": "bc93c336ef7a15f2655c571b5fc808e77cf8b788" + "reference": "3259d59edc37920f3971b166bc9845fa3a031cea" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/monarc-project/zm-client/zipball/bc93c336ef7a15f2655c571b5fc808e77cf8b788", - "reference": "bc93c336ef7a15f2655c571b5fc808e77cf8b788", + "url": "https://api.github.com/repos/monarc-project/zm-client/zipball/3259d59edc37920f3971b166bc9845fa3a031cea", + "reference": "3259d59edc37920f3971b166bc9845fa3a031cea", "shasum": "" }, "require": { @@ -1626,7 +1627,7 @@ } ], "description": "Frontoffice for monarc/monarc application", - "time": "2019-12-11T09:54:09+00:00" + "time": "2019-12-18T10:11:50+00:00" }, { "name": "monarc/phpword", @@ -2180,22 +2181,22 @@ }, { "name": "ramsey/uuid", - "version": "3.9.1", + "version": "3.9.2", "source": { "type": "git", "url": "https://github.com/ramsey/uuid.git", - "reference": "5ac2740e0c8c599d2bbe7f113a939f2b5b216c67" + "reference": "7779489a47d443f845271badbdcedfe4df8e06fb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ramsey/uuid/zipball/5ac2740e0c8c599d2bbe7f113a939f2b5b216c67", - "reference": "5ac2740e0c8c599d2bbe7f113a939f2b5b216c67", + "url": "https://api.github.com/repos/ramsey/uuid/zipball/7779489a47d443f845271badbdcedfe4df8e06fb", + "reference": "7779489a47d443f845271badbdcedfe4df8e06fb", "shasum": "" }, "require": { "ext-json": "*", "paragonie/random_compat": "^1 | ^2 | 9.99.99", - "php": "^5.4 | ^7", + "php": "^5.4 | ^7 | ^8", "symfony/polyfill-ctype": "^1.8" }, "replace": { @@ -2205,13 +2206,13 @@ "codeception/aspect-mock": "^1 | ^2", "doctrine/annotations": "^1.2", "goaop/framework": "1.0.0-alpha.2 | ^1 | ^2.1", - "jakub-onderka/php-parallel-lint": "^0.9.0", - "mockery/mockery": "^0.9.9", + "jakub-onderka/php-parallel-lint": "^1", + "mockery/mockery": "^0.9.11 | ^1", "moontoast/math": "^1.1", "paragonie/random-lib": "^2", "php-mock/php-mock-phpunit": "^0.3 | ^1.1", "phpunit/phpunit": "^4.8 | ^5.4 | ^6.5", - "squizlabs/php_codesniffer": "^2.3" + "squizlabs/php_codesniffer": "^3.5" }, "suggest": { "ext-ctype": "Provides support for PHP Ctype functions", @@ -2263,7 +2264,7 @@ "identifier", "uuid" ], - "time": "2019-12-01T04:55:27+00:00" + "time": "2019-12-17T08:18:51+00:00" }, { "name": "ramsey/uuid-doctrine", @@ -2324,16 +2325,16 @@ }, { "name": "robmorgan/phinx", - "version": "0.11.1", + "version": "0.11.3", "source": { "type": "git", "url": "https://github.com/cakephp/phinx.git", - "reference": "a6cced878695d26396b26dfd62ce300aea07de05" + "reference": "3c6a171b0455225cf42716dc4864feb620da716f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cakephp/phinx/zipball/a6cced878695d26396b26dfd62ce300aea07de05", - "reference": "a6cced878695d26396b26dfd62ce300aea07de05", + "url": "https://api.github.com/repos/cakephp/phinx/zipball/3c6a171b0455225cf42716dc4864feb620da716f", + "reference": "3c6a171b0455225cf42716dc4864feb620da716f", "shasum": "" }, "require": { @@ -2342,9 +2343,9 @@ "cakephp/database": "^3.6", "cakephp/datasource": "^3.6", "php": ">=5.6", - "symfony/config": "^3.4|^4.0", - "symfony/console": "^3.4|^4.0", - "symfony/yaml": "^3.4|^4.0" + "symfony/config": "^3.4|^4.0|^5.0", + "symfony/console": "^3.4|^4.0|^5.0", + "symfony/yaml": "^3.4|^4.0|^5.0" }, "require-dev": { "cakephp/cakephp-codesniffer": "^3.0", @@ -2397,36 +2398,36 @@ "migrations", "phinx" ], - "time": "2019-08-28T12:24:19+00:00" + "time": "2019-12-12T16:53:38+00:00" }, { "name": "symfony/config", - "version": "v4.4.1", + "version": "v5.0.1", "source": { "type": "git", "url": "https://github.com/symfony/config.git", - "reference": "7aa5817f1b7a8ed377752b90fcc47dfb3c67b40c" + "reference": "c0773efcc2c940ffbc4c34a0dba2836f2cf6dc9c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/7aa5817f1b7a8ed377752b90fcc47dfb3c67b40c", - "reference": "7aa5817f1b7a8ed377752b90fcc47dfb3c67b40c", + "url": "https://api.github.com/repos/symfony/config/zipball/c0773efcc2c940ffbc4c34a0dba2836f2cf6dc9c", + "reference": "c0773efcc2c940ffbc4c34a0dba2836f2cf6dc9c", "shasum": "" }, "require": { - "php": "^7.1.3", - "symfony/filesystem": "^3.4|^4.0|^5.0", + "php": "^7.2.5", + "symfony/filesystem": "^4.4|^5.0", "symfony/polyfill-ctype": "~1.8" }, "conflict": { - "symfony/finder": "<3.4" + "symfony/finder": "<4.4" }, "require-dev": { - "symfony/event-dispatcher": "^3.4|^4.0|^5.0", - "symfony/finder": "^3.4|^4.0|^5.0", - "symfony/messenger": "^4.1|^5.0", + "symfony/event-dispatcher": "^4.4|^5.0", + "symfony/finder": "^4.4|^5.0", + "symfony/messenger": "^4.4|^5.0", "symfony/service-contracts": "^1.1|^2", - "symfony/yaml": "^3.4|^4.0|^5.0" + "symfony/yaml": "^4.4|^5.0" }, "suggest": { "symfony/yaml": "To use the yaml reference dumper" @@ -2434,7 +2435,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.4-dev" + "dev-master": "5.0-dev" } }, "autoload": { @@ -2461,45 +2462,45 @@ ], "description": "Symfony Config Component", "homepage": "https://symfony.com", - "time": "2019-12-01T10:50:45+00:00" + "time": "2019-12-01T10:51:15+00:00" }, { "name": "symfony/console", - "version": "v4.4.1", + "version": "v5.0.1", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "f0aea3df20d15635b3cb9730ca5eea1c65b7f201" + "reference": "dae5ef273d700771168ab889d9f8a19b2d206656" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/f0aea3df20d15635b3cb9730ca5eea1c65b7f201", - "reference": "f0aea3df20d15635b3cb9730ca5eea1c65b7f201", + "url": "https://api.github.com/repos/symfony/console/zipball/dae5ef273d700771168ab889d9f8a19b2d206656", + "reference": "dae5ef273d700771168ab889d9f8a19b2d206656", "shasum": "" }, "require": { - "php": "^7.1.3", + "php": "^7.2.5", "symfony/polyfill-mbstring": "~1.0", "symfony/polyfill-php73": "^1.8", "symfony/service-contracts": "^1.1|^2" }, "conflict": { - "symfony/dependency-injection": "<3.4", - "symfony/event-dispatcher": "<4.3|>=5", + "symfony/dependency-injection": "<4.4", + "symfony/event-dispatcher": "<4.4", "symfony/lock": "<4.4", - "symfony/process": "<3.3" + "symfony/process": "<4.4" }, "provide": { "psr/log-implementation": "1.0" }, "require-dev": { "psr/log": "~1.0", - "symfony/config": "^3.4|^4.0|^5.0", - "symfony/dependency-injection": "^3.4|^4.0|^5.0", - "symfony/event-dispatcher": "^4.3", + "symfony/config": "^4.4|^5.0", + "symfony/dependency-injection": "^4.4|^5.0", + "symfony/event-dispatcher": "^4.4|^5.0", "symfony/lock": "^4.4|^5.0", - "symfony/process": "^3.4|^4.0|^5.0", - "symfony/var-dumper": "^4.3|^5.0" + "symfony/process": "^4.4|^5.0", + "symfony/var-dumper": "^4.4|^5.0" }, "suggest": { "psr/log": "For using the console logger", @@ -2510,7 +2511,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.4-dev" + "dev-master": "5.0-dev" } }, "autoload": { @@ -2537,7 +2538,7 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2019-12-01T10:06:17+00:00" + "time": "2019-12-01T10:51:15+00:00" }, { "name": "symfony/filesystem", @@ -2824,27 +2825,27 @@ }, { "name": "symfony/yaml", - "version": "v4.4.1", + "version": "v5.0.1", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "76de473358fe802578a415d5bb43c296cf09d211" + "reference": "51b684480184fa767b97e28eaca67664e48dd3e9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/76de473358fe802578a415d5bb43c296cf09d211", - "reference": "76de473358fe802578a415d5bb43c296cf09d211", + "url": "https://api.github.com/repos/symfony/yaml/zipball/51b684480184fa767b97e28eaca67664e48dd3e9", + "reference": "51b684480184fa767b97e28eaca67664e48dd3e9", "shasum": "" }, "require": { - "php": "^7.1.3", + "php": "^7.2.5", "symfony/polyfill-ctype": "~1.8" }, "conflict": { - "symfony/console": "<3.4" + "symfony/console": "<4.4" }, "require-dev": { - "symfony/console": "^3.4|^4.0|^5.0" + "symfony/console": "^4.4|^5.0" }, "suggest": { "symfony/console": "For validating YAML files using the lint command" @@ -2852,7 +2853,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.4-dev" + "dev-master": "5.0-dev" } }, "autoload": { @@ -2879,7 +2880,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2019-11-12T14:51:11+00:00" + "time": "2019-11-18T17:27:11+00:00" }, { "name": "true/punycode", @@ -3664,16 +3665,16 @@ }, { "name": "zendframework/zend-i18n", - "version": "2.10.0", + "version": "2.10.1", "source": { "type": "git", "url": "https://github.com/zendframework/zend-i18n.git", - "reference": "561a815ce32c86b0f1de11135477e637926d56b6" + "reference": "84038e6a1838b611dcc491b1c40321fa4c3a123c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-i18n/zipball/561a815ce32c86b0f1de11135477e637926d56b6", - "reference": "561a815ce32c86b0f1de11135477e637926d56b6", + "url": "https://api.github.com/repos/zendframework/zend-i18n/zipball/84038e6a1838b611dcc491b1c40321fa4c3a123c", + "reference": "84038e6a1838b611dcc491b1c40321fa4c3a123c", "shasum": "" }, "require": { @@ -3681,6 +3682,9 @@ "php": "^5.6 || ^7.0", "zendframework/zend-stdlib": "^2.7 || ^3.0" }, + "conflict": { + "phpspec/prophecy": "<1.9.0" + }, "require-dev": { "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.16", "zendframework/zend-cache": "^2.6.1", @@ -3728,7 +3732,7 @@ "i18n", "zf" ], - "time": "2019-11-18T20:31:29+00:00" + "time": "2019-12-12T14:08:22+00:00" }, { "name": "zendframework/zend-inputfilter", @@ -4812,12 +4816,12 @@ "source": { "type": "git", "url": "https://github.com/Roave/SecurityAdvisories.git", - "reference": "e4ee2c8e4ccd908debc64069faf023c684a76760" + "reference": "1b2183eef1fdf7438d26b37dd87beb07dd4808bc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/e4ee2c8e4ccd908debc64069faf023c684a76760", - "reference": "e4ee2c8e4ccd908debc64069faf023c684a76760", + "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/1b2183eef1fdf7438d26b37dd87beb07dd4808bc", + "reference": "1b2183eef1fdf7438d26b37dd87beb07dd4808bc", "shasum": "" }, "conflict": { @@ -4838,7 +4842,7 @@ "composer/composer": "<=1-alpha.11", "contao-components/mediaelement": ">=2.14.2,<2.21.1", "contao/core": ">=2,<3.5.39", - "contao/core-bundle": ">=4,<4.4.39|>=4.5,<4.7.5", + "contao/core-bundle": ">=4,<4.4.46|>=4.5,<4.8.6", "contao/listing-bundle": ">=4,<4.4.8", "datadog/dd-trace": ">=0.30,<0.30.2", "david-garcia/phpwhois": "<=4.3.1", @@ -4885,7 +4889,7 @@ "league/commonmark": "<0.18.3", "magento/magento1ce": "<1.9.4.3", "magento/magento1ee": ">=1,<1.14.4.3", - "magento/product-community-edition": ">=2,<2.2.10|>=2.3,<2.3.2", + "magento/product-community-edition": ">=2,<2.2.10|>=2.3,<2.3.2-p.2", "monolog/monolog": ">=1.8,<1.12", "namshi/jose": "<2.2", "onelogin/php-saml": "<2.10.4", @@ -4967,8 +4971,8 @@ "titon/framework": ">=0,<9.9.99", "truckersmp/phpwhois": "<=4.3.1", "twig/twig": "<1.38|>=2,<2.7", - "typo3/cms": ">=6.2,<6.2.30|>=7,<7.6.32|>=8,<8.7.27|>=9,<9.5.8", - "typo3/cms-core": ">=8,<8.7.27|>=9,<9.5.8", + "typo3/cms": ">=6.2,<6.2.30|>=7,<7.6.32|>=8,<8.7.30|>=9,<9.5.12|>=10,<10.2.1", + "typo3/cms-core": ">=8,<8.7.30|>=9,<9.5.12|>=10,<10.2.1", "typo3/flow": ">=1,<1.0.4|>=1.1,<1.1.1|>=2,<2.0.1|>=2.3,<2.3.16|>=3,<3.0.10|>=3.1,<3.1.7|>=3.2,<3.2.7|>=3.3,<3.3.5", "typo3/neos": ">=1.1,<1.1.3|>=1.2,<1.2.13|>=2,<2.0.4", "typo3/phar-stream-wrapper": ">=1,<2.1.1|>=3,<3.1.1", @@ -5022,7 +5026,7 @@ } ], "description": "Prevents installation of composer packages with known security vulnerabilities: no API, simply require it", - "time": "2019-12-02T13:03:15+00:00" + "time": "2019-12-17T15:12:43+00:00" }, { "name": "zendframework/zend-component-installer", diff --git a/package.json b/package.json index c4a308e..192e232 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "MONARC", - "version": "2.9.4", + "version": "2.9.5", "description": "Monarc front office application", "private": true, "repository": { diff --git a/scripts/update-all.sh b/scripts/update-all.sh index 1c61e47..96ff9dd 100755 --- a/scripts/update-all.sh +++ b/scripts/update-all.sh @@ -52,7 +52,7 @@ if [ $? != 0 ]; then exit 1 fi -composer install -o +composer install -o --no-dev pathCore="module/Monarc/Core" pathFO="module/Monarc/FrontOffice"