From e9fd4060b1b154eb46aa4b804f3a639830aef71b Mon Sep 17 00:00:00 2001 From: Ruslan Baidan Date: Thu, 21 Nov 2019 09:41:45 +0100 Subject: [PATCH] Fixed the composer to use temporary dev-master for the core and frontoffice dependencies. --- composer.json | 4 +- composer.lock | 118 +++++++++++++++++++++++++------------------------- 2 files changed, 63 insertions(+), 59 deletions(-) diff --git a/composer.json b/composer.json index 75edc06..65dd05c 100644 --- a/composer.json +++ b/composer.json @@ -29,5 +29,7 @@ }, "config": { "bin-dir": "bin/" - } + }, + "minimum-stability": "dev", + "prefer-stable": true } diff --git a/composer.lock b/composer.lock index 587d00a..d4a8413 100644 --- a/composer.lock +++ b/composer.lock @@ -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": "5377926879625fef4e42f7e516bee26f", + "content-hash": "2ec110512ee04ed5a05a4abe9c349baa", "packages": [ { "name": "cakephp/cache", @@ -1467,20 +1467,21 @@ }, { "name": "monarc/core", - "version": "2.9.1", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/monarc-project/zm-core.git", - "reference": "a0da4dad5823ea3ef34236fb1286e2b046ddb6c6" + "reference": "5002338c1ab37ae74d149fe37bb50c7c17c09c20" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/monarc-project/zm-core/zipball/a0da4dad5823ea3ef34236fb1286e2b046ddb6c6", - "reference": "a0da4dad5823ea3ef34236fb1286e2b046ddb6c6", + "url": "https://api.github.com/repos/monarc-project/zm-core/zipball/5002338c1ab37ae74d149fe37bb50c7c17c09c20", + "reference": "5002338c1ab37ae74d149fe37bb50c7c17c09c20", "shasum": "" }, "require": { "doctrine/doctrine-orm-module": "^2.1", + "ext-intl": "*", "ext-openssl": "*", "ocramius/package-versions": "<1.5", "ocramius/proxy-manager": "<2.3", @@ -1547,7 +1548,7 @@ } ], "description": "Core for monarc/monarc application", - "time": "2019-11-20T14:20:20+00:00" + "time": "2019-11-21T08:23:34+00:00" }, { "name": "monarc/frontoffice", @@ -1555,19 +1556,19 @@ "source": { "type": "git", "url": "https://github.com/monarc-project/zm-client.git", - "reference": "73744d4f53de4fbd125ea5658fe2aa2bcadb1357" + "reference": "ee177ece89fa5facd610a04111c395a61eb13899" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/monarc-project/zm-client/zipball/73744d4f53de4fbd125ea5658fe2aa2bcadb1357", - "reference": "73744d4f53de4fbd125ea5658fe2aa2bcadb1357", + "url": "https://api.github.com/repos/monarc-project/zm-client/zipball/ee177ece89fa5facd610a04111c395a61eb13899", + "reference": "ee177ece89fa5facd610a04111c395a61eb13899", "shasum": "" }, "require": { "doctrine/doctrine-orm-module": "^2.1", "ext-imagick": "*", "ext-intl": "*", - "monarc/core": "^2.9", + "monarc/core": "dev-master", "monarc/phpword": "^1.0", "php": "^7.1", "robmorgan/phinx": "^0.11.1", @@ -1626,7 +1627,7 @@ } ], "description": "Frontoffice for monarc/monarc application", - "time": "2019-11-20T09:22:19+00:00" + "time": "2019-11-20T14:58:11+00:00" }, { "name": "monarc/phpword", @@ -2396,32 +2397,32 @@ }, { "name": "symfony/config", - "version": "v4.3.8", + "version": "v4.4.0", "source": { "type": "git", "url": "https://github.com/symfony/config.git", - "reference": "8267214841c44d315a55242ea867684eb43c42ce" + "reference": "f08e1c48e1f05d07c32f2d8599ed539e62105beb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/8267214841c44d315a55242ea867684eb43c42ce", - "reference": "8267214841c44d315a55242ea867684eb43c42ce", + "url": "https://api.github.com/repos/symfony/config/zipball/f08e1c48e1f05d07c32f2d8599ed539e62105beb", + "reference": "f08e1c48e1f05d07c32f2d8599ed539e62105beb", "shasum": "" }, "require": { "php": "^7.1.3", - "symfony/filesystem": "~3.4|~4.0", + "symfony/filesystem": "^3.4|^4.0|^5.0", "symfony/polyfill-ctype": "~1.8" }, "conflict": { "symfony/finder": "<3.4" }, "require-dev": { - "symfony/dependency-injection": "~3.4|~4.0", - "symfony/event-dispatcher": "~3.4|~4.0", - "symfony/finder": "~3.4|~4.0", - "symfony/messenger": "~4.1", - "symfony/yaml": "~3.4|~4.0" + "symfony/event-dispatcher": "^3.4|^4.0|^5.0", + "symfony/finder": "^3.4|^4.0|^5.0", + "symfony/messenger": "^4.1|^5.0", + "symfony/service-contracts": "^1.1|^2", + "symfony/yaml": "^3.4|^4.0|^5.0" }, "suggest": { "symfony/yaml": "To use the yaml reference dumper" @@ -2429,7 +2430,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.3-dev" + "dev-master": "4.4-dev" } }, "autoload": { @@ -2456,31 +2457,32 @@ ], "description": "Symfony Config Component", "homepage": "https://symfony.com", - "time": "2019-11-08T08:31:27+00:00" + "time": "2019-11-16T15:22:42+00:00" }, { "name": "symfony/console", - "version": "v4.3.8", + "version": "v4.4.0", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "831424efae0a1fe6642784bd52aae14ece6538e6" + "reference": "35d9077f495c6d184d9930f7a7ecbd1ad13c7ab8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/831424efae0a1fe6642784bd52aae14ece6538e6", - "reference": "831424efae0a1fe6642784bd52aae14ece6538e6", + "url": "https://api.github.com/repos/symfony/console/zipball/35d9077f495c6d184d9930f7a7ecbd1ad13c7ab8", + "reference": "35d9077f495c6d184d9930f7a7ecbd1ad13c7ab8", "shasum": "" }, "require": { "php": "^7.1.3", "symfony/polyfill-mbstring": "~1.0", "symfony/polyfill-php73": "^1.8", - "symfony/service-contracts": "^1.1" + "symfony/service-contracts": "^1.1|^2" }, "conflict": { "symfony/dependency-injection": "<3.4", - "symfony/event-dispatcher": "<4.3", + "symfony/event-dispatcher": "<4.3|>=5", + "symfony/lock": "<4.4", "symfony/process": "<3.3" }, "provide": { @@ -2488,12 +2490,12 @@ }, "require-dev": { "psr/log": "~1.0", - "symfony/config": "~3.4|~4.0", - "symfony/dependency-injection": "~3.4|~4.0", + "symfony/config": "^3.4|^4.0|^5.0", + "symfony/dependency-injection": "^3.4|^4.0|^5.0", "symfony/event-dispatcher": "^4.3", - "symfony/lock": "~3.4|~4.0", - "symfony/process": "~3.4|~4.0", - "symfony/var-dumper": "^4.3" + "symfony/lock": "^4.4|^5.0", + "symfony/process": "^3.4|^4.0|^5.0", + "symfony/var-dumper": "^4.3|^5.0" }, "suggest": { "psr/log": "For using the console logger", @@ -2504,7 +2506,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.3-dev" + "dev-master": "4.4-dev" } }, "autoload": { @@ -2531,20 +2533,20 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2019-11-13T07:29:07+00:00" + "time": "2019-11-13T07:39:40+00:00" }, { "name": "symfony/filesystem", - "version": "v4.3.8", + "version": "v4.4.0", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "9abbb7ef96a51f4d7e69627bc6f63307994e4263" + "reference": "d12b01cba60be77b583c9af660007211e3909854" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/9abbb7ef96a51f4d7e69627bc6f63307994e4263", - "reference": "9abbb7ef96a51f4d7e69627bc6f63307994e4263", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/d12b01cba60be77b583c9af660007211e3909854", + "reference": "d12b01cba60be77b583c9af660007211e3909854", "shasum": "" }, "require": { @@ -2554,7 +2556,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.3-dev" + "dev-master": "4.4-dev" } }, "autoload": { @@ -2581,7 +2583,7 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", - "time": "2019-08-20T14:07:54+00:00" + "time": "2019-11-12T14:51:11+00:00" }, { "name": "symfony/polyfill-ctype", @@ -2760,20 +2762,20 @@ }, { "name": "symfony/service-contracts", - "version": "v1.1.8", + "version": "v2.0.0", "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "ffc7f5692092df31515df2a5ecf3b7302b3ddacf" + "reference": "9d99e1556417bf227a62e14856d630672bf10eaf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/ffc7f5692092df31515df2a5ecf3b7302b3ddacf", - "reference": "ffc7f5692092df31515df2a5ecf3b7302b3ddacf", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/9d99e1556417bf227a62e14856d630672bf10eaf", + "reference": "9d99e1556417bf227a62e14856d630672bf10eaf", "shasum": "" }, "require": { - "php": "^7.1.3", + "php": "^7.2.9", "psr/container": "^1.0" }, "suggest": { @@ -2782,7 +2784,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1-dev" + "dev-master": "2.0-dev" } }, "autoload": { @@ -2814,20 +2816,20 @@ "interoperability", "standards" ], - "time": "2019-10-14T12:27:06+00:00" + "time": "2019-11-09T09:18:34+00:00" }, { "name": "symfony/yaml", - "version": "v4.3.8", + "version": "v4.4.0", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "324cf4b19c345465fad14f3602050519e09e361d" + "reference": "76de473358fe802578a415d5bb43c296cf09d211" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/324cf4b19c345465fad14f3602050519e09e361d", - "reference": "324cf4b19c345465fad14f3602050519e09e361d", + "url": "https://api.github.com/repos/symfony/yaml/zipball/76de473358fe802578a415d5bb43c296cf09d211", + "reference": "76de473358fe802578a415d5bb43c296cf09d211", "shasum": "" }, "require": { @@ -2838,7 +2840,7 @@ "symfony/console": "<3.4" }, "require-dev": { - "symfony/console": "~3.4|~4.0" + "symfony/console": "^3.4|^4.0|^5.0" }, "suggest": { "symfony/console": "For validating YAML files using the lint command" @@ -2846,7 +2848,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.3-dev" + "dev-master": "4.4-dev" } }, "autoload": { @@ -2873,7 +2875,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2019-10-30T12:58:49+00:00" + "time": "2019-11-12T14:51:11+00:00" }, { "name": "true/punycode", @@ -5067,12 +5069,12 @@ } ], "aliases": [], - "minimum-stability": "stable", + "minimum-stability": "dev", "stability-flags": { "monarc/frontoffice": 20, "roave/security-advisories": 20 }, - "prefer-stable": false, + "prefer-stable": true, "prefer-lowest": false, "platform": { "php": "^7.1",