Fix #1141 - add symlinked symlinked repos to directory list

vimeo · Jan 6, 2019 · 07b29e4 · 07b29e4
1 parent e3f2cee
commit 07b29e4
Show file tree

Hide file tree

Showing 4 changed files with 64 additions and 2 deletions.
diff --git a/psalm.xml.dist b/psalm.xml.dist
@@ -22,8 +22,8 @@
             <directory name="tests/DummyProject"/>
             <file name="vendor/phpunit/phpunit/src/Framework/TestCase.php"/>
             <file name="src/Psalm/Internal/Traverser/CustomTraverser.php"/>
-            <directory name="tests/performance/a.test"/>
-            <directory name="tests/performance/b.test"/>
+            <file name="tests/performance/a.test"/>
+            <file name="tests/performance/b.test"/>
             <file name="tests/ErrorBaselineTest.php"/>
         </ignoreFiles>
     </projectFiles>

diff --git a/src/Psalm/Config/FileFilter.php b/src/Psalm/Config/FileFilter.php
@@ -138,6 +138,36 @@ public static function loadFromXMLElement(
                     exit(1);
                 }
 
+                if (!is_dir($directory_path)) {
+                    echo $base_dir . DIRECTORY_SEPARATOR . (string)$directory['name']
+                        . ' is not a directory ' . PHP_EOL;
+                    exit(1);
+                }
+
+                /** @var \RecursiveDirectoryIterator */
+                $iterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($directory_path));
+                $iterator->rewind();
+
+                while ($iterator->valid()) {
+                    if (!$iterator->isDot() && $iterator->isLink()) {
+                        $linked_path = readlink($iterator->getPathName());
+
+                        if (stripos($linked_path, $directory_path) !== 0) {
+                            if ($ignore_type_stats && $filter instanceof ProjectFileFilter) {
+                                $filter->ignore_type_stats[$directory_path] = true;
+                            }
+
+                            if ($declare_strict_types && $filter instanceof ProjectFileFilter) {
+                                $filter->declare_strict_types[$directory_path] = true;
+                            }
+
+                            $filter->addDirectory(readlink($iterator->getPathName()));
+                        }
+                    }
+
+                    $iterator->next();
+                }
+
                 if ($ignore_type_stats && $filter instanceof ProjectFileFilter) {
                     $filter->ignore_type_stats[$directory_path] = true;
                 }

diff --git a/tests/ConfigTest.php b/tests/ConfigTest.php
@@ -139,6 +139,38 @@ public function testIgnoreProjectDirectory()
         $this->assertFalse($config->isInProjectDirs(realpath('examples/StringAnalyzer.php')));
     }
 
+    /**
+     * @return void
+     */
+    public function testIgnoreSymlinkedProjectDirectory()
+    {
+        @unlink(__DIR__ . '/symlinktest/ignored/b');
+        symlink(__DIR__ . '/symlinktest/a', __DIR__ . '/symlinktest/ignored/b');
+
+        $this->project_analyzer = $this->getProjectAnalyzerWithConfig(
+            Config::loadFromXML(
+                dirname(__DIR__),
+                '<?xml version="1.0"?>
+                <psalm>
+                    <projectFiles>
+                        <directory name="tests" />
+                        <ignoreFiles>
+                            <directory name="tests/symlinktest/ignored" />
+                        </ignoreFiles>
+                    </projectFiles>
+                </psalm>'
+            )
+        );
+
+        $config = $this->project_analyzer->getConfig();
+
+        $this->assertTrue($config->isInProjectDirs(realpath('tests/AnnotationTest.php')));
+        $this->assertFalse($config->isInProjectDirs(realpath('tests/symlinktest/a/ignoreme.php')));
+        $this->assertFalse($config->isInProjectDirs(realpath('examples/StringAnalyzer.php')));
+
+        unlink(__DIR__ . '/symlinktest/ignored/b');
+    }
+
     /**
      * @return void
      */

diff --git a/tests/symlinktest/a/ignoreme.php b/tests/symlinktest/a/ignoreme.php