Skip to content

Make zlib optional #71

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
@@ -22,12 +22,12 @@
],
"require": {
"php": "^5.5.9 || ^7.0",
"ext-zlib": "*",
"psr/http-message": "^1.0",
"paragonie/random_compat": "*",
"symfony/finder": "^3.0|^4.0|^5.0"
},
"require-dev": {
"ext-zlib": "*",
"ext-bz2": "*",
"ext-openssl": "*",
"ext-fileinfo": "*",
17 changes: 17 additions & 0 deletions src/Util/FilesUtil.php
Original file line number Diff line number Diff line change
@@ -2,6 +2,7 @@

namespace PhpZip\Util;

use PhpZip\Constants\ZipCompressionMethod;
use PhpZip\Util\Iterator\IgnoreFilesFilterIterator;
use PhpZip\Util\Iterator\IgnoreFilesRecursiveFilterIterator;

@@ -319,6 +320,22 @@ public static function symlink($target, $path, $allowSymlink)
return symlink($target, $path);
}

/**
* @param bool $deflateCompatible
*
* @return int
*/
public static function getDefaultCompressionMethod($deflateCompatible)
{
if (!$deflateCompatible) {
return ZipCompressionMethod::STORED;
}
if (!extension_loaded('zlib')) {
return ZipCompressionMethod::STORED;
}
return ZipCompressionMethod::DEFLATED;
}

/**
* @param string $file
*
14 changes: 4 additions & 10 deletions src/ZipFile.php
Original file line number Diff line number Diff line change
@@ -576,9 +576,7 @@ public function addFromString($entryName, $contents, $compressionMethod = null)
$compressionMethod = ZipCompressionMethod::STORED;
} else {
$mimeType = FilesUtil::getMimeTypeFromString($contents);
$compressionMethod = FilesUtil::isBadCompressionMimeType($mimeType) ?
ZipCompressionMethod::STORED :
ZipCompressionMethod::DEFLATED;
$compressionMethod = FilesUtil::getDefaultCompressionMethod(!FilesUtil::isBadCompressionMimeType($mimeType));
}
}

@@ -714,9 +712,7 @@ public function addSplFile(\SplFileInfo $file, $entryName = null, array $options
} elseif ($file->getSize() < 512) {
$compressionMethod = ZipCompressionMethod::STORED;
} else {
$compressionMethod = FilesUtil::isBadCompressionFile($file->getPathname()) ?
ZipCompressionMethod::STORED :
ZipCompressionMethod::DEFLATED;
$compressionMethod = FilesUtil::getDefaultCompressionMethod(!FilesUtil::isBadCompressionFile($file->getPathname()));
}

$zipEntry->setCompressionMethod($compressionMethod);
@@ -838,17 +834,15 @@ public function addFromStream($stream, $entryName, $compressionMethod = null)
$bufferContents = stream_get_contents($stream, min(1024, $length));
rewind($stream);
$mimeType = FilesUtil::getMimeTypeFromString($bufferContents);
$compressionMethod = FilesUtil::isBadCompressionMimeType($mimeType) ?
ZipCompressionMethod::STORED :
ZipCompressionMethod::DEFLATED;
$compressionMethod = FilesUtil::getDefaultCompressionMethod(!FilesUtil::isBadCompressionMimeType($mimeType));
}
$zipEntry->setUncompressedSize($length);
}
} else {
$unixMode = 0100644;

if ($compressionMethod === null || $compressionMethod === ZipEntry::UNKNOWN) {
$compressionMethod = ZipCompressionMethod::DEFLATED;
$compressionMethod = FilesUtil::getDefaultCompressionMethod(true);
}
}