fix merge

nicolas-grekas · nicolas-grekas · commit 058429542af0 · 2021-09-10T14:46:58.000+02:00
diff --git a/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php b/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php
@@ -397,7 +397,7 @@ public function testAlias()
         $pass->process($container);
 
         $locator = $container->getDefinition((string) $resolver->getArgument(0))->getArgument(0);
-        $this->assertSame([RegisterTestController::class.'::fooAction', 'foo::fooAction'], array_keys($locator));
+        $this->assertEqualsCanonicalizing([RegisterTestController::class.'::fooAction', 'foo::fooAction'], array_keys($locator));
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -397,7 +397,7 @@ public function testAlias()`
`397`	`397`	`$pass->process($container);`
`398`	`398`
`399`	`399`	`$locator = $container->getDefinition((string) $resolver->getArgument(0))->getArgument(0);`
`400`		`- $this->assertSame([RegisterTestController::class.'::fooAction', 'foo::fooAction'], array_keys($locator));`
	`400`	`+ $this->assertEqualsCanonicalizing([RegisterTestController::class.'::fooAction', 'foo::fooAction'], array_keys($locator));`
`401`	`401`	`}`
`402`	`402`
`403`	`403`	`/**`