merged and solved conflict in composer.json
Cédric Bonhomme
commit
d24bb44863
|
|
@ -16,9 +16,7 @@
|
|||
"php": "^7.1",
|
||||
"ext-json": "*",
|
||||
"ext-pdo": "*",
|
||||
"monarc/core": "dev-master",
|
||||
"monarc/frontoffice": "dev-master",
|
||||
"monarc/phpword": "dev-master",
|
||||
"monarc/frontoffice": "~2.9",
|
||||
"zendframework/zend-mvc": "^3.1",
|
||||
"zendframework/zend-di": "^3.1",
|
||||
"zendframework/zend-permissions-rbac": "^3.0",
|
||||
|
|
|
|||
|
|
@ -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": "aae51d958075c812d333b26f0b1603ec",
|
||||
"content-hash": "a6c747567731a714418e430190fda016",
|
||||
"packages": [
|
||||
{
|
||||
"name": "cakephp/cache",
|
||||
|
|
@ -1226,33 +1226,35 @@
|
|||
},
|
||||
{
|
||||
"name": "doctrine/orm",
|
||||
"version": "v2.6.5",
|
||||
"version": "v2.7.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/doctrine/orm.git",
|
||||
"reference": "16751d210fb806cc6f1b868a2b9dde6fab6866ed"
|
||||
"reference": "4d763ca4c925f647b248b9fa01b5f47aa3685d62"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/doctrine/orm/zipball/16751d210fb806cc6f1b868a2b9dde6fab6866ed",
|
||||
"reference": "16751d210fb806cc6f1b868a2b9dde6fab6866ed",
|
||||
"url": "https://api.github.com/repos/doctrine/orm/zipball/4d763ca4c925f647b248b9fa01b5f47aa3685d62",
|
||||
"reference": "4d763ca4c925f647b248b9fa01b5f47aa3685d62",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"doctrine/annotations": "~1.5",
|
||||
"doctrine/cache": "~1.6",
|
||||
"doctrine/collections": "^1.4",
|
||||
"doctrine/common": "^2.7.1",
|
||||
"doctrine/dbal": "^2.6",
|
||||
"doctrine/instantiator": "~1.1",
|
||||
"doctrine/annotations": "^1.8",
|
||||
"doctrine/cache": "^1.9.1",
|
||||
"doctrine/collections": "^1.5",
|
||||
"doctrine/common": "^2.11",
|
||||
"doctrine/dbal": "^2.9.3",
|
||||
"doctrine/event-manager": "^1.1",
|
||||
"doctrine/instantiator": "^1.3",
|
||||
"doctrine/persistence": "^1.2",
|
||||
"ext-pdo": "*",
|
||||
"php": "^7.1",
|
||||
"symfony/console": "~3.0|~4.0"
|
||||
"symfony/console": "^3.0|^4.0|^5.0"
|
||||
},
|
||||
"require-dev": {
|
||||
"doctrine/coding-standard": "^5.0",
|
||||
"phpunit/phpunit": "^7.5",
|
||||
"symfony/yaml": "~3.4|~4.0"
|
||||
"symfony/yaml": "^3.4|^4.0|^5.0"
|
||||
},
|
||||
"suggest": {
|
||||
"symfony/yaml": "If you want to use YAML Metadata Mapping Driver"
|
||||
|
|
@ -1263,7 +1265,7 @@
|
|||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "2.6.x-dev"
|
||||
"dev-master": "2.7.x-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
|
|
@ -1298,12 +1300,12 @@
|
|||
}
|
||||
],
|
||||
"description": "Object-Relational-Mapper for PHP",
|
||||
"homepage": "http://www.doctrine-project.org",
|
||||
"homepage": "https://www.doctrine-project.org/projects/orm.html",
|
||||
"keywords": [
|
||||
"database",
|
||||
"orm"
|
||||
],
|
||||
"time": "2019-11-18T11:06:51+00:00"
|
||||
"time": "2019-11-19T08:38:05+00:00"
|
||||
},
|
||||
{
|
||||
"name": "doctrine/persistence",
|
||||
|
|
@ -1464,16 +1466,16 @@
|
|||
},
|
||||
{
|
||||
"name": "monarc/core",
|
||||
"version": "dev-feature/upgrade-to-zf3",
|
||||
"version": "2.9.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/monarc-project/zm-core.git",
|
||||
"reference": "8b7df63499d1c05c43a0de2e85615bafb4e99303"
|
||||
"reference": "c704f57c9c9ebb0b9f28ac3862fb705d8036b49e"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/monarc-project/zm-core/zipball/8b7df63499d1c05c43a0de2e85615bafb4e99303",
|
||||
"reference": "8b7df63499d1c05c43a0de2e85615bafb4e99303",
|
||||
"url": "https://api.github.com/repos/monarc-project/zm-core/zipball/c704f57c9c9ebb0b9f28ac3862fb705d8036b49e",
|
||||
"reference": "c704f57c9c9ebb0b9f28ac3862fb705d8036b49e",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -1540,28 +1542,28 @@
|
|||
}
|
||||
],
|
||||
"description": "Core for monarc/monarc application",
|
||||
"time": "2019-11-18T10:58:13+00:00"
|
||||
"time": "2019-11-19T07:46:02+00:00"
|
||||
},
|
||||
{
|
||||
"name": "monarc/frontoffice",
|
||||
"version": "dev-feature/upgrade-to-zf3",
|
||||
"version": "2.9.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/monarc-project/zm-client.git",
|
||||
"reference": "7dbd78d50ec817c877ed311e9a599e44722dddf2"
|
||||
"reference": "d89a1b15f6d352169d4a129eb7f5a0f3f4eee9d5"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/monarc-project/zm-client/zipball/7dbd78d50ec817c877ed311e9a599e44722dddf2",
|
||||
"reference": "7dbd78d50ec817c877ed311e9a599e44722dddf2",
|
||||
"url": "https://api.github.com/repos/monarc-project/zm-client/zipball/d89a1b15f6d352169d4a129eb7f5a0f3f4eee9d5",
|
||||
"reference": "d89a1b15f6d352169d4a129eb7f5a0f3f4eee9d5",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"doctrine/doctrine-orm-module": "^2.1",
|
||||
"ext-imagick": "*",
|
||||
"ext-intl": "*",
|
||||
"monarc/core": "dev-feature/upgrade-to-zf3",
|
||||
"monarc/phpword": "dev-master",
|
||||
"monarc/core": "~2.9",
|
||||
"monarc/phpword": "^1.0",
|
||||
"php": "^7.1",
|
||||
"robmorgan/phinx": "^0.11.1",
|
||||
"zendframework/zend-di": "^3.1",
|
||||
|
|
@ -1603,11 +1605,11 @@
|
|||
}
|
||||
],
|
||||
"description": "Frontoffice for monarc/monarc application",
|
||||
"time": "2019-11-15T12:34:45+00:00"
|
||||
"time": "2019-11-19T08:25:45+00:00"
|
||||
},
|
||||
{
|
||||
"name": "monarc/phpword",
|
||||
"version": "dev-master",
|
||||
"version": "1.0.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/monarc-project/monarc-phpword.git",
|
||||
|
|
@ -3630,19 +3632,20 @@
|
|||
},
|
||||
{
|
||||
"name": "zendframework/zend-i18n",
|
||||
"version": "2.9.2",
|
||||
"version": "2.10.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/zendframework/zend-i18n.git",
|
||||
"reference": "e17a54b3aee333ab156958f570cde630acee8b07"
|
||||
"reference": "561a815ce32c86b0f1de11135477e637926d56b6"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/zendframework/zend-i18n/zipball/e17a54b3aee333ab156958f570cde630acee8b07",
|
||||
"reference": "e17a54b3aee333ab156958f570cde630acee8b07",
|
||||
"url": "https://api.github.com/repos/zendframework/zend-i18n/zipball/561a815ce32c86b0f1de11135477e637926d56b6",
|
||||
"reference": "561a815ce32c86b0f1de11135477e637926d56b6",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"ext-intl": "*",
|
||||
"php": "^5.6 || ^7.0",
|
||||
"zendframework/zend-stdlib": "^2.7 || ^3.0"
|
||||
},
|
||||
|
|
@ -3658,7 +3661,6 @@
|
|||
"zendframework/zend-view": "^2.6.3"
|
||||
},
|
||||
"suggest": {
|
||||
"ext-intl": "Required for most features of Zend\\I18n; included in default builds of PHP",
|
||||
"zendframework/zend-cache": "Zend\\Cache component",
|
||||
"zendframework/zend-config": "Zend\\Config component",
|
||||
"zendframework/zend-eventmanager": "You should install this package to use the events in the translator",
|
||||
|
|
@ -3671,8 +3673,8 @@
|
|||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "2.9.x-dev",
|
||||
"dev-develop": "2.10.x-dev"
|
||||
"dev-master": "2.10.x-dev",
|
||||
"dev-develop": "2.11.x-dev"
|
||||
},
|
||||
"zf": {
|
||||
"component": "Zend\\I18n",
|
||||
|
|
@ -3694,7 +3696,7 @@
|
|||
"i18n",
|
||||
"zf"
|
||||
],
|
||||
"time": "2019-09-30T12:04:37+00:00"
|
||||
"time": "2019-11-18T20:31:29+00:00"
|
||||
},
|
||||
{
|
||||
"name": "zendframework/zend-inputfilter",
|
||||
|
|
@ -5046,9 +5048,6 @@
|
|||
"aliases": [],
|
||||
"minimum-stability": "stable",
|
||||
"stability-flags": {
|
||||
"monarc/core": 20,
|
||||
"monarc/frontoffice": 20,
|
||||
"monarc/phpword": 20,
|
||||
"roave/security-advisories": 20
|
||||
},
|
||||
"prefer-stable": false,
|
||||
|
|
|
|||
Loading…
Reference in New Issue