Skip to content

Commit aebc95d

Browse files
author
Anthony MARTIN
committed
[DI] adding corresponding tests following the support for "wither" method
1 parent 6517a34 commit aebc95d

File tree

23 files changed

+80
-68
lines changed

23 files changed

+80
-68
lines changed

src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPassTest.php

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,11 @@ public function testProcessEventListenersWithPriorities()
9292

9393
$this->assertEquals(
9494
[
95-
['addEventListener', [['foo_bar'], 'c']],
96-
['addEventListener', [['foo_bar'], 'a']],
97-
['addEventListener', [['bar'], 'a']],
98-
['addEventListener', [['foo'], 'b']],
99-
['addEventListener', [['foo'], 'a']],
95+
['addEventListener', [['foo_bar'], 'c'], false],
96+
['addEventListener', [['foo_bar'], 'a'], false],
97+
['addEventListener', [['bar'], 'a'], false],
98+
['addEventListener', [['foo'], 'b'], false],
99+
['addEventListener', [['foo'], 'a'], false],
100100
],
101101
$methodCalls
102102
);
@@ -147,8 +147,8 @@ public function testProcessEventListenersWithMultipleConnections()
147147
// first connection
148148
$this->assertEquals(
149149
[
150-
['addEventListener', [['onFlush'], 'a']],
151-
['addEventListener', [['onFlush'], 'b']],
150+
['addEventListener', [['onFlush'], 'a'], false],
151+
['addEventListener', [['onFlush'], 'b'], false],
152152
],
153153
$eventManagerDef->getMethodCalls()
154154
);
@@ -167,8 +167,8 @@ public function testProcessEventListenersWithMultipleConnections()
167167
$secondEventManagerDef = $container->getDefinition('doctrine.dbal.second_connection.event_manager');
168168
$this->assertEquals(
169169
[
170-
['addEventListener', [['onFlush'], 'a']],
171-
['addEventListener', [['onFlush'], 'c']],
170+
['addEventListener', [['onFlush'], 'a'], false],
171+
['addEventListener', [['onFlush'], 'c'], false],
172172
],
173173
$secondEventManagerDef->getMethodCalls()
174174
);
@@ -215,16 +215,16 @@ public function testProcessEventSubscribersWithMultipleConnections()
215215

216216
$this->assertEquals(
217217
[
218-
['addEventSubscriber', [new Reference('a')]],
219-
['addEventSubscriber', [new Reference('b')]],
218+
['addEventSubscriber', [new Reference('a')], false],
219+
['addEventSubscriber', [new Reference('b')], false],
220220
],
221221
$container->getDefinition('doctrine.dbal.default_connection.event_manager')->getMethodCalls()
222222
);
223223

224224
$this->assertEquals(
225225
[
226-
['addEventSubscriber', [new Reference('a')]],
227-
['addEventSubscriber', [new Reference('c')]],
226+
['addEventSubscriber', [new Reference('a')], false],
227+
['addEventSubscriber', [new Reference('c')], false],
228228
],
229229
$container->getDefinition('doctrine.dbal.second_connection.event_manager')->getMethodCalls()
230230
);
@@ -267,11 +267,11 @@ public function testProcessEventSubscribersWithPriorities()
267267

268268
$this->assertEquals(
269269
[
270-
['addEventSubscriber', [new Reference('c')]],
271-
['addEventSubscriber', [new Reference('d')]],
272-
['addEventSubscriber', [new Reference('e')]],
273-
['addEventSubscriber', [new Reference('b')]],
274-
['addEventSubscriber', [new Reference('a')]],
270+
['addEventSubscriber', [new Reference('c')], false],
271+
['addEventSubscriber', [new Reference('d')], false],
272+
['addEventSubscriber', [new Reference('e')], false],
273+
['addEventSubscriber', [new Reference('b')], false],
274+
['addEventSubscriber', [new Reference('a')], false],
275275
],
276276
$container->getDefinition('doctrine.dbal.default_connection.event_manager')->getMethodCalls()
277277
);

src/Symfony/Component/Cache/Tests/DependencyInjection/CacheCollectorPassTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ public function testProcess()
3838
(new CacheCollectorPass())->process($container);
3939

4040
$this->assertEquals([
41-
['addInstance', ['fs', new Reference('fs')]],
42-
['addInstance', ['tagged_fs', new Reference('tagged_fs')]],
41+
['addInstance', ['fs', new Reference('fs')], false],
42+
['addInstance', ['tagged_fs', new Reference('tagged_fs')], false],
4343
], $collector->getMethodCalls());
4444

4545
$this->assertSame(TraceableAdapter::class, $container->findDefinition('fs')->getClass());

src/Symfony/Component/Console/Tests/DependencyInjection/AddConsoleCommandPassTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public function testProcessRegistersLazyCommands()
7575
$this->assertSame(['my:command' => 'my-command', 'my:alias' => 'my-command'], $commandLoader->getArgument(1));
7676
$this->assertEquals([['my-command' => new ServiceClosureArgument(new TypedReference('my-command', MyCommand::class))]], $commandLocator->getArguments());
7777
$this->assertSame([], $container->getParameter('console.command.ids'));
78-
$this->assertSame([['setName', ['my:command']], ['setAliases', [['my:alias']]]], $command->getMethodCalls());
78+
$this->assertSame([['setName', ['my:command'], false], ['setAliases', [['my:alias']], false]], $command->getMethodCalls());
7979
}
8080

