diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json
index 300f903424..b00634b0de 100644
--- a/src/Symfony/Bridge/Doctrine/composer.json
+++ b/src/Symfony/Bridge/Doctrine/composer.json
@@ -19,9 +19,9 @@
"php": "^7.1.3",
"doctrine/event-manager": "~1.0",
"doctrine/persistence": "~1.0",
- "symfony/contracts": "^1.0",
"symfony/polyfill-ctype": "~1.8",
- "symfony/polyfill-mbstring": "~1.0"
+ "symfony/polyfill-mbstring": "~1.0",
+ "symfony/service-contracts": "^1.1"
},
"require-dev": {
"symfony/stopwatch": "~3.4|~4.0",
diff --git a/src/Symfony/Bridge/Monolog/composer.json b/src/Symfony/Bridge/Monolog/composer.json
index 81e7b15cd0..e57ae259e9 100644
--- a/src/Symfony/Bridge/Monolog/composer.json
+++ b/src/Symfony/Bridge/Monolog/composer.json
@@ -18,7 +18,7 @@
"require": {
"php": "^7.1.3",
"monolog/monolog": "~1.19",
- "symfony/contracts": "^1.0",
+ "symfony/service-contracts": "^1.1",
"symfony/http-kernel": "^4.3"
},
"require-dev": {
diff --git a/src/Symfony/Bridge/Twig/composer.json b/src/Symfony/Bridge/Twig/composer.json
index 026a9003c3..c16b3ac871 100644
--- a/src/Symfony/Bridge/Twig/composer.json
+++ b/src/Symfony/Bridge/Twig/composer.json
@@ -17,7 +17,6 @@
],
"require": {
"php": "^7.1.3",
- "symfony/contracts": "^1.0.2",
"twig/twig": "^1.41|^2.10"
},
"require-dev": {
diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json
index 12f744c237..bcfdf01fba 100644
--- a/src/Symfony/Bundle/FrameworkBundle/composer.json
+++ b/src/Symfony/Bundle/FrameworkBundle/composer.json
@@ -20,7 +20,6 @@
"ext-xml": "*",
"symfony/cache": "~4.3",
"symfony/config": "~4.2",
- "symfony/contracts": "^1.1",
"symfony/dependency-injection": "^4.3",
"symfony/http-foundation": "^4.3",
"symfony/http-kernel": "^4.3",
diff --git a/src/Symfony/Component/Cache/composer.json b/src/Symfony/Component/Cache/composer.json
index 098cdadee0..05bed1cf75 100644
--- a/src/Symfony/Component/Cache/composer.json
+++ b/src/Symfony/Component/Cache/composer.json
@@ -24,7 +24,8 @@
"php": "^7.1.3",
"psr/cache": "~1.0",
"psr/log": "~1.0",
- "symfony/contracts": "^1.0",
+ "symfony/cache-contracts": "^1.1",
+ "symfony/service-contracts": "^1.1",
"symfony/var-exporter": "^4.2"
},
"require-dev": {
diff --git a/src/Symfony/Component/Console/composer.json b/src/Symfony/Component/Console/composer.json
index b8033b2272..5613467fd2 100644
--- a/src/Symfony/Component/Console/composer.json
+++ b/src/Symfony/Component/Console/composer.json
@@ -17,9 +17,9 @@
],
"require": {
"php": "^7.1.3",
- "symfony/contracts": "^1.1",
"symfony/polyfill-mbstring": "~1.0",
- "symfony/polyfill-php73": "^1.8"
+ "symfony/polyfill-php73": "^1.8",
+ "symfony/service-contracts": "^1.1"
},
"require-dev": {
"symfony/config": "~3.4|~4.0",
diff --git a/src/Symfony/Component/DependencyInjection/composer.json b/src/Symfony/Component/DependencyInjection/composer.json
index 282b52ed1f..8e19886da1 100644
--- a/src/Symfony/Component/DependencyInjection/composer.json
+++ b/src/Symfony/Component/DependencyInjection/composer.json
@@ -18,7 +18,7 @@
"require": {
"php": "^7.1.3",
"psr/container": "^1.0",
- "symfony/contracts": "^1.1"
+ "symfony/service-contracts": "^1.1"
},
"require-dev": {
"symfony/yaml": "~3.4|~4.0",
diff --git a/src/Symfony/Component/EventDispatcher/composer.json b/src/Symfony/Component/EventDispatcher/composer.json
index 6677e2b74f..f5d1e72b9b 100644
--- a/src/Symfony/Component/EventDispatcher/composer.json
+++ b/src/Symfony/Component/EventDispatcher/composer.json
@@ -17,7 +17,7 @@
],
"require": {
"php": "^7.1.3",
- "symfony/contracts": "^1.1"
+ "symfony/event-dispatcher-contracts": "^1.1"
},
"require-dev": {
"symfony/dependency-injection": "~3.4|~4.0",
diff --git a/src/Symfony/Component/ExpressionLanguage/composer.json b/src/Symfony/Component/ExpressionLanguage/composer.json
index 66581371f9..bcab816043 100644
--- a/src/Symfony/Component/ExpressionLanguage/composer.json
+++ b/src/Symfony/Component/ExpressionLanguage/composer.json
@@ -18,7 +18,7 @@
"require": {
"php": "^7.1.3",
"symfony/cache": "~3.4|~4.0",
- "symfony/contracts": "^1.0"
+ "symfony/service-contracts": "^1.1"
},
"autoload": {
"psr-4": { "Symfony\\Component\\ExpressionLanguage\\": "" },
diff --git a/src/Symfony/Component/HttpClient/composer.json b/src/Symfony/Component/HttpClient/composer.json
index b02ae3beea..4ffe7bfd82 100644
--- a/src/Symfony/Component/HttpClient/composer.json
+++ b/src/Symfony/Component/HttpClient/composer.json
@@ -21,7 +21,7 @@
"require": {
"php": "^7.1.3",
"psr/log": "^1.0",
- "symfony/contracts": "^1.1",
+ "symfony/http-client-contracts": "^1.1",
"symfony/polyfill-php73": "^1.11"
},
"require-dev": {
diff --git a/src/Symfony/Component/HttpKernel/composer.json b/src/Symfony/Component/HttpKernel/composer.json
index 3edbf79cc3..7ddbd2f945 100644
--- a/src/Symfony/Component/HttpKernel/composer.json
+++ b/src/Symfony/Component/HttpKernel/composer.json
@@ -17,7 +17,6 @@
],
"require": {
"php": "^7.1.3",
- "symfony/contracts": "^1.1",
"symfony/event-dispatcher": "^4.3",
"symfony/http-foundation": "^4.1.1",
"symfony/debug": "~3.4|~4.0",
diff --git a/src/Symfony/Component/Security/Core/composer.json b/src/Symfony/Component/Security/Core/composer.json
index 05c1c3dbbe..f2bbd44967 100644
--- a/src/Symfony/Component/Security/Core/composer.json
+++ b/src/Symfony/Component/Security/Core/composer.json
@@ -17,7 +17,8 @@
],
"require": {
"php": "^7.1.3",
- "symfony/contracts": "^1.1"
+ "symfony/event-dispatcher-contracts": "^1.1",
+ "symfony/service-contracts": "^1.1"
},
"require-dev": {
"psr/container": "^1.0",
diff --git a/src/Symfony/Component/Security/composer.json b/src/Symfony/Component/Security/composer.json
index 4f54140b55..6365520893 100644
--- a/src/Symfony/Component/Security/composer.json
+++ b/src/Symfony/Component/Security/composer.json
@@ -17,10 +17,11 @@
],
"require": {
"php": "^7.1.3",
- "symfony/contracts": "^1.1",
+ "symfony/event-dispatcher-contracts": "^1.1",
"symfony/http-foundation": "~3.4|~4.0",
"symfony/http-kernel": "^4.3",
- "symfony/property-access": "~3.4|~4.0"
+ "symfony/property-access": "~3.4|~4.0",
+ "symfony/service-contracts": "^1.1"
},
"replace": {
"symfony/security-core": "self.version",
diff --git a/src/Symfony/Component/Stopwatch/composer.json b/src/Symfony/Component/Stopwatch/composer.json
index 2ac6e03e29..68c4d9f2e0 100644
--- a/src/Symfony/Component/Stopwatch/composer.json
+++ b/src/Symfony/Component/Stopwatch/composer.json
@@ -17,7 +17,7 @@
],
"require": {
"php": "^7.1.3",
- "symfony/contracts": "^1.0"
+ "symfony/service-contracts": "^1.0"
},
"autoload": {
"psr-4": { "Symfony\\Component\\Stopwatch\\": "" },
diff --git a/src/Symfony/Component/Translation/Tests/IdentityTranslatorTest.php b/src/Symfony/Component/Translation/Tests/IdentityTranslatorTest.php
index be0a548aa1..cf618d95a2 100644
--- a/src/Symfony/Component/Translation/Tests/IdentityTranslatorTest.php
+++ b/src/Symfony/Component/Translation/Tests/IdentityTranslatorTest.php
@@ -12,7 +12,7 @@
namespace Symfony\Component\Translation\Tests;
use Symfony\Component\Translation\IdentityTranslator;
-use Symfony\Contracts\Tests\Translation\TranslatorTest;
+use Symfony\Contracts\Translation\Test\TranslatorTest;
class IdentityTranslatorTest extends TranslatorTest
{
diff --git a/src/Symfony/Component/Translation/composer.json b/src/Symfony/Component/Translation/composer.json
index 2b1b6d84da..e9997ba290 100644
--- a/src/Symfony/Component/Translation/composer.json
+++ b/src/Symfony/Component/Translation/composer.json
@@ -17,8 +17,8 @@
],
"require": {
"php": "^7.1.3",
- "symfony/contracts": "^1.0.2",
- "symfony/polyfill-mbstring": "~1.0"
+ "symfony/polyfill-mbstring": "~1.0",
+ "symfony/translation-contracts": "^1.1"
},
"require-dev": {
"symfony/config": "~3.4|~4.0",
diff --git a/src/Symfony/Component/Validator/composer.json b/src/Symfony/Component/Validator/composer.json
index b6eae402a8..f221cc585f 100644
--- a/src/Symfony/Component/Validator/composer.json
+++ b/src/Symfony/Component/Validator/composer.json
@@ -17,9 +17,9 @@
],
"require": {
"php": "^7.1.3",
- "symfony/contracts": "^1.0.2",
"symfony/polyfill-ctype": "~1.8",
- "symfony/polyfill-mbstring": "~1.0"
+ "symfony/polyfill-mbstring": "~1.0",
+ "symfony/translation-contracts": "^1.1"
},
"require-dev": {
"symfony/http-client": "^4.3",
diff --git a/src/Symfony/Contracts/Tests/Translation/TranslatorTest.php b/src/Symfony/Contracts/Translation/Test/TranslatorTest.php
similarity index 99%
rename from src/Symfony/Contracts/Tests/Translation/TranslatorTest.php
rename to src/Symfony/Contracts/Translation/Test/TranslatorTest.php
index ac5f9c7aeb..48466300b5 100644
--- a/src/Symfony/Contracts/Tests/Translation/TranslatorTest.php
+++ b/src/Symfony/Contracts/Translation/Test/TranslatorTest.php
@@ -9,7 +9,7 @@
* file that was distributed with this source code.
*/
-namespace Symfony\Contracts\Tests\Translation;
+namespace Symfony\Contracts\Translation\Test;
use PHPUnit\Framework\TestCase;
use Symfony\Contracts\Translation\TranslatorInterface;
diff --git a/src/Symfony/Contracts/phpunit.xml.dist b/src/Symfony/Contracts/phpunit.xml.dist
index e222d9f5a7..4a9e8f0fc3 100644
--- a/src/Symfony/Contracts/phpunit.xml.dist
+++ b/src/Symfony/Contracts/phpunit.xml.dist
@@ -15,6 +15,7 @@
./Tests/
+ ./Translation/Test/
@@ -23,6 +24,7 @@
./
./Tests
+ ./Translation/Test/
./vendor