minor #42968 [HttpKernel] Relax service locator tests. Allow any order (BoShurik)

fabpot · fabpot · commit 4f1e0ddb93f1 · 2021-09-10T09:21:45.000+02:00
This PR was merged into the 4.4 branch. Discussion ---------- [HttpKernel] Relax service locator tests. Allow any order | Q | A | ------------- | --- | Branch? | 4.4  | Bug fix? | no | New feature? | no  | Deprecations? | no  | Tickets | Fix #42532 tests  | License | MIT | Doc PR | symfony/symfony-docs#...   Commits ------- 48f830a Relax service locator tests. Allow any order
diff --git a/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php b/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php
@@ -236,7 +236,8 @@ public function testNoExceptionOnNonExistentTypeHintOptionalArg()
         $pass->process($container);
 
         $locator = $container->getDefinition((string) $resolver->getArgument(0))->getArgument(0);
-        $this->assertSame(['foo::barAction', 'foo::fooAction'], array_keys($locator));
+
+        $this->assertEqualsCanonicalizing(['foo::barAction', 'foo::fooAction'], array_keys($locator));
     }
 
     public function testArgumentWithNoTypeHintIsOk()
diff --git a/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RemoveEmptyControllerArgumentLocatorsPassTest.php b/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RemoveEmptyControllerArgumentLocatorsPassTest.php
@@ -57,7 +57,7 @@ public function testProcess()
             'Symfony\Component\HttpKernel\DependencyInjection\RemoveEmptyControllerArgumentLocatorsPass: Removing method "setTestCase" of service "c2" from controller candidates: the method is called at instantiation, thus cannot be an action.',
         ];
 
-        $this->assertSame($expectedLog, $container->getCompiler()->getLog());
+        $this->assertEqualsCanonicalizing($expectedLog, $container->getCompiler()->getLog());
     }
 
     public function testInvoke()

Original file line number	Diff line number	Diff line change
`@@ -236,7 +236,8 @@ public function testNoExceptionOnNonExistentTypeHintOptionalArg()`
`236`	`236`	`$pass->process($container);`
`237`	`237`
`238`	`238`	`$locator = $container->getDefinition((string) $resolver->getArgument(0))->getArgument(0);`
`239`		`- $this->assertSame(['foo::barAction', 'foo::fooAction'], array_keys($locator));`
	`239`	`+`
	`240`	`+ $this->assertEqualsCanonicalizing(['foo::barAction', 'foo::fooAction'], array_keys($locator));`
`240`	`241`	`}`
`241`	`242`
`242`	`243`	`public function testArgumentWithNoTypeHintIsOk()`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public function testProcess()`
`57`	`57`	`'Symfony\Component\HttpKernel\DependencyInjection\RemoveEmptyControllerArgumentLocatorsPass: Removing method "setTestCase" of service "c2" from controller candidates: the method is called at instantiation, thus cannot be an action.',`
`58`	`58`	`];`
`59`	`59`
`60`		`- $this->assertSame($expectedLog, $container->getCompiler()->getLog());`
	`60`	`+ $this->assertEqualsCanonicalizing($expectedLog, $container->getCompiler()->getLog());`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`public function testInvoke()`