[Routing] Fix ContainerLoader and ObjectLoaderTest

fancyweb · fancyweb · commit 81f13f141dcb · 2019-11-18T09:50:27.000+01:00
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/Tests/Loader/ObjectLoaderTest.php b/src/Symfony/Component/Routing/Tests/Loader/ObjectLoaderTest.php
@@ -62,9 +62,6 @@ public function getBadResourceStrings()
         ];
     }
 
-    /**
-     * @group legacy
-     */
     public function testExceptionOnNoObjectReturned()
     {
         $this->expectException('LogicException');
@@ -106,6 +103,11 @@ public function supports($resource, string $type = null): bool
         return 'service';
     }
 
+    /**
+     * {@inheritdoc}
+     *
+     * @return object
+     */
     protected function getObject(string $id)
     {
         return $this->loaderMap[$id] ?? null;

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
`@@ -62,9 +62,6 @@ public function getBadResourceStrings()`
`62`	`62`	`];`
`63`	`63`	`}`
`64`	`64`
`65`		`- /**`
`66`		`- * @group legacy`
`67`		`- */`
`68`	`65`	`public function testExceptionOnNoObjectReturned()`
`69`	`66`	`{`
`70`	`67`	`$this->expectException('LogicException');`
`@@ -106,6 +103,11 @@ public function supports($resource, string $type = null): bool`
`106`	`103`	`return 'service';`
`107`	`104`	`}`
`108`	`105`
	`106`	`+ /**`
	`107`	`+ * {@inheritdoc}`
	`108`	`+ *`
	`109`	`+ * @return object`
	`110`	`+ */`
`109`	`111`	`protected function getObject(string $id)`
`110`	`112`	`{`
`111`	`113`	`return $this->loaderMap[$id] ?? null;`