Merge branch '6.0' into 6.1

fabpot · fabpot · commit 1410129e36e5 · 2022-07-20T15:46:29.000+02:00
* 6.0:
  Fix CS
  Fix CS
diff --git a/Tests/DependencyInjection/CompleteConfigurationTest.php b/Tests/DependencyInjection/CompleteConfigurationTest.php
@@ -607,7 +607,7 @@ public function testDefaultAccessDecisionManagerStrategyIsAffirmative()
     {
         $container = $this->getContainer('access_decision_manager_default_strategy');
 
-        $this->assertEquals((new Definition(AffirmativeStrategy::class, [false])), $container->getDefinition('security.access.decision_manager')->getArgument(1), 'Default vote strategy is affirmative');
+        $this->assertEquals(new Definition(AffirmativeStrategy::class, [false]), $container->getDefinition('security.access.decision_manager')->getArgument(1), 'Default vote strategy is affirmative');
     }
 
     public function testCustomAccessDecisionManagerService()
@@ -630,7 +630,7 @@ public function testAccessDecisionManagerOptionsAreNotOverriddenByImplicitStrate
 
         $accessDecisionManagerDefinition = $container->getDefinition('security.access.decision_manager');
 
-        $this->assertEquals((new Definition(AffirmativeStrategy::class, [true])), $accessDecisionManagerDefinition->getArgument(1));
+        $this->assertEquals(new Definition(AffirmativeStrategy::class, [true]), $accessDecisionManagerDefinition->getArgument(1));
     }
 
     public function testAccessDecisionManagerWithStrategyService()

Original file line number	Diff line number	Diff line change
`@@ -607,7 +607,7 @@ public function testDefaultAccessDecisionManagerStrategyIsAffirmative()`
`607`	`607`	`{`
`608`	`608`	`$container = $this->getContainer('access_decision_manager_default_strategy');`
`609`	`609`
`610`		`- $this->assertEquals((new Definition(AffirmativeStrategy::class, [false])), $container->getDefinition('security.access.decision_manager')->getArgument(1), 'Default vote strategy is affirmative');`
	`610`	`+ $this->assertEquals(new Definition(AffirmativeStrategy::class, [false]), $container->getDefinition('security.access.decision_manager')->getArgument(1), 'Default vote strategy is affirmative');`
`611`	`611`	`}`
`612`	`612`
`613`	`613`	`public function testCustomAccessDecisionManagerService()`
`@@ -630,7 +630,7 @@ public function testAccessDecisionManagerOptionsAreNotOverriddenByImplicitStrate`
`630`	`630`
`631`	`631`	`$accessDecisionManagerDefinition = $container->getDefinition('security.access.decision_manager');`
`632`	`632`
`633`		`- $this->assertEquals((new Definition(AffirmativeStrategy::class, [true])), $accessDecisionManagerDefinition->getArgument(1));`
	`633`	`+ $this->assertEquals(new Definition(AffirmativeStrategy::class, [true]), $accessDecisionManagerDefinition->getArgument(1));`
`634`	`634`	`}`
`635`	`635`
`636`	`636`	`public function testAccessDecisionManagerWithStrategyService()`