Skip to content

Commit 66924db

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '4.4'
* 4.4: Allow Symfony 5.0
2 parents 65981cc + 1f2b66f commit 66924db

File tree

58 files changed

+318
-318
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+318
-318
lines changed

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,19 @@
2424
"symfony/service-contracts": "^1.1"
2525
},
2626
"require-dev": {
27-
"symfony/stopwatch": "~3.4|~4.0",
28-
"symfony/config": "^4.2",
29-
"symfony/dependency-injection": "~3.4|~4.0",
30-
"symfony/form": "~4.3",
31-
"symfony/http-kernel": "~3.4|~4.0",
32-
"symfony/messenger": "~4.3",
33-
"symfony/property-access": "~3.4|~4.0",
34-
"symfony/property-info": "~3.4|~4.0",
35-
"symfony/proxy-manager-bridge": "~3.4|~4.0",
36-
"symfony/security-core": "~3.4|~4.0",
37-
"symfony/expression-language": "~3.4|~4.0",
38-
"symfony/validator": "~3.4|~4.0",
39-
"symfony/translation": "~3.4|~4.0",
27+
"symfony/stopwatch": "^3.4|^4.0|^5.0",
28+
"symfony/config": "^4.2|^5.0",
29+
"symfony/dependency-injection": "^3.4|^4.0|^5.0",
30+
"symfony/form": "^4.3|^5.0",
31+
"symfony/http-kernel": "^3.4|^4.0|^5.0",
32+
"symfony/messenger": "^4.3|^5.0",
33+
"symfony/property-access": "^3.4|^4.0|^5.0",
34+
"symfony/property-info": "^3.4|^4.0|^5.0",
35+
"symfony/proxy-manager-bridge": "^3.4|^4.0|^5.0",
36+
"symfony/security-core": "^3.4|^4.0|^5.0",
37+
"symfony/expression-language": "^3.4|^4.0|^5.0",
38+
"symfony/validator": "^3.4|^4.0|^5.0",
39+
"symfony/translation": "^3.4|^4.0|^5.0",
4040
"doctrine/annotations": "~1.0",
4141
"doctrine/cache": "~1.6",
4242
"doctrine/collections": "~1.0",

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919
"php": "^7.1.3",
2020
"monolog/monolog": "~1.19",
2121
"symfony/service-contracts": "^1.1",
22-
"symfony/http-kernel": "^4.3"
22+
"symfony/http-kernel": "^4.3|^5.0"
2323
},
2424
"require-dev": {
25-
"symfony/console": "~3.4|~4.0",
26-
"symfony/security-core": "~3.4|~4.0",
27-
"symfony/var-dumper": "~3.4|~4.0"
25+
"symfony/console": "^3.4|^4.0|^5.0",
26+
"symfony/security-core": "^3.4|^4.0|^5.0",
27+
"symfony/var-dumper": "^3.4|^4.0|^5.0"
2828
},
2929
"conflict": {
3030
"symfony/console": "<3.4",

‎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": "^7.1.3",
20-
"symfony/dependency-injection": "~4.0",
20+
"symfony/dependency-injection": "^4.0|^5.0",
2121
"ocramius/proxy-manager": "~2.1"
2222
},
2323
"require-dev": {
24-
"symfony/config": "~3.4|~4.0"
24+
"symfony/config": "^3.4|^4.0|^5.0"
2525
},
2626
"conflict": {
2727
"zendframework/zend-eventmanager": "2.6.0"

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

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -21,27 +21,27 @@
2121
},
2222
"require-dev": {
2323
"egulias/email-validator": "^2.0",
24-
"symfony/asset": "~3.4|~4.0",
25-
"symfony/dependency-injection": "~3.4|~4.0",
26-
"symfony/finder": "~3.4|~4.0",
27-
"symfony/form": "^4.3",
28-
"symfony/http-foundation": "~4.3",
29-
"symfony/http-kernel": "~3.4|~4.0",
30-
"symfony/mime": "~4.3",
24+
"symfony/asset": "^3.4|^4.0|^5.0",
25+
"symfony/dependency-injection": "^3.4|^4.0|^5.0",
26+
"symfony/finder": "^3.4|^4.0|^5.0",
27+
"symfony/form": "^4.3|^5.0",
28+
"symfony/http-foundation": "^4.3|^5.0",
29+
"symfony/http-kernel": "^3.4|^4.0|^5.0",
30+
"symfony/mime": "~4.3|^5.0",
3131
"symfony/polyfill-intl-icu": "~1.0",
32-
"symfony/routing": "~3.4|~4.0",
33-
"symfony/templating": "~3.4|~4.0",
34-
"symfony/translation": "^4.2.1",
35-
"symfony/yaml": "~3.4|~4.0",
36-
"symfony/security-acl": "~2.8|~3.0",
37-
"symfony/security-csrf": "~3.4|~4.0",
38-
"symfony/security-http": "~3.4|~4.0",
39-
"symfony/stopwatch": "~3.4|~4.0",
40-
"symfony/console": "~3.4|~4.0",
41-
"symfony/var-dumper": "~3.4|~4.0",
42-
"symfony/expression-language": "~3.4|~4.0",
43-
"symfony/web-link": "~3.4|~4.0",
44-
"symfony/workflow": "~4.3"
32+
"symfony/routing": "^3.4|^4.0|^5.0",
33+
"symfony/templating": "^3.4|^4.0|^5.0",
34+
"symfony/translation": "^4.2.1|^5.0",
35+
"symfony/yaml": "^3.4|^4.0|^5.0",
36+
"symfony/security-acl": "^2.8|^3.0",
37+
"symfony/security-csrf": "^3.4|^4.0|^5.0",
38+
"symfony/security-http": "^3.4|^4.0|^5.0",
39+
"symfony/stopwatch": "^3.4|^4.0|^5.0",
40+
"symfony/console": "^3.4|^4.0|^5.0",
41+
"symfony/var-dumper": "^3.4|^4.0|^5.0",
42+
"symfony/expression-language": "^3.4|^4.0|^5.0",
43+
"symfony/web-link": "^3.4|^4.0|^5.0",
44+
"symfony/workflow": "^4.3|^5.0"
4545
},
4646
"conflict": {
4747
"symfony/console": "<3.4",

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@
1818
"require": {
1919
"php": "^7.1.3",
2020
"ext-xml": "*",
21-
"symfony/http-kernel": "~3.4|~4.0",
22-
"symfony/twig-bridge": "~3.4|~4.0",
23-
"symfony/var-dumper": "^4.1.1"
21+
"symfony/http-kernel": "^3.4|^4.0|^5.0",
22+
"symfony/twig-bridge": "^3.4|^4.0|^5.0",
23+
"symfony/var-dumper": "^4.1.1|^5.0"
2424
},
2525
"require-dev": {
26-
"symfony/config": "~4.2",
27-
"symfony/dependency-injection": "~3.4|~4.0",
28-
"symfony/web-profiler-bundle": "~3.4|~4.0"
26+
"symfony/config": "^4.2|^5.0",
27+
"symfony/dependency-injection": "^3.4|^4.0|^5.0",
28+
"symfony/web-profiler-bundle": "^3.4|^4.0|^5.0"
2929
},
3030
"conflict": {
3131
"symfony/config": "<4.2",

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

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -18,46 +18,46 @@
1818
"require": {
1919
"php": "^7.1.3",
2020
"ext-xml": "*",
21-
"symfony/cache": "~4.3",
22-
"symfony/config": "~4.2",
23-
"symfony/dependency-injection": "^4.3",
24-
"symfony/http-foundation": "^4.3",
25-
"symfony/http-kernel": "^4.3",
21+
"symfony/cache": "^4.3|^5.0",
22+
"symfony/config": "^4.2|^5.0",
23+
"symfony/dependency-injection": "^4.3|^5.0",
24+
"symfony/http-foundation": "^4.3|^5.0",
25+
"symfony/http-kernel": "^4.3|^5.0",
2626
"symfony/polyfill-mbstring": "~1.0",
27-
"symfony/filesystem": "~3.4|~4.0",
28-
"symfony/finder": "~3.4|~4.0",
29-
"symfony/routing": "^4.3"
27+
"symfony/filesystem": "^3.4|^4.0|^5.0",
28+
"symfony/finder": "^3.4|^4.0|^5.0",
29+
"symfony/routing": "^4.3|^5.0"
3030
},
3131
"require-dev": {
3232
"doctrine/cache": "~1.0",
3333
"fig/link-util": "^1.0",
34-
"symfony/asset": "~3.4|~4.0",
35-
"symfony/browser-kit": "^4.3",
36-
"symfony/console": "^4.3",
37-
"symfony/css-selector": "~3.4|~4.0",
38-
"symfony/dom-crawler": "^4.3",
34+
"symfony/asset": "^3.4|^4.0|^5.0",
35+
"symfony/browser-kit": "^4.3|^5.0",
36+
"symfony/console": "^4.3|^5.0",
37+
"symfony/css-selector": "^3.4|^4.0|^5.0",
38+
"symfony/dom-crawler": "^4.3|^5.0",
3939
"symfony/polyfill-intl-icu": "~1.0",
40-
"symfony/form": "^4.3",
41-
"symfony/expression-language": "~3.4|~4.0",
42-
"symfony/http-client": "^4.3",
43-
"symfony/mailer": "^4.3",
44-
"symfony/messenger": "^4.3",
45-
"symfony/mime": "^4.3",
46-
"symfony/process": "~3.4|~4.0",
47-
"symfony/security-csrf": "~3.4|~4.0",
48-
"symfony/security-http": "~3.4|~4.0",
49-
"symfony/serializer": "^4.3",
50-
"symfony/stopwatch": "~3.4|~4.0",
51-
"symfony/translation": "~4.2",
52-
"symfony/templating": "~3.4|~4.0",
53-
"symfony/twig-bundle": "~2.8|~3.2|~4.0",
54-
"symfony/validator": "^4.1",
55-
"symfony/var-dumper": "^4.3",
56-
"symfony/workflow": "^4.3",
57-
"symfony/yaml": "~3.4|~4.0",
58-
"symfony/property-info": "~3.4|~4.0",
59-
"symfony/lock": "~3.4|~4.0",
60-
"symfony/web-link": "~3.4|~4.0",
40+
"symfony/form": "^4.3|^5.0",
41+
"symfony/expression-language": "^3.4|^4.0|^5.0",
42+
"symfony/http-client": "^4.3|^5.0",
43+
"symfony/mailer": "^4.3|^5.0",
44+
"symfony/messenger": "^4.3|^5.0",
45+
"symfony/mime": "^4.3|^5.0",
46+
"symfony/process": "^3.4|^4.0|^5.0",
47+
"symfony/security-csrf": "^3.4|^4.0|^5.0",
48+
"symfony/security-http": "^3.4|^4.0|^5.0",
49+
"symfony/serializer": "^4.3|^5.0",
50+
"symfony/stopwatch": "^3.4|^4.0|^5.0",
51+
"symfony/translation": "^4.2|^5.0",
52+
"symfony/templating": "^3.4|^4.0|^5.0",
53+
"symfony/twig-bundle": "^3.4|^4.0|^5.0",
54+
"symfony/validator": "^4.1|^5.0",
55+
"symfony/var-dumper": "^4.3|^5.0",
56+
"symfony/workflow": "^4.3|^5.0",
57+
"symfony/yaml": "^3.4|^4.0|^5.0",
58+
"symfony/property-info": "^3.4|^4.0|^5.0",
59+
"symfony/lock": "^3.4|^4.0|^5.0",
60+
"symfony/web-link": "^3.4|^4.0|^5.0",
6161
"doctrine/annotations": "~1.0",
6262
"phpdocumentor/reflection-docblock": "^3.0|^4.0",
6363
"twig/twig": "~1.34|~2.4"

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

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -18,31 +18,31 @@
1818
"require": {
1919
"php": "^7.1.3",
2020
"ext-xml": "*",
21-
"symfony/config": "^4.2",
22-
"symfony/dependency-injection": "^4.2",
23-
"symfony/http-kernel": "^4.3",
24-
"symfony/security-core": "~4.3",
25-
"symfony/security-csrf": "~4.2",
26-
"symfony/security-guard": "~4.2",
27-
"symfony/security-http": "^4.3"
21+
"symfony/config": "^4.2|^5.0",
22+
"symfony/dependency-injection": "^4.2|^5.0",
23+
"symfony/http-kernel": "^4.3|^5.0",
24+
"symfony/security-core": "^4.3|^5.0",
25+
"symfony/security-csrf": "^4.2|^5.0",
26+
"symfony/security-guard": "^4.2|^5.0",
27+
"symfony/security-http": "^4.3|^5.0"
2828
},
2929
"require-dev": {
30-
"symfony/asset": "~3.4|~4.0",
31-
"symfony/browser-kit": "~4.2",
32-
"symfony/console": "~3.4|~4.0",
33-
"symfony/css-selector": "~3.4|~4.0",
34-
"symfony/dom-crawler": "~3.4|~4.0",
35-
"symfony/form": "~3.4|~4.0",
36-
"symfony/framework-bundle": "~4.2",
37-
"symfony/http-foundation": "~3.4|~4.0",
38-
"symfony/translation": "~3.4|~4.0",
39-
"symfony/twig-bundle": "~4.2",
40-
"symfony/twig-bridge": "~3.4|~4.0",
41-
"symfony/process": "~3.4|~4.0",
42-
"symfony/validator": "~3.4|~4.0",
43-
"symfony/var-dumper": "~3.4|~4.0",
44-
"symfony/yaml": "~3.4|~4.0",
45-
"symfony/expression-language": "~3.4|~4.0",
30+
"symfony/asset": "^3.4|^4.0|^5.0",
31+
"symfony/browser-kit": "^4.2|^5.0",
32+
"symfony/console": "^3.4|^4.0|^5.0",
33+
"symfony/css-selector": "^3.4|^4.0|^5.0",
34+
"symfony/dom-crawler": "^3.4|^4.0|^5.0",
35+
"symfony/form": "^3.4|^4.0|^5.0",
36+
"symfony/framework-bundle": "^4.2|^5.0",
37+
"symfony/http-foundation": "^3.4|^4.0|^5.0",
38+
"symfony/translation": "^3.4|^4.0|^5.0",
39+
"symfony/twig-bundle": "^4.2|^5.0",
40+
"symfony/twig-bridge": "^3.4|^4.0|^5.0",
41+
"symfony/process": "^3.4|^4.0|^5.0",
42+
"symfony/validator": "^3.4|^4.0|^5.0",
43+
"symfony/var-dumper": "^3.4|^4.0|^5.0",
44+
"symfony/yaml": "^3.4|^4.0|^5.0",
45+
"symfony/expression-language": "^3.4|^4.0|^5.0",
4646
"doctrine/doctrine-bundle": "~1.5",
4747
"twig/twig": "~1.34|~2.4"
4848
},

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,26 +17,26 @@
1717
],
1818
"require": {
1919
"php": "^7.1.3",
20-
"symfony/config": "~4.2",
21-
"symfony/twig-bridge": "^4.3",
22-
"symfony/http-foundation": "~4.3",
23-
"symfony/http-kernel": "~4.1",
20+
"symfony/config": "^4.2|^5.0",
21+
"symfony/twig-bridge": "^4.3|^5.0",
22+
"symfony/http-foundation": "^4.3|^5.0",
23+
"symfony/http-kernel": "^4.1|^5.0",
2424
"symfony/polyfill-ctype": "~1.8",
2525
"twig/twig": "~1.41|~2.10"
2626
},
2727
"require-dev": {
28-
"symfony/asset": "~3.4|~4.0",
29-
"symfony/stopwatch": "~3.4|~4.0",
30-
"symfony/dependency-injection": "^4.2.5",
31-
"symfony/expression-language": "~3.4|~4.0",
32-
"symfony/finder": "~3.4|~4.0",
33-
"symfony/form": "~3.4|~4.0",
34-
"symfony/routing": "~3.4|~4.0",
35-
"symfony/templating": "~3.4|~4.0",
36-
"symfony/translation": "^4.2",
37-
"symfony/yaml": "~3.4|~4.0",
38-
"symfony/framework-bundle": "~4.3",
39-
"symfony/web-link": "~3.4|~4.0",
28+
"symfony/asset": "^3.4|^4.0|^5.0",
29+
"symfony/stopwatch": "^3.4|^4.0|^5.0",
30+
"symfony/dependency-injection": "^4.2.5|^5.0",
31+
"symfony/expression-language": "^3.4|^4.0|^5.0",
32+
"symfony/finder": "^3.4|^4.0|^5.0",
33+
"symfony/form": "^3.4|^4.0|^5.0",
34+
"symfony/routing": "^3.4|^4.0|^5.0",
35+
"symfony/templating": "^3.4|^4.0|^5.0",
36+
"symfony/translation": "^4.2|^5.0",
37+
"symfony/yaml": "^3.4|^4.0|^5.0",
38+
"symfony/framework-bundle": "^4.3|^5.0",
39+
"symfony/web-link": "^3.4|^4.0|^5.0",
4040
"doctrine/annotations": "~1.0",
4141
"doctrine/cache": "~1.0"
4242
},

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,17 @@
1717
],
1818
"require": {
1919
"php": "^7.1.3",
20-
"symfony/config": "^4.2",
21-
"symfony/http-kernel": "^4.3",
22-
"symfony/routing": "~3.4|~4.0",
23-
"symfony/twig-bundle": "~4.2",
24-
"symfony/var-dumper": "~3.4|~4.0",
20+
"symfony/config": "^4.2|^5.0",
21+
"symfony/http-kernel": "^4.3|^5.0",
22+
"symfony/routing": "^3.4|^4.0|^5.0",
23+
"symfony/twig-bundle": "^4.2|^5.0",
24+
"symfony/var-dumper": "^3.4|^4.0|^5.0",
2525
"twig/twig": "^1.41|^2.10"
2626
},
2727
"require-dev": {
28-
"symfony/console": "~3.4|~4.0",
29-
"symfony/dependency-injection": "~3.4|~4.0",
30-
"symfony/stopwatch": "~3.4|~4.0"
28+
"symfony/console": "^3.4|^4.0|^5.0",
29+
"symfony/dependency-injection": "^3.4|^4.0|^5.0",
30+
"symfony/stopwatch": "^3.4|^4.0|^5.0"
3131
},
3232
"conflict": {
3333
"symfony/dependency-injection": "<3.4",

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
],
1818
"require": {
1919
"php": "^7.1.3",
20-
"symfony/config": "~3.4|~4.0",
21-
"symfony/console": "~3.4|~4.0",
22-
"symfony/dependency-injection": "~3.4|~4.0",
23-
"symfony/http-kernel": "~3.4|~4.0",
20+
"symfony/config": "^3.4|^4.0|^5.0",
21+
"symfony/console": "^3.4|^4.0|^5.0",
22+
"symfony/dependency-injection": "^3.4|^4.0|^5.0",
23+
"symfony/http-kernel": "^3.4|^4.0|^5.0",
2424
"symfony/polyfill-ctype": "~1.8",
25-
"symfony/process": "^3.4.2|^4.0.2"
25+
"symfony/process": "^3.4.2|^4.0.2|^5.0"
2626
},
2727
"autoload": {
2828
"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": "~3.4|~4.0",
26-
"symfony/http-kernel": "~3.4|~4.0"
25+
"symfony/http-foundation": "^3.4|^4.0|^5.0",
26+
"symfony/http-kernel": "^3.4|^4.0|^5.0"
2727
},
2828
"autoload": {
2929
"psr-4": { "Symfony\\Component\\Asset\\": "" },

‎src/Symfony/Component/BrowserKit/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": "^7.1.3",
20-
"symfony/dom-crawler": "~3.4|~4.0"
20+
"symfony/dom-crawler": "^3.4|^4.0|^5.0"
2121
},
2222
"require-dev": {
23-
"symfony/css-selector": "~3.4|~4.0",
24-
"symfony/http-client": "^4.3",
25-
"symfony/mime": "^4.3",
26-
"symfony/process": "~3.4|~4.0"
23+
"symfony/css-selector": "^3.4|^4.0|^5.0",
24+
"symfony/http-client": "^4.3|^5.0",
25+
"symfony/mime": "^4.3|^5.0",
26+
"symfony/process": "^3.4|^4.0|^5.0"
2727
},
2828
"suggest": {
2929
"symfony/process": ""

0 commit comments

Comments
 (0)