Merge pull request #1349 from xabbuh/pr-1339

some tweaks to the directory route loader

Author: lsmith77

Routing/Loader/DirectoryRouteLoader.php

@@ -12,6 +12,7 @@
 namespace FOS\RestBundle\Routing\Loader;
 
 use Symfony\Component\Config\Loader\Loader;
+use Symfony\Component\Finder\Finder;
 use Symfony\Component\Routing\RouteCollection;
 
 /**
@@ -39,14 +40,10 @@ public function load($resource, $type = null)
 
         $collection = new RouteCollection();
 
-        $directoryIterator = new \DirectoryIterator($resource);
+        $finder = new Finder();
 
-        foreach ($directoryIterator as $file) {
-            if ($file->getFilename() === '.' || $file->getFilename() === '..') {
-                continue;
-            }
-
-            $imported = $this->processor->importResource($this, ClassUtils::findClassInFile($file->getPathname()), array(), null, null, 'rest');
+        foreach ($finder->in($resource)->name('*.php')->files() as $file) {
+            $imported = $this->processor->importResource($this, ClassUtils::findClassInFile($file), array(), null, null, 'rest');
             $collection->addCollection($imported);
         }
 

Routing/Loader/RestRouteLoader.php

@@ -162,7 +162,7 @@ private function getControllerLocator($controller)
      */
     protected function findClass($file)
     {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 1.8 and will be removed in 2.0. Use '.__NAMESPACE__.'\ClassUtils::findClassInFile() instead.', E_USER_DEPRECATED);
+        @trigger_error(sprintf('The %s method is deprecated since version 1.8 and will be removed in 2.0.', __METHOD__), E_USER_DEPRECATED);
 
         return ClassUtils::findClassInFile($file);
     }

Tests/Routing/Loader/DirectoryRouteLoaderTest.php

@@ -23,15 +23,9 @@ public function testLoad()
 
         $this->assertCount(9, $collection);
 
-        $this->assertInstanceOf('Symfony\Component\Routing\Route', $collection->get('get_users'));
-        $this->assertInstanceOf('Symfony\Component\Routing\Route', $collection->get('get_user'));
-        $this->assertInstanceOf('Symfony\Component\Routing\Route', $collection->get('post_users'));
-        $this->assertInstanceOf('Symfony\Component\Routing\Route', $collection->get('put_user'));
-        $this->assertInstanceOf('Symfony\Component\Routing\Route', $collection->get('get_comments'));
-        $this->assertInstanceOf('Symfony\Component\Routing\Route', $collection->get('put_comment'));
-        $this->assertInstanceOf('Symfony\Component\Routing\Route', $collection->get('get_topics'));
-        $this->assertInstanceOf('Symfony\Component\Routing\Route', $collection->get('get_topic'));
-        $this->assertInstanceOf('Symfony\Component\Routing\Route', $collection->get('put_topic'));
+        foreach ($collection as $route) {
+            $this->assertInstanceOf('Symfony\Component\Routing\Route', $route);
+        }
     }
 
     /**

composer.json

@@ -23,6 +23,7 @@
     "require": {
         "php":                            "^5.3.9|~7.0",
         "psr/log":                        "~1.0",
+        "symfony/finder":                 "~2.3|~3.0",
         "symfony/framework-bundle":       "~2.3|~3.0",
         "symfony/http-kernel":            "^2.3.24|~3.0",
         "doctrine/inflector":             "~1.0",