Skip to content

Commit 9263d52

Browse files
Merge branch '4.4' into 5.0
* 4.4: 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 818b758 + f33a28e commit 9263d52

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
@@ -245,10 +245,10 @@ public function testTags()
245245
$def->addTag('foo', ['foo' => 'bar']);
246246
$this->assertEquals([[], ['foo' => 'bar']], $def->getTag('foo'), '->addTag() can adds the same tag several times');
247247
$def->addTag('bar', ['bar' => 'bar']);
248-
$this->assertEquals($def->getTags(), [
248+
$this->assertEquals([
249249
'foo' => [[], ['foo' => 'bar']],
250250
'bar' => [['bar' => 'bar']],
251-
], '->getTags() returns all tags');
251+
], $def->getTags(), '->getTags() returns all tags');
252252
}
253253

254254
public function testSetArgument()

0 commit comments

Comments
 (0)