Merge pull request #9158 from infabo/patch-1

Fix symlink check
4 years ago · dacc21e54f
parent 5f6c6216e0 750172dc4c
commit dacc21e54f
1 changed files with 2 additions and 2 deletions
--- a/src/Composer/Package/Archiver/ArchivableFilesFinder.php
+++ b/src/Composer/Package/Archiver/ArchivableFilesFinder.php
@ -43,7 +43,7 @@ class ArchivableFilesFinder extends \FilterIterator
    {
        $fs = new Filesystem();

-        $sources = $fs->normalizePath($sources);
+        $sources = $fs->normalizePath(realpath($sources));

        if ($ignoreFilters) {
            $filters = array();
@ -58,7 +58,7 @@ class ArchivableFilesFinder extends \FilterIterator
        $this->finder = new Finder();

        $filter = function (\SplFileInfo $file) use ($sources, $filters, $fs) {
-            if ($file->isLink() && strpos($file->getLinkTarget(), $sources) !== 0) {
+            if ($file->isLink() && strpos($file->getRealPath(), $sources) !== 0) {
                return false;
            }