Monarc
/
MonarcAppFO
mirror of https://github.com/monarc-project/MonarcAppFO
1
0
Fork 0
Code Issues Releases Wiki Activity

Changed the composer to use versions of the dependencies instead of feature branches.

pull/202/head
Ruslan Baidan 2019-11-19 09:43:48 +01:00
parent 767a44039d
commit cdc41ed290
No known key found for this signature in database
GPG Key ID: 4B7724C136BF1D89
2 changed files with 57 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
composer.json
View File

@ -9,15 +9,14 @@
{"name": "Thomas Metois", "email": "thomas@netlor.fr"}, {"name": "Thomas Metois", "email": "thomas@netlor.fr"},
{"name": "Jérôme Lombardi", "email": "jerome.lombardi@cases.lu"}, {"name": "Jérôme Lombardi", "email": "jerome.lombardi@cases.lu"},
{"name": "Juan Rocha", "email": "juan.rocha@cases.lu"}, {"name": "Juan Rocha", "email": "juan.rocha@cases.lu"},
{"name": "Cédric Bonhomme", "email": "cedric.bonhomme@cases.lu"} {"name": "Cédric Bonhomme", "email": "cedric.bonhomme@cases.lu"},
{"name": "Ruslan Baidan", "email": "ruslan.baidan@cases.lu"}
], ],
"require": { "require": {
"php": "^7.1", "php": "^7.1",
"ext-json": "*", "ext-json": "*",
"ext-pdo": "*", "ext-pdo": "*",
"monarc/core": "dev-feature/upgrade-to-zf3", "monarc/frontoffice": "~2.9",
"monarc/frontoffice": "dev-feature/upgrade-to-zf3",
"monarc/phpword": "dev-master",
"zendframework/zend-mvc": "^3.1", "zendframework/zend-mvc": "^3.1",
"zendframework/zend-di": "^3.1", "zendframework/zend-di": "^3.1",
"zendframework/zend-permissions-rbac": "^3.0", "zendframework/zend-permissions-rbac": "^3.0",

108
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "aae51d958075c812d333b26f0b1603ec", "content-hash": "a6c747567731a714418e430190fda016",
"packages": [ "packages": [
{ {
"name": "cakephp/cache", "name": "cakephp/cache",
@ -443,16 +443,16 @@
}, },
{ {
"name": "doctrine/cache", "name": "doctrine/cache",
"version": "1.9.0", "version": "1.9.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/doctrine/cache.git", "url": "https://github.com/doctrine/cache.git",
"reference": "c15dcd24b756f9e52ea7c3ae8227354f3628f11a" "reference": "89a5c76c39c292f7798f964ab3c836c3f8192a55"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/doctrine/cache/zipball/c15dcd24b756f9e52ea7c3ae8227354f3628f11a", "url": "https://api.github.com/repos/doctrine/cache/zipball/89a5c76c39c292f7798f964ab3c836c3f8192a55",
"reference": "c15dcd24b756f9e52ea7c3ae8227354f3628f11a", "reference": "89a5c76c39c292f7798f964ab3c836c3f8192a55",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -522,20 +522,20 @@
"riak", "riak",
"xcache" "xcache"
], ],
"time": "2019-11-11T10:31:52+00:00" "time": "2019-11-15T14:31:57+00:00"
}, },
{ {
"name": "doctrine/collections", "name": "doctrine/collections",
"version": "1.6.3", "version": "1.6.4",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/doctrine/collections.git", "url": "https://github.com/doctrine/collections.git",
"reference": "037ccc5b1c249275f8f6bb48e35f140fd52fd577" "reference": "6b1e4b2b66f6d6e49983cebfe23a21b7ccc5b0d7"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/doctrine/collections/zipball/037ccc5b1c249275f8f6bb48e35f140fd52fd577", "url": "https://api.github.com/repos/doctrine/collections/zipball/6b1e4b2b66f6d6e49983cebfe23a21b7ccc5b0d7",
"reference": "037ccc5b1c249275f8f6bb48e35f140fd52fd577", "reference": "6b1e4b2b66f6d6e49983cebfe23a21b7ccc5b0d7",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -592,7 +592,7 @@
"iterators", "iterators",
"php" "php"
], ],
"time": "2019-11-04T15:26:07+00:00" "time": "2019-11-13T13:07:11+00:00"
}, },
{ {
"name": "doctrine/common", "name": "doctrine/common",
@ -1226,16 +1226,16 @@
}, },
{ {
"name": "doctrine/orm", "name": "doctrine/orm",
"version": "v2.6.4", "version": "v2.6.6",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/doctrine/orm.git", "url": "https://github.com/doctrine/orm.git",
"reference": "b52ef5a1002f99ab506a5a2d6dba5a2c236c5f43" "reference": "2d9b9351831d1230881c52f006011cbf72fe944e"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/doctrine/orm/zipball/b52ef5a1002f99ab506a5a2d6dba5a2c236c5f43", "url": "https://api.github.com/repos/doctrine/orm/zipball/2d9b9351831d1230881c52f006011cbf72fe944e",
"reference": "b52ef5a1002f99ab506a5a2d6dba5a2c236c5f43", "reference": "2d9b9351831d1230881c52f006011cbf72fe944e",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1303,7 +1303,7 @@
"database", "database",
"orm" "orm"
], ],
"time": "2019-09-20T14:30:26+00:00" "time": "2019-11-18T22:01:21+00:00"
}, },
{ {
"name": "doctrine/persistence", "name": "doctrine/persistence",
@ -1464,16 +1464,16 @@
}, },
{ {
"name": "monarc/core", "name": "monarc/core",
"version": "dev-feature/upgrade-to-zf3", "version": "2.9.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/monarc-project/zm-core.git", "url": "https://github.com/monarc-project/zm-core.git",
"reference": "da93cead1f8fb02b0edef7c0b7cda7d5888224e7" "reference": "c704f57c9c9ebb0b9f28ac3862fb705d8036b49e"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/monarc-project/zm-core/zipball/da93cead1f8fb02b0edef7c0b7cda7d5888224e7", "url": "https://api.github.com/repos/monarc-project/zm-core/zipball/c704f57c9c9ebb0b9f28ac3862fb705d8036b49e",
"reference": "da93cead1f8fb02b0edef7c0b7cda7d5888224e7", "reference": "c704f57c9c9ebb0b9f28ac3862fb705d8036b49e",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1540,27 +1540,28 @@
} }
], ],
"description": "Core for monarc/monarc application", "description": "Core for monarc/monarc application",
"time": "2019-11-12T09:43:37+00:00" "time": "2019-11-19T07:46:02+00:00"
}, },
{ {
"name": "monarc/frontoffice", "name": "monarc/frontoffice",
"version": "dev-feature/upgrade-to-zf3", "version": "2.9.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/monarc-project/zm-client.git", "url": "https://github.com/monarc-project/zm-client.git",
"reference": "bab021121059c6441745daa1d5588f913a65f1fb" "reference": "d89a1b15f6d352169d4a129eb7f5a0f3f4eee9d5"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/monarc-project/zm-client/zipball/bab021121059c6441745daa1d5588f913a65f1fb", "url": "https://api.github.com/repos/monarc-project/zm-client/zipball/d89a1b15f6d352169d4a129eb7f5a0f3f4eee9d5",
"reference": "bab021121059c6441745daa1d5588f913a65f1fb", "reference": "d89a1b15f6d352169d4a129eb7f5a0f3f4eee9d5",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"doctrine/doctrine-orm-module": "^2.1", "doctrine/doctrine-orm-module": "^2.1",
"ext-imagick": "*", "ext-imagick": "*",
"ext-intl": "*", "ext-intl": "*",
"monarc/core": "dev-feature/upgrade-to-zf3", "monarc/core": "~2.9",
"monarc/phpword": "^1.0",
"php": "^7.1", "php": "^7.1",
"robmorgan/phinx": "^0.11.1", "robmorgan/phinx": "^0.11.1",
"zendframework/zend-di": "^3.1", "zendframework/zend-di": "^3.1",
@ -1602,11 +1603,11 @@
} }
], ],
"description": "Frontoffice for monarc/monarc application", "description": "Frontoffice for monarc/monarc application",
"time": "2019-11-13T08:56:10+00:00" "time": "2019-11-19T08:25:45+00:00"
}, },
{ {
"name": "monarc/phpword", "name": "monarc/phpword",
"version": "dev-master", "version": "1.0.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/monarc-project/monarc-phpword.git", "url": "https://github.com/monarc-project/monarc-phpword.git",
@ -1709,16 +1710,16 @@
}, },
{ {
"name": "ocramius/package-versions", "name": "ocramius/package-versions",
"version": "1.4.0", "version": "1.4.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/Ocramius/PackageVersions.git", "url": "https://github.com/Ocramius/PackageVersions.git",
"reference": "a4d4b60d0e60da2487bd21a2c6ac089f85570dbb" "reference": "44af6f3a2e2e04f2af46bcb302ad9600cba41c7d"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/Ocramius/PackageVersions/zipball/a4d4b60d0e60da2487bd21a2c6ac089f85570dbb", "url": "https://api.github.com/repos/Ocramius/PackageVersions/zipball/44af6f3a2e2e04f2af46bcb302ad9600cba41c7d",
"reference": "a4d4b60d0e60da2487bd21a2c6ac089f85570dbb", "reference": "44af6f3a2e2e04f2af46bcb302ad9600cba41c7d",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1730,7 +1731,7 @@
"doctrine/coding-standard": "^5.0.1", "doctrine/coding-standard": "^5.0.1",
"ext-zip": "*", "ext-zip": "*",
"infection/infection": "^0.7.1", "infection/infection": "^0.7.1",
"phpunit/phpunit": "^7.0.0" "phpunit/phpunit": "^7.5.17"
}, },
"type": "composer-plugin", "type": "composer-plugin",
"extra": { "extra": {
@ -1755,7 +1756,7 @@
} }
], ],
"description": "Composer plugin that provides efficient querying for installed package versions (no runtime IO)", "description": "Composer plugin that provides efficient querying for installed package versions (no runtime IO)",
"time": "2019-02-21T12:16:21+00:00" "time": "2019-11-15T16:17:10+00:00"
}, },
{ {
"name": "ocramius/proxy-manager", "name": "ocramius/proxy-manager",
@ -3629,19 +3630,20 @@
}, },
{ {
"name": "zendframework/zend-i18n", "name": "zendframework/zend-i18n",
"version": "2.9.2", "version": "2.10.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/zendframework/zend-i18n.git", "url": "https://github.com/zendframework/zend-i18n.git",
"reference": "e17a54b3aee333ab156958f570cde630acee8b07" "reference": "561a815ce32c86b0f1de11135477e637926d56b6"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/zendframework/zend-i18n/zipball/e17a54b3aee333ab156958f570cde630acee8b07", "url": "https://api.github.com/repos/zendframework/zend-i18n/zipball/561a815ce32c86b0f1de11135477e637926d56b6",
"reference": "e17a54b3aee333ab156958f570cde630acee8b07", "reference": "561a815ce32c86b0f1de11135477e637926d56b6",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"ext-intl": "*",
"php": "^5.6 || ^7.0", "php": "^5.6 || ^7.0",
"zendframework/zend-stdlib": "^2.7 || ^3.0" "zendframework/zend-stdlib": "^2.7 || ^3.0"
}, },
@ -3657,7 +3659,6 @@
"zendframework/zend-view": "^2.6.3" "zendframework/zend-view": "^2.6.3"
}, },
"suggest": { "suggest": {
"ext-intl": "Required for most features of Zend\\I18n; included in default builds of PHP",
"zendframework/zend-cache": "Zend\\Cache component", "zendframework/zend-cache": "Zend\\Cache component",
"zendframework/zend-config": "Zend\\Config component", "zendframework/zend-config": "Zend\\Config component",
"zendframework/zend-eventmanager": "You should install this package to use the events in the translator", "zendframework/zend-eventmanager": "You should install this package to use the events in the translator",
@ -3670,8 +3671,8 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "2.9.x-dev", "dev-master": "2.10.x-dev",
"dev-develop": "2.10.x-dev" "dev-develop": "2.11.x-dev"
}, },
"zf": { "zf": {
"component": "Zend\\I18n", "component": "Zend\\I18n",
@ -3693,7 +3694,7 @@
"i18n", "i18n",
"zf" "zf"
], ],
"time": "2019-09-30T12:04:37+00:00" "time": "2019-11-18T20:31:29+00:00"
}, },
{ {
"name": "zendframework/zend-inputfilter", "name": "zendframework/zend-inputfilter",
@ -4777,12 +4778,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/Roave/SecurityAdvisories.git", "url": "https://github.com/Roave/SecurityAdvisories.git",
"reference": "15eb463aecc9e315b89b744ee0feb0bb1b4c6787" "reference": "261562a9c048aa10932e5e1d596da6c761cf95bb"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/15eb463aecc9e315b89b744ee0feb0bb1b4c6787", "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/261562a9c048aa10932e5e1d596da6c761cf95bb",
"reference": "15eb463aecc9e315b89b744ee0feb0bb1b4c6787", "reference": "261562a9c048aa10932e5e1d596da6c761cf95bb",
"shasum": "" "shasum": ""
}, },
"conflict": { "conflict": {
@ -4899,13 +4900,14 @@
"sylius/grid": ">=1,<1.1.19|>=1.2,<1.2.18|>=1.3,<1.3.13|>=1.4,<1.4.5|>=1.5,<1.5.1", "sylius/grid": ">=1,<1.1.19|>=1.2,<1.2.18|>=1.3,<1.3.13|>=1.4,<1.4.5|>=1.5,<1.5.1",
"sylius/grid-bundle": ">=1,<1.1.19|>=1.2,<1.2.18|>=1.3,<1.3.13|>=1.4,<1.4.5|>=1.5,<1.5.1", "sylius/grid-bundle": ">=1,<1.1.19|>=1.2,<1.2.18|>=1.3,<1.3.13|>=1.4,<1.4.5|>=1.5,<1.5.1",
"sylius/sylius": ">=1,<1.1.18|>=1.2,<1.2.17|>=1.3,<1.3.12|>=1.4,<1.4.4", "sylius/sylius": ">=1,<1.1.18|>=1.2,<1.2.17|>=1.3,<1.3.12|>=1.4,<1.4.4",
"symfony/cache": ">=3.1,<3.4.26|>=4,<4.1.12|>=4.2,<4.2.7", "symfony/cache": ">=3.1,<3.4.35|>=4,<4.2.12|>=4.3,<4.3.8",
"symfony/dependency-injection": ">=2,<2.0.17|>=2.7,<2.7.51|>=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.1.12|>=4.2,<4.2.7", "symfony/dependency-injection": ">=2,<2.0.17|>=2.7,<2.7.51|>=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.1.12|>=4.2,<4.2.7",
"symfony/form": ">=2.3,<2.3.35|>=2.4,<2.6.12|>=2.7,<2.7.50|>=2.8,<2.8.49|>=3,<3.4.20|>=4,<4.0.15|>=4.1,<4.1.9|>=4.2,<4.2.1", "symfony/form": ">=2.3,<2.3.35|>=2.4,<2.6.12|>=2.7,<2.7.50|>=2.8,<2.8.49|>=3,<3.4.20|>=4,<4.0.15|>=4.1,<4.1.9|>=4.2,<4.2.1",
"symfony/framework-bundle": ">=2,<2.3.18|>=2.4,<2.4.8|>=2.5,<2.5.2|>=2.7,<2.7.51|>=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.1.12|>=4.2,<4.2.7", "symfony/framework-bundle": ">=2,<2.3.18|>=2.4,<2.4.8|>=2.5,<2.5.2|>=2.7,<2.7.51|>=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.1.12|>=4.2,<4.2.7",
"symfony/http-foundation": ">=2,<2.7.51|>=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.1.12|>=4.2,<4.2.7", "symfony/http-foundation": ">=2,<2.8.52|>=3,<3.4.35|>=4,<4.2.12|>=4.3,<4.3.8",
"symfony/http-kernel": ">=2,<2.3.29|>=2.4,<2.5.12|>=2.6,<2.6.8", "symfony/http-kernel": ">=2,<2.8.52|>=3,<3.4.35|>=4,<4.2.12|>=4.3,<4.3.8",
"symfony/intl": ">=2.7,<2.7.38|>=2.8,<2.8.31|>=3,<3.2.14|>=3.3,<3.3.13", "symfony/intl": ">=2.7,<2.7.38|>=2.8,<2.8.31|>=3,<3.2.14|>=3.3,<3.3.13",
"symfony/mime": ">=4.3,<4.3.8",
"symfony/phpunit-bridge": ">=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.1.12|>=4.2,<4.2.7", "symfony/phpunit-bridge": ">=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.1.12|>=4.2,<4.2.7",
"symfony/polyfill": ">=1,<1.10", "symfony/polyfill": ">=1,<1.10",
"symfony/polyfill-php55": ">=1,<1.10", "symfony/polyfill-php55": ">=1,<1.10",
@ -4916,11 +4918,12 @@
"symfony/security-core": ">=2.4,<2.6.13|>=2.7,<2.7.9|>=2.7.30,<2.7.32|>=2.8,<2.8.37|>=3,<3.3.17|>=3.4,<3.4.7|>=4,<4.0.7", "symfony/security-core": ">=2.4,<2.6.13|>=2.7,<2.7.9|>=2.7.30,<2.7.32|>=2.8,<2.8.37|>=3,<3.3.17|>=3.4,<3.4.7|>=4,<4.0.7",
"symfony/security-csrf": ">=2.4,<2.7.48|>=2.8,<2.8.41|>=3,<3.3.17|>=3.4,<3.4.11|>=4,<4.0.11", "symfony/security-csrf": ">=2.4,<2.7.48|>=2.8,<2.8.41|>=3,<3.3.17|>=3.4,<3.4.11|>=4,<4.0.11",
"symfony/security-guard": ">=2.8,<2.8.41|>=3,<3.3.17|>=3.4,<3.4.11|>=4,<4.0.11", "symfony/security-guard": ">=2.8,<2.8.41|>=3,<3.3.17|>=3.4,<3.4.11|>=4,<4.0.11",
"symfony/security-http": ">=2.3,<2.3.41|>=2.4,<2.7.51|>=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.1.12|>=4.2,<4.2.7", "symfony/security-http": ">=2.3,<2.3.41|>=2.4,<2.7.51|>=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.2.12|>=4.3,<4.3.8",
"symfony/serializer": ">=2,<2.0.11", "symfony/serializer": ">=2,<2.0.11",
"symfony/symfony": ">=2,<2.7.51|>=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.1.12|>=4.2,<4.2.7", "symfony/symfony": ">=2,<2.8.52|>=3,<3.4.35|>=4,<4.2.12|>=4.3,<4.3.8",
"symfony/translation": ">=2,<2.0.17", "symfony/translation": ">=2,<2.0.17",
"symfony/validator": ">=2,<2.0.24|>=2.1,<2.1.12|>=2.2,<2.2.5|>=2.3,<2.3.3", "symfony/validator": ">=2,<2.0.24|>=2.1,<2.1.12|>=2.2,<2.2.5|>=2.3,<2.3.3",
"symfony/var-exporter": ">=4.2,<4.2.12|>=4.3,<4.3.8",
"symfony/web-profiler-bundle": ">=2,<2.3.19|>=2.4,<2.4.9|>=2.5,<2.5.4", "symfony/web-profiler-bundle": ">=2,<2.3.19|>=2.4,<2.4.9|>=2.5,<2.5.4",
"symfony/yaml": ">=2,<2.0.22|>=2.1,<2.1.7", "symfony/yaml": ">=2,<2.0.22|>=2.1,<2.1.7",
"tecnickcom/tcpdf": "<6.2.22", "tecnickcom/tcpdf": "<6.2.22",
@ -4985,7 +4988,7 @@
} }
], ],
"description": "Prevents installation of composer packages with known security vulnerabilities: no API, simply require it", "description": "Prevents installation of composer packages with known security vulnerabilities: no API, simply require it",
"time": "2019-11-07T10:12:47+00:00" "time": "2019-11-15T09:15:43+00:00"
}, },
{ {
"name": "zendframework/zend-component-installer", "name": "zendframework/zend-component-installer",
@ -5043,9 +5046,6 @@
"aliases": [], "aliases": [],
"minimum-stability": "stable", "minimum-stability": "stable",
"stability-flags": { "stability-flags": {
"monarc/core": 20,
"monarc/frontoffice": 20,
"monarc/phpword": 20,
"roave/security-advisories": 20 "roave/security-advisories": 20
}, },
"prefer-stable": false, "prefer-stable": false,