public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Merge pull request #9158 from infabo/patch-1 

Fix symlink check
pull/9323/head
Nils Adermann 2020-10-22 16:04:27 +02:00 committed by GitHub
parent 5f6c6216e0 750172dc4c
commit dacc21e54f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Composer/Package/Archiver/ArchivableFilesFinder.php
View File

@ -43,7 +43,7 @@ class ArchivableFilesFinder extends \FilterIterator
{ {
$fs = new Filesystem(); $fs = new Filesystem();
$sources = $fs->normalizePath($sources); $sources = $fs->normalizePath(realpath($sources));
if ($ignoreFilters) { if ($ignoreFilters) {
$filters = array(); $filters = array();
@ -58,7 +58,7 @@ class ArchivableFilesFinder extends \FilterIterator
$this->finder = new Finder(); $this->finder = new Finder();
$filter = function (\SplFileInfo $file) use ($sources, $filters, $fs) { $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; return false;
} }