Merge pull request #4196 from localheinz/fix/namespace
Fix: Import Symfony\Component\Finder\Finderpull/2819/merge
commit
8775c94895
|
@ -13,8 +13,7 @@
|
||||||
namespace Composer\Package\Archiver;
|
namespace Composer\Package\Archiver;
|
||||||
|
|
||||||
use Composer\Util\Filesystem;
|
use Composer\Util\Filesystem;
|
||||||
|
use Symfony\Component\Finder\Finder;
|
||||||
use Symfony\Component\Finder;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A Symfony Finder wrapper which locates files that should go into archives
|
* A Symfony Finder wrapper which locates files that should go into archives
|
||||||
|
@ -27,7 +26,7 @@ use Symfony\Component\Finder;
|
||||||
class ArchivableFilesFinder extends \FilterIterator
|
class ArchivableFilesFinder extends \FilterIterator
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* @var Symfony\Component\Finder\Finder
|
* @var Finder
|
||||||
*/
|
*/
|
||||||
protected $finder;
|
protected $finder;
|
||||||
|
|
||||||
|
@ -49,7 +48,7 @@ class ArchivableFilesFinder extends \FilterIterator
|
||||||
new ComposerExcludeFilter($sources, $excludes),
|
new ComposerExcludeFilter($sources, $excludes),
|
||||||
);
|
);
|
||||||
|
|
||||||
$this->finder = new Finder\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->getLinkTarget(), $sources) !== 0) {
|
||||||
|
|
Loading…
Reference in New Issue