Skip to content

Commit 19d7496

Browse files
committed
Fixed test failing on symfony 4
1 parent 4772a36 commit 19d7496

File tree

3 files changed

+36
-15
lines changed

3 files changed

+36
-15
lines changed

src/DependencyInjection/DoctrineOrmBridgeExtension.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99

1010
class DoctrineOrmBridgeExtension extends ConfigurableExtension
1111
{
12+
private $alias;
13+
1214
public function __construct($alias)
1315
{
1416
$this->alias = $alias;

src/DependencyInjection/EventBusExtension.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010

1111
class EventBusExtension extends ConfigurableExtension
1212
{
13+
private $alias;
14+
1315
public function __construct($alias)
1416
{
1517
$this->alias = $alias;

tests/SymfonyBundle/DependencyInjection/Compiler/ConfigureMiddlewaresTest.php

Lines changed: 32 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
use SimpleBus\SymfonyBridge\DependencyInjection\Compiler\ConfigureMiddlewares;
66
use Symfony\Component\DependencyInjection\ContainerBuilder;
77
use Symfony\Component\DependencyInjection\Definition;
8+
use Symfony\Component\HttpKernel\Kernel;
89

910
class ConfigureMiddlewaresTest extends \PHPUnit_Framework_TestCase
1011
{
@@ -35,41 +36,57 @@ protected function setUp()
3536
*/
3637
public function it_configures_a_chain_of_buses_according_to_the_given_priorities()
3738
{
38-
$this->createBusDefinition('middleware100', 100);
39-
$this->createBusDefinition('middleware-100', -100);
40-
$this->createBusDefinition('middleware200', 200);
39+
$classes = [
40+
'SimpleBus\SymfonyBridge\Tests\Functional\SmokeTest\Auto\AuteEvent1' => 100,
41+
'SimpleBus\SymfonyBridge\Tests\Functional\SmokeTest\Auto\AuteEvent2' => -100,
42+
'SimpleBus\SymfonyBridge\Tests\Functional\SmokeTest\Auto\AuteEvent3' => 200,
43+
];
44+
45+
foreach ($classes as $class => $priority) {
46+
$this->createBusDefinition($class, $priority);
47+
}
4148

4249
$this->container->compile();
4350

44-
$this->commandBusContainsMiddlewares(array('middleware200', 'middleware100', 'middleware-100'));
51+
$this->commandBusContainsMiddlewares($classes);
4552
}
4653

47-
private function createBusDefinition($id, $priority)
54+
private function createBusDefinition($class, $priority)
4855
{
49-
$definition = new Definition('stdClass');
56+
$definition = new Definition($class);
5057
$definition->addTag($this->middlewareTag, array('priority' => $priority));
5158

52-
$this->container->setDefinition($id, $definition);
59+
$this->container->setDefinition($class, $definition);
5360

5461
return $definition;
5562
}
5663

57-
private function commandBusContainsMiddlewares($expectedMiddlewareIds)
64+
private function commandBusContainsMiddlewares($expectedMiddlewareclasses)
5865
{
59-
$actualMiddlewareIds = [];
66+
$actualMiddlewareClasses = [];
6067

6168
foreach ($this->mainBusDefinition->getMethodCalls() as $methodCall) {
6269
list($method, $arguments) = $methodCall;
6370
$this->assertSame('appendMiddleware', $method);
6471
$this->assertCount(1, $arguments);
6572
$referencedService = $arguments[0];
66-
$this->assertInstanceOf(
67-
'Symfony\Component\DependencyInjection\Reference',
68-
$referencedService
69-
);
70-
$actualMiddlewareIds[] = (string) $referencedService;
73+
74+
if (Kernel::VERSION_ID >= 40000) {
75+
$this->assertInstanceOf(
76+
'Symfony\Component\DependencyInjection\Definition',
77+
$referencedService
78+
);
79+
} else {
80+
$this->assertInstanceOf(
81+
'Symfony\Component\DependencyInjection\Reference',
82+
$referencedService
83+
);
84+
$referencedService = $this->container->getDefition((string) $referencedService);
85+
}
86+
87+
$actualMiddlewareClasses[$referencedService->getClass()] = $referencedService->getTag('middleware')[0]['priority'];
7188
}
7289

73-
$this->assertEquals($expectedMiddlewareIds, $actualMiddlewareIds);
90+
$this->assertEquals($expectedMiddlewareclasses, $actualMiddlewareClasses);
7491
}
7592
}

0 commit comments

Comments
 (0)