PHPCS will now follow symlinks under the list of checked directories (ref #1438)

gsherwood · gsherwood · commit edcca453f892 · 2017-08-09T13:04:04.000+10:00
diff --git a/package.xml b/package.xml
@@ -36,6 +36,8 @@ http://pear.php.net/dtd/package-2.0.xsd">
     -- Previously, a file had to be in each of the include patterns to be processed by a sniff
     -- Now, a file has to only be in at least one of the patterns
     -- This change reflects the original intention of the feature
+  - PHPCS will now follow symlinks under the list of checked directories
+    -- This previously only worked if you specified the path to a symlink on the command line
   - Comment tokens that start with /** are now always tokenized as docblocks
     -- Thanks to Michał Bundyra for the patch
   - The PHP-supplied T_YIELD and T_YIELD_FROM token have been replicated for older PHP versions
diff --git a/src/Files/FileList.php b/src/Files/FileList.php
@@ -78,7 +78,7 @@ public function __construct(Config $config, Ruleset $ruleset)
 
                 $filterClass = $this->getFilterClass();
 
-                $di       = new \RecursiveDirectoryIterator($path, \RecursiveDirectoryIterator::SKIP_DOTS);
+                $di       = new \RecursiveDirectoryIterator($path, \RecursiveDirectoryIterator::SKIP_DOTS | \FilesystemIterator::FOLLOW_SYMLINKS);
                 $filter   = new $filterClass($di, $path, $config, $ruleset);
                 $iterator = new \RecursiveIteratorIterator($filter);
 
diff --git a/src/Filters/Filter.php b/src/Filters/Filter.php
@@ -114,7 +114,7 @@ public function accept()
     public function getChildren()
     {
         $children = new static(
-            new \RecursiveDirectoryIterator($this->current(), \RecursiveDirectoryIterator::SKIP_DOTS),
+            new \RecursiveDirectoryIterator($this->current(), \RecursiveDirectoryIterator::SKIP_DOTS | \FilesystemIterator::FOLLOW_SYMLINKS),
             $this->basedir,
             $this->config,
             $this->ruleset

Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ public function accept()`
`114`	`114`	`public function getChildren()`
`115`	`115`	`{`
`116`	`116`	`$children = new static(`
`117`		`- new \RecursiveDirectoryIterator($this->current(), \RecursiveDirectoryIterator::SKIP_DOTS),`
	`117`	`+ new \RecursiveDirectoryIterator($this->current(), \RecursiveDirectoryIterator::SKIP_DOTS \| \FilesystemIterator::FOLLOW_SYMLINKS),`
`118`	`118`	`$this->basedir,`
`119`	`119`	`$this->config,`
`120`	`120`	`$this->ruleset`