10000 Allow version 2 of the contracts package. · symfony/symfony@f4ff613 · GitHub
[go: up one dir, main page]
Skip to content

Commit f4ff613

Browse files
derrabusderrabus
committed
Allow version 2 of the contracts package.
# Conflicts: # src/Symfony/Bridge/Monolog/composer.json # src/Symfony/Bridge/Twig/composer.json # src/Symfony/Component/Cache/composer.json # src/Symfony/Component/Config/composer.json # src/Symfony/Component/EventDispatcher/composer.json # src/Symfony/Component/ExpressionLanguage/composer.json # src/Symfony/Component/HttpClient/composer.json # src/Symfony/Component/HttpKernel/composer.json # src/Symfony/Component/Messenger/composer.json # src/Symfony/Component/Security/Core/composer.json # src/Symfony/Component/Security/composer.json # src/Symfony/Component/Stopwatch/composer.json # src/Symfony/Component/Translation/composer.json
1 parent bfdf79e commit f4ff613

File tree

18 files changed

+24
-24
lines changed

18 files changed

+24
-24
lines changed

‎composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"psr/container": "^1.0",
2626
"psr/link": "^1.0",
2727
"psr/log": "~1.0",
28-
"symfony/contracts": "^1.1.3",
28+
"symfony/contracts": "^1.1.3|^2",
2929
"symfony/polyfill-ctype": "~1.8",
3030
"symfony/polyfill-intl-icu": "~1.0",
3131
"symfony/polyfill-intl-idn": "^1.10",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"doctrine/persistence": "~1.0",
2222
"symfony/polyfill-ctype": "~1.8",
2323
"symfony/polyfill-mbstring": "~1.0",
24-
"symfony/service-contracts": "^1.1"
24+
"symfony/service-contracts": "^1.1|^2"
2525
},
2626
"require-dev": {
2727
"symfony/stopwatch": "^4.4|^5.0",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"require": {
1919
"php": "^7.2.9",
2020
"monolog/monolog": "^1.25.1|^2",
21-
"symfony/service-contracts": "^1.1",
21+
"symfony/service-contracts": "^1.1|^2",
2222
"symfony/http-kernel": "^4.4|^5.0"
2323
},
2424
"require-dev": {

‎src/Symfony/Bridge/Twig/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": "^7.2.9",
20-
"symfony/translation-contracts": "^1.1",
20+
"symfony/translation-contracts": "^1.1|^2",
2121
"twig/twig": "^2.10|^3"
2222
},
2323
"require-dev": {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
"php": "^7.2.9",
2525
"psr/cache": "~1.0",
2626
"psr/log": "~1.0",
27-
"symfony/cache-contracts": "^1.1",
28-
"symfony/service-contracts": "^1.1",
27+
"symfony/cache-contracts": "^1.1|^2",
28+
"symfony/service-contracts": "^1.1|^2",
2929
"symfony/var-exporter": "^4.4|^5.0"
3030
},
3131
"require-dev": {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"symfony/event-dispatcher": "^4.4|^5.0",
2525
"symfony/finder": "^4.4|^5.0",
2626
"symfony/messenger": "^4.4|^5.0",
27-
"symfony/service-contracts": "^1.1",
27+
"symfony/service-contracts": "^1.1|^2",
2828
"symfony/yaml": "^4.4|^5.0"
2929
},
3030
"conflict": {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"php": "^7.2.9",
2020
"symfony/polyfill-mbstring": "~1.0",
2121
"symfony/polyfill-php73": "^1.8",
22-
"symfony/service-contracts": "^1.1"
22+
"symfony/service-contracts": "^1.1|^2"
2323
},
2424
"require-dev": {
2525
"symfony/config": "^4.4|^5.0",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"require": {
1919
"php": "^7.2.9",
2020
"psr/container": "^1.0",
21-
"symfony/service-contracts": "^1.1.6"
21+
"symfony/service-contracts": "^1.1.6|^2"
2222
},
2323
"require-dev": {
2424
"symfony/yaml": "^4.4|^5.0",

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@
1717
],
1818
"require": {
1919
"php": "^7.2.9",
20-
"symfony/event-dispatcher-contracts": "^1.1"
20+
"symfony/event-dispatcher-contracts": "^1.1|^2"
2121
},
2222
"require-dev": {
2323
"symfony/dependency-injection": "^4.4|^5.0",
2424
"symfony/expression-language": "^4.4|^5.0",
2525
"symfony/config": "^4.4|^5.0",
2626
"symfony/http-foundation": "^4.4|^5.0",
27-
"symfony/service-contracts": "^1.1",
27+
"symfony/service-contracts": "^1.1|^2",
2828
"symfony/stopwatch": "^4.4|^5.0",
2929
"psr/log": "~1.0"
3030
},

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"require": {
1919
"php": "^7.2.9",
2020
"symfony/cache": "^4.4|^5.0",
21-
"symfony/service-contracts": "^1.1"
21+
"symfony/service-contracts": "^1.1|^2"
2222
},
2323
"autoload": {
2424
"psr-4": { "Symfony\\Component\\ExpressionLanguage\\": "" },

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"require": {
2323
"php": "^7.2.9",
2424
"psr/log": "^1.0",
25-
"symfony/http-client-contracts": "^1.1.7",
25+
"symfony/http-client-contracts": "^1.1.7|^2",
2626
"symfony/polyfill-php73": "^1.11"
2727
},
2828
"require-dev": {
@@ -32,7 +32,7 @@
3232
"symfony/dependency-injection": "^4.4|^5.0",
3333
"symfony/http-kernel": "^4.4|^5.0",
3434
"symfony/process": "^4.4|^5.0",
35-
"symfony/service-contracts": "^1.0",
35+
"symfony/service-contracts": "^1.0|^2",
3636
"symfony/var-dumper": "^4.4|^5.0"
3737
},
3838
"autoload": {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"symfony/routing": "^4.4|^5.0",
3939
"symfony/stopwatch": "^4.4|^5.0",
4040
"symfony/translation": "^4.4|^5.0",
41-
"symfony/translation-contracts": "^1.1",
41+
"symfony/translation-contracts": "^1.1|^2",
4242
"symfony/var-dumper": "^4.4|^5.0",
4343
"psr/cache": "~1.0",
4444
"twig/twig": "^2.4|^3"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
"psr/log": "~1.0",
2222
"symfony/event-dispatcher": "^4.4|^5.0",
2323
"symfony/mime": "^4.4|^5.0",
24-
"symfony/service-contracts": "^1.1"
24+
"symfony/service-contracts": "^1.1|^2"
2525
},
2626
"require-dev": {
2727
"symfony/amazon-mailer": "^4.4|^5.0",
2828
"symfony/google-mailer": "^4.4|^5.0",
29-
"symfony/http-client-contracts": "^1.1",
29+
"symfony/http-client-contracts": "^1.1|^2",
3030
"symfony/mailgun-mailer": "^4.4|^5.0",
3131
"symfony/mailchimp-mailer": "^4.4|^5.0",
3232
"symfony/messenger": "^4.4|^5.0",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"symfony/process": "^4.4|^5.0",
3232
"symfony/property-access": "^4.4|^5.0",
3333
"symfony/serializer": "^4.4|^5.0",
34-
"symfony/service-contracts": "^1.1",
34+
"symfony/service-contracts": "^1.1|^2",
3535
"symfony/stopwatch": "^4.4|^5.0",
3636
"symfony/validator": "^4.4|^5.0",
3737
"symfony/var-dumper": "^4.4|^5.0"

‎src/Symfony/Component/Security/Core/composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
],
1818
"require": {
1919
"php": "^7.2.9",
20-
"symfony/event-dispatcher-contracts": "^1.1",
21-
"symfony/service-contracts": "^1.1"
20+
"symfony/event-dispatcher-contracts": "^1.1|^2",
21+
"symfony/service-contracts": "^1.1|^2"
2222
},
2323
"require-dev": {
2424
"psr/container": "^1.0",

‎src/Symfony/Component/Stopwatch/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": "^7.2.9",
20-
"symfony/service-contracts": "^1.0"
20+
"symfony/service-contracts": "^1.0|^2"
2121
},
2222
"autoload": {
2323
"psr-4": { "Symfony\\Component\\Stopwatch\\": "" },

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@
1818
"require": {
1919
"php": "^7.2.9",
2020
"symfony/polyfill-mbstring": "~1.0",
21-
"symfony/translation-contracts": "^1.1.6"
21+
"symfony/translation-contracts": "^1.1.6|^2"
2222
},
2323
"require-dev": {
2424
"symfony/config": "^4.4|^5.0",
2525
"symfony/console": "^4.4|^5.0",
2626
"symfony/dependency-injection": "^5.0",
2727
"symfony/http-kernel": "^5.0",
2828
"symfony/intl": "^4.4|^5.0",
29-
"symfony/service-contracts": "^1.1.2",
29+
"symfony/service-contracts": "^1.1.2|^2",
3030
"symfony/var-dumper": "^4.4|^5.0",
3131
"symfony/yaml": "^4.4|^5.0",
3232
"symfony/finder": "^4.4|^5.0",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"php": "^7.2.9",
2020
"symfony/polyfill-ctype": "~1.8",
2121
"symfony/polyfill-mbstring": "~1.0",
22-
"symfony/translation-contracts": "^1.1"
22+
"symfony/translation-contracts": "^1.1|^2"
2323
},
2424
"require-dev": {
2525
"symfony/http-client": "^4.4|^5.0",

0 commit comments

Comments
 (0)
0