From cfeb5bee072b419d2a034685edff6fa7e4922d7c Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Tue, 28 May 2019 09:50:59 +0200
Subject: [PATCH] fix tests

---
 src/Symfony/Bridge/Twig/composer.json                           | 2 +-
 .../Component/DependencyInjection/Tests/ServiceLocatorTest.php  | 2 +-
 src/Symfony/Component/DependencyInjection/composer.json         | 2 +-
 src/Symfony/Component/EventDispatcher/composer.json             | 1 +
 src/Symfony/Component/HttpKernel/composer.json                  | 1 +
 src/Symfony/Component/Mailer/composer.json                      | 1 +
 src/Symfony/Component/Messenger/composer.json                   | 1 +
 src/Symfony/Component/Translation/composer.json                 | 2 +-
 .../{Tests/Service => Service/Test}/ServiceLocatorTest.php      | 2 +-
 src/Symfony/Contracts/phpunit.xml.dist                          | 2 ++
 10 files changed, 11 insertions(+), 5 deletions(-)
 rename src/Symfony/Contracts/{Tests/Service => Service/Test}/ServiceLocatorTest.php (98%)

diff --git a/src/Symfony/Bridge/Twig/composer.json b/src/Symfony/Bridge/Twig/composer.json
index c16b3ac871..c5dbb1247a 100644
--- a/src/Symfony/Bridge/Twig/composer.json
+++ b/src/Symfony/Bridge/Twig/composer.json
@@ -31,7 +31,7 @@
         "symfony/polyfill-intl-icu": "~1.0",
         "symfony/routing": "~3.4|~4.0",
         "symfony/templating": "~3.4|~4.0",
-        "symfony/translation": "~4.2",
+        "symfony/translation": "^4.2.1",
         "symfony/yaml": "~3.4|~4.0",
         "symfony/security-acl": "~2.8|~3.0",
         "symfony/security-csrf": "~3.4|~4.0",
diff --git a/src/Symfony/Component/DependencyInjection/Tests/ServiceLocatorTest.php b/src/Symfony/Component/DependencyInjection/Tests/ServiceLocatorTest.php
index eb43029696..2d3092ae0d 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/ServiceLocatorTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/ServiceLocatorTest.php
@@ -14,7 +14,7 @@ namespace Symfony\Component\DependencyInjection\Tests;
 use Symfony\Component\DependencyInjection\Container;
 use Symfony\Component\DependencyInjection\ServiceLocator;
 use Symfony\Contracts\Service\ServiceSubscriberInterface;
-use Symfony\Contracts\Tests\Service\ServiceLocatorTest as BaseServiceLocatorTest;
+use Symfony\Contracts\Service\Test\ServiceLocatorTest as BaseServiceLocatorTest;
 
 class ServiceLocatorTest extends BaseServiceLocatorTest
 {
diff --git a/src/Symfony/Component/DependencyInjection/composer.json b/src/Symfony/Component/DependencyInjection/composer.json
index 8e19886da1..d5182ab7a8 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/service-contracts": "^1.1"
+        "symfony/service-contracts": "^1.1.2"
     },
     "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 f5d1e72b9b..8449c4785d 100644
--- a/src/Symfony/Component/EventDispatcher/composer.json
+++ b/src/Symfony/Component/EventDispatcher/composer.json
@@ -24,6 +24,7 @@
         "symfony/expression-language": "~3.4|~4.0",
         "symfony/config": "~3.4|~4.0",
         "symfony/http-foundation": "^3.4|^4.0",
+        "symfony/service-contracts": "^1.1",
         "symfony/stopwatch": "~3.4|~4.0",
         "psr/log": "~1.0"
     },
diff --git a/src/Symfony/Component/HttpKernel/composer.json b/src/Symfony/Component/HttpKernel/composer.json
index 7ddbd2f945..e07b453b48 100644
--- a/src/Symfony/Component/HttpKernel/composer.json
+++ b/src/Symfony/Component/HttpKernel/composer.json
@@ -38,6 +38,7 @@
         "symfony/stopwatch": "~3.4|~4.0",
         "symfony/templating": "~3.4|~4.0",
         "symfony/translation": "~4.2",
