Skip to content

Commit 386f601

Browse files
GromNaNGromNaN
committed
Fix tags set in DecoratorServicePassTest
1 parent 7d36d4f commit 386f601

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

‎src/Symfony/Component/DependencyInjection/Tests/Compiler/DecoratorServicePassTest.php‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -187,18 +187,18 @@ public function testProcessMovesTagsFromDecoratedDefinitionToDecoratingDefinitio
187187
$container = new ContainerBuilder();
188188
$container
189189
->register('foo')
190-
->setTags(['bar' => ['attr' => 'baz']])
190+
->setTags(['bar' => [['attr' => 'baz']]])
191191
;
192192
$container
193193
->register('baz')
194-
->setTags(['foobar' => ['attr' => 'bar']])
194+
->setTags(['foobar' => [['attr' => 'bar']]])
195195
->setDecoratedService('foo')
196196
;
197197

198198
$this->process($container);
199199

200200
$this->assertEmpty($container->getDefinition('baz.inner')->getTags());
201-
$this->assertEquals(['bar' => ['attr' => 'baz'], 'foobar' => ['attr' => 'bar'], 'container.decorator' => [['id' => 'foo', 'inner' => 'baz.inner']]], $container->getDefinition('baz')->getTags());
201+
$this->assertEquals(['bar' => [['attr' => 'baz']], 'foobar' => [['attr' => 'bar']], 'container.decorator' => [['id' => 'foo', 'inner' => 'baz.inner']]], $container->getDefinition('baz')->getTags());
202202
}
203203

204204
public function testProcessMovesTagsFromDecoratedDefinitionToDecoratingDefinitionMultipleTimes()
@@ -207,7 +207,7 @@ public function testProcessMovesTagsFromDecoratedDefinitionToDecoratingDefinitio
207207
$container
208208
->register('foo')
209209
->setPublic(true)
210-
->setTags(['bar' => ['attr' => 'baz']])
210+
->setTags(['bar' => [['attr' => 'baz']]])
211211
;
212212
$container
213213
->register('deco1')
@@ -221,64 +221,64 @@ public function testProcessMovesTagsFromDecoratedDefinitionToDecoratingDefinitio
221221
$this->process($container);
222222

223223
$this->assertEmpty($container->getDefinition('deco1')->getTags());
224-
$this->assertEquals(['bar' => ['attr' => 'baz'], 'container.decorator' => [['id' => 'foo', 'inner' => 'deco1.inner']]], $container->getDefinition('deco2')->getTags());
224+
$this->assertEquals(['bar' => [['attr' => 'baz']], 'container.decorator' => [['id' => 'foo', 'inner' => 'deco1.inner']]], $container->getDefinition('deco2')->getTags());
225225
}
226226

227227
public function testProcessLeavesServiceLocatorTagOnOriginalDefinition()
228228
{
229229
$container = new ContainerBuilder();
230230
$container
231231
->register('foo')
232-
->setTags(['container.service_locator' => [0 => []], 'bar' => ['attr' => 'baz']])
232+
->setTags(['container.service_locator' => [0 => []], 'bar' => [['attr' => 'baz']]])
233233
;
234234
$container
235235
->register('baz')
236-
->setTags(['foobar' => ['attr' => 'bar']])
236+
->setTags(['foobar' => [['attr' => 'bar']]])
237237
->setDecoratedService('foo')
238238
;
239239

240240
$this->process($container);
241241

242242
$this->assertEquals(['container.service_locator' => [0 => []]], $container->getDefinition('baz.inner')->getTags());
243-
$this->assertEquals(['bar' => ['attr' => 'baz'], 'foobar' => ['attr' => 'bar'], 'container.decorator' => [['id' => 'foo', 'inner' => 'baz.inner']]], $container->getDefinition('baz')->getTags());
243+
$this->assertEquals(['bar' => [['attr' => 'baz']], 'foobar' => [['attr' => 'bar']], 'container.decorator' => [['id' => 'foo', 'inner' => 'baz.inner']]], $container->getDefinition('baz')->getTags());
244244
}
245245

246246
public function testProcessLeavesServiceSubscriberTagOnOriginalDefinition()
247247
{
248248
$container = new ContainerBuilder();
249249
$container
250250
->register('foo')
251-
->setTags(['container.service_subscriber' => [], 'container.service_subscriber.locator' => [], 'bar' => ['attr' => 'baz']])
251+
->setTags(['container.service_subscriber' => [], 'container.service_subscriber.locator' => [], 'bar' => [['attr' => 'baz']]])
252252
;
253253
$container
254254
->register('baz')
255-
->setTags(['foobar' => ['attr' => 'bar']])
255+
->setTags(['foobar' => [['attr' => 'bar']]])
256256
->setDecoratedService('foo')
257257
;
258258

259259
$this->process($container);
260260

261261
$this->assertEquals(['container.service_subscriber' => [], 'container.service_subscriber.locator' => []], $container->getDefinition('baz.inner')->getTags());
262-
$this->assertEquals(['bar' => ['attr' => 'baz'], 'foobar' => ['attr' => 'bar'], 'container.decorator' => [['id' => 'foo', 'inner' => 'baz.inner']]], $container->getDefinition('baz')->getTags());
262+
$this->assertEquals(['bar' => [['attr' => 'baz']], 'foobar' => [['attr' => 'bar']], 'container.decorator' => [['id' => 'foo', 'inner' => 'baz.inner']]], $container->getDefinition('baz')->getTags());
263263
}
264264

265265
public function testProcessLeavesProxyTagOnOriginalDefinition()
266266
{
267267
$container = new ContainerBuilder();
268268
$container
269269
->register('foo')
270-
->setTags(['proxy' => 'foo', 'bar' => ['attr' => 'baz']])
270+
->setTags(['proxy' => ['foo'], 'bar' => [['attr' => 'baz']]])
271271
;
272272
$container
273273
->register('baz')
274-
->setTags(['foobar' => ['attr' => 'bar']])
274+
->setTags(['foobar' => [['attr' => 'bar']]])
275275
->setDecoratedService('foo')
276276
;
277277

278278
$this->process($container);
279279

280-
$this->assertEquals(['proxy' => 'foo'], $container->getDefinition('baz.inner')->getTags());
281-
$this->assertEquals(['bar' => ['attr' => 'baz'], 'foobar' => ['attr' => 'bar'], 'container.decorator' => [['id' => 'foo', 'inner' => 'baz.inner']]], $container->getDefinition('baz')->getTags());
280+
$this->assertEquals(['proxy' => ['foo']], $container->getDefinition('baz.inner')->getTags());
281+
$this->assertEquals(['bar' => [['attr' => 'baz']], 'foobar' => [['attr' => 'bar']], 'container.decorator' => [['id' => 'foo', 'inner' => 'baz.inner']]], $container->getDefinition('baz')->getTags());
282282
}
283283

284284
public function testCannotDecorateSyntheticService()

0 commit comments

Comments
 (0)