From 245eaa8fa2697b5951012afcc02e938000f40c8c Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sat, 18 Feb 2017 09:11:51 -0800 Subject: [PATCH 1/3] fixed Composer constraints --- src/Symfony/Bridge/Doctrine/composer.json | 8 ++++---- src/Symfony/Bridge/Twig/composer.json | 6 +++--- .../Bundle/FrameworkBundle/composer.json | 18 +++++++++--------- .../Bundle/SecurityBundle/composer.json | 12 ++++++------ src/Symfony/Bundle/TwigBundle/composer.json | 6 +++--- src/Symfony/Component/BrowserKit/composer.json | 4 ++-- .../Component/ClassLoader/composer.json | 2 +- src/Symfony/Component/Console/composer.json | 2 +- src/Symfony/Component/Debug/composer.json | 2 +- .../DependencyInjection/composer.json | 2 +- .../Component/EventDispatcher/composer.json | 2 +- src/Symfony/Component/Form/composer.json | 4 ++-- src/Symfony/Component/HttpKernel/composer.json | 16 ++++++++-------- src/Symfony/Component/Routing/composer.json | 2 +- .../Component/Security/Core/composer.json | 2 +- src/Symfony/Component/Security/composer.json | 2 +- src/Symfony/Component/Serializer/composer.json | 2 +- src/Symfony/Component/Validator/composer.json | 4 ++-- 18 files changed, 48 insertions(+), 48 deletions(-) diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json index 4c106a2568..29c2e1cc8c 100644 --- a/src/Symfony/Bridge/Doctrine/composer.json +++ b/src/Symfony/Bridge/Doctrine/composer.json @@ -22,16 +22,16 @@ "require-dev": { "symfony/stopwatch": "~2.2", "symfony/dependency-injection": "~2.2", - "symfony/form": "~2.7.12|~2.8.5", + "symfony/form": "~2.7.12|^2.8.5", "symfony/http-kernel": "~2.2", "symfony/property-access": "~2.3", "symfony/security": "~2.2", "symfony/expression-language": "~2.2", - "symfony/validator": "~2.5,>=2.5.5", - "symfony/translation": "~2.0,>=2.0.5", + "symfony/validator": "^2.5.5", + "symfony/translation": "^2.0.5", "doctrine/data-fixtures": "1.0.*", "doctrine/dbal": "~2.4", - "doctrine/orm": "~2.4,>=2.4.5" + "doctrine/orm": "^2.4.5" }, "suggest": { "symfony/form": "", diff --git a/src/Symfony/Bridge/Twig/composer.json b/src/Symfony/Bridge/Twig/composer.json index 426bf9a64c..e98ff57d50 100644 --- a/src/Symfony/Bridge/Twig/composer.json +++ b/src/Symfony/Bridge/Twig/composer.json @@ -22,18 +22,18 @@ "require-dev": { "symfony/asset": "~2.7", "symfony/finder": "~2.3", - "symfony/form": "~2.7.23|~2.8.16", + "symfony/form": "~2.7.23|^2.8.16", "symfony/http-kernel": "~2.3", "symfony/intl": "~2.3", "symfony/routing": "~2.2", "symfony/templating": "~2.1", "symfony/translation": "~2.7", - "symfony/yaml": "~2.0,>=2.0.5", + "symfony/yaml": "^2.0.5", "symfony/security": "~2.6", "symfony/security-acl": "~2.6", "symfony/stopwatch": "~2.2", "symfony/console": "~2.7", - "symfony/var-dumper": "~2.7.16|~2.8.9", + "symfony/var-dumper": "~2.7.16|^2.8.9", "symfony/expression-language": "~2.4" }, "suggest": { diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json index 5f0c6ce2e1..1a479551d6 100644 --- a/src/Symfony/Bundle/FrameworkBundle/composer.json +++ b/src/Symfony/Bundle/FrameworkBundle/composer.json @@ -18,14 +18,14 @@ "require": { "php": ">=5.3.9", "symfony/asset": "~2.7", - "symfony/dependency-injection": "~2.6,>=2.6.2", + "symfony/dependency-injection": "^2.6.2", "symfony/config": "~2.4", "symfony/event-dispatcher": "~2.5", - "symfony/finder": "~2.0,>=2.0.5", + "symfony/finder": "^2.0.5", "symfony/http-foundation": "~2.7", - "symfony/http-kernel": "~2.7.23|~2.8.16", + "symfony/http-kernel": "~2.7.23|^2.8.16", "symfony/filesystem": "~2.3", - "symfony/routing": "~2.7.24|~2.8.17", + "symfony/routing": "~2.7.24|^2.8.17", "symfony/security-core": "~2.6.13|~2.7.9|~2.8", "symfony/security-csrf": "~2.6", "symfony/stopwatch": "~2.3", @@ -36,16 +36,16 @@ "require-dev": { "symfony/browser-kit": "~2.4", "symfony/console": "~2.7", - "symfony/css-selector": "~2.0,>=2.0.5", - "symfony/dom-crawler": "~2.0,>=2.0.5", + "symfony/css-selector": "^2.0.5", + "symfony/dom-crawler": "^2.0.5", "symfony/intl": "~2.3", "symfony/security": "~2.6", - "symfony/form": "~2.7.23|~2.8.16", + "symfony/form": "~2.7.23|^2.8.16", "symfony/class-loader": "~2.1", "symfony/expression-language": "~2.6", - "symfony/process": "~2.0,>=2.0.5", + "symfony/process": "^2.0.5", "symfony/validator": "~2.5", - "symfony/yaml": "~2.0,>=2.0.5", + "symfony/yaml": "^2.0.5", "sensio/framework-extra-bundle": "^3.0.2" }, "suggest": { diff --git a/src/Symfony/Bundle/SecurityBundle/composer.json b/src/Symfony/Bundle/SecurityBundle/composer.json index 64dfae228b..88289a9bb1 100644 --- a/src/Symfony/Bundle/SecurityBundle/composer.json +++ b/src/Symfony/Bundle/SecurityBundle/composer.json @@ -24,17 +24,17 @@ "require-dev": { "symfony/browser-kit": "~2.4", "symfony/console": "~2.7", - "symfony/css-selector": "~2.0,>=2.0.5", - "symfony/dependency-injection": "~2.6,>=2.6.6", - "symfony/dom-crawler": "~2.0,>=2.0.5", + "symfony/css-selector": "^2.0.5", + "symfony/dependency-injection": "^2.6.6", + "symfony/dom-crawler": "^2.0.5", "symfony/form": "~2.7", "symfony/framework-bundle": "~2.7", "symfony/http-foundation": "~2.3", "symfony/twig-bundle": "~2.7", - "symfony/twig-bridge": "~2.7,>=2.7.4", - "symfony/process": "~2.0,>=2.0.5", + "symfony/twig-bridge": "^2.7.4", + "symfony/process": "^2.0.5", "symfony/validator": "~2.5", - "symfony/yaml": "~2.0,>=2.0.5", + "symfony/yaml": "^2.0.5", "symfony/expression-language": "~2.6", "doctrine/doctrine-bundle": "~1.2", "twig/twig": "~1.28|~2.0", diff --git a/src/Symfony/Bundle/TwigBundle/composer.json b/src/Symfony/Bundle/TwigBundle/composer.json index 861b45d561..4613ffb27a 100644 --- a/src/Symfony/Bundle/TwigBundle/composer.json +++ b/src/Symfony/Bundle/TwigBundle/composer.json @@ -21,14 +21,14 @@ "symfony/twig-bridge": "~2.7", "twig/twig": "~1.28|~2.0", "symfony/http-foundation": "~2.5", - "symfony/http-kernel": "~2.7.23|~2.8.16" + "symfony/http-kernel": "~2.7.23|^2.8.16" }, "require-dev": { "symfony/stopwatch": "~2.2", - "symfony/dependency-injection": "~2.6,>=2.6.6", + "symfony/dependency-injection": "^2.6.6", "symfony/expression-language": "~2.4", "symfony/config": "~2.2", - "symfony/finder": "~2.0,>=2.0.5", + "symfony/finder": "^2.0.5", "symfony/routing": "~2.1", "symfony/templating": "~2.1", "symfony/yaml": "~2.3", diff --git a/src/Symfony/Component/BrowserKit/composer.json b/src/Symfony/Component/BrowserKit/composer.json index 344e3e81af..ffb909e127 100644 --- a/src/Symfony/Component/BrowserKit/composer.json +++ b/src/Symfony/Component/BrowserKit/composer.json @@ -20,8 +20,8 @@ "symfony/dom-crawler": "~2.1" }, "require-dev": { - "symfony/process": "~2.3.34|~2.7,>=2.7.6", - "symfony/css-selector": "~2.0,>=2.0.5" + "symfony/process": "~2.3.34|^2.7.6", + "symfony/css-selector": "^2.0.5" }, "suggest": { "symfony/process": "" diff --git a/src/Symfony/Component/ClassLoader/composer.json b/src/Symfony/Component/ClassLoader/composer.json index 08306bcc1a..01d92dd6d8 100644 --- a/src/Symfony/Component/ClassLoader/composer.json +++ b/src/Symfony/Component/ClassLoader/composer.json @@ -21,7 +21,7 @@ "symfony/polyfill-apcu": "~1.1" }, "require-dev": { - "symfony/finder": "~2.0,>=2.0.5" + "symfony/finder": "^2.0.5" }, "autoload": { "psr-4": { "Symfony\\Component\\ClassLoader\\": "" }, diff --git a/src/Symfony/Component/Console/composer.json b/src/Symfony/Component/Console/composer.json index 1bd4af63cb..c4fb8c192a 100644 --- a/src/Symfony/Component/Console/composer.json +++ b/src/Symfony/Component/Console/composer.json @@ -17,7 +17,7 @@ ], "require": { "php": ">=5.3.9", - "symfony/debug": "~2.7,>=2.7.2" + "symfony/debug": "^2.7.2" }, "require-dev": { "symfony/event-dispatcher": "~2.1", diff --git a/src/Symfony/Component/Debug/composer.json b/src/Symfony/Component/Debug/composer.json index 51b0df6644..2ae0685bc1 100644 --- a/src/Symfony/Component/Debug/composer.json +++ b/src/Symfony/Component/Debug/composer.json @@ -24,7 +24,7 @@ }, "require-dev": { "symfony/class-loader": "~2.2", - "symfony/http-kernel": "~2.3.24|~2.5.9|~2.6,>=2.6.2" + "symfony/http-kernel": "~2.3.24|~2.5.9|^2.6.2" }, "autoload": { "psr-4": { "Symfony\\Component\\Debug\\": "" }, diff --git a/src/Symfony/Component/DependencyInjection/composer.json b/src/Symfony/Component/DependencyInjection/composer.json index 9c12d111f2..738201f1ad 100644 --- a/src/Symfony/Component/DependencyInjection/composer.json +++ b/src/Symfony/Component/DependencyInjection/composer.json @@ -19,7 +19,7 @@ "php": ">=5.3.9" }, "require-dev": { - "symfony/yaml": "~2.3.42|~2.7.14|~2.8.7", + "symfony/yaml": "~2.3.42|~2.7.14|^2.8.7", "symfony/config": "~2.2", "symfony/expression-language": "~2.6" }, diff --git a/src/Symfony/Component/EventDispatcher/composer.json b/src/Symfony/Component/EventDispatcher/composer.json index 3a20c35f38..108f2d1a45 100644 --- a/src/Symfony/Component/EventDispatcher/composer.json +++ b/src/Symfony/Component/EventDispatcher/composer.json @@ -21,7 +21,7 @@ "require-dev": { "symfony/dependency-injection": "~2.6", "symfony/expression-language": "~2.6", - "symfony/config": "~2.0,>=2.0.5", + "symfony/config": "^2.0.5", "symfony/stopwatch": "~2.3", "psr/log": "~1.0" }, diff --git a/src/Symfony/Component/Form/composer.json b/src/Symfony/Component/Form/composer.json index 5e3eb9ed58..e0c354db64 100644 --- a/src/Symfony/Component/Form/composer.json +++ b/src/Symfony/Component/Form/composer.json @@ -24,11 +24,11 @@ }, "require-dev": { "doctrine/collections": "~1.0", - "symfony/validator": "~2.6,>=2.6.8", + "symfony/validator": "^2.6.8", "symfony/http-foundation": "~2.2", "symfony/http-kernel": "~2.4", "symfony/security-csrf": "~2.4", - "symfony/translation": "~2.0,>=2.0.5" + "symfony/translation": "^2.0.5" }, "conflict": { "symfony/doctrine-bridge": "<2.7", diff --git a/src/Symfony/Component/HttpKernel/composer.json b/src/Symfony/Component/HttpKernel/composer.json index ec2333d9b4..7dec6ef11d 100644 --- a/src/Symfony/Component/HttpKernel/composer.json +++ b/src/Symfony/Component/HttpKernel/composer.json @@ -17,9 +17,9 @@ ], "require": { "php": ">=5.3.9", - "symfony/event-dispatcher": "~2.6,>=2.6.7", - "symfony/http-foundation": "~2.7.20|~2.8.13", - "symfony/debug": "~2.6,>=2.6.2", + "symfony/event-dispatcher": "^2.6.7", + "symfony/http-foundation": "~2.7.20|^2.8.13", + "symfony/debug": "^2.6.2", "psr/log": "~1.0" }, "require-dev": { @@ -27,16 +27,16 @@ "symfony/class-loader": "~2.1", "symfony/config": "~2.7", "symfony/console": "~2.3", - "symfony/css-selector": "~2.0,>=2.0.5", + "symfony/css-selector": "^2.0.5", "symfony/dependency-injection": "~2.2", - "symfony/dom-crawler": "~2.0,>=2.0.5", + "symfony/dom-crawler": "^2.0.5", "symfony/expression-language": "~2.4", - "symfony/finder": "~2.0,>=2.0.5", - "symfony/process": "~2.0,>=2.0.5", + "symfony/finder": "^2.0.5", + "symfony/process": "^2.0.5", "symfony/routing": "~2.2", "symfony/stopwatch": "~2.3", "symfony/templating": "~2.2", - "symfony/translation": "~2.0,>=2.0.5", + "symfony/translation": "^2.0.5", "symfony/var-dumper": "~2.6" }, "conflict": { diff --git a/src/Symfony/Component/Routing/composer.json b/src/Symfony/Component/Routing/composer.json index d7760343f0..1be7e50ad5 100644 --- a/src/Symfony/Component/Routing/composer.json +++ b/src/Symfony/Component/Routing/composer.json @@ -21,7 +21,7 @@ "require-dev": { "symfony/config": "~2.7", "symfony/http-foundation": "~2.3", - "symfony/yaml": "~2.0,>=2.0.5", + "symfony/yaml": "^2.0.5", "symfony/expression-language": "~2.4", "doctrine/annotations": "~1.0", "doctrine/common": "~2.2", diff --git a/src/Symfony/Component/Security/Core/composer.json b/src/Symfony/Component/Security/Core/composer.json index 354c55e5c3..9638d16e22 100644 --- a/src/Symfony/Component/Security/Core/composer.json +++ b/src/Symfony/Component/Security/Core/composer.json @@ -23,7 +23,7 @@ "symfony/event-dispatcher": "~2.1", "symfony/expression-language": "~2.6", "symfony/http-foundation": "~2.4", - "symfony/validator": "~2.5,>=2.5.9", + "symfony/validator": "^2.5.9", "psr/log": "~1.0", "ircmaxell/password-compat": "1.0.*" }, diff --git a/src/Symfony/Component/Security/composer.json b/src/Symfony/Component/Security/composer.json index b64e1b8a98..75e7e2a2d9 100644 --- a/src/Symfony/Component/Security/composer.json +++ b/src/Symfony/Component/Security/composer.json @@ -32,7 +32,7 @@ "symfony/finder": "~2.3", "symfony/intl": "~2.3", "symfony/routing": "~2.2", - "symfony/validator": "~2.5,>=2.5.9", + "symfony/validator": "^2.5.9", "doctrine/common": "~2.2", "doctrine/dbal": "~2.2", "psr/log": "~1.0", diff --git a/src/Symfony/Component/Serializer/composer.json b/src/Symfony/Component/Serializer/composer.json index d6b63120c1..bcacfbc754 100644 --- a/src/Symfony/Component/Serializer/composer.json +++ b/src/Symfony/Component/Serializer/composer.json @@ -19,7 +19,7 @@ "php": ">=5.3.9" }, "require-dev": { - "symfony/yaml": "~2.0,>=2.0.5", + "symfony/yaml": "^2.0.5", "symfony/config": "~2.2", "symfony/property-access": "~2.3", "doctrine/annotations": "~1.0", diff --git a/src/Symfony/Component/Validator/composer.json b/src/Symfony/Component/Validator/composer.json index 96563e4fa4..7fee8690b7 100644 --- a/src/Symfony/Component/Validator/composer.json +++ b/src/Symfony/Component/Validator/composer.json @@ -23,13 +23,13 @@ "doctrine/common": "~2.3", "symfony/http-foundation": "~2.3", "symfony/intl": "~2.7.4|~2.8", - "symfony/yaml": "~2.0,>=2.0.5", + "symfony/yaml": "^2.0.5", "symfony/config": "~2.2", "symfony/property-access": "~2.3", "symfony/expression-language": "~2.4", "doctrine/annotations": "~1.0", "doctrine/cache": "~1.0", - "egulias/email-validator": "~1.2,>=1.2.1" + "egulias/email-validator": "^1.2.1" }, "suggest": { "doctrine/annotations": "For using the annotation mapping. You will also need doctrine/cache.", From 0e1596df25f50ac593ea987635804abe91256c0f Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sat, 18 Feb 2017 11:12:03 -0800 Subject: [PATCH 2/3] fixed Composer constraints --- src/Symfony/Bridge/Doctrine/composer.json | 6 +++--- src/Symfony/Bridge/Twig/composer.json | 4 ++-- src/Symfony/Bundle/FrameworkBundle/composer.json | 14 +++++++------- src/Symfony/Bundle/SecurityBundle/composer.json | 10 +++++----- src/Symfony/Bundle/TwigBundle/composer.json | 6 +++--- src/Symfony/Component/BrowserKit/composer.json | 4 ++-- src/Symfony/Component/ClassLoader/composer.json | 2 +- src/Symfony/Component/Console/composer.json | 2 +- src/Symfony/Component/Debug/composer.json | 2 +- .../Component/EventDispatcher/composer.json | 2 +- src/Symfony/Component/Form/composer.json | 2 +- src/Symfony/Component/HttpKernel/composer.json | 14 +++++++------- src/Symfony/Component/Routing/composer.json | 2 +- src/Symfony/Component/Security/Core/composer.json | 2 +- src/Symfony/Component/Security/composer.json | 2 +- src/Symfony/Component/Serializer/composer.json | 2 +- src/Symfony/Component/Validator/composer.json | 4 ++-- 17 files changed, 40 insertions(+), 40 deletions(-) diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json index f0f79f522b..929aaa5a52 100644 --- a/src/Symfony/Bridge/Doctrine/composer.json +++ b/src/Symfony/Bridge/Doctrine/composer.json @@ -29,11 +29,11 @@ "symfony/property-info": "~2.8|3.0", "symfony/security": "~2.2|~3.0.0", "symfony/expression-language": "~2.2|~3.0.0", - "symfony/validator": "~2.5,>=2.5.5|~3.0.0", - "symfony/translation": "~2.0,>=2.0.5|~3.0.0", + "symfony/validator": "^2.5.5|~3.0.0", + "symfony/translation": "^2.0.5|~3.0.0", "doctrine/data-fixtures": "1.0.*", "doctrine/dbal": "~2.4", - "doctrine/orm": "~2.4,>=2.4.5" + "doctrine/orm": "^2.4.5" }, "suggest": { "symfony/form": "", diff --git a/src/Symfony/Bridge/Twig/composer.json b/src/Symfony/Bridge/Twig/composer.json index 3281ce0f3b..cfe1a1f4ac 100644 --- a/src/Symfony/Bridge/Twig/composer.json +++ b/src/Symfony/Bridge/Twig/composer.json @@ -22,13 +22,13 @@ "require-dev": { "symfony/asset": "~2.7|~3.0.0", "symfony/finder": "~2.3|~3.0.0", - "symfony/form": "~2.8.16", + "symfony/form": "^2.8.16", "symfony/http-kernel": "~2.8|~3.0.0", "symfony/polyfill-intl-icu": "~1.0", "symfony/routing": "~2.2|~3.0.0", "symfony/templating": "~2.1|~3.0.0", "symfony/translation": "~2.7|~3.0.0", - "symfony/yaml": "~2.0,>=2.0.5|~3.0.0", + "symfony/yaml": "^2.0.5|~3.0.0", "symfony/security": "~2.6|~3.0.0", "symfony/security-acl": "~2.6|~3.0.0", "symfony/stopwatch": "~2.2|~3.0.0", diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json index 267985e115..96fbfc312c 100644 --- a/src/Symfony/Bundle/FrameworkBundle/composer.json +++ b/src/Symfony/Bundle/FrameworkBundle/composer.json @@ -22,12 +22,12 @@ "symfony/dependency-injection": "~2.8", "symfony/config": "~2.8", "symfony/event-dispatcher": "~2.8|~3.0.0", - "symfony/finder": "~2.0,>=2.0.5|~3.0.0", + "symfony/finder": "^2.0.5|~3.0.0", "symfony/http-foundation": "~2.7", - "symfony/http-kernel": "~2.8.16", + "symfony/http-kernel": "^2.8.16", "symfony/polyfill-mbstring": "~1.0", "symfony/filesystem": "~2.3|~3.0.0", - "symfony/routing": "~2.8.17", + "symfony/routing": "^2.8.17", "symfony/security-core": "~2.6.13|~2.7.9|~2.8|~3.0.0", "symfony/security-csrf": "~2.6|~3.0.0", "symfony/stopwatch": "~2.3|~3.0.0", @@ -39,15 +39,15 @@ "require-dev": { "symfony/browser-kit": "~2.4|~3.0.0", "symfony/console": "~2.8.8|~3.0.8", - "symfony/css-selector": "~2.0,>=2.0.5|~3.0.0", - "symfony/dom-crawler": "~2.0,>=2.0.5|~3.0.0", + "symfony/css-selector": "^2.0.5|~3.0.0", + "symfony/dom-crawler": "^2.0.5|~3.0.0", "symfony/polyfill-intl-icu": "~1.0", "symfony/security": "~2.6|~3.0.0", "symfony/form": "^2.8.16", "symfony/expression-language": "~2.6|~3.0.0", - "symfony/process": "~2.0,>=2.0.5|~3.0.0", + "symfony/process": "^2.0.5|~3.0.0", "symfony/validator": "~2.5|~3.0.0", - "symfony/yaml": "~2.0,>=2.0.5|~3.0.0", + "symfony/yaml": "^2.0.5|~3.0.0", "symfony/property-info": "~2.8|~3.0.0", "phpdocumentor/reflection": "^1.0.7", "twig/twig": "~1.23|~2.0", diff --git a/src/Symfony/Bundle/SecurityBundle/composer.json b/src/Symfony/Bundle/SecurityBundle/composer.json index 49c836d885..d9abcdca30 100644 --- a/src/Symfony/Bundle/SecurityBundle/composer.json +++ b/src/Symfony/Bundle/SecurityBundle/composer.json @@ -25,16 +25,16 @@ "require-dev": { "symfony/browser-kit": "~2.4|~3.0.0", "symfony/console": "~2.7|~3.0.0", - "symfony/css-selector": "~2.0,>=2.0.5|~3.0.0", - "symfony/dom-crawler": "~2.0,>=2.0.5|~3.0.0", + "symfony/css-selector": "^2.0.5|~3.0.0", + "symfony/dom-crawler": "^2.0.5|~3.0.0", "symfony/form": "~2.8", "symfony/framework-bundle": "~2.8", "symfony/http-foundation": "~2.4|~3.0.0", "symfony/twig-bundle": "~2.7|~3.1.0", - "symfony/twig-bridge": "~2.7,>=2.7.4|~3.1.0", - "symfony/process": "~2.0,>=2.0.5|~3.0.0", + "symfony/twig-bridge": "^2.7.4|~3.1.0", + "symfony/process": "^2.0.5|~3.0.0", "symfony/validator": "~2.5|~3.0.0", - "symfony/yaml": "~2.0,>=2.0.5|~3.0.0", + "symfony/yaml": "^2.0.5|~3.0.0", "symfony/expression-language": "~2.6|~3.0.0", "doctrine/doctrine-bundle": "~1.2", "twig/twig": "~1.28|~2.0" diff --git a/src/Symfony/Bundle/TwigBundle/composer.json b/src/Symfony/Bundle/TwigBundle/composer.json index 2c0a4e92e2..3c2e6c13b4 100644 --- a/src/Symfony/Bundle/TwigBundle/composer.json +++ b/src/Symfony/Bundle/TwigBundle/composer.json @@ -20,15 +20,15 @@ "symfony/asset": "~2.7|~3.0.0", "symfony/twig-bridge": "~2.7|~3.0.0", "symfony/http-foundation": "~2.5|~3.0.0", - "symfony/http-kernel": "~2.7.23|~2.8.16", + "symfony/http-kernel": "~2.7.23|^2.8.16", "twig/twig": "~1.28|~2.0" }, "require-dev": { "symfony/stopwatch": "~2.2|~3.0.0", - "symfony/dependency-injection": "~2.6,>=2.6.6|~3.0.0", + "symfony/dependency-injection": "^2.6.6|~3.0.0", "symfony/expression-language": "~2.4|~3.0.0", "symfony/config": "~2.8|~3.0.0", - "symfony/finder": "~2.0,>=2.0.5", + "symfony/finder": "^2.0.5", "symfony/routing": "~2.1|~3.0.0", "symfony/templating": "~2.1|~3.0.0", "symfony/yaml": "~2.3|~3.0.0", diff --git a/src/Symfony/Component/BrowserKit/composer.json b/src/Symfony/Component/BrowserKit/composer.json index 1deb892a5a..64bfb0eefa 100644 --- a/src/Symfony/Component/BrowserKit/composer.json +++ b/src/Symfony/Component/BrowserKit/composer.json @@ -20,8 +20,8 @@ "symfony/dom-crawler": "~2.1|~3.0.0" }, "require-dev": { - "symfony/process": "~2.3.34|~2.7,>=2.7.6|~3.0.0", - "symfony/css-selector": "~2.0,>=2.0.5|~3.0.0" + "symfony/process": "~2.3.34|^2.7.6|~3.0.0", + "symfony/css-selector": "^2.0.5|~3.0.0" }, "suggest": { "symfony/process": "" diff --git a/src/Symfony/Component/ClassLoader/composer.json b/src/Symfony/Component/ClassLoader/composer.json index 7acbeafda1..6f306d9712 100644 --- a/src/Symfony/Component/ClassLoader/composer.json +++ b/src/Symfony/Component/ClassLoader/composer.json @@ -21,7 +21,7 @@ "symfony/polyfill-apcu": "~1.1" }, "require-dev": { - "symfony/finder": "~2.0,>=2.0.5|~3.0.0" + "symfony/finder": "^2.0.5|~3.0.0" }, "autoload": { "psr-4": { "Symfony\\Component\\ClassLoader\\": "" }, diff --git a/src/Symfony/Component/Console/composer.json b/src/Symfony/Component/Console/composer.json index f0af3f214b..35ee7a7b20 100644 --- a/src/Symfony/Component/Console/composer.json +++ b/src/Symfony/Component/Console/composer.json @@ -18,7 +18,7 @@ "require": { "php": ">=5.3.9", "symfony/polyfill-mbstring": "~1.0", - "symfony/debug": "~2.7,>=2.7.2|~3.0.0" + "symfony/debug": "^2.7.2|~3.0.0" }, "require-dev": { "symfony/event-dispatcher": "~2.1|~3.0.0", diff --git a/src/Symfony/Component/Debug/composer.json b/src/Symfony/Component/Debug/composer.json index e739f75603..acf0ecd8c5 100644 --- a/src/Symfony/Component/Debug/composer.json +++ b/src/Symfony/Component/Debug/composer.json @@ -24,7 +24,7 @@ }, "require-dev": { "symfony/class-loader": "~2.2|~3.0.0", - "symfony/http-kernel": "~2.3.24|~2.5.9|~2.6,>=2.6.2|~3.0.0" + "symfony/http-kernel": "~2.3.24|~2.5.9|^2.6.2|~3.0.0" }, "autoload": { "psr-4": { "Symfony\\Component\\Debug\\": "" }, diff --git a/src/Symfony/Component/EventDispatcher/composer.json b/src/Symfony/Component/EventDispatcher/composer.json index 282b770c8b..14fc24ba22 100644 --- a/src/Symfony/Component/EventDispatcher/composer.json +++ b/src/Symfony/Component/EventDispatcher/composer.json @@ -21,7 +21,7 @@ "require-dev": { "symfony/dependency-injection": "~2.6|~3.0.0", "symfony/expression-language": "~2.6|~3.0.0", - "symfony/config": "~2.0,>=2.0.5|~3.0.0", + "symfony/config": "^2.0.5|~3.0.0", "symfony/stopwatch": "~2.3|~3.0.0", "psr/log": "~1.0" }, diff --git a/src/Symfony/Component/Form/composer.json b/src/Symfony/Component/Form/composer.json index 8c882b4f02..ef1c2696ff 100644 --- a/src/Symfony/Component/Form/composer.json +++ b/src/Symfony/Component/Form/composer.json @@ -30,7 +30,7 @@ "symfony/http-foundation": "~2.2|~3.0.0", "symfony/http-kernel": "~2.4|~3.0.0", "symfony/security-csrf": "~2.4|~3.0.0", - "symfony/translation": "~2.0,>=2.0.5|~3.0.0" + "symfony/translation": "^2.0.5|~3.0.0" }, "conflict": { "symfony/doctrine-bridge": "<2.7", diff --git a/src/Symfony/Component/HttpKernel/composer.json b/src/Symfony/Component/HttpKernel/composer.json index 13a89b7184..14a36bbd4a 100644 --- a/src/Symfony/Component/HttpKernel/composer.json +++ b/src/Symfony/Component/HttpKernel/composer.json @@ -17,9 +17,9 @@ ], "require": { "php": ">=5.3.9", - "symfony/event-dispatcher": "~2.6,>=2.6.7|~3.0.0", + "symfony/event-dispatcher": "^2.6.7|~3.0.0", "symfony/http-foundation": "~2.7.20|~2.8.13|~3.1.6", - "symfony/debug": "~2.6,>=2.6.2", + "symfony/debug": "^2.6.2", "psr/log": "~1.0" }, "require-dev": { @@ -27,16 +27,16 @@ "symfony/class-loader": "~2.1|~3.0.0", "symfony/config": "~2.8", "symfony/console": "~2.3|~3.0.0", - "symfony/css-selector": "~2.0,>=2.0.5|~3.0.0", + "symfony/css-selector": "^2.0.5|~3.0.0", "symfony/dependency-injection": "~2.8|~3.0.0", - "symfony/dom-crawler": "~2.0,>=2.0.5|~3.0.0", + "symfony/dom-crawler": "^2.0.5|~3.0.0", "symfony/expression-language": "~2.4|~3.0.0", - "symfony/finder": "~2.0,>=2.0.5|~3.0.0", - "symfony/process": "~2.0,>=2.0.5|~3.0.0", + "symfony/finder": "^2.0.5|~3.0.0", + "symfony/process": "^2.0.5|~3.0.0", "symfony/routing": "~2.8|~3.0.0", "symfony/stopwatch": "~2.3|~3.0.0", "symfony/templating": "~2.2|~3.0.0", - "symfony/translation": "~2.0,>=2.0.5|~3.0.0", + "symfony/translation": "^2.0.5|~3.0.0", "symfony/var-dumper": "~2.6|~3.0.0" }, "conflict": { diff --git a/src/Symfony/Component/Routing/composer.json b/src/Symfony/Component/Routing/composer.json index d00ae6d5db..7fb49738ef 100644 --- a/src/Symfony/Component/Routing/composer.json +++ b/src/Symfony/Component/Routing/composer.json @@ -21,7 +21,7 @@ "require-dev": { "symfony/config": "~2.7|~3.0.0", "symfony/http-foundation": "~2.3|~3.0.0", - "symfony/yaml": "~2.0,>=2.0.5|~3.0.0", + "symfony/yaml": "^2.0.5|~3.0.0", "symfony/expression-language": "~2.4|~3.0.0", "doctrine/annotations": "~1.0", "doctrine/common": "~2.2", diff --git a/src/Symfony/Component/Security/Core/composer.json b/src/Symfony/Component/Security/Core/composer.json index 3362971d17..1a5696830f 100644 --- a/src/Symfony/Component/Security/Core/composer.json +++ b/src/Symfony/Component/Security/Core/composer.json @@ -27,7 +27,7 @@ "symfony/expression-language": "~2.6|~3.0.0", "symfony/http-foundation": "~2.4|~3.0.0", "symfony/ldap": "~2.8|~3.0.0", - "symfony/validator": "~2.5,>=2.5.9|~3.0.0", + "symfony/validator": "^2.5.9|~3.0.0", "psr/log": "~1.0" }, "suggest": { diff --git a/src/Symfony/Component/Security/composer.json b/src/Symfony/Component/Security/composer.json index 3eab48b1a3..17ca9c0a79 100644 --- a/src/Symfony/Component/Security/composer.json +++ b/src/Symfony/Component/Security/composer.json @@ -37,7 +37,7 @@ "symfony/finder": "~2.3|~3.0.0", "symfony/polyfill-intl-icu": "~1.0", "symfony/routing": "~2.2|~3.0.0", - "symfony/validator": "~2.5,>=2.5.9|~3.0.0", + "symfony/validator": "^2.5.9|~3.0.0", "psr/log": "~1.0", "symfony/expression-language": "~2.6|~3.0.0", "symfony/ldap": "~2.8|~3.0.0" diff --git a/src/Symfony/Component/Serializer/composer.json b/src/Symfony/Component/Serializer/composer.json index 88b7832bfd..70bc5438d1 100644 --- a/src/Symfony/Component/Serializer/composer.json +++ b/src/Symfony/Component/Serializer/composer.json @@ -20,7 +20,7 @@ "symfony/polyfill-php55": "~1.0" }, "require-dev": { - "symfony/yaml": "~2.0,>=2.0.5|~3.0.0", + "symfony/yaml": "^2.0.5|~3.0.0", "symfony/config": "~2.2|~3.0.0", "symfony/property-access": "~2.3|~3.0.0", "doctrine/annotations": "~1.0", diff --git a/src/Symfony/Component/Validator/composer.json b/src/Symfony/Component/Validator/composer.json index f68d6e957c..3afe355499 100644 --- a/src/Symfony/Component/Validator/composer.json +++ b/src/Symfony/Component/Validator/composer.json @@ -23,13 +23,13 @@ "require-dev": { "symfony/http-foundation": "~2.3|~3.0.0", "symfony/intl": "~2.7.4|~2.8|~3.0.0", - "symfony/yaml": "~2.0,>=2.0.5|~3.0.0", + "symfony/yaml": "^2.0.5|~3.0.0", "symfony/config": "~2.2|~3.0.0", "symfony/property-access": "~2.3|~3.0.0", "symfony/expression-language": "~2.4|~3.0.0", "doctrine/annotations": "~1.0", "doctrine/cache": "~1.0", - "egulias/email-validator": "~1.2,>=1.2.1" + "egulias/email-validator": "^1.2.1" }, "suggest": { "doctrine/annotations": "For using the annotation mapping. You will also need doctrine/cache.", From 86eb217de76674868ca9c8c9fa4a41666b62cae2 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sat, 18 Feb 2017 11:15:38 -0800 Subject: [PATCH 3/3] fixed Composer constraints --- src/Symfony/Bridge/Doctrine/composer.json | 4 ++-- src/Symfony/Bundle/FrameworkBundle/composer.json | 2 +- src/Symfony/Component/Validator/composer.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json index e2803b0168..9619b07d8f 100644 --- a/src/Symfony/Bridge/Doctrine/composer.json +++ b/src/Symfony/Bridge/Doctrine/composer.json @@ -23,7 +23,7 @@ "require-dev": { "symfony/stopwatch": "~2.8|~3.0", "symfony/dependency-injection": "~2.8|~3.0", - "symfony/form": "~3.0,>=3.0.5", + "symfony/form": "^3.0.5", "symfony/http-kernel": "~2.8|~3.0", "symfony/property-access": "~2.8|~3.0", "symfony/property-info": "~2.8|3.0", @@ -34,7 +34,7 @@ "symfony/translation": "~2.8|~3.0", "doctrine/data-fixtures": "1.0.*", "doctrine/dbal": "~2.4", - "doctrine/orm": "~2.4,>=2.4.5" + "doctrine/orm": "^2.4.5" }, "suggest": { "symfony/form": "", diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json index 46e374408b..c13654fb5d 100644 --- a/src/Symfony/Bundle/FrameworkBundle/composer.json +++ b/src/Symfony/Bundle/FrameworkBundle/composer.json @@ -27,7 +27,7 @@ "symfony/polyfill-mbstring": "~1.0", "symfony/filesystem": "~2.8|~3.0", "symfony/finder": "~2.8|~3.0", - "symfony/routing": "~3.1.10|~3.2.3", + "symfony/routing": "~3.1.10|^3.2.3", "symfony/security-core": "~2.8|~3.0", "symfony/security-csrf": "~2.8|~3.0", "symfony/stopwatch": "~2.8|~3.0", diff --git a/src/Symfony/Component/Validator/composer.json b/src/Symfony/Component/Validator/composer.json index e4b2f61fae..716de5bef0 100644 --- a/src/Symfony/Component/Validator/composer.json +++ b/src/Symfony/Component/Validator/composer.json @@ -29,7 +29,7 @@ "symfony/cache": "~3.1", "doctrine/annotations": "~1.0", "doctrine/cache": "~1.0", - "egulias/email-validator": "~1.2,>=1.2.8|~2.0" + "egulias/email-validator": "^1.2.8|~2.0" }, "suggest": { "psr/cache-implementation": "For using the metadata cache.",