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

merged and solved conflict in composer.lock

pull/255/head
Cédric Bonhomme 2019-11-19 10:39:26 +01:00
parent 0d14a8343e cdc41ed290
commit 5532024e14
No known key found for this signature in database
GPG Key ID: A1CB94DE57B7A70D
2 changed files with 42 additions and 44 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",

79
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",
@ -1226,33 +1226,35 @@
}, },
{ {
"name": "doctrine/orm", "name": "doctrine/orm",
"version": "v2.6.5", "version": "v2.7.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/doctrine/orm.git", "url": "https://github.com/doctrine/orm.git",
"reference": "16751d210fb806cc6f1b868a2b9dde6fab6866ed" "reference": "4d763ca4c925f647b248b9fa01b5f47aa3685d62"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/doctrine/orm/zipball/16751d210fb806cc6f1b868a2b9dde6fab6866ed", "url": "https://api.github.com/repos/doctrine/orm/zipball/4d763ca4c925f647b248b9fa01b5f47aa3685d62",
"reference": "16751d210fb806cc6f1b868a2b9dde6fab6866ed", "reference": "4d763ca4c925f647b248b9fa01b5f47aa3685d62",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"doctrine/annotations": "~1.5", "doctrine/annotations": "^1.8",
"doctrine/cache": "~1.6", "doctrine/cache": "^1.9.1",
"doctrine/collections": "^1.4", "doctrine/collections": "^1.5",
"doctrine/common": "^2.7.1", "doctrine/common": "^2.11",
"doctrine/dbal": "^2.6", "doctrine/dbal": "^2.9.3",
"doctrine/instantiator": "~1.1", "doctrine/event-manager": "^1.1",
"doctrine/instantiator": "^1.3",
"doctrine/persistence": "^1.2",
"ext-pdo": "*", "ext-pdo": "*",
"php": "^7.1", "php": "^7.1",
"symfony/console": "~3.0|~4.0" "symfony/console": "^3.0|^4.0|^5.0"
}, },
"require-dev": { "require-dev": {
"doctrine/coding-standard": "^5.0", "doctrine/coding-standard": "^5.0",
"phpunit/phpunit": "^7.5", "phpunit/phpunit": "^7.5",
"symfony/yaml": "~3.4|~4.0" "symfony/yaml": "^3.4|^4.0|^5.0"
}, },
"suggest": { "suggest": {
"symfony/yaml": "If you want to use YAML Metadata Mapping Driver" "symfony/yaml": "If you want to use YAML Metadata Mapping Driver"
@ -1263,7 +1265,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "2.6.x-dev" "dev-master": "2.7.x-dev"
} }
}, },
"autoload": { "autoload": {
@ -1298,12 +1300,12 @@
} }
], ],
"description": "Object-Relational-Mapper for PHP", "description": "Object-Relational-Mapper for PHP",
"homepage": "http://www.doctrine-project.org", "homepage": "https://www.doctrine-project.org/projects/orm.html",
"keywords": [ "keywords": [
"database", "database",
"orm" "orm"
], ],
"time": "2019-11-18T11:06:51+00:00" "time": "2019-11-19T08:38:05+00:00"
}, },
{ {
"name": "doctrine/persistence", "name": "doctrine/persistence",
@ -1464,16 +1466,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": "8b7df63499d1c05c43a0de2e85615bafb4e99303" "reference": "c704f57c9c9ebb0b9f28ac3862fb705d8036b49e"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/monarc-project/zm-core/zipball/8b7df63499d1c05c43a0de2e85615bafb4e99303", "url": "https://api.github.com/repos/monarc-project/zm-core/zipball/c704f57c9c9ebb0b9f28ac3862fb705d8036b49e",
"reference": "8b7df63499d1c05c43a0de2e85615bafb4e99303", "reference": "c704f57c9c9ebb0b9f28ac3862fb705d8036b49e",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1540,28 +1542,28 @@
} }
], ],
"description": "Core for monarc/monarc application", "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", "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": "7dbd78d50ec817c877ed311e9a599e44722dddf2" "reference": "d89a1b15f6d352169d4a129eb7f5a0f3f4eee9d5"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/monarc-project/zm-client/zipball/7dbd78d50ec817c877ed311e9a599e44722dddf2", "url": "https://api.github.com/repos/monarc-project/zm-client/zipball/d89a1b15f6d352169d4a129eb7f5a0f3f4eee9d5",
"reference": "7dbd78d50ec817c877ed311e9a599e44722dddf2", "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": "dev-master", "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",
@ -1603,11 +1605,11 @@
} }
], ],
"description": "Frontoffice for monarc/monarc application", "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", "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",
@ -3630,19 +3632,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"
}, },
@ -3658,7 +3661,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",
@ -3671,8 +3673,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",
@ -3694,7 +3696,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",
@ -5046,9 +5048,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,