8181
public function testProcessFallsBackToDefaultName()

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -925,6 +925,7 @@ public function testNamedArgumentAliasResolveCollisions()
925925
[
926926
'setMultipleInstancesForOneArg',
927927
[new TypedReference(CollisionInterface::class.' $collision', CollisionInterface::class)],
928+
false,
928929
],
929930
];
930931
$this->assertEquals($expected, $container->getDefinition('setter_injection_collision')->getMethodCalls());

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ public function testProcess()
3535

3636
$this->assertEquals([null, 1, 'a'], $container->getDefinition('foo')->getArguments());
3737
$this->assertEquals([
38-
['bar', ['a', 'b']],
39-
['baz', ['c', 'd']],
38+
['bar', ['a', 'b'], false],
39+
['baz', ['c', 'd'], false],
4040
], $container->getDefinition('foo')->getMethodCalls());
4141
}
4242

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public function testProcess()
4444
$pass->process($container);
4545

4646
$this->assertEquals([new Reference('foo'), '123'], $definition->getArguments());
47-
$this->assertEquals([['setSensitiveClass', [new Reference('foo')]]], $definition->getMethodCalls());
47+
$this->assertEquals([['setSensitiveClass', [new Reference('foo')], false]], $definition->getMethodCalls());
4848
}
4949

5050
/**
@@ -109,7 +109,7 @@ public function testScalarSetter()
109109
(new AutowireRequiredMethodsPass())->process($container);
110110
(new ResolveBindingsPass())->process($container);
111111

112-
$this->assertEquals([['setDefaultLocale', ['fr']]], $definition->getMethodCalls());
112+
$this->assertEquals([['setDefaultLocale', ['fr'], false]], $definition->getMethodCalls());
113113
}
114114

115115
public function testTupleBinding()
@@ -130,8 +130,8 @@ public function testTupleBinding()
130130
$pass->process($container);
131131

132132
$expected = [
133-
['setSensitiveClass', [new Reference('foo')]],
134-
['setAnotherC', [new Reference('bar')]],
133+
['setSensitiveClass', [new Reference('foo')], false],
134+
['setAnotherC', [new Reference('bar')], false],
135135
];
136136
$this->assertEquals($expected, $definition->getMethodCalls());
137137
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ public function testProcessAppendsMethodCallsAlways()
5555

5656
$def = $container->getDefinition('child');
5757
$this->assertEquals([
58-
['foo', ['bar']],
59-
['bar', ['foo']],
58+
['foo', ['bar'], false],
59+
['bar', ['foo'], false],
6060
], $def->getMethodCalls());
6161
}
6262

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ public function testProcessInheritance()
6262
(new ResolveChildDefinitionsPass())->process($container);
6363

6464
$expected = [
65-
['foo', ['bar']],
66-
['foo', ['foo']],
65+
['foo', ['bar'], false],
66+
['foo', ['foo'], false],
6767
];
6868

6969
$this->assertSame($expected, $container->getDefinition('parent')->getMethodCalls());
@@ -212,17 +212,17 @@ public function testProcessForAutoconfiguredCalls()
212212
['setFoo', [
213213
'plain_value',
214214
'%some_parameter%',
215-
]],
216-
['callBar', []],
217-
['isBaz', []],
215+
], false],
216+
['callBar', [], false],
217+
['isBaz', [], false],
218218
];
219219

220220
$container->registerForAutoconfiguration(parent::class)->addMethodCall('setFoo', $expected[0][1]);
221221
$container->registerForAutoconfiguration(self::class)->addMethodCall('callBar');
222222

223223
$def = $container->register('foo', self::class)->setAutoconfigured(true)->addMethodCall('isBaz');
224224
$this->assertEquals(
225-
[['isBaz', []]],
225+
[['isBaz', [], false]],
226226
$def->getMethodCalls(),
227227
'Definition shouldn\'t have only one method call.'
228228
);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public function testProcess()
4343
$pass->process($container);
4444

4545
$this->assertEquals([0 => new Reference('foo'), 1 => '123', 2 => 'http://api.example.com'], $definition->getArguments());
46-
$this->assertEquals([['setApiKey', ['123']]], $definition->getMethodCalls());
46+
$this->assertEquals([['setApiKey', ['123'], false]], $definition->getMethodCalls());
4747
}
4848

4949
public function testWithFactory()

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public function testArgumentParametersShouldBeResolved()
4646

4747
public function testMethodCallParametersShouldBeResolved()
4848
{
49-
$this->assertSame([['foobar', ['bar', ['bar' => 'baz']]]], $this->fooDefinition->getMethodCalls());
49+
$this->assertSame([['foobar', ['bar', ['bar' => 'baz']], false]], $this->fooDefinition->getMethodCalls());
5050
}
5151

5252
public function testPropertyParametersShouldBeResolved()

0 commit comments

Comments
 (0)