Skip to content

Commit f33a28e

Browse files
Merge branch '3.4' into 4.4
* 3.4: [Cache] fix catching auth errors Fix CS [FrameworkBundle] set default session.handler alias if handler_id is not provided Fix CS Readability update Fix checks for phpunit releases on Composer 2 (resolves #37601) [SCA] Minor fixes on tests
2 parents 8726b37 + e91bf2b commit f33a28e

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Tests/ContainerBuilderTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -879,12 +879,12 @@ public function testfindTaggedServiceIds()
879879
->addTag('bar', ['bar' => 'bar'])
880880
->addTag('foo', ['foofoo' => 'foofoo'])
881881
;
882-
$this->assertEquals($builder->findTaggedServiceIds('foo'), [
882+
$this->assertEquals([
883883
'foo' => [
884884
['foo' => 'foo'],
885885
['foofoo' => 'foofoo'],
886886
],
887-
], '->findTaggedServiceIds() returns an array of service ids and its tag attributes');
887+
], $builder->findTaggedServiceIds('foo'), '->findTaggedServiceIds() returns an array of service ids and its tag attributes');
888888
$this->assertEquals([], $builder->findTaggedServiceIds('foobar'), '->findTaggedServiceIds() returns an empty array if there is annotated services');
889889
}
890890

Tests/DefinitionTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -280,10 +280,10 @@ public function testTags()
280280
$def->addTag('foo', ['foo' => 'bar']);
281281
$this->assertEquals([[], ['foo' => 'bar']], $def->getTag('foo'), '->addTag() can adds the same tag several times');
282282
$def->addTag('bar', ['bar' => 'bar']);
283-
$this->assertEquals($def->getTags(), [
283+
$this->assertEquals([
284284
'foo' => [[], ['foo' => 'bar']],
285285
'bar' => [['bar' => 'bar']],
286-
], '->getTags() returns all tags');
286+
], $def->getTags(), '->getTags() returns all tags');
287287
}
288288

289289
public function testSetArgument()

0 commit comments

Comments
 (0)