8000 minor #13135 [2.7] Allow 3.0 requirements (nicolas-grekas) · symfony/symfony@4c5730c · GitHub
[go: up one dir, main page]
Skip to content

Commit 4c5730c

Browse files
fabpotfabpot
committed
minor #13135 [2.7] Allow 3.0 requirements (nicolas-grekas)
This PR was merged into the 2.7 branch. Discussion ---------- [2.7] Allow 3.0 requirements | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | lets see | Fixed tickets | - | License | MIT | Doc PR | - 2.7 is going to provide almost the same interfaces as 3.0 but also a BC layer for previous releases. This means that 2.7 is going to be mostly compatible with 3.0. Lets continuously test this assumption and see when and were we break compat with 2.7 (and try to avoid it as much as possible to smoothen the transition to 3.0). Commits ------- b369bb6 [2.7] Allow 3.0 requirements
2 parents 7c2c228 + b369bb6 commit 4c5730c

File tree

32 files changed

+180
-180
lines changed

32 files changed

+180
-180
lines changed

‎src/Symfony/Bridge/Doctrine/composer.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@
2020
"doctrine/common": "~2.3"
2121
},
2222
"require-dev": {
23-
"symfony/stopwatch": "~2.2",
24-
"symfony/dependency-injection": "~2.2",
25-
"symfony/form": "~2.3,>=2.3.8",
26-
"symfony/http-kernel": "~2.2",
27-
"symfony/property-access": "~2.3",
28-
"symfony/security": "~2.2",
29-
"symfony/expression-language": "~2.2",
30-
"symfony/validator": "~2.5,>=2.5.5",
31-
"symfony/translation": "~2.0,>=2.0.5",
23+
"symfony/stopwatch": "~2.2|~3.0.0",
24+
"symfony/dependency-injection": "~2.2|~3.0.0",
25+
"symfony/form": "~2.3,>=2.3.8|~3.0.0",
26+
"symfony/http-kernel": "~2.2|~3.0.0",
27+
"symfony/property-access": "~2.3|~3.0.0",
28+
"symfony/security": "~2.2|~3.0.0",
29+
"symfony/expression-language": "~2.2|~3.0.0",
30+
"symfony/validator": "~2.5,>=2.5.5|~3.0.0",
31+
"symfony/translation": "~2.0,>=2.0.5|~3.0.0",
3232
"doctrine/data-fixtures": "1.0.*",
3333
"doctrine/dbal": "~2.2",
3434
"doctrine/orm": "~2.2,>=2.2.3"

‎src/Symfony/Bridge/Monolog/composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@
2020
"monolog/monolog": "~1.11"
2121
},
2222
"require-dev": {
23-
"symfony/http-kernel": "~2.4",
24-
"symfony/console": "~2.4",
25-
"symfony/event-dispatcher": "~2.2"
23+
"symfony/http-kernel": "~2.4|~3.0.0",
24+
"symfony/console": "~2.4|~3.0.0",
25+
"symfony/event-dispatcher": "~2.2|~3.0.0"
2626
},
2727
"suggest": {
2828
"symfony/http-kernel": "For using the debugging handlers together with the response life cycle of the HTTP kernel.",
2929
"symfony/console": "For the possibility to show log messages in console commands depending on verbosity settings. You need version ~2.3 of the console for it.",
30-
"symfony/event-dispatcher": "Needed when using log messages in console commands"
30+
"symfony/event-dispatcher": "Needed when using log messages in console commands."
3131
},
3232
"autoload": {
3333
"psr-0": { "Symfony\\Bridge\\Monolog\\": "" }

‎src/Symfony/Bridge/Propel1/composer.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@
1717
],
1818
"require": {
1919
"php": ">=5.3.3",
20-
"symfony/http-foundation": "~2.0,>=2.0.5",
21-
"symfony/http-kernel": "~2.0,>=2.0.5",
22-
"symfony/form": "~2.3,>=2.3.8",
23-
"symfony/property-access": "~2.3",
20+
"symfony/http-foundation": "~2.0,>=2.0.5|~3.0.0",
21+
"symfony/http-kernel": "~2.0,>=2.0.5|~3.0.0",
22+
"symfony/form": "~2.3,>=2.3.8|~3.0.0",
23+
"symfony/property-access": "~2.3|~3.0.0",
2424
"propel/propel1": "~1.6,>=1.6.5"
2525
},
2626
"require-dev": {
27-
"symfony/stopwatch": "~2.2"
27+
"symfony/stopwatch": "~2.2|~3.0.0"
2828
},
2929
"autoload": {
3030
"psr-0": { "Symfony\\Bridge\\Propel1\\": "" }

‎src/Symfony/Bridge/ProxyManager/composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
],
1818
"require": {
1919
"php": ">=5.3.3",
20-
"symfony/dependency-injection": "~2.3",
20+
"symfony/dependency-injection": "~2.3|~3.0.0",
2121
"ocramius/proxy-manager": "~0.4|~1.0"
2222
},
2323
"require-dev": {
24-
"symfony/config": "~2.3"
24+
"symfony/config": "~2.3|~3.0.0"
2525
},
2626
"autoload": {
2727
"psr-0": {

‎src/Symfony/Bridge/Twig/composer.json

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,23 +17,23 @@
1717
],
1818
"require": {
1919
"php": ">=5.3.3",
20-
"symfony/security-csrf": "~2.4",
20+
"symfony/security-csrf": "~2.4|~3.0.0",
2121
"twig/twig": "~1.13,>=1.13.1"
2222
},
2323
"require-dev": {
24-
"symfony/finder": "~2.3",
25-
"symfony/form": "~2.6",
26-
"symfony/http-kernel": "~2.3",
27-
"symfony/locale": "~2.0,>=2.0.5",
28-
"symfony/routing": "~2.2",
29-
"symfony/templating": "~2.1",
30-
"symfony/translation": "~2.2",
31-
"symfony/yaml": "~2.0,>=2.0.5",
32-
"symfony/security": "~2.4",
33-
"symfony/stopwatch": "~2.2",
34-
"symfony/console": "~2.4",
35-
"symfony/var-dumper": "~2.6",
36-
"symfony/expression-language": "~2.4"
24+
"symfony/finder": "~2.3|~3.0.0",
25+
"symfony/form": "~2.6|~3.0.0",
26+
"symfony/http-kernel": "~2.3|~3.0.0",
27+
"symfony/locale": "~2.0,>=2.0.5|~3.0.0",
28+
"symfony/routing": "~2.2|~3.0.0",
29+
"symfony/templating": "~2.1|~3.0.0",
30+
"symfony/translation": "~2.2|~3.0.0",
31+
"symfony/yaml": "~2.0,>=2.0.5|~3.0.0",
32+
"symfony/security": "~2.4|~3.0.0",
33+
"symfony/stopwatch": "~2.2|~3.0.0",
34+
"symfony/console": "~2.4|~3.0.0",
35+
"symfony/var-dumper": "~2.6|~3.0.0",
36+
"symfony/expression-language": "~2.4|~3.0.0"
3737
},
3838
"suggest": {
3939
"symfony/finder": "",

‎src/Symfony/Bundle/DebugBundle/composer.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717
],
1818
"require": {
1919
"php": ">=5.3.3",
20-
"symfony/http-kernel": "~2.6",
21-
"symfony/twig-bridge": "~2.6",
22-
"symfony/var-dumper": "~2.6"
20+
"symfony/http-kernel": "~2.6|~3.0.0",
21+
"symfony/twig-bridge": "~2.6|~3.0.0",
22+
"symfony/var-dumper": "~2.6|~3.0.0"
2323
},
2424
"require-dev": {
25-
"symfony/config": "~2.3",
26-
"symfony/dependency-injection": "~2.3"
25+
"symfony/config": "~2.3|~3.0.0",
26+
"symfony/dependency-injection": "~2.3|~3.0.0"
2727
},
2828
"suggest": {
2929
"symfony/config": "For service container configuration",

‎src/Symfony/Bundle/FrameworkBundle/composer.json

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -19,32 +19,32 @@
1919
"php": ">=5.3.3",
2020
"symfony/dependency-injection" : "~2.6,>=2.6.2",
2121
"symfony/config" : "~2.4",
22-
"symfony/event-dispatcher": "~2.5",
23-
"symfony/http-foundation": "~2.4.9|~2.5,>=2.5.4",
24-
"symfony/http-kernel": "~2.6",
25-
"symfony/filesystem": "~2.3",
26-
"symfony/routing": "~2.2",
27-
"symfony/security-core": "~2.6",
28-
"symfony/security-csrf": "~2.6",
29-
"symfony/stopwatch": "~2.3",
30-
"symfony/templating": "~2.1",
31-
"symfony/translation": "~2.6",
22+
"symfony/event-dispatcher": "~2.5|~3.0.0",
23+
"symfony/http-foundation": "~2.4.9|~2.5,>=2.5.4|~3.0.0",
24+
"symfony/http-kernel": "~2.6|~3.0.0",
25+
"symfony/filesystem": "~2.3|~3.0.0",
26+
"symfony/routing": "~2.2|~3.0.0",
27+
"symfony/security-core": "~2.6|~3.0.0",
28+
"symfony/security-csrf": "~2.6|~3.0.0",
29+
"symfony/stopwatch": "~2.3|~3.0.0",
30+
"symfony/templating": "~2.1|~3.0.0",
31+
"symfony/translation": "~2.6|~3.0.0",
3232
"doctrine/annotations": "~1.0"
3333
},
3434
"require-dev": {
35-
"symfony/browser-kit": "~2.4",
36-
"symfony/console": "~2.4,>=2.4.8",
37-
"symfony/css-selector": "~2.0,>=2.0.5",
38-
"symfony/dom-crawler": "~2.0,>=2.0.5",
39-
"symfony/finder": "~2.0,>=2.0.5",
40-
"symfony/locale": "~2.0,>=2.0.5",
41-
"symfony/security": "~2.6",
42-
"symfony/form": "~2.6",
43-
"symfony/class-loader": "~2.1",
44-
"symfony/expression-language": "~2.6",
45-
"symfony/process": "~2.0,>=2.0.5",
46-
"symfony/validator": "~2.5",
47-
"symfony/yaml": "~2.0,>=2.0.5"
35+
"symfony/browser-kit": "~2.4|~3.0.0",
36+
"symfony/console": "~2.4,>=2.4.8|~3.0.0",
37+
"symfony/css-selector": "~2.0,>=2.0.5|~3.0.0",
38+
"symfony/dom-crawler": "~2.0,>=2.0.5|~3.0.0",
39+
"symfony/finder": "~2.0,>=2.0.5|~3.0.0",
40+
"symfony/locale": "~2.0,>=2.0.5|~3.0.0",
41+
"symfony/security": "~2.6|~3.0.0",
42+
"symfony/form": "~2.6|~3.0.0",
43+
"symfony/class-loader": "~2.1|~3.0.0",
44+
"symfony/expression-language": "~2.6|~3.0.0",
45+
"symfony/process": "~2.0,>=2.0.5|~3.0.0",
46+
"symfony/validator": "~2.5|~3.0.0",
47+
"symfony/yaml": "~2.0,>=2.0.5|~3.0.0"
4848
},
4949
"suggest": {
5050
"symfony/console": "For using the console commands",

‎src/Symfony/Bundle/SecurityBundle/composer.json

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,24 +17,24 @@
1717
],
1818
"require": {
1919
"php": ">=5.3.3",
20-
"symfony/security": "~2.6",
21-
"symfony/http-kernel": "~2.2"
20+
"symfony/security": "~2.6|~3.0.0",
21+
"symfony/http-kernel": "~2.2|~3.0.0"
2222
},
2323
"require-dev": {
24-
"symfony/browser-kit": "~2.4",
25-
"symfony/console": "~2.3",
26-
"symfony/css-selector": "~2.0,>=2.0.5",
27-
"symfony/dependency-injection": "~2.3",
28-
"symfony/dom-crawler": "~2.0,>=2.0.5",
29-
"symfony/form": "~2.4",
30-
"symfony/framework-bundle": "~2.6",
31-
"symfony/http-foundation": "~2.3",
32-
"symfony/twig-bundle": "~2.2",
33-
"symfony/twig-bridge": "~2.2,>=2.2.6",
34-
"symfony/process": "~2.0,>=2.0.5",
35-
"symfony/validator": "~2.5",
36-
"symfony/yaml": "~2.0,>=2.0.5",
37-
"symfony/expression-language": "~2.6",
24+
"symfony/browser-kit": "~2.4|~3.0.0",
25+
"symfony/console": "~2.3|~3.0.0",
26+
"symfony/css-selector": "~2.0,>=2.0.5|~3.0.0",
27+
"symfony/dependency-injection": "~2.3|~3.0.0",
28+
"symfony/dom-crawler": "~2.0,>=2.0.5|~3.0.0",
29+
"symfony/form": "~2.4|~3.0.0",
30+
"symfony/framework-bundle": "~2.6|~3.0.0",
31+
"symfony/http-foundation": "~2.3|~3.0.0",
32+
"symfony/twig-bundle": "~2.2|~3.0.0",
33+
"symfony/twig-bridge": "~2.2,>=2.2.6|~3.0.0",
34+
"symfony/process": "~2.0,>=2.0.5|~3.0.0",
35+
"symfony/validator": "~2.5|~3.0.0",
36+
"symfony/yaml": "~2.0,>=2.0.5|~3.0.0",
37+
"symfony/expression-language": "~2.6|~3.0.0",
3838
"doctrine/doctrine-bundle": "~1.2",
3939
"twig/twig": "~1.12"
4040
},

‎src/Symfony/Bundle/TwigBundle/composer.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,18 @@
1717
],
1818
"require": {
1919
"php": ">=5.3.3",
20-
"symfony/twig-bridge": "~2.6",
21-
"symfony/http-foundation": "~2.5",
22-
"symfony/http-kernel": "~2.1"
20+
"symfony/twig-bridge": "~2.6|~3.0.0",
21+
"symfony/http-foundation": "~2.5|~3.0.0",
22+
"symfony/http-kernel": "~2.1|~3.0.0"
2323
},
2424
"require-dev": {
25-
"symfony/stopwatch": "~2.2",
26-
"symfony/dependency-injection": "~2.2",
27-
"symfony/expression-language": "~2.4",
28-
"symfony/config": "~2.2",
29-
"symfony/routing": "~2.1",
30-
"symfony/templating": "~2.1",
31-
"symfony/framework-bundle": "~2.1"
25+
"symfony/stopwatch": "~2.2|~3.0.0",
26+
"symfony/dependency-injection": "~2.2|~3.0.0",
27+
"symfony/expression-language": "~2.4|~3.0.0",
28+
"symfony/config": "~2.2|~3.0.0",
29+
"symfony/routing": "~2.1|~3.0.0",
30+
"symfony/templating": "~2.1|~3.0.0",
31+
"symfony/framework-bundle": "~2.1|~3.0.0"
3232
},
3333
"autoload": {
3434
"psr-0": { "Symfony\\Bundle\\TwigBundle\\": "" }

‎src/Symfony/Bundle/WebProfilerBundle/composer.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@
1717
],
1818
"require": {
1919
"php": ">=5.3.3",
20-
"symfony/http-kernel": "~2.4",
21-
"symfony/routing": "~2.2",
22-
"symfony/twig-bridge": "~2.2"
20+
"symfony/http-kernel": "~2.4|~3.0.0",
21+
"symfony/routing": "~2.2|~3.0.0",
22+
"symfony/twig-bridge": "~2.2|~3.0.0"
2323
},
24< 97AE code>24
"require-dev": {
25-
"symfony/config": "~2.2",
26-
"symfony/console": "~2.3",
27-
"symfony/dependency-injection": "~2.2",
28-
"symfony/stopwatch": "~2.2"
25+
"symfony/config": "~2.2|~3.0.0",
26+
"symfony/console": "~2.3|~3.0.0",
27+
"symfony/dependency-injection": "~2.2|~3.0.0",
28+
"symfony/stopwatch": "~2.2|~3.0.0"
2929
},
3030
"autoload": {
3131
"psr-0": { "Symfony\\Bundle\\WebProfilerBundle\\": "" }

‎src/Symfony/Component/BrowserKit/composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
],
1818
"require": {
1919
"php": ">=5.3.3",
20-
"symfony/dom-crawler": "~2.0,>=2.0.5"
20+
"symfony/dom-crawler": "~2.0,>=2.0.5|~3.0.0"
2121
},
2222
"require-dev": {
23-
"symfony/process": "~2.0,>=2.0.5",
24-
"symfony/css-selector": "~2.0,>=2.0.5"
23+
"symfony/process": "~2.0,>=2.0.5|~3.0.0",
24+
"symfony/css-selector": "~2.0,>=2.0.5|~3.0.0"
2525
},
2626
"suggest": {
2727
"symfony/process": ""

‎src/Symfony/Component/ClassLoader/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"php": ">=5.3.3"
2121
},
2222
"require-dev": {
23-
"symfony/finder": "~2.0,>=2.0.5"
23+
"symfony/finder": "~2.0,>=2.0.5|~3.0.0"
2424
},
2525
"autoload": {
2626
"psr-0": { "Symfony\\Component\\ClassLoader\\": "" }

‎src/Symfony/Component/Config/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
],
1818
"require": {
1919
"php": ">=5.3.3",
20-
"symfony/filesystem": "~2.3"
20+
"symfony/filesystem": "~2.3|~3.0.0"
2121
},
2222
"autoload": {
2323
"psr-0": { "Symfony\\Component\\Config\\": "" }

‎src/Symfony/Component/Console/composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
"php": ">=5.3.3"
2020
},
2121
"require-dev": {
22-
"symfony/event-dispatcher": "~2.1",
23-
"symfony/process": "~2.1",
22+
"symfony/event-dispatcher": "~2.1|~3.0.0",
23+
"symfony/process": "~2.1|~3.0.0",
2424
"psr/log": "~1.0"
2525
},
2626
"suggest": {

‎src/Symfony/Component/Debug/composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
"psr/log": "~1.0"
2121
},
2222
"require-dev": {
23-
"symfony/http-kernel": "~2.2",
24-
"symfony/http-foundation": "~2.1"
23+
"symfony/http-kernel": "~2.2|~3.0.0",
24+
"symfony/http-foundation": "~2.1|~3.0.0"
2525
},
2626
"suggest": {
2727
"symfony/http-foundation": "",

‎src/Symfony/Component/DependencyInjection/composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
"php": ">=5.3.3"
2020
},
2121
"require-dev": {
22-
"symfony/yaml": "~2.1",
23-
"symfony/config": "~2.2",
24-
"symfony/expression-language": "~2.6"
22+
"symfony/yaml": "~2.1|~3.0.0",
23+
"symfony/config": "~2.2|~3.0.0",
24+
"symfony/expression-language": "~2.6|~3.0.0"
2525
},
2626
"suggest": {
2727
"symfony/yaml": "",

‎src/Symfony/Component/DomCrawler/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"php": ">=5.3.3"
2020
},
2121
"require-dev": {
22-
"symfony/css-selector": "~2.3"
22+
"symfony/css-selector": "~2.3|~3.0.0"
2323
},
2424
"suggest": {
2525
"symfony/css-selector": ""

‎src/Symfony/Component/EventDispatcher/composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
"php": ">=5.3.3"
2020
},
2121
"require-dev": {
22-
"symfony/dependency-injection": "~2.6",
23-
"symfony/expression-language": "~2.6",
24-
"symfony/config": "~2.0,>=2.0.5",
25-
"symfony/stopwatch": "~2.3",
22+
"symfony/dependency-injection": "~2.6|~3.0.0",
23+
"symfony/expression-language": "~2.6|~3.0.0",
24+
"symfony/config": "~2.0,>=2.0.5|~3.0.0",
25+
"symfony/stopwatch": "~2.3|~3.0.0",
2626
"psr/log": "~1.0"
2727
},
2828
"suggest": {

0 commit comments

Comments
 (0)
0