Renaming abstract method and going back to the key "service" as the type

weaverryan · weaverryan · commit c9e31aa39e93 · 2015-09-29T23:24:15.000-04:00
diff --git a/src/Symfony/Component/Routing/Loader/DependencyInjection/ServiceRouterLoader.php b/src/Symfony/Component/Routing/Loader/DependencyInjection/ServiceRouterLoader.php
@@ -37,7 +37,7 @@ public function __construct(ContainerInterface $container)
         $this->container = $container;
     }
 
-    protected function getRouteLoader($id)
+    protected function getRouteLoaderService($id)
     {
         return $this->container->get($id);
     }
diff --git a/src/Symfony/Component/Routing/Loader/ObjectRouteLoader.php b/src/Symfony/Component/Routing/Loader/ObjectRouteLoader.php
@@ -32,7 +32,7 @@ abstract class ObjectRouteLoader extends Loader
      */
     public function load($resource, $type = null)
     {
-        $routeLoader = $this->getRouteLoader($resource);
+        $routeLoader = $this->getRouteLoaderService($resource);
 
         if (!$routeLoader instanceof RouteLoaderInterface) {
             throw new \LogicException(sprintf('Service "%s" must implement RouteLoaderInterface.', $resource));
@@ -53,7 +53,7 @@ public function load($resource, $type = null)
      */
     public function supports($resource, $type = null)
     {
-        return 'object' === $type;
+        return 'service' === $type;
     }
 
     /**
@@ -65,7 +65,7 @@ public function supports($resource, $type = null)
      * @param string $id
      * @return RouteLoaderInterface
      */
-    abstract protected function getRouteLoader($id);
+    abstract protected function getRouteLoaderService($id);
 
     private function addClassResource(\ReflectionClass $class, RouteCollection $collection)
     {
diff --git a/src/Symfony/Component/Routing/Tests/Loader/ObjectRouteLoaderTest.php b/src/Symfony/Component/Routing/Tests/Loader/ObjectRouteLoaderTest.php
@@ -66,7 +66,7 @@ class ObjectRouteLoaderForTest extends ObjectRouteLoader
 {
     public $loaderMap = array();
 
-    protected function getRouteLoader($id)
+    protected function getRouteLoaderService($id)
     {
         return isset($this->loaderMap[$id]) ? $this->loaderMap[$id] : null;
     }

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public function __construct(ContainerInterface $container)`
`37`	`37`	`$this->container = $container;`
`38`	`38`	`}`
`39`	`39`
`40`		`- protected function getRouteLoader($id)`
	`40`	`+ protected function getRouteLoaderService($id)`
`41`	`41`	`{`
`42`	`42`	`return $this->container->get($id);`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ abstract class ObjectRouteLoader extends Loader`
`32`	`32`	`*/`
`33`	`33`	`public function load($resource, $type = null)`
`34`	`34`	`{`
`35`		`- $routeLoader = $this->getRouteLoader($resource);`
	`35`	`+ $routeLoader = $this->getRouteLoaderService($resource);`
`36`	`36`
`37`	`37`	`if (!$routeLoader instanceof RouteLoaderInterface) {`
`38`	`38`	`throw new \LogicException(sprintf('Service "%s" must implement RouteLoaderInterface.', $resource));`
`@@ -53,7 +53,7 @@ public function load($resource, $type = null)`
`53`	`53`	`*/`
`54`	`54`	`public function supports($resource, $type = null)`
`55`	`55`	`{`
`56`		`- return 'object' === $type;`
	`56`	`+ return 'service' === $type;`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`/**`
`@@ -65,7 +65,7 @@ public function supports($resource, $type = null)`
`65`	`65`	`* @param string $id`
`66`	`66`	`* @return RouteLoaderInterface`
`67`	`67`	`*/`
`68`		`- abstract protected function getRouteLoader($id);`
	`68`	`+ abstract protected function getRouteLoaderService($id);`
`69`	`69`
`70`	`70`	`private function addClassResource(\ReflectionClass $class, RouteCollection $collection)`
`71`	`71`	`{`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ class ObjectRouteLoaderForTest extends ObjectRouteLoader`
`66`	`66`	`{`
`67`	`67`	`public $loaderMap = array();`
`68`	`68`
`69`		`- protected function getRouteLoader($id)`
	`69`	`+ protected function getRouteLoaderService($id)`
`70`	`70`	`{`
`71`	`71`	`return isset($this->loaderMap[$id]) ? $this->loaderMap[$id] : null;`
`72`	`72`	`}`