@@ -522,8 +522,7 @@ discard block |
||
522 | 522 | protected function parseExtraFields($buffer, ZipEntry $zipEntry, $local = false) |
523 | 523 | { |
524 | 524 | $collection = $local ? |
525 | - $zipEntry->getLocalExtraFields() : |
|
526 | - $zipEntry->getCdExtraFields(); |
|
525 | + $zipEntry->getLocalExtraFields() : $zipEntry->getCdExtraFields(); |
|
527 | 526 | |
528 | 527 | if (!empty($buffer)) { |
529 | 528 | $pos = 0; |
@@ -547,8 +546,7 @@ discard block |
||
547 | 546 | if ($className !== null) { |
548 | 547 | try { |
549 | 548 | $extraField = $local ? |
550 | - \call_user_func([$className, 'unpackLocalFileData'], $bufferData, $zipEntry) : |
|
551 | - \call_user_func([$className, 'unpackCentralDirData'], $bufferData, $zipEntry); |
|
549 | + \call_user_func([$className, 'unpackLocalFileData'], $bufferData, $zipEntry) : \call_user_func([$className, 'unpackCentralDirData'], $bufferData, $zipEntry); |
|
552 | 550 | } catch (\Throwable $e) { |
553 | 551 | // skip errors while parsing invalid data |
554 | 552 | continue; |
@@ -559,8 +559,7 @@ discard block |
||
559 | 559 | } else { |
560 | 560 | $mimeType = FilesUtil::getMimeTypeFromString($contents); |
561 | 561 | $compressionMethod = FilesUtil::isBadCompressionMimeType($mimeType) ? |
562 | - ZipCompressionMethod::STORED : |
|
563 | - ZipCompressionMethod::DEFLATED; |
|
562 | + ZipCompressionMethod::STORED : ZipCompressionMethod::DEFLATED; |
|
564 | 563 | } |
565 | 564 | } |
566 | 565 | |
@@ -661,8 +660,7 @@ discard block |
||
661 | 660 | $compressionMethod = ZipCompressionMethod::STORED; |
662 | 661 | } else { |
663 | 662 | $compressionMethod = FilesUtil::isBadCompressionFile($file->getPathname()) ? |
664 | - ZipCompressionMethod::STORED : |
|
665 | - ZipCompressionMethod::DEFLATED; |
|
663 | + ZipCompressionMethod::STORED : ZipCompressionMethod::DEFLATED; |
|
666 | 664 | } |
667 | 665 | |
668 | 666 | $zipEntry->setCompressionMethod($compressionMethod); |
@@ -805,8 +803,7 @@ discard block |
||
805 | 803 | rewind($stream); |
806 | 804 | $mimeType = FilesUtil::getMimeTypeFromString($bufferContents); |
807 | 805 | $compressionMethod = FilesUtil::isBadCompressionMimeType($mimeType) ? |
808 | - ZipCompressionMethod::STORED : |
|
809 | - ZipCompressionMethod::DEFLATED; |
|
806 | + ZipCompressionMethod::STORED : ZipCompressionMethod::DEFLATED; |
|
810 | 807 | } |
811 | 808 | $zipEntry->setUncompressedSize($length); |
812 | 809 | } |
@@ -973,8 +970,7 @@ discard block |
||
973 | 970 | } |
974 | 971 | |
975 | 972 | $iterator = $iterator instanceof \RecursiveIterator ? |
976 | - new \RecursiveIteratorIterator($iterator) : |
|
977 | - new \IteratorIterator($iterator); |
|
973 | + new \RecursiveIteratorIterator($iterator) : new \IteratorIterator($iterator); |
|
978 | 974 | /** |
979 | 975 | * @var string[] $files |
980 | 976 | * @var string $path |