Merge branch '5.1' into 5.2

nicolas-grekas · nicolas-grekas · commit 8931b1d56542 · 2021-01-04T18:59:10.000+01:00
* 5.1:
  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
  propagate groups to nested constraints
diff --git a/Tests/Loader/ObjectLoaderTest.php b/Tests/Loader/ObjectLoaderTest.php
@@ -43,7 +43,7 @@ public function testLoadCallsServiceAndReturnsCollection()
     /**
      * @dataProvider getBadResourceStrings
      */
-    public function testExceptionWithoutSyntax(string $resourceString): void
+    public function testExceptionWithoutSyntax(string $resourceString)
     {
         $this->expectException('InvalidArgumentException');
         $loader = new TestObjectLoader();

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public function testLoadCallsServiceAndReturnsCollection()`
`43`	`43`	`/**`
`44`	`44`	`* @dataProvider getBadResourceStrings`
`45`	`45`	`*/`
`46`		`- public function testExceptionWithoutSyntax(string $resourceString): void`
	`46`	`+ public function testExceptionWithoutSyntax(string $resourceString)`
`47`	`47`	`{`
`48`	`48`	`$this->expectException('InvalidArgumentException');`
`49`	`49`	`$loader = new TestObjectLoader();`