diff --git a/CHANGELOG.md b/CHANGELOG.md index 263cb47..767e9bf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,14 +1,35 @@ MONARC Changelog ================ +## 2.11.1 (2021-10-27) + +### New + +- Add import of referential mapping from MOSP + ([#]391(https://github.com/monarc-project/MonarcAppFO/issues/391)). + +### Fix +- Subsuming CIA criteria according to the maximum criteria does not work + ([#339](https://github.com/monarc-project/MonarcAppFO/issues/339)). +- Incorrect sum and list of risks under the secondary assets + ([#367](https://github.com/monarc-project/MonarcAppFO/issues/367)). +- If impact adjustments are made not only at the level of the primary assets but also at the level of the secondary assets, these assets are listed more than once + ([#387](https://github.com/monarc-project/MonarcAppFO/issues/387)). +- Recommendation status change error in the Knowledge Base + ([#393](https://github.com/monarc-project/MonarcAppFO/issues/393)). +- Import issue of setting operational risks values + ([#394](https://github.com/monarc-project/MonarcAppFO/issues/394)). +- Fix possible circular iteration of the instance root -> parent -> child rendering + ([#395](https://github.com/monarc-project/MonarcAppFO/issues/395)). + ## 2.11.0 (2021-09-02) ### New -- having the possibility to define custom scales for operational risks - ([#353](https://github.com/monarc-project/MonarcAppFO/issues/353)); -- introduction of the risk context and the risk owner +- Having the possibility to define custom scales for operational risks + ([#353](https://github.com/monarc-project/MonarcAppFO/issues/353)). +- Introduction of the risk context and the risk owner ([#21](https://github.com/monarc-project/MonarcAppFO/issues/21), [#186](https://github.com/monarc-project/MonarcAppFO/issues/186)). @@ -16,8 +37,8 @@ MONARC Changelog ### Fix - update-all.sh: Could not read from remote repository - ([#365](https://github.com/monarc-project/MonarcAppFO/issues/365)); -- some files in script do not have the correct permissions + ([#365](https://github.com/monarc-project/MonarcAppFO/issues/365)). +- Ыome files in script do not have the correct permissions ([#364](https://github.com/monarc-project/MonarcAppFO/issues/364)). @@ -25,12 +46,12 @@ MONARC Changelog ### Fix -- Foreign Key Error by when deactivating information security risks. - ([#358](https://github.com/monarc-project/MonarcAppFO/issues/358)) -- Dashboard cartography error for risk lists. - ([#359](https://github.com/monarc-project/MonarcAppFO/issues/359)) -- [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)). +- Dashboard cartography error for risk lists + ([#359](https://github.com/monarc-project/MonarcAppFO/issues/359)). +- [FrontOffice] Snapshots creation error + ([#362](https://github.com/monarc-project/MonarcAppFO/issues/362)). ## 2.10.3 (2021-05-12) Includes bug-fixes, new features and an enhancement. @@ -38,23 +59,23 @@ MONARC Changelog ### New - Implement the UI language management - ([#318](https://github.com/monarc-project/MonarcAppFO/issues/318)) + ([#318](https://github.com/monarc-project/MonarcAppFO/issues/318)). - Implementation of the library objects import and assets export from/to MOSP - ([#320](https://github.com/monarc-project/MonarcAppFO/issues/320)) + ([#320](https://github.com/monarc-project/MonarcAppFO/issues/320)). - Possibility to export items from the Knowledge Base - ([#321](https://github.com/monarc-project/MonarcAppFO/issues/321)) + ([#321](https://github.com/monarc-project/MonarcAppFO/issues/321)). - Send MONARC version to Stats Service - ([#341](https://github.com/monarc-project/MonarcAppFO/issues/341)) + ([#341](https://github.com/monarc-project/MonarcAppFO/issues/341)). ### Fix - [Front Office] export of measure related to "amvs" stoped working since v2.10.1 - ([#340](https://github.com/monarc-project/MonarcAppFO/issues/340)) + ([#340](https://github.com/monarc-project/MonarcAppFO/issues/340)). ### Enhancement -- Improve the import speed of analyses and instances (*partially done*). - ([#248](https://github.com/monarc-project/MonarcAppFO/issues/248)) +- Improve the import speed of analyses and instances (*partially done*) + ([#248](https://github.com/monarc-project/MonarcAppFO/issues/248)). ## 2.10.2 (2021-02-24) Includes 3 bug-fixes and a new feature. diff --git a/VERSION.json b/VERSION.json index b4f1dae..2b1ee4b 100644 --- a/VERSION.json +++ b/VERSION.json @@ -1 +1 @@ -{"major":2, "minor":11, "hotfix":0} +{"major":2, "minor":11, "hotfix":1} diff --git a/composer.lock b/composer.lock index caa7e9e..bce674a 100644 --- a/composer.lock +++ b/composer.lock @@ -1980,16 +1980,16 @@ }, { "name": "guzzlehttp/promises", - "version": "1.4.1", + "version": "1.5.1", "source": { "type": "git", "url": "https://github.com/guzzle/promises.git", - "reference": "8e7d04f1f6450fef59366c399cfad4b9383aa30d" + "reference": "fe752aedc9fd8fcca3fe7ad05d419d32998a06da" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/8e7d04f1f6450fef59366c399cfad4b9383aa30d", - "reference": "8e7d04f1f6450fef59366c399cfad4b9383aa30d", + "url": "https://api.github.com/repos/guzzle/promises/zipball/fe752aedc9fd8fcca3fe7ad05d419d32998a06da", + "reference": "fe752aedc9fd8fcca3fe7ad05d419d32998a06da", "shasum": "" }, "require": { @@ -2001,7 +2001,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.4-dev" + "dev-master": "1.5-dev" } }, "autoload": { @@ -2017,10 +2017,25 @@ "MIT" ], "authors": [ + { + "name": "Graham Campbell", + "email": "hello@gjcampbell.co.uk", + "homepage": "https://github.com/GrahamCampbell" + }, { "name": "Michael Dowling", "email": "mtdowling@gmail.com", "homepage": "https://github.com/mtdowling" + }, + { + "name": "Tobias Nyholm", + "email": "tobias.nyholm@gmail.com", + "homepage": "https://github.com/Nyholm" + }, + { + "name": "Tobias Schultze", + "email": "webmaster@tubo-world.de", + "homepage": "https://github.com/Tobion" } ], "description": "Guzzle promises library", @@ -2029,22 +2044,36 @@ ], "support": { "issues": "https://github.com/guzzle/promises/issues", - "source": "https://github.com/guzzle/promises/tree/1.4.1" + "source": "https://github.com/guzzle/promises/tree/1.5.1" }, - "time": "2021-03-07T09:25:29+00:00" + "funding": [ + { + "url": "https://github.com/GrahamCampbell", + "type": "github" + }, + { + "url": "https://github.com/Nyholm", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/promises", + "type": "tidelift" + } + ], + "time": "2021-10-22T20:56:57+00:00" }, { "name": "guzzlehttp/psr7", - "version": "1.8.2", + "version": "1.8.3", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "dc960a912984efb74d0a90222870c72c87f10c91" + "reference": "1afdd860a2566ed3c2b0b4a3de6e23434a79ec85" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/dc960a912984efb74d0a90222870c72c87f10c91", - "reference": "dc960a912984efb74d0a90222870c72c87f10c91", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/1afdd860a2566ed3c2b0b4a3de6e23434a79ec85", + "reference": "1afdd860a2566ed3c2b0b4a3de6e23434a79ec85", "shasum": "" }, "require": { @@ -2081,13 +2110,34 @@ "MIT" ], "authors": [ + { + "name": "Graham Campbell", + "email": "hello@gjcampbell.co.uk", + "homepage": "https://github.com/GrahamCampbell" + }, { "name": "Michael Dowling", "email": "mtdowling@gmail.com", "homepage": "https://github.com/mtdowling" }, + { + "name": "George Mponos", + "email": "gmponos@gmail.com", + "homepage": "https://github.com/gmponos" + }, + { + "name": "Tobias Nyholm", + "email": "tobias.nyholm@gmail.com", + "homepage": "https://github.com/Nyholm" + }, + { + "name": "Márk Sági-Kazár", + "email": "mark.sagikazar@gmail.com", + "homepage": "https://github.com/sagikazarmark" + }, { "name": "Tobias Schultze", + "email": "webmaster@tubo-world.de", "homepage": "https://github.com/Tobion" } ], @@ -2104,9 +2154,23 @@ ], "support": { "issues": "https://github.com/guzzle/psr7/issues", - "source": "https://github.com/guzzle/psr7/tree/1.8.2" + "source": "https://github.com/guzzle/psr7/tree/1.8.3" }, - "time": "2021-04-26T09:17:50+00:00" + "funding": [ + { + "url": "https://github.com/GrahamCampbell", + "type": "github" + }, + { + "url": "https://github.com/Nyholm", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/psr7", + "type": "tidelift" + } + ], + "time": "2021-10-05T13:56:00+00:00" }, { "name": "laminas/laminas-authentication", @@ -2741,16 +2805,16 @@ }, { "name": "laminas/laminas-filter", - "version": "2.11.1", + "version": "2.12.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-filter.git", - "reference": "671724e163aa75c210e94d12b77a0f3f8240d4b2" + "reference": "0fc5dcd27dc22dba1a2544123684c67768fc5f88" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-filter/zipball/671724e163aa75c210e94d12b77a0f3f8240d4b2", - "reference": "671724e163aa75c210e94d12b77a0f3f8240d4b2", + "url": "https://api.github.com/repos/laminas/laminas-filter/zipball/0fc5dcd27dc22dba1a2544123684c67768fc5f88", + "reference": "0fc5dcd27dc22dba1a2544123684c67768fc5f88", "shasum": "" }, "require": { @@ -2819,7 +2883,7 @@ "type": "community_bridge" } ], - "time": "2021-05-24T18:29:02+00:00" + "time": "2021-10-24T21:01:15+00:00" }, { "name": "laminas/laminas-form", @@ -3051,16 +3115,16 @@ }, { "name": "laminas/laminas-i18n", - "version": "2.11.2", + "version": "2.11.3", "source": { "type": "git", "url": "https://github.com/laminas/laminas-i18n.git", - "reference": "78adb53ebf6c0bc63f92273fd7809dabc554f786" + "reference": "563b1b720ee53f2748473656a250d65911fc4462" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-i18n/zipball/78adb53ebf6c0bc63f92273fd7809dabc554f786", - "reference": "78adb53ebf6c0bc63f92273fd7809dabc554f786", + "url": "https://api.github.com/repos/laminas/laminas-i18n/zipball/563b1b720ee53f2748473656a250d65911fc4462", + "reference": "563b1b720ee53f2748473656a250d65911fc4462", "shasum": "" }, "require": { @@ -3087,12 +3151,12 @@ "phpunit/phpunit": "^9.3" }, "suggest": { - "laminas/laminas-cache": "Laminas\\Cache component", - "laminas/laminas-config": "Laminas\\Config component", + "laminas/laminas-cache": "You should install this package to cache the translations", + "laminas/laminas-config": "You should install this package to use the INI translation format", "laminas/laminas-eventmanager": "You should install this package to use the events in the translator", "laminas/laminas-filter": "You should install this package to use the provided filters", - "laminas/laminas-i18n-resources": "Translation resources", - "laminas/laminas-servicemanager": "Laminas\\ServiceManager component", + "laminas/laminas-i18n-resources": "This package provides validator and captcha translations", + "laminas/laminas-servicemanager": "You should install this package to use the translator", "laminas/laminas-validator": "You should install this package to use the provided validators", "laminas/laminas-view": "You should install this package to use the provided view helpers" }, @@ -3132,7 +3196,7 @@ "type": "community_bridge" } ], - "time": "2021-08-20T08:23:04+00:00" + "time": "2021-10-13T08:07:28+00:00" }, { "name": "laminas/laminas-inputfilter", @@ -3875,24 +3939,23 @@ }, { "name": "laminas/laminas-permissions-rbac", - "version": "3.1.0", + "version": "3.2.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-permissions-rbac.git", - "reference": "ef224b6c7376d6fc8131b6d5b3609fe2583ffadb" + "reference": "ce117f1d2fb8ec8ec6186633bf485a89149fe46f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-permissions-rbac/zipball/ef224b6c7376d6fc8131b6d5b3609fe2583ffadb", - "reference": "ef224b6c7376d6fc8131b6d5b3609fe2583ffadb", + "url": "https://api.github.com/repos/laminas/laminas-permissions-rbac/zipball/ce117f1d2fb8ec8ec6186633bf485a89149fe46f", + "reference": "ce117f1d2fb8ec8ec6186633bf485a89149fe46f", "shasum": "" }, "require": { - "laminas/laminas-zendframework-bridge": "^1.0", - "php": "^7.3 || ~8.0.0" + "php": "^7.3 || ~8.0.0 || ~8.1.0" }, - "replace": { - "zendframework/zend-permissions-rbac": "^3.0.2" + "conflict": { + "zendframework/zend-permissions-rbac": "*" }, "require-dev": { "laminas/laminas-coding-standard": "~1.0.0", @@ -3932,7 +3995,7 @@ "type": "community_bridge" } ], - "time": "2021-04-08T13:07:31+00:00" + "time": "2021-10-13T17:50:42+00:00" }, { "name": "laminas/laminas-router", @@ -4367,16 +4430,16 @@ }, { "name": "laminas/laminas-view", - "version": "2.12.0", + "version": "2.12.1", "source": { "type": "git", "url": "https://github.com/laminas/laminas-view.git", - "reference": "3ef103da6887809f08ecf52f42c31a76c9bf08b1" + "reference": "23fc886670e05d3fae34d3ba2c5089e2d29beb03" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-view/zipball/3ef103da6887809f08ecf52f42c31a76c9bf08b1", - "reference": "3ef103da6887809f08ecf52f42c31a76c9bf08b1", + "url": "https://api.github.com/repos/laminas/laminas-view/zipball/23fc886670e05d3fae34d3ba2c5089e2d29beb03", + "reference": "23fc886670e05d3fae34d3ba2c5089e2d29beb03", "shasum": "" }, "require": { @@ -4388,6 +4451,7 @@ "php": "^7.3 || ~8.0.0" }, "conflict": { + "laminas/laminas-router": "<3.0.1", "laminas/laminas-servicemanager": "<3.3" }, "replace": { @@ -4407,7 +4471,9 @@ "laminas/laminas-log": "^2.7", "laminas/laminas-modulemanager": "^2.7.1", "laminas/laminas-mvc": "^2.7.14 || ^3.0", - "laminas/laminas-navigation": "^2.5", + "laminas/laminas-mvc-i18n": "^1.1", + "laminas/laminas-mvc-plugin-flashmessenger": "^1.2", + "laminas/laminas-navigation": "^2.8.1", "laminas/laminas-paginator": "^2.5", "laminas/laminas-permissions-acl": "^2.6", "laminas/laminas-router": "^3.0.1", @@ -4467,7 +4533,7 @@ "type": "community_bridge" } ], - "time": "2021-01-01T14:07:41+00:00" + "time": "2021-10-12T16:49:06+00:00" }, { "name": "laminas/laminas-zendframework-bridge", @@ -4533,16 +4599,16 @@ }, { "name": "monarc/core", - "version": "v2.11.0-p3", + "version": "v2.11.1", "source": { "type": "git", "url": "https://github.com/monarc-project/zm-core.git", - "reference": "3c247e2fd5077b0e53d152d16cb8835d2bede0c8" + "reference": "24e0f2bc3f8d574a17066095a8c22698656462dd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/monarc-project/zm-core/zipball/3c247e2fd5077b0e53d152d16cb8835d2bede0c8", - "reference": "3c247e2fd5077b0e53d152d16cb8835d2bede0c8", + "url": "https://api.github.com/repos/monarc-project/zm-core/zipball/24e0f2bc3f8d574a17066095a8c22698656462dd", + "reference": "24e0f2bc3f8d574a17066095a8c22698656462dd", "shasum": "" }, "require": { @@ -4618,22 +4684,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.11.0-p3" + "source": "https://github.com/monarc-project/zm-core/tree/v2.11.1" }, - "time": "2021-10-04T12:04:47+00:00" + "time": "2021-10-26T09:17:04+00:00" }, { "name": "monarc/frontoffice", - "version": "v2.11.0-p5", + "version": "v2.11.1", "source": { "type": "git", "url": "https://github.com/monarc-project/zm-client.git", - "reference": "74f9ef2edbf1835316c44988df27bf97c282bdf5" + "reference": "f1e19dd5acf744a8ebac0c0e31779fcea9831b2b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/monarc-project/zm-client/zipball/74f9ef2edbf1835316c44988df27bf97c282bdf5", - "reference": "74f9ef2edbf1835316c44988df27bf97c282bdf5", + "url": "https://api.github.com/repos/monarc-project/zm-client/zipball/f1e19dd5acf744a8ebac0c0e31779fcea9831b2b", + "reference": "f1e19dd5acf744a8ebac0c0e31779fcea9831b2b", "shasum": "" }, "require": { @@ -4714,9 +4780,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.11.0-p5" + "source": "https://github.com/monarc-project/zm-client/tree/v2.11.1" }, - "time": "2021-09-15T15:31:17+00:00" + "time": "2021-10-26T09:16:29+00:00" }, { "name": "nikic/php-parser", @@ -5274,16 +5340,16 @@ }, { "name": "ramsey/collection", - "version": "1.2.1", + "version": "1.2.2", "source": { "type": "git", "url": "https://github.com/ramsey/collection.git", - "reference": "eaca1dc1054ddd10cbd83c1461907bee6fb528fa" + "reference": "cccc74ee5e328031b15640b51056ee8d3bb66c0a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ramsey/collection/zipball/eaca1dc1054ddd10cbd83c1461907bee6fb528fa", - "reference": "eaca1dc1054ddd10cbd83c1461907bee6fb528fa", + "url": "https://api.github.com/repos/ramsey/collection/zipball/cccc74ee5e328031b15640b51056ee8d3bb66c0a", + "reference": "cccc74ee5e328031b15640b51056ee8d3bb66c0a", "shasum": "" }, "require": { @@ -5337,7 +5403,7 @@ ], "support": { "issues": "https://github.com/ramsey/collection/issues", - "source": "https://github.com/ramsey/collection/tree/1.2.1" + "source": "https://github.com/ramsey/collection/tree/1.2.2" }, "funding": [ { @@ -5349,7 +5415,7 @@ "type": "tidelift" } ], - "time": "2021-08-06T03:41:06+00:00" + "time": "2021-10-10T03:01:02+00:00" }, { "name": "ramsey/uuid", @@ -7353,16 +7419,16 @@ }, { "name": "phpdocumentor/reflection-docblock", - "version": "5.2.2", + "version": "5.3.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "069a785b2141f5bcf49f3e353548dc1cce6df556" + "reference": "622548b623e81ca6d78b721c5e029f4ce664f170" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/069a785b2141f5bcf49f3e353548dc1cce6df556", - "reference": "069a785b2141f5bcf49f3e353548dc1cce6df556", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/622548b623e81ca6d78b721c5e029f4ce664f170", + "reference": "622548b623e81ca6d78b721c5e029f4ce664f170", "shasum": "" }, "require": { @@ -7373,7 +7439,8 @@ "webmozart/assert": "^1.9.1" }, "require-dev": { - "mockery/mockery": "~1.3.2" + "mockery/mockery": "~1.3.2", + "psalm/phar": "^4.8" }, "type": "library", "extra": { @@ -7403,9 +7470,9 @@ "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", "support": { "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues", - "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/master" + "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.3.0" }, - "time": "2020-09-03T19:13:55+00:00" + "time": "2021-10-19T17:43:47+00:00" }, { "name": "phpdocumentor/type-resolver",