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

Merge pull request #1981 from orukusaki/closure-fix 

Unbind the filter Closure from ArchivableFilesFinder to allow the object to be garbage collected
pull/1979/merge
Jordi Boggiano 2013-06-08 07:13:43 -07:00
parent f4baa50a05 8a7e2a3c00
commit 4fe074efdc
1 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,9 +52,8 @@ class ArchivableFilesFinder extends \FilterIterator
); );
$this->finder = new Finder\Finder(); $this->finder = new Finder\Finder();
$this->finder
->in($sources) $filter = function (\SplFileInfo $file) use ($sources, $filters, $fs) {
->filter(function (\SplFileInfo $file) use ($sources, $filters, $fs) {
$relativePath = preg_replace( $relativePath = preg_replace(
'#^'.preg_quote($sources, '#').'#', '#^'.preg_quote($sources, '#').'#',
'', '',
@ -66,7 +65,15 @@ class ArchivableFilesFinder extends \FilterIterator
$exclude = $filter->filter($relativePath, $exclude); $exclude = $filter->filter($relativePath, $exclude);
} }
return !$exclude; return !$exclude;
}) };
if (method_exists($filter, 'bindTo')) {
$filter = $filter->bindTo(null);
}
$this->finder
->in($sources)
->filter($filter)
->ignoreVCS(true) ->ignoreVCS(true)
->ignoreDotFiles(false); ->ignoreDotFiles(false);