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

Merge pull request #5144 from ktomk/patch-6 

Skip non-empty directories in zip generation
pull/5150/head
Jordi Boggiano 2016-04-03 19:44:22 +02:00
parent b2b4603215 8389b4b829
commit bc1d92aeee
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,7 +13,9 @@
namespace Composer\Package\Archiver;
use Composer\Util\Filesystem;
use FilesystemIterator;
use Symfony\Component\Finder\Finder;
use Symfony\Component\Finder\SplFileInfo;
/**
* A Symfony Finder wrapper which locates files that should go into archives
@ -84,6 +86,14 @@ class ArchivableFilesFinder extends \FilterIterator
public function accept()
{
return !$this->getInnerIterator()->current()->isDir();
/** @var SplFileInfo $current */
$current = $this->getInnerIterator()->current();
if (!$current->isDir()) {
return true;
}
$iterator = new FilesystemIterator($current, FilesystemIterator::SKIP_DOTS);
return !$iterator->valid();
}
}

6
src/Composer/Package/Archiver/ZipArchiver.php
View File

@ -37,7 +37,11 @@ class ZipArchiver implements ArchiverInterface
/** @var $file \SplFileInfo */
$filepath = $file->getPath()."/".$file->getFilename();
$localname = str_replace($sources."/", '', $filepath);
$zip->addFile($filepath, $localname);
if ($file->isDir()) {
$zip->addEmptyDir($localname);
} else {
$zip->addFile($filepath, $localname);
}
}
if ($zip->close()) {
return $target;