Merge branch '5.1' into 5.2

OskarStark · OskarStark · commit 074b362bbd9a · 2021-01-25T17:23:41.000+01:00
* 5.1:
  Fix typo in test
diff --git a/Tests/Routing/DelegatingLoaderTest.php b/Tests/Routing/DelegatingLoaderTest.php
@@ -15,7 +15,7 @@ class DelegatingLoaderTest extends TestCase
     public function testConstructorApi()
     {
         new DelegatingLoader(new LoaderResolver());
-        $this->assertTrue(true, '__construct() takeS a LoaderResolverInterface as its first argument.');
+        $this->assertTrue(true, '__construct() takes a LoaderResolverInterface as its first argument.');
     }
 
     public function testLoadDefaultOptions()

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ class DelegatingLoaderTest extends TestCase`
`15`	`15`	`public function testConstructorApi()`
`16`	`16`	`{`
`17`	`17`	`new DelegatingLoader(new LoaderResolver());`
`18`		`- $this->assertTrue(true, '__construct() takeS a LoaderResolverInterface as its first argument.');`
	`18`	`+ $this->assertTrue(true, '__construct() takes a LoaderResolverInterface as its first argument.');`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`public function testLoadDefaultOptions()`