Merge pull request #70 from artfulrobot/master

Fix #69. Recursively follow symlinks.
vim-php · Mar 17, 2017 · 19b59d6 · 19b59d6
2 parents abdb8e2 + 9ddc0ef
commit 19b59d6
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,3 +1,8 @@
+Version 0.6.1
+
+* Follow symlinks below directories. (Previously only symlinks in the top
+  directory were followed)
+
 Version 0.6.0
 * Exclude phpctags when re-building phar
 * Fix typo in README.md

diff --git a/PHPCtags.class.php b/PHPCtags.class.php
@@ -1,7 +1,7 @@
 <?php
 class PHPCtags
 {
-    const VERSION = '0.6.0';
+    const VERSION = '0.6.1';
 
     private $mFile;
 
@@ -525,7 +525,11 @@ public function __toString() {
 class ReadableRecursiveDirectoryIterator extends RecursiveDirectoryIterator {
     function getChildren() {
         try {
-            return new ReadableRecursiveDirectoryIterator($this->getPathname());
+          return new ReadableRecursiveDirectoryIterator(
+            $this->getPathname(),
+            FilesystemIterator::SKIP_DOTS |
+            FilesystemIterator::FOLLOW_SYMLINKS);
+
         } catch(UnexpectedValueException $e) {
             file_put_contents('php://stderr', "\nPHPPCtags: {$e->getMessage()} - {$this->getPathname()}\n");
             return new RecursiveArrayIterator(array());

diff --git a/tests/Acceptance/AcceptanceTestCase.php b/tests/Acceptance/AcceptanceTestCase.php
@@ -122,7 +122,7 @@ protected function assertTagsFileHeaderIsCorrect()
             "!_TAG_PROGRAM_AUTHOR\ttechlivezheng\t/[email protected]/",
             "!_TAG_PROGRAM_NAME\tphpctags\t//",
             "!_TAG_PROGRAM_URL\thttps://github.com/techlivezheng/phpctags\t/official site/",
-            "!_TAG_PROGRAM_VERSION\t0.6.0\t//",
+            "!_TAG_PROGRAM_VERSION\t0.6.1\t//",
         );
 
         $realHeader = array_splice($this->tagsFileContent, 0, count($expectedHeader));