Skip to content

Commit e2aae82

Browse files
fabpotfabpot
committed
Merge branch '4.3'
* 4.3: Reference individual contracts packages
2 parents 97d378a + 95c6e86 commit e2aae82

File tree

19 files changed

+25
-23
lines changed

19 files changed

+25
-23
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
"php": "^7.1.3",
2020
"doctrine/event-manager": "~1.0",
2121
"doctrine/persistence": "~1.0",
22-
"symfony/contracts": "^1.0",
2322
"symfony/polyfill-ctype": "~1.8",
24-
"symfony/polyfill-mbstring": "~1.0"
23+
"symfony/polyfill-mbstring": "~1.0",
24+
"symfony/service-contracts": "^1.1"
2525
},
2626
"require-dev": {
2727
"symfony/stopwatch": "~3.4|~4.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.1.3",
2020
"monolog/monolog": "~1.19",
21-
"symfony/contracts": "^1.0",
21+
"symfony/service-contracts": "^1.1",
2222
"symfony/http-kernel": "^4.3"
2323
},
2424
"require-dev": {

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
],
1818
"require": {
1919
"php": "^7.1.3",
20-
"symfony/contracts": "^1.0.2",
2120
"twig/twig": "^1.41|^2.10"
2221
},
2322
"require-dev": {

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
"ext-xml": "*",
2121
"symfony/cache": "~4.3",
2222
"symfony/config": "~4.2",
23-
"symfony/contracts": "^1.1",
2423
"symfony/dependency-injection": "^4.3",
2524
"symfony/http-foundation": "^4.3",
2625
"symfony/http-kernel": "^4.3",

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@
2424
"php": "^7.1.3",
2525
"psr/cache": "~1.0",
2626
"psr/log": "~1.0",
27-
"symfony/contracts": "^1.0",
27+
"symfony/cache-contracts": "^1.1",
28+
"symfony/service-contracts": "^1.1",
2829
"symfony/var-exporter": "^4.2"
2930
},
3031
"require-dev": {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
],
1818
"require": {
1919
"php": "^7.1.3",
20-
"symfony/contracts": "^1.1",
2120
"symfony/polyfill-mbstring": "~1.0",
22-
"symfony/polyfill-php73": "^1.8"
21+
"symfony/polyfill-php73": "^1.8",
22+
"symfony/service-contracts": "^1.1"
2323
},
2424
"require-dev": {
2525
"symfony/config": "~3.4|~4.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.1.3",
2020
"psr/container": "^1.0",
21-
"symfony/contracts": "^1.1"
21+
"symfony/service-contracts": "^1.1"
2222
},
2323
"require-dev": {
2424
"symfony/yaml": "~3.4|~4.0",

‎src/Symfony/Component/EventDispatcher/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.1.3",
20-
"symfony/contracts": "^1.1"
20+
"symfony/event-dispatcher-contracts": "^1.1"
2121
},
2222
"require-dev": {
2323
"symfony/dependency-injection": "~3.4|~4.0",

‎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.1.3",
2020
"symfony/cache": "~3.4|~4.0",
21-
"symfony/contracts": "^1.0"
21+
"symfony/service-contracts": "^1.1"
2222
},
2323
"autoload": {
2424
"psr-4": { "Symfony\\Component\\ExpressionLanguage\\": "" },

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"require": {
2222
"php": "^7.1.3",
2323
"psr/log": "^1.0",
24-
"symfony/contracts": "^1.1",
24+
"symfony/http-client-contracts": "^1.1",
2525
"symfony/polyfill-php73": "^1.11"
2626
},
2727
"require-dev": {

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
],
1818
"require": {
1919
"php": "^7.1.3",
20-
"symfony/contracts": "^1.1",
2120
"symfony/event-dispatcher": "^4.3",
2221
"symfony/http-foundation": "^4.1.1",
2322
"symfony/debug": "~3.4|~4.0",

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
],
1818
"require": {
1919
"php": "^7.1.3",
20-
"symfony/contracts": "^1.1"
20+
"symfony/event-dispatcher-contracts": "^1.1",
21+
"symfony/service-contracts": "^1.1"
2122
},
2223
"require-dev": {
2324
"psr/container": "^1.0",

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,11 @@
1717
],
1818
"require": {
1919
"php": "^7.1.3",
20-
"symfony/contracts": "^1.1",
20+
"symfony/event-dispatcher-contracts": "^1.1",
2121
"symfony/http-foundation": "~3.4|~4.0",
2222
"symfony/http-kernel": "^4.3",
23-
"symfony/property-access": "~3.4|~4.0"
23+
"symfony/property-access": "~3.4|~4.0",
24+
"symfony/service-contracts": "^1.1"
2425
},
2526
"replace": {
2627
"symfony/security-core": "self.version",

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

‎src/Symfony/Component/Translation/Tests/IdentityTranslatorTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
namespace Symfony\Component\Translation\Tests;
1313

1414
use Symfony\Component\Translation\IdentityTranslator;
15-
use Symfony\Contracts\Tests\Translation\TranslatorTest;
15+
use Symfony\Contracts\Translation\Test\TranslatorTest;
1616

1717
class IdentityTranslatorTest extends TranslatorTest
1818
{

‎src/Symfony/Component/Translation/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.1.3",
20-
"symfony/contracts": "^1.0.2",
21-
"symfony/polyfill-mbstring": "~1.0"
20+
"symfony/polyfill-mbstring": "~1.0",
21+
"symfony/translation-contracts": "^1.1"
2222
},
2323
"require-dev": {
2424
"symfony/config": "~3.4|~4.0",

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
],
1818
"require": {
1919
"php": "^7.1.3",
20-
"symfony/contracts": "^1.0.2",
2120
"symfony/polyfill-ctype": "~1.8",
22-
"symfony/polyfill-mbstring": "~1.0"
21+
"symfony/polyfill-mbstring": "~1.0",
22+
"symfony/translation-contracts": "^1.1"
2323
},
2424
"require-dev": {
2525
"symfony/http-client": "^4.3",

‎src/Symfony/Contracts/Tests/Translation/TranslatorTest.php renamed to ‎src/Symfony/Contracts/Translation/Test/TranslatorTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* file that was distributed with this source code.
1010
*/
1111

12-
namespace Symfony\Contracts\Tests\Translation;
12+
namespace Symfony\Contracts\Translation\Test;
1313

1414
use PHPUnit\Framework\TestCase;
1515
use Symfony\Contracts\Translation\TranslatorInterface;

‎src/Symfony/Contracts/phpunit.xml.dist

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<testsuites>
1616
<testsuite name="Symfony Contracts Test Suite">
1717
<directory>./Tests/</directory>
18+
<directory>./Translation/Test/</directory>
1819
</testsuite>
1920
</testsuites>
2021

@@ -23,6 +24,7 @@
2324
<directory>./</directory>
2425
<exclude>
2526
<directory>./Tests</directory>
27+
<directory>./Translation/Test/</directory>
2628
<directory>./vendor</directory>
2729
</exclude>
2830
</whitelist>

0 commit comments

Comments
 (0)