Marked the ResolveParameterPlaceHoldersPassTest as legacy

saro0h · saro0h · commit 11e8632a80eb · 2015-03-17T11:08:25.000+01:00
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/LegacyResolveParameterPlaceHoldersPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/LegacyResolveParameterPlaceHoldersPassTest.php
@@ -0,0 +1,50 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * 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
+{
+    private $compilerPass;
+    private $container;
+    private $fooDefinition;
+
+    protected function setUp()
+    {
+        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
+        $this->compilerPass = new ResolveParameterPlaceHoldersPass();
+        $this->container = $this->createContainerBuilder();
+        $this->compilerPass->process($this->container);
+        $this->fooDefinition = $this->container->getDefinition('foo');
+    }
+
+    private function createContainerBuilder()
+    {
+        $containerBuilder = new ContainerBuilder();
+        $containerBuilder->setParameter('foo.class', 'Foo');
+        $containerBuilder->setParameter('foo.factory.class', 'FooFactory');
+        $fooDefinition = $containerBuilder->register('foo', '%foo.class%');
+        $fooDefinition->setFactoryClass('%foo.factory.class%');
+
+        return $containerBuilder;
+    }
+
+    public function testFactoryClassParametersShouldBeResolved()
+    {
+        $this->assertSame('FooFactory', $this->fooDefinition->getFactoryClass());
+    }
+}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveParameterPlaceHoldersPassTest.php b/src/Symfony/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
-{
+/**
+ * Be careful here: this class is included in Tests\Dumper\GraphvizDumperTest::testDumpWithFrozenCustomClassContainer
+ * and Tests\Dumper\XmlDumper::TesttestCompiledContainerCanBeDumped.
+ */
+if (!class_exists('Container14\ProjectServiceContainer')) {
+    class ProjectServiceContainer extends ContainerBuilder
+    {
+    }
 }
 
 return new ProjectServiceContainer();

Original file line number	Diff line number	Diff line change
`@@ -33,12 +33,7 @@ public function testClassParametersShouldBeResolved()`
`33`	`33`	`$this->assertSame('Foo', $this->fooDefinition->getClass());`
`34`	`34`	`}`
`35`	`35`
`36`		`- public function testFactoryClassParametersShouldBeResolved()`
`37`		`- {`
`38`		`- $this->assertSame('FooFactory', $this->fooDefinition->getFactoryClass());`
`39`		`- }`
`40`		`-`
`41`		`- public function testClassOfFactoryParametersShouldBeResolved()`
	`36`	`+ public function testFactoryParametersShouldBeResolved()`
`42`	`37`	`{`
`43`	`38`	`$this->assertSame(array('FooFactory', 'getFoo'), $this->fooDefinition->getFactory());`
`44`	`39`	`}`
`@@ -83,7 +78,6 @@ private function createContainerBuilder()`
`83`	`78`	`$containerBuilder->setParameter('alias.id', 'bar');`
`84`	`79`
`85`	`80`	`$fooDefinition = $containerBuilder->register('foo', '%foo.class%');`
`86`		`- $fooDefinition->setFactoryClass('%foo.factory.class%');`
`87`	`81`	`$fooDefinition->setFactory(array('%foo.factory.class%', 'getFoo'));`
`88`	`82`	`$fooDefinition->setArguments(array('%foo.arg1%', '%foo.arg2%'));`
`89`	`83`	`$fooDefinition->addMethodCall('%foo.method%', array('%foo.arg1%', '%foo.arg2%'));`