8000 Marked the ResolveParameterPlaceHoldersPassTest as legacy · symfony/symfony@0a3f60e · GitHub
[go: up one dir, main page]

Skip to content

Commit 0a3f60e

Browse files
committed
Marked the ResolveParameterPlaceHoldersPassTest as legacy
1 parent be05344 commit 0a3f60e

File tree

2 files changed

+34
-15
lines changed

2 files changed

+34
-15
lines changed
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<?php
2+
3+
namespace Symfony\Component\DependencyInjection\Tests\Compiler;
4+
5+
class LegacyResolveParameterPlaceHoldersPassTest extends ResolveParameterPlaceHoldersPassTest
6+
{
7+
protected function setUp()
8+
{
9+
$this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
10+
parent::setUp();
11+
12+
$this->container->setParameter('foo.factory.class', 'FooFactory');
13+
$this->fooDefinition->setFactoryClass('%foo.factory.class%');
14+
$this->compilerPass->process($this->container);
15+
}
16+
17+
/**
18+
* @group legacy
19+
*/
20+
public function testFactoryClassParametersShouldBeResolved()
21+
{
22+
$this->assertSame('FooFactory', $this->fooDefinition->getFactoryClass());
23+
}
24+
}

src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveParameterPlaceHoldersPassTest.php

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616

1717
class ResolveParameterPlaceHoldersPassTest extends \PHPUnit_Framework_TestCase
1818
{
19-
private $compilerPass;
20-
private $container;
21-
private $fooDefinition;
19+
protected $compilerPass;
20+
protected $container;
21+
protected $fooDefinition;
2222

2323
protected function setUp()
2424
{
@@ -28,16 +28,6 @@ protected function setUp()
2828
$this->fooDefinition = $this->container->getDefinition('foo');
2929
}
3030

31-
public function testClassParametersShouldBeResolved()
32-
{
33-
$this->assertSame('Foo', $this->fooDefinition->getClass());
34-
}
35-
36-
public function testFactoryClassParametersShouldBeResolved()
37-
{
38-
$this->assertSame('FooFactory', $this->fooDefinition->getFactoryClass());
39-
}
40-
4131
public function testArgumentParametersShouldBeResolved()
4232
{
4333
$this->assertSame(array('bar', 'baz'), $this->fooDefinition->getArguments());
@@ -68,7 +58,6 @@ private function createContainerBuilder()
6858
$containerBuilder = new ContainerBuilder();
6959

7060
$containerBuilder->setParameter('foo.class', 'Foo');
71-
$containerBuilder->setParameter('foo.factory.class', 'FooFactory');
7261
$containerBuilder->setParameter('foo.arg1', 'bar');
7362
$containerBuilder->setParameter('foo.arg2', 'baz');
7463
$containerBuilder->setParameter('foo.method', 'foobar');
@@ -78,7 +67,6 @@ private function createContainerBuilder()
7867
$containerBuilder->setParameter('alias.id', 'bar');
7968

8069
$fooDefinition = $containerBuilder->register('foo', '%foo.class%');
81-
$fooDefinition->setFactoryClass('%foo.factory.class%');
8270
$fooDefinition->setArguments(array('%foo.arg1%', '%foo.arg2%'));
8371
$fooDefinition->addMethodCall('%foo.method%', array('%foo.arg1%', '%foo.arg2%'));
8472
$fooDefinition->setProperty('%foo.property.name%', '%foo.property.value%');
@@ -88,4 +76,11 @@ private function createContainerBuilder()
8876

8977
return $containerBuilder;
9078
}
79+
80+
protected function tearDown()
81+
{
82+
$this->compilerPass = null;
83+
$this->container = null;
84+
$this->fooDefinition = null;
85+
}
9186
}

0 commit comments

Comments
 (0)
0