From fd1fbf3ad6aa563ecc15bdfccb0f4129ee9e41eb Mon Sep 17 00:00:00 2001 From: Ne-Lexa Date: Thu, 9 Jan 2020 17:33:02 +0300 Subject: [PATCH] fix deprecation use --- src/ZipFile.php | 13 ++++++------- src/ZipFileInterface.php | 2 +- tests/Issue24Test.php | 3 ++- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/ZipFile.php b/src/ZipFile.php index fc551e8..fa0e637 100644 --- a/src/ZipFile.php +++ b/src/ZipFile.php @@ -1353,14 +1353,13 @@ class ZipFile implements ZipFileInterface * @see ZipCompressionLevel::FAST * @see ZipCompressionLevel::MAXIMUM */ - public function setCompressionLevel($compressionLevel = self::LEVEL_DEFAULT_COMPRESSION) + public function setCompressionLevel($compressionLevel = ZipCompressionLevel::NORMAL) { - $this->matcher()->all()->invoke( - /** @param string $entry */ - function ($entry) use ($compressionLevel) { - $this->setCompressionLevelEntry($entry, $compressionLevel); - } - ); + $compressionLevel = (int) $compressionLevel; + + foreach ($this->zipContainer->getEntries() as $entry) { + $entry->setCompressionLevel($compressionLevel); + } return $this; } diff --git a/src/ZipFileInterface.php b/src/ZipFileInterface.php index 9ff0f60..1ba1850 100644 --- a/src/ZipFileInterface.php +++ b/src/ZipFileInterface.php @@ -586,7 +586,7 @@ interface ZipFileInterface extends \Countable, \ArrayAccess, \Iterator * @see ZipCompressionLevel::FAST * @see ZipCompressionLevel::MAXIMUM */ - public function setCompressionLevel($compressionLevel = self::LEVEL_DEFAULT_COMPRESSION); + public function setCompressionLevel($compressionLevel = ZipCompressionLevel::NORMAL); /** * @param string $entryName diff --git a/tests/Issue24Test.php b/tests/Issue24Test.php index 6aa59a6..d71e128 100644 --- a/tests/Issue24Test.php +++ b/tests/Issue24Test.php @@ -2,6 +2,7 @@ namespace PhpZip\Tests; +use PhpZip\Constants\ZipCompressionMethod; use PhpZip\Exception\ZipException; use PhpZip\Tests\Internal\DummyFileSystemStream; use PhpZip\ZipFile; @@ -38,7 +39,7 @@ class Issue24Test extends ZipTestCase $zip->addFromString( 'file.txt', $fileContents, - ZipFile::METHOD_DEFLATED + ZipCompressionMethod::DEFLATED ); $zip->saveAsFile($this->outputFilename); $zip->close();