8000 Merge branch '3.4' · hhamon/symfony@cd69fc1 · GitHub
[go: up one dir, main page]
Skip to content

Commit cd69fc1

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '3.4'
* 3.4: Allow individual bridges, bundles and components to be used with 4.0
2 parents 3eb2fc1 + 27852a0 commit cd69fc1

File tree

40 files changed

+228
-229
lines changed

40 files changed

+228
-229
lines changed

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,17 @@
2121
"symfony/polyfill-mbstring": "~1.0"
2222
},
2323
"require-dev": {
24-
"symfony/stopwatch": "~2.8|~3.0",
25-
"symfony/dependency-injection": "~3.3",
26-
"symfony/form": "^3.2.5",
27-
"symfony/http-kernel": "~2.8|~3.0",
28-
"symfony/property-access": "~2.8|~3.0",
29-
"symfony/property-info": "~2.8|3.0",
30-
"symfony/proxy-manager-bridge": "~2.8|~3.0",
31-
"symfony/security": "~2.8|~3.0",
32-
"symfony/expression-language": "~2.8|~3.0",
33-
"symfony/validator": "^2.8.18|^3.2.5",
34-
"symfony/translation": "~2.8|~3.0",
24+
"symfony/stopwatch": "~2.8|~3.0|~4.0.0",
25+
"symfony/dependency-injection": "~3.3|~4.0.0",
26+
"symfony/form": "^3.2.5|~4.0.0",
27+
"symfony/http-kernel": "~2.8|~3.0|~4.0.0",
28+
"symfony/property-access": "~2.8|~3.0|~4.0.0",
29+
"symfony/property-info": "~2.8|3.0|~4.0.0",
30+
"symfony/proxy-manager-bridge": "~2.8|~3.0|~4.0.0",
31+
"symfony/security": "~2.8|~3.0|~4.0.0",
32+
"symfony/expression-language": "~2.8|~3.0|~4.0.0",
33+
"symfony/validator": "^2.8.18|^3.2.5|~4.0.0",
34+
"symfony/translation": "~2.8|~3.0|~4.0.0",
3535
"doctrine/data-fixtures": "1.0.*",
3636
"doctrine/dbal": "~2.4",
3737
"doctrine/orm": "^2.4.5"

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818
"require": {
1919
"php": ">=5.5.9",
2020
"monolog/monolog": "~1.19",
21-
"symfony/http-kernel": "~2.8|~3.0"
21+
"symfony/http-kernel": "~2.8|~3.0|~4.0.0"
2222
},
2323
"require-dev": {
24-
"symfony/console": "~2.8|~3.0",
25-
"symfony/event-dispatcher": "~2.8|~3.0",
26-
"symfony/var-dumper": "~3.3"
24+
"symfony/console": "~2.8|~3.0|~4.0.0",
25+
"symfony/event-dispatcher": "~2.8|~3.0|~4.0.0",
26+
"symfony/var-dumper": "~3.3|~4.0.0"
2727
},
2828
"conflict": {
2929
"symfony/http-foundation": "<3.3"

‎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.5.9",
20-
"symfony/dependency-injection": "~2.8|~3.0",
20+
"symfony/dependency-injection": "~2.8|~3.0|~4.0.0",
2121
"ocramius/proxy-manager": "~0.4|~1.0|~2.0"
2222
},
2323
"require-dev": {
24-
"symfony/config": "~2.8|~3.0"
24+
"symfony/config": "~2.8|~3.0|~4.0.0"
2525
},
2626
"autoload": {
2727
"psr-4": { "Symfony\\Bridge\\ProxyManager\\": "" },

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -21,22 +21,22 @@
2121
},
2222
"require-dev": {
2323
"fig/link-util": "^1.0",
24-
"symfony/asset": "~2.8|~3.0",
25-
"symfony/finder": "~2.8|~3.0",
26-
"symfony/form": "^3.2.7",
27-
"symfony/http-kernel": "~3.2",
24+
"symfony/asset": "~2.8|~3.0|~4.0.0",
25+
"symfony/finder": "~2.8|~3.0|~4.0.0",
26+
"symfony/form": "^3.2.7|~4.0.0",
27+
"symfony/http-kernel": "~3.2|~4.0.0",
2828
"symfony/polyfill-intl-icu": "~1.0",
29-
"symfony/routing": "~2.8|~3.0",
30-
"symfony/templating": "~2.8|~3.0",
31-
"symfony/translation": "~2.8|~3.0",
32-
"symfony/yaml": "~2.8|~3.0",
33-
"symfony/security": "~2.8|~3.0",
29+
"symfony/routing": "~2.8|~3.0|~4.0.0",
30+
"symfony/templating": "~2.8|~3.0|~4.0.0",
31+
"symfony/translation": "~2.8|~3.0|~4.0.0",
32+
"symfony/yaml": "~2.8|~3.0|~4.0.0",
33+
"symfony/security": "~2.8|~3.0|~4.0.0",
3434
"symfony/security-acl": "~2.8|~3.0",
35-
"symfony/stopwatch": "~2.8|~3.0",
36-
"symfony/console": "~2.8|~3.0",
37-
"symfony/var-dumper": "~2.8.10|~3.1.4|~3.2",
38-
"symfony/expression-language": "~2.8|~3.0",
39-
"symfony/web-link": "~3.3"
35+
"symfony/stopwatch": "~2.8|~3.0|~4.0.0",
36+
"symfony/console": "~2.8|~3.0|~4.0.0",
37+
"symfony/var-dumper": "~2.8.10|~3.1.4|~3.2|~4.0.0",
38+
"symfony/expression-language": "~2.8|~3.0|~4.0.0",
39+
"symfony/web-link": "~3.3|~4.0.0"
4040
},
4141
"suggest": {
4242
"symfony/finder": "",

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@
1717
],
1818
"require": {
1919
"php": ">=5.5.9",
20-
"symfony/http-kernel": "~2.8|~3.0",
21-
"symfony/twig-bridge": "~2.8|~3.0",
22-
"symfony/var-dumper": "~2.8|~3.0"
20+
"symfony/http-kernel": "~2.8|~3.0|~4.0.0",
21+
"symfony/twig-bridge": "~2.8|~3.0|~4.0.0",
22+
"symfony/var-dumper": "~2.8|~3.0|~4.0.0"
2323
},
2424
"require-dev": {
25-
"symfony/config": "~3.3",
26-
"symfony/dependency-injection": "~3.3",
27-
"symfony/web-profiler-bundle": "~2.8|~3.0"
25+
"symfony/config": "~3.3|~4.0.0",
26+
"symfony/dependency-injection": "~3.3|~4.0.0",
27+
"symfony/web-profiler-bundle": "~2.8|~3.0|~4.0.0"
2828
},
2929
"suggest": {
3030
"symfony/config": "For service container configuration",

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

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -18,42 +18,42 @@
1818
"require": {
1919
"php": ">=5.5.9",
2020
"ext-xml": "*",
21-
"symfony/cache": "~3.3",
21+
"symfony/cache": "~3.3|~4.0.0",
2222
"symfony/class-loader": "~3.2",
23-
"symfony/dependency-injection": "~3.3-beta2",
24-
"symfony/config": "~3.3",
25-
"symfony/event-dispatcher": "~3.3",
26-
"symfony/http-foundation": "~3.3",
27-
"symfony/http-kernel": "~3.3",
23+
"symfony/dependency-injection": "~3.3-beta2|~4.0.0",
24+
"symfony/config": "~3.3|~4.0.0",
25+
"symfony/event-dispatcher": "~3.3|~4.0.0",
26+
"symfony/http-foundation": "~3.3|~4.0.0",
27+
"symfony/http-kernel": "~3.3|~4.0.0",
2828
"symfony/polyfill-mbstring": "~1.0",
29-
"symfony/filesystem": "~2.8|~3.0",
30-
"symfony/finder": "~2.8|~3.0",
31-
"symfony/routing": "~3.3",
32-
"symfony/stopwatch": "~2.8|~3.0",
29+
"symfony/filesystem": "~2.8|~3.0|~4.0.0",
30+
"symfony/finder": "~2.8|~3.0|~4.0.0",
31+
"symfony/routing": "~3.3|~4.0.0",
32+
"symfony/stopwatch": "~2.8|~3.0|~4.0.0",
3333
"doctrine/cache": "~1.0"
3434
},
3535
"require-dev": {
3636
"fig/link-util": "^1.0",
37-
"symfony/asset": "~3.3",
38-
"symfony/browser-kit": "~2.8|~3.0",
39-
"symfony/console": "~3.3",
40-
"symfony/css-selector": "~2.8|~3.0",
41-
"symfony/dom-crawler": "~2.8|~3.0",
37+
"symfony/asset": "~3.3|~4.0.0",
38+
"symfony/browser-kit": "~2.8|~3.0|~4.0.0",
39+
"symfony/console": "~3.3|~4.0.0",
40+
"symfony/css-selector": "~2.8|~3.0|~4.0.0",
41+
"symfony/dom-crawler": "~2.8|~3.0|~4.0.0",
4242
"symfony/polyfill-intl-icu": "~1.0",
43-
"symfony/security": "~2.8|~3.0",
44-
"symfony/form": "~3.3",
45-
"symfony/expression-language": "~2.8|~3.0",
46-
"symfony/process": "~2.8|~3.0",
47-
"symfony/security-core": "~3.2",
48-
"symfony/security-csrf": "~2.8|~3.0",
49-
"symfony/serializer": "~3.3",
50-
"symfony/translation": "~3.2",
51-
"symfony/templating": "~2.8|~3.0",
52-
"symfony/validator": "~3.3",
53-
"symfony/workflow": "~3.3",
54-
"symfony/yaml": "~3.2",
55-
"symfony/property-info": "~3.3",
56-
"symfony/web-link": "~3.3",
43+
"symfony/security": "~2.8|~3.0|~4.0.0",
44+
"symfony/form": "~3.3|~4.0.0",
45+
"symfony/expression-language": "~2.8|~3.0|~4.0.0",
46+
"symfony/process": "~2.8|~3.0|~4.0.0",
47+
"symfony/security-core": "~3.2|~4.0.0",
48+
"symfony/security-csrf": "~2.8|~3.0|~4.0.0",
49+
"symfony/serializer": "~3.3|~4.0.0",
50+
"symfony/translation": "~3.2|~4.0.0",
51+
"symfony/templating": "~2.8|~3.0|~4.0.0",
52+
"symfony/validator": "~3.3|~4.0.0",
53+
"symfony/workflow": "~3.3|~4.0.0",
54+
"symfony/yaml": "~3.2|~4.0.0",
55+
"symfony/property-info": "~3.3|~4.0.0",
56+
"symfony/web-link": "~3.3|~4.0.0",
5757
"doctrine/annotations": "~1.0",
5858
"phpdocumentor/reflection-docblock": "^3.0",
5959
"twig/twig": "~1.26|~2.0",

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

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -17,29 +17,29 @@
1717
],
1818
"require": {
1919
"php": ">=5.5.9",
20-
"symfony/security": "~3.3",
21-
"symfony/dependency-injection": "~3.3-beta2",
22-
"symfony/http-kernel": "~3.3",
20+
"symfony/security": "~3.3|~4.0.0",
21+
"symfony/dependency-injection": "~3.3-beta2|~4.0.0",
22+
"symfony/http-kernel": "~3.3|~4.0.0",
2323
"symfony/polyfill-php70": "~1.0"
2424
},
2525
"require-dev": {
26-
"symfony/asset": "~2.8|~3.0",
27-
"symfony/browser-kit": "~2.8|~3.0",
28-
"symfony/console": "~3.2",
29-
"symfony/css-selector": "~2.8|~3.0",
30-
"symfony/dom-crawler": "~2.8|~3.0",
31-
"symfony/form": "^2.8.18|^3.2.5",
32-
"symfony/framework-bundle": "^3.2.8",
33-
"symfony/http-foundation": "~2.8|~3.0",
26+
"symfony/asset": "~2.8|~3.0|~4.0.0",
27+
"symfony/browser-kit": "~2.8|~3.0|~4.0.0",
28+
"symfony/console": "~3.2|~4.0.0",
29+
"symfony/css-selector": "~2.8|~3.0|~4.0.0",
30+
"symfony/dom-crawler": "~2.8|~3.0|~4.0.0",
31+
"symfony/form": "^2.8.18|^3.2.5|~4.0.0",
32+
"symfony/framework-bundle": "^3.2.8|~4.0.0",
33+
"symfony/http-foundation": "~2.8|~3.0|~4.0.0",
3434
"symfony/security-acl": "~2.8|~3.0",
35-
"symfony/translation": "~2.8|~3.0",
36-
"symfony/twig-bundle": "~2.8|~3.0",
37-
"symfony/twig-bridge": "~2.8|~3.0",
38-
"symfony/process": "~2.8|~3.0",
39-
"symfony/validator": "^3.2.5",
40-
"symfony/var-dumper": "~3.3",
41-
"symfony/yaml": "~2.8|~3.0",
42-
"symfony/expression-language": "~2.8|~3.0",
35+
"symfony/translation": "~2.8|~3.0|~4.0.0",
36+
"symfony/twig-bundle": "~2.8|~3.0|~4.0.0",
37+
"symfony/twig-bridge": "~2.8|~3.0|~4.0.0",
38+
"symfony/process": "~2.8|~3.0|~4.0.0",
39+
"symfony/validator": "^3.2.5|~4.0.0",
40+
"symfony/var-dumper": "~3.3|~4.0.0",
41+
"symfony/yaml": "~2.8|~3.0|~4.0.0",
42+
"symfony/expression-language": "~2.8|~3.0|~4.0.0",
4343
"doctrine/doctrine-bundle": "~1.4",
4444
"twig/twig": "~1.28|~2.0"
4545
},

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,17 @@
2424
"twig/twig": "^1.32|^2.2"
2525
},
2626
"require-dev": {
27-
"symfony/asset": "~2.8|~3.0",
28-
"symfony/stopwatch": "~2.8|~3.0",
29-
"symfony/dependency-injection": "~3.3",
30-
"symfony/expression-language": "~2.8|~3.0",
31-
"symfony/finder": "~2.8|~3.0",
32-
"symfony/form": "~2.8|~3.0",
33-
"symfony/routing": "~2.8|~3.0",
34-
"symfony/templating": "~2.8|~3.0",
35-
"symfony/yaml": "~2.8|~3.0",
36-
"symfony/framework-bundle": "^3.2.8",
37-
"symfony/web-link": "~3.3",
27+
"symfony/asset": "~2.8|~3.0|~4.0.0",
28+
"symfony/stopwatch": "~2.8|~3.0|~4.0.0",
29+
"symfony/dependency-injection": "~3.3|~4.0.0",
30+
"symfony/expression-language": "~2.8|~3.0|~4.0.0",
31+
"symfony/finder": "~2.8|~3.0|~4.0.0",
32+
"symfony/form": "~2.8|~3.0|~4.0.0",
33+
"symfony/routing": "~2.8|~3.0|~4.0.0",
34+
"symfony/templating": "~2.8|~3.0|~4.0.0",
35+
"symfony/yaml": "~2.8|~3.0|~4.0.0",
36+
"symfony/framework-bundle": "^3.2.8|~4.0.0",
37+
"symfony/web-link": "~3.3|~4.0.0",
3838
"doctrine/annotations": "~1.0"
3939
},
4040
"conflict": {

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,18 @@
1717
],
1818
"require": {
1919
"php": ">=5.5.9",
20-
"symfony/http-kernel": "~3.2",
20+
"symfony/http-kernel": "~3.2|~4.0.0",
2121
"symfony/polyfill-php70": "~1.0",
22-
"symfony/routing": "~2.8|~3.0",
23-
"symfony/twig-bridge": "~2.8|~3.0",
22+
"symfony/routing": "~2.8|~3.0|~4.0.0",
23+
"symfony/twig-bridge": "~2.8|~3.0|~4.0.0",
2424
"twig/twig": "~1.28|~2.0",
25-
"symfony/var-dumper": "~3.3"
25+
"symfony/var-dumper": "~3.3|~4.0.0"
2626
},
2727
"require-dev": {
28-
"symfony/config": "~2.8|~3.0",
29-
"symfony/console": "~2.8|~3.0",
30-
"symfony/dependency-injection": "~3.3",
31-
"symfony/stopwatch": "~2.8|~3.0"
28+
"symfony/config": "~2.8|~3.0|~4.0.0",
29+
"symfony/console": "~2.8|~3.0|~4.0.0",
30+
"symfony/dependency-injection": "~3.3|~4.0.0",
31+
"symfony/stopwatch": "~2.8|~3.0|~4.0.0"
3232
},
3333
"conflict": {
3434
"symfony/dependency-injection": "<3.3",

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
],
1818
"require": {
1919
"php": ">=5.5.9",
20-
"symfony/console": "~2.8.8|~3.0.8|~3.1.2|~3.2",
21-
"symfony/http-kernel": "~2.8|~3.0",
22-
"symfony/process": "~2.8|~3.0"
20+
"symfony/console": "~2.8.8|~3.0.8|~3.1.2|~3.2|~4.0.0",
21+
"symfony/http-kernel": "~2.8|~3.0|~4.0.0",
22+
"symfony/process": "~2.8|~3.0|~4.0.0"
2323
},
2424
"autoload": {
2525
"psr-4": { "Symfony\\Bundle\\WebServerBundle\\": "" },

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
"symfony/http-foundation": ""
2323
},
2424
"require-dev": {
25-
"symfony/http-foundation": "~2.8|~3.0",
26-
"symfony/http-kernel": "~2.8|~3.0"
25+
"symfony/http-foundation": "~2.8|~3.0|~4.0.0",
26+
"symfony/http-kernel": "~2.8|~3.0|~4.0.0"
2727
},
2828
"autoload": {
2929
"psr-4": { "Symfony\\Component\\Asset\\": "" },

‎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.5.9",
20-
"symfony/dom-crawler": "~2.8|~3.0"
20+
"symfony/dom-crawler": "~2.8|~3.0|~4.0.0"
2121
},
2222
"require-dev": {
23-
"symfony/process": "~2.8|~3.0",
24-
"symfony/css-selector": "~2.8|~3.0"
23+
"symfony/process": "~2.8|~3.0|~4.0.0",
24+
"symfony/css-selector": "~2.8|~3.0|~4.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.5.9"
2121
},
2222
"require-dev": {
23-
"symfony/finder": "~2.8|~3.0",
23+
"symfony/finder": "~2.8|~3.0|~4.0.0",
2424
"symfony/polyfill-apcu": "~1.1"
2525
},
2626
"suggest": {

‎src/Symfony/Component/Config/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.5.9",
20-
"symfony/filesystem": "~2.8|~3.0"
20+
"symfony/filesystem": "~2.8|~3.0|~4.0.0"
2121
},
2222
"require-dev": {
23-
"symfony/yaml": "~3.0",
24-
"symfony/dependency-injection": "~3.3"
23+
"symfony/yaml": "~3.0|~4.0.0",
24+
"symfony/dependency-injection": "~3.3|~4.0.0"
2525
},
2626
"conflict": {
2727
"symfony/dependency-injection": "<3.3"

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@
1818
"require": {
1919
"php": ">=5.5.9",
2020
"symfony/polyfill-mbstring": "~1.0",
21-
"symfony/debug": "~2.8|~3.0"
21+
"symfony/debug": "~2.8|~3.0|~4.0.0"
2222
},
2323
"require-dev": {
24-
"symfony/http-kernel": "~2.8|~3.0",
25-
"symfony/event-dispatcher": "~2.8|~3.0",
26-
"symfony/dependency-injection": "~3.3",
27-
"symfony/filesystem": "~2.8|~3.0",
28-
"symfony/process": "~2.8|~3.0",
24+
"symfony/http-kernel": "~2.8|~3.0|~4.0.0",
25+
"symfony/event-dispatcher": "~2.8|~3.0|~4.0.0",
26+
"symfony/dependency-injection": "~3.3|~4.0.0",
27+
"symfony/filesystem": "~2.8|~3.0|~4.0.0",
28+
"symfony/process": "~2.8|~3.0|~4.0.0",
2929
"psr/log": "~1.0"
3030
},
3131
"suggest": {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2"
2424
},
2525
"require-dev": {
26-
"symfony/http-kernel": "~2.8|~3.0"
26+
"symfony/http-kernel": "~2.8|~3.0|~4.0.0"
2727
},
2828
"autoload": {
2929
"psr-4": { "Symfony\\Component\\Debug\\": "" },

0 commit comments

Comments
 (0)
0