Added CHANGELOG entries, cleanups

nicolas-grekas · nicolas-grekas · commit 60b1c5b5aa1b · 2015-06-02T16:18:00.000-07:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/routing.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/routing.xml
@@ -12,7 +12,6 @@
         <parameter key="routing.loader.xml.class">Symfony\Component\Routing\Loader\XmlFileLoader</parameter>
         <parameter key="routing.loader.yml.class">Symfony\Component\Routing\Loader\YamlFileLoader</parameter>
         <parameter key="routing.loader.php.class">Symfony\Component\Routing\Loader\PhpFileLoader</parameter>
-        <parameter key="routing.loader.directory.class">Symfony\Component\Routing\Loader\DirectoryLoader</parameter>
         <parameter key="router.options.generator_class">Symfony\Component\Routing\Generator\UrlGenerator</parameter>
         <parameter key="router.options.generator_base_class">Symfony\Component\Routing\Generator\UrlGenerator</parameter>
         <parameter key="router.options.generator_dumper_class">Symfony\Component\Routing\Generator\Dumper\PhpGeneratorDumper</parameter>
@@ -46,7 +45,7 @@
             <argument type="service" id="file_locator" />
         </service>
 
-        <service id="routing.loader.directory" class="%routing.loader.directory.class%" public="false">
+        <service id="routing.loader.directory" class="Symfony\Component\Routing\Loader\DirectoryLoader" public="false">
             <tag name="routing.loader" />
             <argument type="service" id="file_locator" />
         </service>
diff --git a/src/Symfony/Component/DependencyInjection/CHANGELOG.md b/src/Symfony/Component/DependencyInjection/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
 -----
 
diff --git a/src/Symfony/Component/DependencyInjection/Loader/DirectoryLoader.php b/src/Symfony/Component/DependencyInjection/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);
     }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Loader/DirectoryLoaderTest.php b/src/Symfony/Component/DependencyInjection/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');
diff --git a/src/Symfony/Component/HttpKernel/composer.json b/src/Symfony/Component/HttpKernel/composer.json
@@ -34,7 +34,7 @@
         "symfony/expression-language": "~2.4|~3.0.0",
         "symfony/finder": "~2.0,>=2.0.5|~3.0.0",
         "symfony/process": "~2.0,>=2.0.5|~3.0.0",
-        "symfony/routing": "~2.7|~3.0.0",
+        "symfony/routing": "~2.8|~3.0.0",
         "symfony/stopwatch": "~2.3|~3.0.0",
         "symfony/templating": "~2.2|~3.0.0",
         "symfony/translation": "~2.0,>=2.0.5|~3.0.0",
diff --git a/src/Symfony/Component/Routing/CHANGELOG.md b/src/Symfony/Component/Routing/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+2.8.0
+-----
+
+ * allowed specifying a directory to recursively load all routing configuration files it contains
+
 2.5.0
 -----
 
diff --git a/src/Symfony/Component/Routing/Loader/DirectoryLoader.php b/src/Symfony/Component/Routing/Loader/DirectoryLoader.php
@@ -28,7 +28,7 @@ public function load($file, $type = null)
         $collection->addResource(new DirectoryResource($path));
 
         foreach (scandir($path) as $dir) {
-            if ($dir[0] !== '.') {
+            if ('.' !== $dir[0]) {
                 $this->setCurrentDir($path);
                 $subPath = $path.'/'.$dir;
                 $subType = null;
diff --git a/src/Symfony/Component/Routing/Tests/Loader/DirectoryLoaderTest.php b/src/Symfony/Component/Routing/Tests/Loader/DirectoryLoaderTest.php
@@ -58,7 +58,7 @@ private function verifyCollection(RouteCollection $collection)
         $this->assertContainsOnly('Symfony\Component\Routing\Route', $routes);
 
         for ($i = 1; $i <= 3; $i++) {
-            $this->assertSame('/route/'.$i, $routes["route".$i]->getPath());
+            $this->assertSame('/route/'.$i, $routes['route'.$i]->getPath());
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`use Symfony\Component\Config\Resource\DirectoryResource;`
`15`	`15`
`16`	`16`	`/**`
`17`		`- * DirectoryLoader is a recursive loader to go through directories`
	`17`	`+ * DirectoryLoader is a recursive loader to go through directories.`
`18`	`18`	`*`
`19`	`19`	`* @author Sebastien Lavoie <[email protected]>`
`20`	`20`	`*/`
`@@ -30,7 +30,7 @@ public function load($file, $type = null)`
`30`	`30`	`$this->container->addResource(new DirectoryResource($path));`
`31`	`31`
`32`	`32`	`foreach (scandir($path) as $dir) {`
`33`		`- if ($dir[0] !== '.') {`
	`33`	`+ if ('.' !== $dir[0]) {`
`34`	`34`	`if (is_dir($path.'/'.$dir)) {`
`35`	`35`	`$dir .= '/'; // append / to allow recursion`
`36`	`36`	`}`
`@@ -51,10 +51,6 @@ public function supports($resource, $type = null)`
`51`	`51`	`return true;`
`52`	`52`	`}`
`53`	`53`
`54`		`- if (null === $type) {`
`55`		`- return preg_match('/\/$/', $resource) === 1;`
`56`		`- }`
`57`		`-`
`58`		`- return false;`
	`54`	`+ return null === $type && is_string($resource) && '/' === substr($resource, -1);`
`59`	`55`	`}`
`60`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ private function verifyCollection(RouteCollection $collection)`
`58`	`58`	`$this->assertContainsOnly('Symfony\Component\Routing\Route', $routes);`
`59`	`59`
`60`	`60`	`for ($i = 1; $i <= 3; $i++) {`
`61`		`- $this->assertSame('/route/'.$i, $routes["route".$i]->getPath());`
	`61`	`+ $this->assertSame('/route/'.$i, $routes['route'.$i]->getPath());`
`62`	`62`	`}`
`63`	`63`	`}`
`64`	`64`