bug #34434 [Routing] Fix ContainerLoader and ObjectLoaderTest (fancyweb)

fabpot · fabpot · commit 123c84a9dd12 · 2019-11-19T06:52:41.000+01:00
This PR was merged into the 5.0 branch. Discussion ---------- [Routing] Fix ContainerLoader and ObjectLoaderTest | Q | A | ------------- | --- | Branch? | master | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - Commits ------- 0e5db6a [Routing] Fix ContainerLoader and ObjectLoaderTest
diff --git a/src/Symfony/Component/Routing/Loader/ContainerLoader.php b/src/Symfony/Component/Routing/Loader/ContainerLoader.php
@@ -30,7 +30,7 @@ public function __construct(ContainerInterface $container)
     /**
      * {@inheritdoc}
      */
-    public function supports($resource, $type = null)
+    public function supports($resource, string $type = null)
     {
         return 'service' === $type;
     }
diff --git a/src/Symfony/Component/Routing/Loader/ObjectLoader.php b/src/Symfony/Component/Routing/Loader/ObjectLoader.php
@@ -52,7 +52,7 @@ public function load($resource, string $type = null)
         $loaderObject = $this->getObject($parts[0]);
 
         if (!\is_object($loaderObject)) {
-            throw new \LogicException(sprintf('%s:getObject() must return an object: %s returned', \get_class($this), \gettype($loaderObject)));
+            throw new \TypeError(sprintf('%s:getObject() must return an object: %s returned', \get_class($this), \gettype($loaderObject)));
         }
 
         if (!\is_callable([$loaderObject, $method])) {
diff --git a/src/Symfony/Component/Routing/Tests/Loader/ObjectLoaderTest.php b/src/Symfony/Component/Routing/Tests/Loader/ObjectLoaderTest.php
@@ -62,12 +62,9 @@ public function getBadResourceStrings()
         ];
     }
 
-    /**
-     * @group legacy
-     */
     public function testExceptionOnNoObjectReturned()
     {
-        $this->expectException('LogicException');
+        $this->expectException(\TypeError::class);
         $loader = new TestObjectLoader();
         $loader->loaderMap = ['my_service' => 'NOT_AN_OBJECT'];
         $loader->load('my_service::method');

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public function __construct(ContainerInterface $container)`
`30`	`30`	`/**`
`31`	`31`	`* {@inheritdoc}`
`32`	`32`	`*/`
`33`		`- public function supports($resource, $type = null)`
	`33`	`+ public function supports($resource, string $type = null)`
`34`	`34`	`{`
`35`	`35`	`return 'service' === $type;`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public function load($resource, string $type = null)`
`52`	`52`	`$loaderObject = $this->getObject($parts[0]);`
`53`	`53`
`54`	`54`	`if (!\is_object($loaderObject)) {`
`55`		`- throw new \LogicException(sprintf('%s:getObject() must return an object: %s returned', \get_class($this), \gettype($loaderObject)));`
	`55`	`+ throw new \TypeError(sprintf('%s:getObject() must return an object: %s returned', \get_class($this), \gettype($loaderObject)));`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`if (!\is_callable([$loaderObject, $method])) {`
Original file line number	Diff line number	Diff line change
`@@ -62,12 +62,9 @@ public function getBadResourceStrings()`
`62`	`62`	`];`
`63`	`63`	`}`
`64`	`64`
`65`		`- /**`
`66`		`- * @group legacy`
`67`		`- */`
`68`	`65`	`public function testExceptionOnNoObjectReturned()`
`69`	`66`	`{`
`70`		`- $this->expectException('LogicException');`
	`67`	`+ $this->expectException(\TypeError::class);`
`71`	`68`	`$loader = new TestObjectLoader();`
`72`	`69`	`$loader->loaderMap = ['my_service' => 'NOT_AN_OBJECT'];`
`73`	`70`	`$loader->load('my_service::method');`