Merge pull request #443 from monarc-project/feature/compliance-scale

Feature/compliance scale
feature/dockerized-app
Cedric 2022-06-20 10:09:28 +00:00 committed by GitHub
commit 77786a7845
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 161 additions and 68 deletions

View File

@ -1,6 +1,21 @@
MONARC Changelog
================
## 2.12.0 (2021-06-20)
### New
- [compliance scale](https://github.com/monarc-project/MonarcAppFO/discussions/439);
- [metadata assets](https://github.com/monarc-project/MonarcAppFO/discussions/437);
- [two-factor authentication](https://github.com/monarc-project/MonarcAppFO/discussions/442)).
### Fix
- [Stats provider] removed the leading slash in the URI
([e7dfba1](https://github.com/monarc-project/zm-client/commit/e7dfba1cf64322bc3e83630df6729b525d7d5c8d))
## 2.11.1 (2021-10-28)
### New

View File

@ -1 +1 @@
{"major":2, "minor":11, "hotfix":1}
{"major":2, "minor":12, "hotfix":0}

View File

@ -53,7 +53,8 @@
"laminas/laminas-log": "^2.11",
"laminas/laminas-i18n": "^2.9",
"symfony/console": "^5.0",
"laminas/laminas-dependency-plugin": "^2.0"
"laminas/laminas-dependency-plugin": "^2.0",
"robthree/twofactorauth": "^1.8"
},
"require-dev": {
"roave/security-advisories": "dev-master",

197
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "3d6d241a9d4b1a683900cf5c4a61093f",
"content-hash": "72d71f8018457c8642f895529ecd5da3",
"packages": [
{
"name": "brick/math",
@ -68,16 +68,16 @@
},
{
"name": "brick/varexporter",
"version": "0.3.5",
"version": "0.3.6",
"source": {
"type": "git",
"url": "https://github.com/brick/varexporter.git",
"reference": "05241f28dfcba2b51b11e2d750e296316ebbe518"
"reference": "3361a8a30e807c0841a7ca98e5c72b6bffc73463"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/brick/varexporter/zipball/05241f28dfcba2b51b11e2d750e296316ebbe518",
"reference": "05241f28dfcba2b51b11e2d750e296316ebbe518",
"url": "https://api.github.com/repos/brick/varexporter/zipball/3361a8a30e807c0841a7ca98e5c72b6bffc73463",
"reference": "3361a8a30e807c0841a7ca98e5c72b6bffc73463",
"shasum": ""
},
"require": {
@ -87,7 +87,7 @@
"require-dev": {
"php-coveralls/php-coveralls": "^2.2",
"phpunit/phpunit": "^8.5 || ^9.0",
"vimeo/psalm": "4.4.1"
"vimeo/psalm": "4.23.0"
},
"type": "library",
"autoload": {
@ -105,9 +105,15 @@
],
"support": {
"issues": "https://github.com/brick/varexporter/issues",
"source": "https://github.com/brick/varexporter/tree/0.3.5"
"source": "https://github.com/brick/varexporter/tree/0.3.6"
},
"time": "2021-02-10T13:53:07+00:00"
"funding": [
{
"url": "https://github.com/BenMorel",
"type": "github"
}
],
"time": "2022-06-15T23:51:29+00:00"
},
{
"name": "cakephp/cache",
@ -819,16 +825,16 @@
},
{
"name": "doctrine/dbal",
"version": "3.3.6",
"version": "3.3.7",
"source": {
"type": "git",
"url": "https://github.com/doctrine/dbal.git",
"reference": "9e7f76dd1cde81c62574fdffa5a9c655c847ad21"
"reference": "9f79d4650430b582f4598fe0954ef4d52fbc0a8a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/dbal/zipball/9e7f76dd1cde81c62574fdffa5a9c655c847ad21",
"reference": "9e7f76dd1cde81c62574fdffa5a9c655c847ad21",
"url": "https://api.github.com/repos/doctrine/dbal/zipball/9f79d4650430b582f4598fe0954ef4d52fbc0a8a",
"reference": "9f79d4650430b582f4598fe0954ef4d52fbc0a8a",
"shasum": ""
},
"require": {
@ -843,11 +849,11 @@
"require-dev": {
"doctrine/coding-standard": "9.0.0",
"jetbrains/phpstorm-stubs": "2022.1",
"phpstan/phpstan": "1.6.3",
"phpstan/phpstan": "1.7.13",
"phpstan/phpstan-strict-rules": "^1.2",
"phpunit/phpunit": "9.5.20",
"psalm/plugin-phpunit": "0.16.1",
"squizlabs/php_codesniffer": "3.6.2",
"squizlabs/php_codesniffer": "3.7.0",
"symfony/cache": "^5.2|^6.0",
"symfony/console": "^2.7|^3.0|^4.0|^5.0|^6.0",
"vimeo/psalm": "4.23.0"
@ -910,7 +916,7 @@
],
"support": {
"issues": "https://github.com/doctrine/dbal/issues",
"source": "https://github.com/doctrine/dbal/tree/3.3.6"
"source": "https://github.com/doctrine/dbal/tree/3.3.7"
},
"funding": [
{
@ -926,7 +932,7 @@
"type": "tidelift"
}
],
"time": "2022-05-02T17:21:01+00:00"
"time": "2022-06-13T21:43:03+00:00"
},
{
"name": "doctrine/deprecations",
@ -1631,16 +1637,16 @@
},
{
"name": "doctrine/orm",
"version": "2.12.2",
"version": "2.12.3",
"source": {
"type": "git",
"url": "https://github.com/doctrine/orm.git",
"reference": "8291a7f09b12d14783ed6537b4586583d155869e"
"reference": "c05e1709e9ffb9abe8d37260a78975cc816ee385"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/orm/zipball/8291a7f09b12d14783ed6537b4586583d155869e",
"reference": "8291a7f09b12d14783ed6537b4586583d155869e",
"url": "https://api.github.com/repos/doctrine/orm/zipball/c05e1709e9ffb9abe8d37260a78975cc816ee385",
"reference": "c05e1709e9ffb9abe8d37260a78975cc816ee385",
"shasum": ""
},
"require": {
@ -1669,10 +1675,10 @@
"doctrine/annotations": "^1.13",
"doctrine/coding-standard": "^9.0",
"phpbench/phpbench": "^0.16.10 || ^1.0",
"phpstan/phpstan": "~1.4.10 || 1.6.3",
"phpstan/phpstan": "~1.4.10 || 1.7.13",
"phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
"psr/log": "^1 || ^2 || ^3",
"squizlabs/php_codesniffer": "3.6.2",
"squizlabs/php_codesniffer": "3.7.0",
"symfony/cache": "^4.4 || ^5.4 || ^6.0",
"symfony/yaml": "^3.4 || ^4.0 || ^5.0 || ^6.0",
"vimeo/psalm": "4.23.0"
@ -1724,9 +1730,9 @@
],
"support": {
"issues": "https://github.com/doctrine/orm/issues",
"source": "https://github.com/doctrine/orm/tree/2.12.2"
"source": "https://github.com/doctrine/orm/tree/2.12.3"
},
"time": "2022-05-02T19:10:07+00:00"
"time": "2022-06-16T13:42:23+00:00"
},
{
"name": "doctrine/persistence",
@ -2854,22 +2860,22 @@
},
{
"name": "laminas/laminas-form",
"version": "3.1.1",
"version": "3.2.0",
"source": {
"type": "git",
"url": "https://github.com/laminas/laminas-form.git",
"reference": "43005a3ec4c2292d4f825273768d9b884acbca37"
"reference": "c1a8474dc459672a30b5817716a797da7a5026a9"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laminas/laminas-form/zipball/43005a3ec4c2292d4f825273768d9b884acbca37",
"reference": "43005a3ec4c2292d4f825273768d9b884acbca37",
"url": "https://api.github.com/repos/laminas/laminas-form/zipball/c1a8474dc459672a30b5817716a797da7a5026a9",
"reference": "c1a8474dc459672a30b5817716a797da7a5026a9",
"shasum": ""
},
"require": {
"laminas/laminas-hydrator": "^4.3.0",
"laminas/laminas-hydrator": "^4.3.1",
"laminas/laminas-inputfilter": "^2.13.0",
"laminas/laminas-stdlib": "^3.6.1",
"laminas/laminas-stdlib": "^3.7.1",
"php": "^7.4 || ~8.0.0 || ~8.1.0"
},
"conflict": {
@ -2882,26 +2888,26 @@
"laminas/laminas-view": "<2.14.0"
},
"require-dev": {
"doctrine/annotations": "^1.12.0",
"doctrine/annotations": "^1.13.2",
"ext-intl": "*",
"laminas/laminas-captcha": "^2.11.0",
"laminas/laminas-coding-standard": "^2.3.0",
"laminas/laminas-db": "^2.13.4",
"laminas/laminas-escaper": "^2.9.0",
"laminas/laminas-eventmanager": "^3.4.0",
"laminas/laminas-filter": "^2.13.0",
"laminas/laminas-i18n": "^2.12.0",
"laminas/laminas-filter": "^2.14.0",
"laminas/laminas-i18n": "^2.14.0",
"laminas/laminas-modulemanager": "^2.11.0",
"laminas/laminas-recaptcha": "^3.4.0",
"laminas/laminas-servicemanager": "^3.10.0",
"laminas/laminas-session": "^2.12.0",
"laminas/laminas-session": "^2.12.1",
"laminas/laminas-text": "^2.9.0",
"laminas/laminas-validator": "^2.15.1",
"laminas/laminas-view": "^2.14.0",
"laminas/laminas-validator": "^2.16.0",
"laminas/laminas-view": "^2.19.1",
"phpspec/prophecy-phpunit": "^2.0.1",
"phpunit/phpunit": "^9.5.10",
"phpunit/phpunit": "^9.5.14",
"psalm/plugin-phpunit": "^0.16.1",
"vimeo/psalm": "^4.13.1"
"vimeo/psalm": "^4.21.0"
},
"suggest": {
"doctrine/annotations": "^1.12, required to use laminas-form annotations support",
@ -2948,7 +2954,7 @@
"type": "community_bridge"
}
],
"time": "2022-01-28T15:58:45+00:00"
"time": "2022-06-16T10:13:15+00:00"
},
{
"name": "laminas/laminas-http",
@ -3182,16 +3188,16 @@
},
{
"name": "laminas/laminas-inputfilter",
"version": "2.17.0",
"version": "2.18.0",
"source": {
"type": "git",
"url": "https://github.com/laminas/laminas-inputfilter.git",
"reference": "a6e8bc751c321bae1b3f8e235eeb4871256a6009"
"reference": "8c663d35926f8276b4bf1a2c571310eb285f80cb"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laminas/laminas-inputfilter/zipball/a6e8bc751c321bae1b3f8e235eeb4871256a6009",
"reference": "a6e8bc751c321bae1b3f8e235eeb4871256a6009",
"url": "https://api.github.com/repos/laminas/laminas-inputfilter/zipball/8c663d35926f8276b4bf1a2c571310eb285f80cb",
"reference": "8c663d35926f8276b4bf1a2c571310eb285f80cb",
"shasum": ""
},
"require": {
@ -3253,7 +3259,7 @@
"type": "community_bridge"
}
],
"time": "2022-06-13T16:43:33+00:00"
"time": "2022-06-15T11:40:14+00:00"
},
{
"name": "laminas/laminas-json",
@ -5642,6 +5648,76 @@
},
"time": "2020-05-09T13:59:05+00:00"
},
{
"name": "robthree/twofactorauth",
"version": "1.8.2",
"source": {
"type": "git",
"url": "https://github.com/RobThree/TwoFactorAuth.git",
"reference": "65681de5a324eae05140ac58b08648a60212afc0"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/RobThree/TwoFactorAuth/zipball/65681de5a324eae05140ac58b08648a60212afc0",
"reference": "65681de5a324eae05140ac58b08648a60212afc0",
"shasum": ""
},
"require": {
"php": ">=5.6.0"
},
"require-dev": {
"php-parallel-lint/php-parallel-lint": "^1.2",
"phpunit/phpunit": "@stable"
},
"suggest": {
"bacon/bacon-qr-code": "Needed for BaconQrCodeProvider provider",
"endroid/qr-code": "Needed for EndroidQrCodeProvider"
},
"type": "library",
"autoload": {
"psr-4": {
"RobThree\\Auth\\": "lib"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Rob Janssen",
"homepage": "http://robiii.me",
"role": "Developer"
}
],
"description": "Two Factor Authentication",
"homepage": "https://github.com/RobThree/TwoFactorAuth",
"keywords": [
"Authentication",
"MFA",
"Multi Factor Authentication",
"Two Factor Authentication",
"authenticator",
"authy",
"php",
"tfa"
],
"support": {
"issues": "https://github.com/RobThree/TwoFactorAuth/issues",
"source": "https://github.com/RobThree/TwoFactorAuth"
},
"funding": [
{
"url": "https://paypal.me/robiii",
"type": "custom"
},
{
"url": "https://github.com/RobThree",
"type": "github"
}
],
"time": "2022-03-22T16:11:07+00:00"
},
{
"name": "symfony/config",
"version": "v5.4.9",
@ -7824,16 +7900,16 @@
},
{
"name": "phpunit/phpunit",
"version": "8.5.26",
"version": "8.5.27",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "ef117c59fc4c54a979021b26d08a3373e386606d"
"reference": "df70070f2711b8fe8dcca0797c1239ede8c94be6"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/ef117c59fc4c54a979021b26d08a3373e386606d",
"reference": "ef117c59fc4c54a979021b26d08a3373e386606d",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/df70070f2711b8fe8dcca0797c1239ede8c94be6",
"reference": "df70070f2711b8fe8dcca0797c1239ede8c94be6",
"shasum": ""
},
"require": {
@ -7863,9 +7939,6 @@
"sebastian/type": "^1.1.3",
"sebastian/version": "^2.0.1"
},
"require-dev": {
"ext-pdo": "*"
},
"suggest": {
"ext-soap": "*",
"ext-xdebug": "*",
@ -7905,7 +7978,7 @@
],
"support": {
"issues": "https://github.com/sebastianbergmann/phpunit/issues",
"source": "https://github.com/sebastianbergmann/phpunit/tree/8.5.26"
"source": "https://github.com/sebastianbergmann/phpunit/tree/8.5.27"
},
"funding": [
{
@ -7917,7 +7990,7 @@
"type": "github"
}
],
"time": "2022-04-01T12:34:39+00:00"
"time": "2022-06-19T12:11:16+00:00"
},
{
"name": "roave/security-advisories",
@ -7925,12 +7998,12 @@
"source": {
"type": "git",
"url": "https://github.com/Roave/SecurityAdvisories.git",
"reference": "bf362097fbfe4580b99b696dd8208b24ffd112b2"
"reference": "0a2664d739af6996ce1a24a35cb59ed2bbd27f4b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/bf362097fbfe4580b99b696dd8208b24ffd112b2",
"reference": "bf362097fbfe4580b99b696dd8208b24ffd112b2",
"url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/0a2664d739af6996ce1a24a35cb59ed2bbd27f4b",
"reference": "0a2664d739af6996ce1a24a35cb59ed2bbd27f4b",
"shasum": ""
},
"conflict": {
@ -7964,6 +8037,8 @@
"bottelet/flarepoint": "<2.2.1",
"brightlocal/phpwhois": "<=4.2.5",
"brotkrueml/codehighlight": "<2.7",
"brotkrueml/schema": "<1.13.1|>=2,<2.5.1",
"brotkrueml/typo3-matomo-integration": "<1.3.2",
"buddypress/buddypress": "<7.2.1",
"bugsnag/bugsnag-laravel": ">=2,<2.0.2",
"bytefury/crater": "<6.0.2",
@ -8006,7 +8081,7 @@
"doctrine/mongodb-odm": ">=1,<1.0.2",
"doctrine/mongodb-odm-bundle": ">=2,<3.0.1",
"doctrine/orm": ">=2,<2.4.8|>=2.5,<2.5.1|>=2.8.3,<2.8.4",
"dolibarr/dolibarr": "= 12.0.5|<16|>= 3.3.beta1, < 13.0.2",
"dolibarr/dolibarr": "<16|= 12.0.5|>= 3.3.beta1, < 13.0.2",
"dompdf/dompdf": "<1.2.1",
"drupal/core": ">=7,<7.88|>=8,<9.2.13|>=9.3,<9.3.6",
"drupal/drupal": ">=7,<7.80|>=8,<8.9.16|>=9,<9.1.12|>=9.2,<9.2.4",
@ -8049,7 +8124,7 @@
"fooman/tcpdf": "<6.2.22",
"forkcms/forkcms": "<5.11.1",
"fossar/tcpdf-parser": "<6.2.22",
"francoisjacquet/rosariosis": "<9",
"francoisjacquet/rosariosis": "<9.1",
"friendsofsymfony/oauth2-php": "<1.3",
"friendsofsymfony/rest-bundle": ">=1.2,<1.2.2",
"friendsofsymfony/user-bundle": ">=1.2,<1.3.5",
@ -8315,9 +8390,9 @@
"tribalsystems/zenario": "<9.2.55826",
"truckersmp/phpwhois": "<=4.3.1",
"twig/twig": "<1.38|>=2,<2.14.11|>=3,<3.3.8",
"typo3/cms": ">=6.2,<6.2.30|>=7,<7.6.32|>=8,<8.7.38|>=9,<9.5.29|>=10,<10.4.19|>=11,<11.5",
"typo3/cms": ">=6.2,<6.2.30|>=7,<7.6.32|>=8,<8.7.38|>=9,<9.5.29|>=10,<10.4.29|>=11,<11.5.11",
"typo3/cms-backend": ">=7,<=7.6.50|>=8,<=8.7.39|>=9,<=9.5.24|>=10,<=10.4.13|>=11,<=11.1",
"typo3/cms-core": ">=6.2,<=6.2.56|>=7,<=7.6.52|>=8,<=8.7.41|>=9,<9.5.29|>=10,<10.4.19|>=11,<11.5",
"typo3/cms-core": ">=6.2,<=6.2.56|>=7,<7.6.57|>=8,<8.7.47|>=9,<9.5.35|>=10,<10.4.29|>=11,<11.5.11",
"typo3/cms-form": ">=8,<=8.7.39|>=9,<=9.5.24|>=10,<=10.4.13|>=11,<=11.1",
"typo3/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",
"typo3/neos": ">=1.1,<1.1.3|>=1.2,<1.2.13|>=2,<2.0.4|>=2.3,<2.3.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",
@ -8415,7 +8490,7 @@
"type": "tidelift"
}
],
"time": "2022-06-10T00:15:15+00:00"
"time": "2022-06-17T21:04:24+00:00"
},
{
"name": "sebastian/code-unit-reverse-lookup",

View File

@ -95,6 +95,8 @@ return [
'from' => 'info@monarc.lu',
],
'instanceName' => 'Development', // for example a short URL or client name from ansible
'terms' => 'https://my.monarc.lu/terms.html',
'monarc' => [

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -1,6 +1,6 @@
{
"name": "MONARC",
"version": "2.11.1",
"version": "2.12.0",
"description": "Monarc front office application",
"private": true,
"repository": {
@ -10,11 +10,11 @@
"author": "CASES",
"license": "GNU Affero General Public License version 3",
"dependencies": {
"ng_anr": "git+https://github.com/monarc-project/ng-anr.git#v2.11.1-p5",
"ng_client": "git+https://github.com/monarc-project/ng-client.git#v2.11.1-p12"
"ng_anr": "git+https://github.com/monarc-project/ng-anr.git#v2.12.0",
"ng_client": "git+https://github.com/monarc-project/ng-client.git#v2.12.0"
},
"devDependencies": {
"grunt": "~1.5.2",
"grunt-cli": "~1.4.2"
"grunt": "~1.5.3",
"grunt-cli": "~1.4.3"
}
}