Merge branch '3.2'

* 3.2:
  Refactored other PHPUnit method calls to work with namespaced PHPUnit 6
  Refactored other PHPUnit method calls to work with namespaced PHPUnit 6
  Further refactorings to PHPUnit namespaces
  resolve parameters in definition classes

Author: nicolas-grekas

DependencyInjection/Compiler/DataCollectorTranslatorPass.php

@@ -25,7 +25,7 @@ public function process(ContainerBuilder $container)
             return;
         }
 
-        $translatorClass = $container->findDefinition('translator')->getClass();
+        $translatorClass = $container->getParameterBag()->resolveValue($container->findDefinition('translator')->getClass());
 
         if (!is_subclass_of($translatorClass, 'Symfony\Component\Translation\TranslatorBagInterface')) {
             $container->removeDefinition('translator.data_collector');

Tests/Controller/ControllerResolverTest.php

@@ -143,7 +143,12 @@ public function testGetControllerOnNonUndefinedFunction($controller, $exceptionN
     {
         // All this logic needs to be duplicated, since calling parent::testGetControllerOnNonUndefinedFunction will override the expected excetion and not use the regex
         $resolver = $this->createControllerResolver();
-        $this->setExpectedExceptionRegExp($exceptionName, $exceptionMessage);
+        if (method_exists($this, 'expectException')) {
+            $this->expectException($exceptionName);
+            $this->expectExceptionMessageRegExp($exceptionMessage);
+        } else {
+            $this->setExpectedExceptionRegExp($exceptionName, $exceptionMessage);
+        }
 
         $request = Request::create('/');
         $request->attributes->set('_controller', $controller);

Tests/DependencyInjection/Compiler/DataCollectorTranslatorPassTest.php

@@ -27,6 +27,9 @@ protected function setUp()
         $this->container = new ContainerBuilder();
         $this->dataCollectorTranslatorPass = new DataCollectorTranslatorPass();
 
+        $this->container->setParameter('translator_implementing_bag', 'Symfony\Component\Translation\Translator');
+        $this->container->setParameter('translator_not_implementing_bag', 'Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\Compiler\TranslatorWithTranslatorBag');
+
         $this->container->register('translator.data_collector', 'Symfony\Component\Translation\DataCollectorTranslator')
             ->setPublic(false)
             ->setDecoratedService('translator')
@@ -38,41 +41,69 @@ protected function setUp()
         ;
     }
 
-    public function testProcessKeepsDataCollectorTranslatorIfItImplementsTranslatorBagInterface()
+    /**
+     * @dataProvider getImplementingTranslatorBagInterfaceTranslatorClassNames
+     */
+    public function testProcessKeepsDataCollectorTranslatorIfItImplementsTranslatorBagInterface($class)
     {
-        $this->container->register('translator', 'Symfony\Component\Translation\Translator');
+        $this->container->register('translator', $class);
 
         $this->dataCollectorTranslatorPass->process($this->container);
 
         $this->assertTrue($this->container->hasDefinition('translator.data_collector'));
     }
 
-    public function testProcessKeepsDataCollectorIfTranslatorImplementsTranslatorBagInterface()
+    /**
+     * @dataProvider getImplementingTranslatorBagInterfaceTranslatorClassNames
+     */
+    public function testProcessKeepsDataCollectorIfTranslatorImplementsTranslatorBagInterface($class)
     {
-        $this->container->register('translator', 'Symfony\Component\Translation\Translator');
+        $this->container->register('translator', $class);
 
         $this->dataCollectorTranslatorPass->process($this->container);
 
         $this->assertTrue($this->container->hasDefinition('data_collector.translation'));
     }
 
-    public function testProcessRemovesDataCollectorTranslatorIfItDoesNotImplementTranslatorBagInterface()
+    public function getImplementingTranslatorBagInterfaceTranslatorClassNames()
+    {
+        return array(
+            array('Symfony\Component\Translation\Translator'),
+            array('%translator_implementing_bag%'),
+        );
+    }
+
+    /**
+     * @dataProvider getNotImplementingTranslatorBagInterfaceTranslatorClassNames
+     */
+    public function testProcessRemovesDataCollectorTranslatorIfItDoesNotImplementTranslatorBagInterface($class)
     {
-        $this->container->register('translator', 'Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\Compiler\TranslatorWithTranslatorBag');
+        $this->container->register('translator', $class);
 
         $this->dataCollectorTranslatorPass->process($this->container);
 
         $this->assertFalse($this->container->hasDefinition('translator.data_collector'));
     }
 
-    public function testProcessRemovesDataCollectorIfTranslatorDoesNotImplementTranslatorBagInterface()
+    /**
+     * @dataProvider getNotImplementingTranslatorBagInterfaceTranslatorClassNames
+     */
+    public function testProcessRemovesDataCollectorIfTranslatorDoesNotImplementTranslatorBagInterface($class)
     {
-        $this->container->register('translator', 'Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\Compiler\TranslatorWithTranslatorBag');
+        $this->container->register('translator', $class);
 
         $this->dataCollectorTranslatorPass->process($this->container);
 
         $this->assertFalse($this->container->hasDefinition('data_collector.translation'));
     }
+
+    public function getNotImplementingTranslatorBagInterfaceTranslatorClassNames()
+    {
+        return array(
+            array('Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\Compiler\TranslatorWithTranslatorBag'),
+            array('%translator_not_implementing_bag%'),
+        );
+    }
 }
 
 class TranslatorWithTranslatorBag implements TranslatorInterface

Tests/DependencyInjection/Compiler/FormPassTest.php

@@ -197,7 +197,12 @@ public function testPrivateTaggedServices($id, $tagName, $expectedExceptionMessa
         $container->setDefinition('form.extension', $extDefinition);
         $container->register($id, 'stdClass')->setPublic(false)->addTag($tagName);
 
-        $this->setExpectedException('\InvalidArgumentException', $expectedExceptionMessage);
+        if (method_exists($this, 'expectException')) {
+            $this->expectException('InvalidArgumentException');
+            $this->expectExceptionMessage($expectedExceptionMessage);
+        } else {
+            $this->setExpectedException('InvalidArgumentException', $expectedExceptionMessage);
+        }
 
         $container->compile();
     }

Tests/DependencyInjection/Compiler/ProfilerPassTest.php

@@ -41,7 +41,7 @@ public function testTemplateNoIdThrowsException()
 
         $builder = $this->createContainerMock($services);
 
-        $this->setExpectedException('InvalidArgumentException');
+        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('InvalidArgumentException');
 
         $profilerPass = new ProfilerPass();
         $profilerPass->process($builder);

Tests/DependencyInjection/Compiler/SerializerPassTest.php

@@ -38,7 +38,7 @@ public function testThrowExceptionWhenNoNormalizers()
             ->with('serializer.normalizer')
             ->will($this->returnValue(array()));
 
-        $this->setExpectedException('RuntimeException');
+        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('RuntimeException');
 
         $serializerPass = new SerializerPass();
         $serializerPass->process($container);
@@ -65,7 +65,7 @@ public function testThrowExceptionWhenNoEncoders()
             ->method('getDefinition')
             ->will($this->returnValue($definition));
 
-        $this->setExpectedException('RuntimeException');
+        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('RuntimeException');
 
         $serializerPass = new SerializerPass();
         $serializerPass->process($container);

Tests/Functional/CachePoolsTest.php

@@ -39,6 +39,11 @@ public function testRedisCachePools()
     {
         try {
             $this->doTestCachePools(array('root_config' => 'redis_config.yml', 'environment' => 'redis_cache'), RedisAdapter::class);
+        } catch (\PHPUnit\Framework\Error\Warning $e) {
+            if (0 !== strpos($e->getMessage(), 'unable to connect to')) {
+                throw $e;
+            }
+            $this->markTestSkipped($e->getMessage());
         } catch (\PHPUnit_Framework_Error_Warning $e) {
             if (0 !== strpos($e->getMessage(), 'unable to connect to')) {
                 throw $e;
@@ -59,6 +64,11 @@ public function testRedisCustomCachePools()
     {
         try {
             $this->doTestCachePools(array('root_config' => 'redis_custom_config.yml', 'environment' => 'custom_redis_cache'), RedisAdapter::class);
+        } catch (\PHPUnit\Framework\Error\Warning $e) {
+            if (0 !== strpos($e->getMessage(), 'unable to connect to')) {
+                throw $e;
+            }
+            $this->markTestSkipped($e->getMessage());
         } catch (\PHPUnit_Framework_Error_Warning $e) {
             if (0 !== strpos($e->getMessage(), 'unable to connect to')) {
                 throw $e;