Merge branch '2.7' into 2.8

* 2.7:
  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

@@ -141,7 +141,12 @@ public function testGetControllerInvokableServiceWithClassNameAsName()
      */
     public function testGetControllerOnNonUndefinedFunction($controller, $exceptionName = null, $exceptionMessage = null)
     {
-        $this->setExpectedException($exceptionName, $exceptionMessage);
+        if (method_exists($this, 'expectException')) {
+            $this->expectException($exceptionName);
+            $this->expectExceptionMessage($exceptionMessage);
+        } else {
+            $this->setExpectedException($exceptionName, $exceptionMessage);
+        }
 
         parent::testGetControllerOnNonUndefinedFunction($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/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

@@ -36,7 +36,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);
@@ -63,7 +63,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/Translation/TranslatorTest.php

@@ -101,7 +101,7 @@ public function testTransWithCachingWithInvalidLocale()
         $translator = $this->getTranslator($loader, array('cache_dir' => $this->tmpDir), 'loader', '\Symfony\Bundle\FrameworkBundle\Tests\Translation\TranslatorWithInvalidLocale');
         $translator->setLocale('invalid locale');
 
-        $this->setExpectedException('\InvalidArgumentException');
+        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('\InvalidArgumentException');
         $translator->trans('foo');
     }