Skip to content

Commit c45c3f2

Browse files
Merge branch '5.0' into 5.1
* 5.0: fix merge Require PHPUnit 9.3 on PHP 8 [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) [Serializer] Support multiple levels of discriminator mapping Use hexadecimal numerals instead of hexadecimals in strings to represent error codes. [SCA] Minor fixes on tests [WebProfilerBundle] modified url generation to use absolute urls [Mailer] Fix reply-to functionality in the SendgridApiTransport [Mime] Fix compat with HTTP requests ticket_36879 - Fix mandrill raw http request setting from email/name
2 parents 11967a5 + 9263d52 commit c45c3f2

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
@@ -902,12 +902,12 @@ public function testfindTaggedServiceIds()
902902
->addTag('bar', ['bar' => 'bar'])
903903
->addTag('foo', ['foofoo' => 'foofoo'])
904904
;
905-
$this->assertEquals($builder->findTaggedServiceIds('foo'), [
905+
$this->assertEquals([
906906
'foo' => [
907907
['foo' => 'foo'],
908908
['foofoo' => 'foofoo'],
909909
],
910-
], '->findTaggedServiceIds() returns an array of service ids and its tag attributes');
910+
], $builder->findTaggedServiceIds('foo'), '->findTaggedServiceIds() returns an array of service ids and its tag attributes');
911911
$this->assertEquals([], $builder->findTaggedServiceIds('foobar'), '->findTaggedServiceIds() returns an empty array if there is annotated services');
912912
}
913913

Tests/DefinitionTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -266,10 +266,10 @@ public function testTags()
266266
$def->addTag('foo', ['foo' => 'bar']);
267267
$this->assertEquals([[], ['foo' => 'bar']], $def->getTag('foo'), '->addTag() can adds the same tag several times');
268268
$def->addTag('bar', ['bar' => 'bar']);
269-
$this->assertEquals($def->getTags(), [
269+
$this->assertEquals([
270270
'foo' => [[], ['foo' => 'bar']],
271271
'bar' => [['bar' => 'bar']],
272-
], '->getTags() returns all tags');
272+
], $def->getTags(), '->getTags() returns all tags');
273273
}
274274

275275
public function testSetArgument()

0 commit comments

Comments
 (0)