Merge branch '4.4' into 5.1

xabbuh · xabbuh · commit 2b347dd7e873 · 2021-01-04T18:34:17.000+01:00
* 4.4:
  Cleanup CI scripts
  fix code style
  fix code style
  take query and request parameters into account when matching routes
  mistake
  fix tests to run assertions on returned Crawler instances
diff --git a/Tests/DataCollector/SecurityDataCollectorTest.php b/Tests/DataCollector/SecurityDataCollectorTest.php
@@ -313,7 +313,7 @@ public function providerCollectDecisionLog(): \Generator
      *
      * @dataProvider providerCollectDecisionLog
      */
-    public function testCollectDecisionLog(string $strategy, array $decisionLog, array $voters, array $expectedVoterClasses, array $expectedDecisionLog): void
+    public function testCollectDecisionLog(string $strategy, array $decisionLog, array $voters, array $expectedVoterClasses, array $expectedDecisionLog)
     {
         $accessDecisionManager = $this
             ->getMockBuilder(TraceableAccessDecisionManager::class)

Original file line number	Diff line number	Diff line change
`@@ -313,7 +313,7 @@ public function providerCollectDecisionLog(): \Generator`
`313`	`313`	`*`
`314`	`314`	`* @dataProvider providerCollectDecisionLog`
`315`	`315`	`*/`
`316`		`- public function testCollectDecisionLog(string $strategy, array $decisionLog, array $voters, array $expectedVoterClasses, array $expectedDecisionLog): void`
	`316`	`+ public function testCollectDecisionLog(string $strategy, array $decisionLog, array $voters, array $expectedVoterClasses, array $expectedDecisionLog)`
`317`	`317`	`{`
`318`	`318`	`$accessDecisionManager = $this`
`319`	`319`	`->getMockBuilder(TraceableAccessDecisionManager::class)`