Added CHANGELOG entries, cleanups

Author: nicolas-grekas

CHANGELOG.md

@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+2.8.0
+-----
+
+ * allowed specifying a directory to recursively load all configuration files it contains
+
 2.7.0
 -----
 

Loader/DirectoryLoader.php

@@ -14,7 +14,7 @@
 use Symfony\Component\Config\Resource\DirectoryResource;
 
 /**
- * DirectoryLoader is a recursive loader to go through directories
+ * DirectoryLoader is a recursive loader to go through directories.
  *
  * @author Sebastien Lavoie <seb@wemakecustom.com>
  */
@@ -30,7 +30,7 @@ public function load($file, $type = null)
         $this->container->addResource(new DirectoryResource($path));
 
         foreach (scandir($path) as $dir) {
-            if ($dir[0] !== '.') {
+            if ('.' !== $dir[0]) {
                 if (is_dir($path.'/'.$dir)) {
                     $dir .= '/'; // append / to allow recursion
                 }
@@ -51,10 +51,6 @@ public function supports($resource, $type = null)
             return true;
         }
 
-        if (null === $type) {
-            return preg_match('/\/$/', $resource) === 1;
-        }
-
-        return false;
+        return null === $type && is_string($resource) && '/' === substr($resource, -1);
     }
 }

Tests/Loader/DirectoryLoaderTest.php

@@ -58,9 +58,6 @@ public function testImports()
     }
 
     /**
-     * @covers Symfony\Component\DependencyInjection\Loader\DirectoryLoader::__construct
-     * @covers Symfony\Component\DependencyInjection\Loader\DirectoryLoader::load
-     *
      * @expectedException        \InvalidArgumentException
      * @expectedExceptionMessage The file "foo" does not exist (in:
      */
@@ -69,12 +66,9 @@ public function testExceptionIsRaisedWhenDirectoryDoesNotExist()
         $this->loader->load('foo/');
     }
 
-    /**
-     * @covers Symfony\Component\DependencyInjection\Loader\DirectoryLoader::supports
-     */
     public function testSupports()
     {
-        $loader  = new DirectoryLoader(new ContainerBuilder(), new FileLocator());
+        $loader = new DirectoryLoader(new ContainerBuilder(), new FileLocator());
 
         $this->assertTrue($loader->supports('directory/'), '->supports("directory/") returns true');
         $this->assertTrue($loader->supports('directory/', 'directory'), '->supports("directory/", "directory") returns true');