소스 검색

fix deprecation use

Ne-Lexa 6 년 전
부모
커밋
fd1fbf3ad6
3개의 변경된 파일9개의 추가작업 그리고 9개의 파일을 삭제
  1. 6 7
      src/ZipFile.php
  2. 1 1
      src/ZipFileInterface.php
  3. 2 1
      tests/Issue24Test.php

+ 6 - 7
src/ZipFile.php

@@ -1353,14 +1353,13 @@ class ZipFile implements ZipFileInterface
      * @see ZipCompressionLevel::FAST
      * @see ZipCompressionLevel::FAST
      * @see ZipCompressionLevel::MAXIMUM
      * @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;
         return $this;
     }
     }

+ 1 - 1
src/ZipFileInterface.php

@@ -586,7 +586,7 @@ interface ZipFileInterface extends \Countable, \ArrayAccess, \Iterator
      * @see ZipCompressionLevel::FAST
      * @see ZipCompressionLevel::FAST
      * @see ZipCompressionLevel::MAXIMUM
      * @see ZipCompressionLevel::MAXIMUM
      */
      */
-    public function setCompressionLevel($compressionLevel = self::LEVEL_DEFAULT_COMPRESSION);
+    public function setCompressionLevel($compressionLevel = ZipCompressionLevel::NORMAL);
 
 
     /**
     /**
      * @param string $entryName
      * @param string $entryName

+ 2 - 1
tests/Issue24Test.php

@@ -2,6 +2,7 @@
 
 
 namespace PhpZip\Tests;
 namespace PhpZip\Tests;
 
 
+use PhpZip\Constants\ZipCompressionMethod;
 use PhpZip\Exception\ZipException;
 use PhpZip\Exception\ZipException;
 use PhpZip\Tests\Internal\DummyFileSystemStream;
 use PhpZip\Tests\Internal\DummyFileSystemStream;
 use PhpZip\ZipFile;
 use PhpZip\ZipFile;
@@ -38,7 +39,7 @@ class Issue24Test extends ZipTestCase
         $zip->addFromString(
         $zip->addFromString(
             'file.txt',
             'file.txt',
             $fileContents,
             $fileContents,
-            ZipFile::METHOD_DEFLATED
+            ZipCompressionMethod::DEFLATED
         );
         );
         $zip->saveAsFile($this->outputFilename);
         $zip->saveAsFile($this->outputFilename);
         $zip->close();
         $zip->close();