Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
bug #21661 Fix Composer constraints (fabpot)
This PR was merged into the 2.7 branch.

Discussion
----------

Fix Composer constraints

| Q             | A
| ------------- | ---
| Branch?       | 2.7
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | n/a
| License       | MIT
| Doc PR        | n/a

Commits
-------

245eaa8 fixed Composer constraints
  • Loading branch information
fabpot committed Feb 18, 2017
2 parents bc34081 + 245eaa8 commit 00c61da
Show file tree
Hide file tree
Showing 18 changed files with 48 additions and 48 deletions.
8 changes: 4 additions & 4 deletions src/Symfony/Bridge/Doctrine/composer.json
Expand Up @@ -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": "",
Expand Down
6 changes: 3 additions & 3 deletions src/Symfony/Bridge/Twig/composer.json
Expand Up @@ -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": {
Expand Down
18 changes: 9 additions & 9 deletions src/Symfony/Bundle/FrameworkBundle/composer.json
Expand Up @@ -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",
Expand All @@ -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": {
Expand Down
12 changes: 6 additions & 6 deletions src/Symfony/Bundle/SecurityBundle/composer.json
Expand Up @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions src/Symfony/Bundle/TwigBundle/composer.json
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions src/Symfony/Component/BrowserKit/composer.json
Expand Up @@ -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": ""
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Component/ClassLoader/composer.json
Expand Up @@ -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\\": "" },
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Component/Console/composer.json
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Component/Debug/composer.json
Expand Up @@ -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\\": "" },
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Component/DependencyInjection/composer.json
Expand Up @@ -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"
},
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Component/EventDispatcher/composer.json
Expand Up @@ -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"
},
Expand Down
4 changes: 2 additions & 2 deletions src/Symfony/Component/Form/composer.json
Expand Up @@ -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",
Expand Down
16 changes: 8 additions & 8 deletions src/Symfony/Component/HttpKernel/composer.json
Expand Up @@ -17,26 +17,26 @@
],
"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": {
"symfony/browser-kit": "~2.3",
"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": {
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Component/Routing/composer.json
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Component/Security/Core/composer.json
Expand Up @@ -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.*"
},
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Component/Security/composer.json
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Component/Serializer/composer.json
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions src/Symfony/Component/Validator/composer.json
Expand Up @@ -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.",
Expand Down

0 comments on commit 00c61da

Please sign in to comment.