Skip to content

Commit

Permalink
Merge branch '3.4' into 4.4
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
nicolas-grekas committed Jul 23, 2020
2 parents 8726b37 + e91bf2b commit f33a28e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions Tests/ContainerBuilderTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -879,12 +879,12 @@ public function testfindTaggedServiceIds()
->addTag('bar', ['bar' => 'bar'])
->addTag('foo', ['foofoo' => 'foofoo'])
;
$this->assertEquals($builder->findTaggedServiceIds('foo'), [
$this->assertEquals([
'foo' => [
['foo' => 'foo'],
['foofoo' => 'foofoo'],
],
], '->findTaggedServiceIds() returns an array of service ids and its tag attributes');
], $builder->findTaggedServiceIds('foo'), '->findTaggedServiceIds() returns an array of service ids and its tag attributes');
$this->assertEquals([], $builder->findTaggedServiceIds('foobar'), '->findTaggedServiceIds() returns an empty array if there is annotated services');
}

Expand Down
4 changes: 2 additions & 2 deletions Tests/DefinitionTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -280,10 +280,10 @@ public function testTags()
$def->addTag('foo', ['foo' => 'bar']);
$this->assertEquals([[], ['foo' => 'bar']], $def->getTag('foo'), '->addTag() can adds the same tag several times');
$def->addTag('bar', ['bar' => 'bar']);
$this->assertEquals($def->getTags(), [
$this->assertEquals([
'foo' => [[], ['foo' => 'bar']],
'bar' => [['bar' => 'bar']],
], '->getTags() returns all tags');
], $def->getTags(), '->getTags() returns all tags');
}

public function testSetArgument()
Expand Down

0 comments on commit f33a28e

Please sign in to comment.