Skip to content

Commit 7e7faf2

Browse files
committed
Merge branch '2.8' into 3.2
* 2.8: [2.8] Prevent double registrations related to tag priorities Prevent double registrations related to tag priorities
2 parents 1988233 + 3dbdfc6 commit 7e7faf2

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

Tests/DependencyInjection/Compiler/PropertyInfoPassTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ class PropertyInfoPassTest extends TestCase
2020
public function testServicesAreOrderedAccordingToPriority()
2121
{
2222
$services = array(
23-
'n3' => array('tag' => array()),
24-
'n1' => array('tag' => array('priority' => 200)),
25-
'n2' => array('tag' => array('priority' => 100)),
23+
'n3' => array(array()),
24+
'n1' => array(array('priority' => 200)),
25+
'n2' => array(array('priority' => 100)),
2626
);
2727

2828
$expected = array(

Tests/DependencyInjection/Compiler/SerializerPassTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,9 @@ public function testThrowExceptionWhenNoEncoders()
7272
public function testServicesAreOrderedAccordingToPriority()
7373
{
7474
$services = array(
75-
'n3' => array('tag' => array()),
76-
'n1' => array('tag' => array('priority' => 200)),
77-
'n2' => array('tag' => array('priority' => 100)),
75+
'n3' => array(array()),
76+
'n1' => array(array('priority' => 200)),
77+
'n2' => array(array('priority' => 100)),
7878
);
7979

8080
$expected = array(

0 commit comments

Comments
 (0)