symfony · fabpot · Mar 17, 2015 · Mar 16, 2015
diff --git a/...mponent/DependencyInjection/Tests/Compiler/LegacyResolveParameterPlaceHoldersPassTest.php b/...mponent/DependencyInjection/Tests/Compiler/LegacyResolveParameterPlaceHoldersPassTest.php
@@ -0,0 +1,37 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Tests\Compiler;
+
+use Symfony\Component\DependencyInjection\Compiler\ResolveParameterPlaceHoldersPass;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+/**
+ * @group legacy
+ */
+class LegacyResolveParameterPlaceHoldersPassTest extends \PHPUnit_Framework_TestCase
+{
+    public function testFactoryClassParametersShouldBeResolved()
+    {
+        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
+
+        $compilerPass = new ResolveParameterPlaceHoldersPass();
+
+        $container = new ContainerBuilder();
+        $container->setParameter('foo.factory.class', 'FooFactory');
+        $fooDefinition = $container->register('foo', '%foo.factory.class%');
+        $fooDefinition->setFactoryClass('%foo.factory.class%');
+        $compilerPass->process($container);
+        $fooDefinition = $container->getDefinition('foo');
+
+        $this->assertSame('FooFactory', $fooDefinition->getFactoryClass());
+    }
+}
diff --git a/...ony/Component/DependencyInjection/Tests/Compiler/ResolveParameterPlaceHoldersPassTest.php b/...ony/Component/DependencyInjection/Tests/Compiler/ResolveParameterPlaceHoldersPassTest.php
@@ -33,12 +33,7 @@ public function testClassParametersShouldBeResolved()
         $this->assertSame('Foo', $this->fooDefinition->getClass());
     }
 
-    public function testFactoryClassParametersShouldBeResolved()
-    {
-        $this->assertSame('FooFactory', $this->fooDefinition->getFactoryClass());
-    }
-
-    public function testClassOfFactoryParametersShouldBeResolved()
+    public function testFactoryParametersShouldBeResolved()
     {
         $this->assertSame(array('FooFactory', 'getFoo'), $this->fooDefinition->getFactory());
     }
@@ -83,7 +78,6 @@ private function createContainerBuilder()
         $containerBuilder->setParameter('alias.id', 'bar');
 
         $fooDefinition = $containerBuilder->register('foo', '%foo.class%');
-        $fooDefinition->setFactoryClass('%foo.factory.class%');
         $fooDefinition->setFactory(array('%foo.factory.class%', 'getFoo'));
         $fooDefinition->setArguments(array('%foo.arg1%', '%foo.arg2%'));
         $fooDefinition->addMethodCall('%foo.method%', array('%foo.arg1%', '%foo.arg2%'));

diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container14.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container14.php
@@ -4,8 +4,14 @@
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
-class ProjectServiceContainer extends ContainerBuilder
-{
+/**
+ * This file is included in Tests\Dumper\GraphvizDumperTest::testDumpWithFrozenCustomClassContainer
+ * and Tests\Dumper\XmlDumperTest::testCompiledContainerCanBeDumped.
+ */
+if (!class_exists('Container14\ProjectServiceContainer')) {
+    class ProjectServiceContainer extends ContainerBuilder
+    {
+    }
 }
 
 return new ProjectServiceContainer();