feature #21854 [Router] Follow symlinks and skip dots in the annotation directory loader (jakzal)

fabpot · fabpot · commit f9d0d3d35acb · 2017-03-03T07:20:25.000-08:00
This PR was merged into the 3.3-dev branch. Discussion ---------- [Router] Follow symlinks and skip dots in the annotation directory loader | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | yes | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Following #21833, this change will make the `AnnotationDirectoryLoader` consistent with other loaders.  Commits ------- 3441140 [Router] Follow symlinks and skip dots in the annotation directory loader
diff --git a/src/Symfony/Component/Routing/Loader/AnnotationDirectoryLoader.php b/src/Symfony/Component/Routing/Loader/AnnotationDirectoryLoader.php
@@ -40,7 +40,7 @@ public function load($path, $type = null)
         $collection->addResource(new DirectoryResource($dir, '/\.php$/'));
         $files = iterator_to_array(new \RecursiveIteratorIterator(
             new \RecursiveCallbackFilterIterator(
-                new \RecursiveDirectoryIterator($dir),
+                new \RecursiveDirectoryIterator($dir, \FilesystemIterator::SKIP_DOTS | \FilesystemIterator::FOLLOW_SYMLINKS),
                 function (\SplFileInfo $current) {
                     return '.' !== substr($current->getBasename(), 0, 1);
                 }

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public function load($path, $type = null)`
`40`	`40`	`$collection->addResource(new DirectoryResource($dir, '/\.php$/'));`
`41`	`41`	`$files = iterator_to_array(new \RecursiveIteratorIterator(`
`42`	`42`	`new \RecursiveCallbackFilterIterator(`
`43`		`- new \RecursiveDirectoryIterator($dir),`
	`43`	`+ new \RecursiveDirectoryIterator($dir, \FilesystemIterator::SKIP_DOTS \| \FilesystemIterator::FOLLOW_SYMLINKS),`
`44`	`44`	`function (\SplFileInfo $current) {`
`45`	`45`	`return '.' !== substr($current->getBasename(), 0, 1);`
`46`	`46`	`}`