+        "symfony/translation-contracts": "^1.1",
         "symfony/var-dumper": "^4.1.1",
         "psr/cache": "~1.0",
         "twig/twig": "^1.34|^2.4"
diff --git a/src/Symfony/Component/Mailer/composer.json b/src/Symfony/Component/Mailer/composer.json
index 48395d4f1f..b9852124f1 100644
--- a/src/Symfony/Component/Mailer/composer.json
+++ b/src/Symfony/Component/Mailer/composer.json
@@ -25,6 +25,7 @@
     "require-dev": {
         "symfony/amazon-mailer": "^4.3",
         "symfony/google-mailer": "^4.3",
+        "symfony/http-client-contracts": "^1.1",
         "symfony/mailgun-mailer": "^4.3",
         "symfony/mailchimp-mailer": "^4.3",
         "symfony/postmark-mailer": "^4.3",
diff --git a/src/Symfony/Component/Messenger/composer.json b/src/Symfony/Component/Messenger/composer.json
index 4b552c9643..798940ef5d 100644
--- a/src/Symfony/Component/Messenger/composer.json
+++ b/src/Symfony/Component/Messenger/composer.json
@@ -31,6 +31,7 @@
         "symfony/process": "~3.4|~4.0",
         "symfony/property-access": "~3.4|~4.0",
         "symfony/serializer": "~3.4|~4.0",
+        "symfony/service-contracts": "^1.1",
         "symfony/stopwatch": "~3.4|~4.0",
         "symfony/validator": "~3.4|~4.0",
         "symfony/var-dumper": "~3.4|~4.0"
diff --git a/src/Symfony/Component/Translation/composer.json b/src/Symfony/Component/Translation/composer.json
index e9997ba290..4cdf5a6aa1 100644
--- a/src/Symfony/Component/Translation/composer.json
+++ b/src/Symfony/Component/Translation/composer.json
@@ -18,7 +18,7 @@
     "require": {
         "php": "^7.1.3",
         "symfony/polyfill-mbstring": "~1.0",
-        "symfony/translation-contracts": "^1.1"
+        "symfony/translation-contracts": "^1.1.2"
     },
     "require-dev": {
         "symfony/config": "~3.4|~4.0",
diff --git a/src/Symfony/Contracts/Tests/Service/ServiceLocatorTest.php b/src/Symfony/Contracts/Service/Test/ServiceLocatorTest.php
similarity index 98%
rename from src/Symfony/Contracts/Tests/Service/ServiceLocatorTest.php
rename to src/Symfony/Contracts/Service/Test/ServiceLocatorTest.php
index 22487a8992..69594583f5 100644
--- a/src/Symfony/Contracts/Tests/Service/ServiceLocatorTest.php
+++ b/src/Symfony/Contracts/Service/Test/ServiceLocatorTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Contracts\Tests\Service;
+namespace Symfony\Contracts\Service\Test;
 
 use PHPUnit\Framework\TestCase;
 use Psr\Container\ContainerInterface;
diff --git a/src/Symfony/Contracts/phpunit.xml.dist b/src/Symfony/Contracts/phpunit.xml.dist
index 4a9e8f0fc3..fd93d020f2 100644
--- a/src/Symfony/Contracts/phpunit.xml.dist
+++ b/src/Symfony/Contracts/phpunit.xml.dist
@@ -15,6 +15,7 @@
     <testsuites>
         <testsuite name="Symfony Contracts Test Suite">
             <directory>./Tests/</directory>
+            <directory>./Service/Test/</directory>
             <directory>./Translation/Test/</directory>
         </testsuite>
     </testsuites>
@@ -24,6 +25,7 @@
             <directory>./</directory>
             <exclude>
                 <directory>./Tests</directory>
+                <directory>./Service/Test/</directory>
                 <directory>./Translation/Test/</directory>
                 <directory>./vendor</directory>
             </exclude>