From bfff5f475a750561c31e0d3cefe316d078695863 Mon Sep 17 00:00:00 2001 From: Ne-Lexa Date: Sun, 12 Dec 2021 12:50:30 +0300 Subject: [PATCH] cs fix --- .php-cs-fixer.php | 5 +- .../Filter/Cipher/Pkware/PKCryptContext.php | 518 +++++++++--------- .../Pkware/PKDecryptionStreamFilter.php | 13 +- .../Pkware/PKEncryptionStreamFilter.php | 11 +- .../WinZipAesDecryptionStreamFilter.php | 8 +- src/IO/Stream/ResponseStream.php | 8 +- src/IO/ZipReader.php | 4 +- src/IO/ZipWriter.php | 12 +- src/Model/Extra/ExtraFieldsCollection.php | 2 +- .../Extra/Fields/ApkAlignmentExtraField.php | 2 +- src/Model/Extra/Fields/AsiExtraField.php | 2 +- src/Model/Extra/Fields/NewUnixExtraField.php | 4 +- src/Model/Extra/Fields/NtfsExtraField.php | 2 +- .../Extra/Fields/UnrecognizedExtraField.php | 4 +- src/Model/Extra/ZipExtraDriver.php | 2 +- src/Model/ZipContainer.php | 2 +- src/Model/ZipEntry.php | 18 +- src/Util/DateTimeConverter.php | 12 +- src/Util/MathUtil.php | 2 +- .../Fields/UnicodeCommentExtraFieldTest.php | 2 +- .../Fields/UnicodePathExtraFieldTest.php | 2 +- tests/Extra/Fields/Zip64ExtraFieldTest.php | 6 +- tests/Zip64Test.php | 2 +- tests/ZipEntryTest.php | 10 +- tests/ZipFileTest.php | 6 +- 25 files changed, 336 insertions(+), 323 deletions(-) diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php index 1487f9e..3e48b94 100644 --- a/.php-cs-fixer.php +++ b/.php-cs-fixer.php @@ -105,9 +105,6 @@ $rules = [ */ 'class_definition' => true, - - 'class_keyword_remove' => false, - // Namespace must not contain spacing, comments or PHPDoc. 'clean_namespace' => true, @@ -1758,7 +1755,7 @@ if (\PHP_SAPI === 'cli' && !class_exists(\PhpCsFixer\Config::class)) { return (new \PhpCsFixer\Config()) ->setUsingCache(true) - ->setCacheFile(__DIR__ . '/.php_cs.cache') + ->setCacheFile(__DIR__ . '/.php-cs-fixer.cache') ->setRules($rules) ->setRiskyAllowed(true) ->setFinder( diff --git a/src/IO/Filter/Cipher/Pkware/PKCryptContext.php b/src/IO/Filter/Cipher/Pkware/PKCryptContext.php index 9bbe9be..05688ac 100644 --- a/src/IO/Filter/Cipher/Pkware/PKCryptContext.php +++ b/src/IO/Filter/Cipher/Pkware/PKCryptContext.php @@ -33,260 +33,260 @@ class PKCryptContext private const CRC_TABLE = [ 0x00000000, 0x77073096, - 0xee0e612c, - 0x990951ba, - 0x076dc419, - 0x706af48f, - 0xe963a535, - 0x9e6495a3, - 0x0edb8832, - 0x79dcb8a4, - 0xe0d5e91e, - 0x97d2d988, - 0x09b64c2b, - 0x7eb17cbd, - 0xe7b82d07, - 0x90bf1d91, - 0x1db71064, - 0x6ab020f2, - 0xf3b97148, - 0x84be41de, - 0x1adad47d, - 0x6ddde4eb, - 0xf4d4b551, - 0x83d385c7, - 0x136c9856, - 0x646ba8c0, - 0xfd62f97a, - 0x8a65c9ec, - 0x14015c4f, - 0x63066cd9, - 0xfa0f3d63, - 0x8d080df5, - 0x3b6e20c8, - 0x4c69105e, - 0xd56041e4, - 0xa2677172, - 0x3c03e4d1, - 0x4b04d447, - 0xd20d85fd, - 0xa50ab56b, - 0x35b5a8fa, - 0x42b2986c, - 0xdbbbc9d6, - 0xacbcf940, - 0x32d86ce3, - 0x45df5c75, - 0xdcd60dcf, - 0xabd13d59, - 0x26d930ac, - 0x51de003a, - 0xc8d75180, - 0xbfd06116, - 0x21b4f4b5, - 0x56b3c423, - 0xcfba9599, - 0xb8bda50f, - 0x2802b89e, - 0x5f058808, - 0xc60cd9b2, - 0xb10be924, - 0x2f6f7c87, - 0x58684c11, - 0xc1611dab, - 0xb6662d3d, - 0x76dc4190, - 0x01db7106, - 0x98d220bc, - 0xefd5102a, - 0x71b18589, - 0x06b6b51f, - 0x9fbfe4a5, - 0xe8b8d433, - 0x7807c9a2, - 0x0f00f934, - 0x9609a88e, - 0xe10e9818, - 0x7f6a0dbb, - 0x086d3d2d, - 0x91646c97, - 0xe6635c01, - 0x6b6b51f4, - 0x1c6c6162, - 0x856530d8, - 0xf262004e, - 0x6c0695ed, - 0x1b01a57b, - 0x8208f4c1, - 0xf50fc457, - 0x65b0d9c6, - 0x12b7e950, - 0x8bbeb8ea, - 0xfcb9887c, - 0x62dd1ddf, - 0x15da2d49, - 0x8cd37cf3, - 0xfbd44c65, - 0x4db26158, - 0x3ab551ce, - 0xa3bc0074, - 0xd4bb30e2, - 0x4adfa541, - 0x3dd895d7, - 0xa4d1c46d, - 0xd3d6f4fb, - 0x4369e96a, - 0x346ed9fc, - 0xad678846, - 0xda60b8d0, - 0x44042d73, - 0x33031de5, - 0xaa0a4c5f, - 0xdd0d7cc9, - 0x5005713c, - 0x270241aa, - 0xbe0b1010, - 0xc90c2086, - 0x5768b525, - 0x206f85b3, - 0xb966d409, - 0xce61e49f, - 0x5edef90e, - 0x29d9c998, - 0xb0d09822, - 0xc7d7a8b4, - 0x59b33d17, - 0x2eb40d81, - 0xb7bd5c3b, - 0xc0ba6cad, - 0xedb88320, - 0x9abfb3b6, - 0x03b6e20c, - 0x74b1d29a, - 0xead54739, - 0x9dd277af, - 0x04db2615, - 0x73dc1683, - 0xe3630b12, - 0x94643b84, - 0x0d6d6a3e, - 0x7a6a5aa8, - 0xe40ecf0b, - 0x9309ff9d, - 0x0a00ae27, - 0x7d079eb1, - 0xf00f9344, - 0x8708a3d2, - 0x1e01f268, - 0x6906c2fe, - 0xf762575d, - 0x806567cb, - 0x196c3671, - 0x6e6b06e7, - 0xfed41b76, - 0x89d32be0, - 0x10da7a5a, - 0x67dd4acc, - 0xf9b9df6f, - 0x8ebeeff9, - 0x17b7be43, - 0x60b08ed5, - 0xd6d6a3e8, - 0xa1d1937e, - 0x38d8c2c4, - 0x4fdff252, - 0xd1bb67f1, - 0xa6bc5767, - 0x3fb506dd, - 0x48b2364b, - 0xd80d2bda, - 0xaf0a1b4c, - 0x36034af6, - 0x41047a60, - 0xdf60efc3, - 0xa867df55, - 0x316e8eef, - 0x4669be79, - 0xcb61b38c, - 0xbc66831a, - 0x256fd2a0, - 0x5268e236, - 0xcc0c7795, - 0xbb0b4703, - 0x220216b9, - 0x5505262f, - 0xc5ba3bbe, - 0xb2bd0b28, - 0x2bb45a92, - 0x5cb36a04, - 0xc2d7ffa7, - 0xb5d0cf31, - 0x2cd99e8b, - 0x5bdeae1d, - 0x9b64c2b0, - 0xec63f226, - 0x756aa39c, - 0x026d930a, - 0x9c0906a9, - 0xeb0e363f, + 0xEE0E612C, + 0x990951BA, + 0x076DC419, + 0x706AF48F, + 0xE963A535, + 0x9E6495A3, + 0x0EDB8832, + 0x79DCB8A4, + 0xE0D5E91E, + 0x97D2D988, + 0x09B64C2B, + 0x7EB17CBD, + 0xE7B82D07, + 0x90BF1D91, + 0x1DB71064, + 0x6AB020F2, + 0xF3B97148, + 0x84BE41DE, + 0x1ADAD47D, + 0x6DDDE4EB, + 0xF4D4B551, + 0x83D385C7, + 0x136C9856, + 0x646BA8C0, + 0xFD62F97A, + 0x8A65C9EC, + 0x14015C4F, + 0x63066CD9, + 0xFA0F3D63, + 0x8D080DF5, + 0x3B6E20C8, + 0x4C69105E, + 0xD56041E4, + 0xA2677172, + 0x3C03E4D1, + 0x4B04D447, + 0xD20D85FD, + 0xA50AB56B, + 0x35B5A8FA, + 0x42B2986C, + 0xDBBBC9D6, + 0xACBCF940, + 0x32D86CE3, + 0x45DF5C75, + 0xDCD60DCF, + 0xABD13D59, + 0x26D930AC, + 0x51DE003A, + 0xC8D75180, + 0xBFD06116, + 0x21B4F4B5, + 0x56B3C423, + 0xCFBA9599, + 0xB8BDA50F, + 0x2802B89E, + 0x5F058808, + 0xC60CD9B2, + 0xB10BE924, + 0x2F6F7C87, + 0x58684C11, + 0xC1611DAB, + 0xB6662D3D, + 0x76DC4190, + 0x01DB7106, + 0x98D220BC, + 0xEFD5102A, + 0x71B18589, + 0x06B6B51F, + 0x9FBFE4A5, + 0xE8B8D433, + 0x7807C9A2, + 0x0F00F934, + 0x9609A88E, + 0xE10E9818, + 0x7F6A0DBB, + 0x086D3D2D, + 0x91646C97, + 0xE6635C01, + 0x6B6B51F4, + 0x1C6C6162, + 0x856530D8, + 0xF262004E, + 0x6C0695ED, + 0x1B01A57B, + 0x8208F4C1, + 0xF50FC457, + 0x65B0D9C6, + 0x12B7E950, + 0x8BBEB8EA, + 0xFCB9887C, + 0x62DD1DDF, + 0x15DA2D49, + 0x8CD37CF3, + 0xFBD44C65, + 0x4DB26158, + 0x3AB551CE, + 0xA3BC0074, + 0xD4BB30E2, + 0x4ADFA541, + 0x3DD895D7, + 0xA4D1C46D, + 0xD3D6F4FB, + 0x4369E96A, + 0x346ED9FC, + 0xAD678846, + 0xDA60B8D0, + 0x44042D73, + 0x33031DE5, + 0xAA0A4C5F, + 0xDD0D7CC9, + 0x5005713C, + 0x270241AA, + 0xBE0B1010, + 0xC90C2086, + 0x5768B525, + 0x206F85B3, + 0xB966D409, + 0xCE61E49F, + 0x5EDEF90E, + 0x29D9C998, + 0xB0D09822, + 0xC7D7A8B4, + 0x59B33D17, + 0x2EB40D81, + 0xB7BD5C3B, + 0xC0BA6CAD, + 0xEDB88320, + 0x9ABFB3B6, + 0x03B6E20C, + 0x74B1D29A, + 0xEAD54739, + 0x9DD277AF, + 0x04DB2615, + 0x73DC1683, + 0xE3630B12, + 0x94643B84, + 0x0D6D6A3E, + 0x7A6A5AA8, + 0xE40ECF0B, + 0x9309FF9D, + 0x0A00AE27, + 0x7D079EB1, + 0xF00F9344, + 0x8708A3D2, + 0x1E01F268, + 0x6906C2FE, + 0xF762575D, + 0x806567CB, + 0x196C3671, + 0x6E6B06E7, + 0xFED41B76, + 0x89D32BE0, + 0x10DA7A5A, + 0x67DD4ACC, + 0xF9B9DF6F, + 0x8EBEEFF9, + 0x17B7BE43, + 0x60B08ED5, + 0xD6D6A3E8, + 0xA1D1937E, + 0x38D8C2C4, + 0x4FDFF252, + 0xD1BB67F1, + 0xA6BC5767, + 0x3FB506DD, + 0x48B2364B, + 0xD80D2BDA, + 0xAF0A1B4C, + 0x36034AF6, + 0x41047A60, + 0xDF60EFC3, + 0xA867DF55, + 0x316E8EEF, + 0x4669BE79, + 0xCB61B38C, + 0xBC66831A, + 0x256FD2A0, + 0x5268E236, + 0xCC0C7795, + 0xBB0B4703, + 0x220216B9, + 0x5505262F, + 0xC5BA3BBE, + 0xB2BD0B28, + 0x2BB45A92, + 0x5CB36A04, + 0xC2D7FFA7, + 0xB5D0CF31, + 0x2CD99E8B, + 0x5BDEAE1D, + 0x9B64C2B0, + 0xEC63F226, + 0x756AA39C, + 0x026D930A, + 0x9C0906A9, + 0xEB0E363F, 0x72076785, 0x05005713, - 0x95bf4a82, - 0xe2b87a14, - 0x7bb12bae, - 0x0cb61b38, - 0x92d28e9b, - 0xe5d5be0d, - 0x7cdcefb7, - 0x0bdbdf21, - 0x86d3d2d4, - 0xf1d4e242, - 0x68ddb3f8, - 0x1fda836e, - 0x81be16cd, - 0xf6b9265b, - 0x6fb077e1, - 0x18b74777, - 0x88085ae6, - 0xff0f6a70, - 0x66063bca, - 0x11010b5c, - 0x8f659eff, - 0xf862ae69, - 0x616bffd3, - 0x166ccf45, - 0xa00ae278, - 0xd70dd2ee, - 0x4e048354, - 0x3903b3c2, - 0xa7672661, - 0xd06016f7, - 0x4969474d, - 0x3e6e77db, - 0xaed16a4a, - 0xd9d65adc, - 0x40df0b66, - 0x37d83bf0, - 0xa9bcae53, - 0xdebb9ec5, - 0x47b2cf7f, - 0x30b5ffe9, - 0xbdbdf21c, - 0xcabac28a, - 0x53b39330, - 0x24b4a3a6, - 0xbad03605, - 0xcdd70693, - 0x54de5729, - 0x23d967bf, - 0xb3667a2e, - 0xc4614ab8, - 0x5d681b02, - 0x2a6f2b94, - 0xb40bbe37, - 0xc30c8ea1, - 0x5a05df1b, - 0x2d02ef8d, + 0x95BF4A82, + 0xE2B87A14, + 0x7BB12BAE, + 0x0CB61B38, + 0x92D28E9B, + 0xE5D5BE0D, + 0x7CDCEFB7, + 0x0BDBDF21, + 0x86D3D2D4, + 0xF1D4E242, + 0x68DDB3F8, + 0x1FDA836E, + 0x81BE16CD, + 0xF6B9265B, + 0x6FB077E1, + 0x18B74777, + 0x88085AE6, + 0xFF0F6A70, + 0x66063BCA, + 0x11010B5C, + 0x8F659EFF, + 0xF862AE69, + 0x616BFFD3, + 0x166CCF45, + 0xA00AE278, + 0xD70DD2EE, + 0x4E048354, + 0x3903B3C2, + 0xA7672661, + 0xD06016F7, + 0x4969474D, + 0x3E6E77DB, + 0xAED16A4A, + 0xD9D65ADC, + 0x40DF0B66, + 0x37D83BF0, + 0xA9BCAE53, + 0xDEBB9EC5, + 0x47B2CF7F, + 0x30B5FFE9, + 0xBDBDF21C, + 0xCABAC28A, + 0x53B39330, + 0x24B4A3A6, + 0xBAD03605, + 0xCDD70693, + 0x54DE5729, + 0x23D967BF, + 0xB3667A2E, + 0xC4614AB8, + 0x5D681B02, + 0x2A6F2B94, + 0xB40BBE37, + 0xC30C8EA1, + 0x5A05DF1B, + 0x2D02EF8D, ]; /** @var array encryption keys */ @@ -317,7 +317,7 @@ class PKCryptContext $byte = 0; foreach (unpack('C*', $header) as $byte) { - $byte = ($byte ^ $this->decryptByte()) & 0xff; + $byte = ($byte ^ $this->decryptByte()) & 0xFF; $this->updateKeys($byte); } @@ -331,7 +331,7 @@ class PKCryptContext $decryptContent = ''; foreach (unpack('C*', $content) as $byte) { - $byte = ($byte ^ $this->decryptByte()) & 0xff; + $byte = ($byte ^ $this->decryptByte()) & 0xFF; $this->updateKeys($byte); $decryptContent .= \chr($byte); } @@ -346,7 +346,7 @@ class PKCryptContext { $temp = $this->keys[2] | 2; - return (($temp * ($temp ^ 1)) >> 8) & 0xffffff; + return (($temp * ($temp ^ 1)) >> 8) & 0xFFFFFF; } /** @@ -355,9 +355,9 @@ class PKCryptContext private function updateKeys(int $charAt): void { $this->keys[0] = $this->crc32($this->keys[0], $charAt); - $this->keys[1] += ($this->keys[0] & 0xff); + $this->keys[1] += ($this->keys[0] & 0xFF); $this->keys[1] = MathUtil::toSignedInt32($this->keys[1] * 134775813 + 1); - $this->keys[2] = MathUtil::toSignedInt32($this->crc32($this->keys[2], ($this->keys[1] >> 24) & 0xff)); + $this->keys[2] = MathUtil::toSignedInt32($this->crc32($this->keys[2], ($this->keys[1] >> 24) & 0xFF)); } /** @@ -365,7 +365,7 @@ class PKCryptContext */ private function crc32(int $oldCrc, int $charAt): int { - return (($oldCrc >> 8) & 0xffffff) ^ self::CRC_TABLE[($oldCrc ^ $charAt) & 0xff]; + return (($oldCrc >> 8) & 0xFFFFFF) ^ self::CRC_TABLE[($oldCrc ^ $charAt) & 0xFF]; } public function encryptString(string $content): string @@ -381,7 +381,7 @@ class PKCryptContext private function encryptByte(int $byte): int { - $tempVal = $byte ^ $this->decryptByte() & 0xff; + $tempVal = $byte ^ $this->decryptByte() & 0xFF; $this->updateKeys($byte); return $tempVal; diff --git a/src/IO/Filter/Cipher/Pkware/PKDecryptionStreamFilter.php b/src/IO/Filter/Cipher/Pkware/PKDecryptionStreamFilter.php index 04c583d..44c3a5c 100644 --- a/src/IO/Filter/Cipher/Pkware/PKDecryptionStreamFilter.php +++ b/src/IO/Filter/Cipher/Pkware/PKDecryptionStreamFilter.php @@ -63,9 +63,9 @@ class PKDecryptionStreamFilter extends \php_user_filter // init check byte if ($entry->isDataDescriptorEnabled()) { - $this->checkByte = ($entry->getDosTime() >> 8) & 0xff; + $this->checkByte = ($entry->getDosTime() >> 8) & 0xFF; } else { - $this->checkByte = ($entry->getCrc() >> 24) & 0xff; + $this->checkByte = ($entry->getCrc() >> 24) & 0xFF; } $this->readLength = 0; @@ -77,10 +77,15 @@ class PKDecryptionStreamFilter extends \php_user_filter /** * Decryption filter. * - * @throws ZipAuthenticationException - * * @todo USE FFI in php 7.4 * @noinspection PhpDocSignatureInspection + * + * @param mixed $in + * @param mixed $out + * @param mixed $consumed + * @param mixed $closing + * + * @throws ZipAuthenticationException */ public function filter($in, $out, &$consumed, $closing): int { diff --git a/src/IO/Filter/Cipher/Pkware/PKEncryptionStreamFilter.php b/src/IO/Filter/Cipher/Pkware/PKEncryptionStreamFilter.php index 0a9d61f..7cd66b0 100644 --- a/src/IO/Filter/Cipher/Pkware/PKEncryptionStreamFilter.php +++ b/src/IO/Filter/Cipher/Pkware/PKEncryptionStreamFilter.php @@ -66,7 +66,7 @@ class PKEncryptionStreamFilter extends \php_user_filter $this->context = new PKCryptContext($password); $crc = $entry->isDataDescriptorRequired() || $entry->getCrc() === ZipEntry::UNKNOWN - ? ($entry->getDosTime() & 0x0000ffff) << 16 + ? ($entry->getDosTime() & 0x0000FFFF) << 16 : $entry->getCrc(); try { @@ -75,8 +75,8 @@ class PKEncryptionStreamFilter extends \php_user_filter throw new \RuntimeException('Oops, our server is bust and cannot generate any random data.', 1, $e); } - $headerBytes[PKCryptContext::STD_DEC_HDR_SIZE - 1] = pack('c', ($crc >> 24) & 0xff); - $headerBytes[PKCryptContext::STD_DEC_HDR_SIZE - 2] = pack('c', ($crc >> 16) & 0xff); + $headerBytes[PKCryptContext::STD_DEC_HDR_SIZE - 1] = pack('c', ($crc >> 24) & 0xFF); + $headerBytes[PKCryptContext::STD_DEC_HDR_SIZE - 2] = pack('c', ($crc >> 16) & 0xFF); $this->headerBytes = $headerBytes; $this->writeLength = 0; @@ -91,6 +91,11 @@ class PKEncryptionStreamFilter extends \php_user_filter * @todo USE FFI in php 7.4 * * @noinspection PhpDocSignatureInspection + * + * @param mixed $in + * @param mixed $out + * @param mixed $consumed + * @param mixed $closing */ public function filter($in, $out, &$consumed, $closing): int { diff --git a/src/IO/Filter/Cipher/WinZipAes/WinZipAesDecryptionStreamFilter.php b/src/IO/Filter/Cipher/WinZipAes/WinZipAesDecryptionStreamFilter.php index 8321701..e57af45 100644 --- a/src/IO/Filter/Cipher/WinZipAes/WinZipAesDecryptionStreamFilter.php +++ b/src/IO/Filter/Cipher/WinZipAes/WinZipAesDecryptionStreamFilter.php @@ -70,8 +70,14 @@ class WinZipAesDecryptionStreamFilter extends \php_user_filter } /** - * @throws ZipAuthenticationException * @noinspection PhpDocSignatureInspection + * + * @param mixed $in + * @param mixed $out + * @param mixed $consumed + * @param mixed $closing + * + * @throws ZipAuthenticationException */ public function filter($in, $out, &$consumed, $closing): int { diff --git a/src/IO/Stream/ResponseStream.php b/src/IO/Stream/ResponseStream.php index 1d61dd8..19ded16 100644 --- a/src/IO/Stream/ResponseStream.php +++ b/src/IO/Stream/ResponseStream.php @@ -91,7 +91,7 @@ class ResponseStream implements StreamInterface } /** - * {@inheritdoc} + * {@inheritDoc} * * @noinspection PhpMissingReturnTypeInspection */ @@ -195,7 +195,7 @@ class ResponseStream implements StreamInterface } /** - * {@inheritdoc} + * {@inheritDoc} */ public function seek($offset, $whence = \SEEK_SET): void { @@ -211,7 +211,7 @@ class ResponseStream implements StreamInterface } /** - * {@inheritdoc} + * {@inheritDoc} */ public function write($string) { @@ -229,7 +229,7 @@ class ResponseStream implements StreamInterface } /** - * {@inheritdoc} + * {@inheritDoc} */ public function read($length): string { diff --git a/src/IO/ZipReader.php b/src/IO/ZipReader.php index d8aea9b..1853368 100644 --- a/src/IO/ZipReader.php +++ b/src/IO/ZipReader.php @@ -216,7 +216,7 @@ class ZipReader protected function findEndOfCentralDirectory(): bool { $max = $this->size - ZipConstants::END_CD_MIN_LEN; - $min = $max >= 0xffff ? $max - 0xffff : 0; + $min = $max >= 0xFFFF ? $max - 0xFFFF : 0; // Search for End of central directory record. for ($position = $max; $position >= $min; $position--) { fseek($this->inStream, $position); @@ -319,7 +319,7 @@ class ZipReader throw new ZipException('ZIP file spanning/splitting is not supported!'); } - if ($entryCount < 0 || $entryCount > 0x7fffffff) { + if ($entryCount < 0 || $entryCount > 0x7FFFFFFF) { throw new ZipException('Total Number Of Entries In The Central Directory out of range!'); } diff --git a/src/IO/ZipWriter.php b/src/IO/ZipWriter.php index bf29c4b..77a90ab 100644 --- a/src/IO/ZipWriter.php +++ b/src/IO/ZipWriter.php @@ -143,13 +143,13 @@ class ZipWriter $size = $nameLength + $extraLength; - if ($size > 0xffff) { + if ($size > 0xFFFF) { throw new ZipException( sprintf( '%s (the total size of %s bytes for the name, extra fields and comment exceeds the maximum size of %d bytes)', $entry->getName(), $size, - 0xffff + 0xFFFF ) ); } @@ -221,7 +221,7 @@ class ZipWriter $size = \strlen($extraData); - if ($size > 0xffff) { + if ($size > 0xFFFF) { throw new ZipException( sprintf( 'Size extra out of range: %d. Extra data: %s', @@ -678,7 +678,7 @@ class ZipWriter ): void { $cdEntriesCount = \count($this->zipContainer); - $cdEntriesZip64 = $cdEntriesCount > 0xffff; + $cdEntriesZip64 = $cdEntriesCount > 0xFFFF; $cdSizeZip64 = $centralDirectorySize > ZipConstants::ZIP64_MAGIC; $cdOffsetZip64 = $centralDirectoryOffset > ZipConstants::ZIP64_MAGIC; @@ -768,10 +768,10 @@ class ZipWriter 0, // total number of entries in the // central directory on this disk 2 bytes - $cdEntriesZip64 ? 0xffff : $cdEntriesCount, + $cdEntriesZip64 ? 0xFFFF : $cdEntriesCount, // total number of entries in // the central directory 2 bytes - $cdEntriesZip64 ? 0xffff : $cdEntriesCount, + $cdEntriesZip64 ? 0xFFFF : $cdEntriesCount, // size of the central directory 4 bytes $cdSizeZip64 ? ZipConstants::ZIP64_MAGIC : $centralDirectorySize, // offset of start of central diff --git a/src/Model/Extra/ExtraFieldsCollection.php b/src/Model/Extra/ExtraFieldsCollection.php index 866ba5d..1ebe2db 100644 --- a/src/Model/Extra/ExtraFieldsCollection.php +++ b/src/Model/Extra/ExtraFieldsCollection.php @@ -53,7 +53,7 @@ class ExtraFieldsCollection implements \ArrayAccess, \Countable, \Iterator private function validateHeaderId(int $headerId): void { - if ($headerId < 0 || $headerId > 0xffff) { + if ($headerId < 0 || $headerId > 0xFFFF) { throw new \InvalidArgumentException('$headerId out of range'); } } diff --git a/src/Model/Extra/Fields/ApkAlignmentExtraField.php b/src/Model/Extra/Fields/ApkAlignmentExtraField.php index a96f20e..24367b9 100644 --- a/src/Model/Extra/Fields/ApkAlignmentExtraField.php +++ b/src/Model/Extra/Fields/ApkAlignmentExtraField.php @@ -29,7 +29,7 @@ final class ApkAlignmentExtraField implements ZipExtraField * well as for aligning the entries's data. See ZIP * appnote.txt section 4.5 Extensible data fields. */ - public const HEADER_ID = 0xd935; + public const HEADER_ID = 0xD935; /** @var int */ public const ALIGNMENT_BYTES = 4; diff --git a/src/Model/Extra/Fields/AsiExtraField.php b/src/Model/Extra/Fields/AsiExtraField.php index 6575e6b..a27b7b6 100644 --- a/src/Model/Extra/Fields/AsiExtraField.php +++ b/src/Model/Extra/Fields/AsiExtraField.php @@ -56,7 +56,7 @@ use PhpZip\Model\ZipEntry; final class AsiExtraField implements ZipExtraField { /** @var int Header id */ - public const HEADER_ID = 0x756e; + public const HEADER_ID = 0x756E; public const USER_GID_PID = 1000; diff --git a/src/Model/Extra/Fields/NewUnixExtraField.php b/src/Model/Extra/Fields/NewUnixExtraField.php index 66e74ee..fe9108b 100644 --- a/src/Model/Extra/Fields/NewUnixExtraField.php +++ b/src/Model/Extra/Fields/NewUnixExtraField.php @@ -186,7 +186,7 @@ final class NewUnixExtraField implements ZipExtraField public function setUid(int $uid): void { - $this->uid = $uid & 0xffffffff; + $this->uid = $uid & 0xFFFFFFFF; } public function getGid(): int @@ -196,7 +196,7 @@ final class NewUnixExtraField implements ZipExtraField public function setGid(int $gid): void { - $this->gid = $gid & 0xffffffff; + $this->gid = $gid & 0xFFFFFFFF; } public function getVersion(): int diff --git a/src/Model/Extra/Fields/NtfsExtraField.php b/src/Model/Extra/Fields/NtfsExtraField.php index a1f5fcf..1ae73d2 100644 --- a/src/Model/Extra/Fields/NtfsExtraField.php +++ b/src/Model/Extra/Fields/NtfsExtraField.php @@ -24,7 +24,7 @@ use PhpZip\Model\ZipEntry; final class NtfsExtraField implements ZipExtraField { /** @var int Header id */ - public const HEADER_ID = 0x000a; + public const HEADER_ID = 0x000A; /** @var int Tag ID */ public const TIME_ATTR_TAG = 0x0001; diff --git a/src/Model/Extra/Fields/UnrecognizedExtraField.php b/src/Model/Extra/Fields/UnrecognizedExtraField.php index 93fe1ad..0489a39 100644 --- a/src/Model/Extra/Fields/UnrecognizedExtraField.php +++ b/src/Model/Extra/Fields/UnrecognizedExtraField.php @@ -73,7 +73,7 @@ final class UnrecognizedExtraField implements ZipExtraField } /** - * {@inheritdoc} + * {@inheritDoc} */ public function packLocalFileData(): string { @@ -81,7 +81,7 @@ final class UnrecognizedExtraField implements ZipExtraField } /** - * {@inheritdoc} + * {@inheritDoc} */ public function packCentralDirData(): string { diff --git a/src/Model/Extra/ZipExtraDriver.php b/src/Model/Extra/ZipExtraDriver.php index e82bb5e..ede51df 100644 --- a/src/Model/Extra/ZipExtraDriver.php +++ b/src/Model/Extra/ZipExtraDriver.php @@ -94,7 +94,7 @@ final class ZipExtraDriver public static function getClassNameOrNull(int $headerId): ?string { - if ($headerId < 0 || $headerId > 0xffff) { + if ($headerId < 0 || $headerId > 0xFFFF) { throw new \InvalidArgumentException('$headerId out of range: ' . $headerId); } diff --git a/src/Model/ZipContainer.php b/src/Model/ZipContainer.php index d38b46d..2166eeb 100644 --- a/src/Model/ZipContainer.php +++ b/src/Model/ZipContainer.php @@ -252,7 +252,7 @@ class ZipContainer extends ImmutableZipContainer if ($archiveComment !== null && $archiveComment !== '') { $length = \strlen($archiveComment); - if ($length > 0xffff) { + if ($length > 0xFFFF) { throw new InvalidArgumentException('Length comment out of range'); } } diff --git a/src/Model/ZipEntry.php b/src/Model/ZipEntry.php index 6282c9a..97c72f2 100644 --- a/src/Model/ZipEntry.php +++ b/src/Model/ZipEntry.php @@ -201,7 +201,7 @@ class ZipEntry $length = \strlen($name); - if ($length > 0xffff) { + if ($length > 0xFFFF) { throw new InvalidArgumentException('Illegal zip entry name parameter'); } @@ -298,7 +298,7 @@ class ZipEntry */ public function setCreatedOS(int $platform): self { - if ($platform < 0x00 || $platform > 0xff) { + if ($platform < 0x00 || $platform > 0xFF) { throw new InvalidArgumentException('Platform out of range'); } $this->createdOS = $platform; @@ -318,7 +318,7 @@ class ZipEntry */ public function setExtractedOS(int $platform): self { - if ($platform < 0x00 || $platform > 0xff) { + if ($platform < 0x00 || $platform > 0xFF) { throw new InvalidArgumentException('Platform out of range'); } $this->extractedOS = $platform; @@ -485,7 +485,7 @@ class ZipEntry */ public function setGeneralPurposeBitFlags(int $gpbf): self { - if ($gpbf < 0x0000 || $gpbf > 0xffff) { + if ($gpbf < 0x0000 || $gpbf > 0xFFFF) { throw new InvalidArgumentException('general purpose bit flags out of range'); } $this->generalPurposeBitFlags = $gpbf; @@ -617,7 +617,7 @@ class ZipEntry */ public function setCompressionMethod(int $compressionMethod): self { - if ($compressionMethod < 0x0000 || $compressionMethod > 0xffff) { + if ($compressionMethod < 0x0000 || $compressionMethod > 0xFFFF) { throw new InvalidArgumentException('method out of range: ' . $compressionMethod); } @@ -658,7 +658,7 @@ class ZipEntry public function setDosTime(int $dosTime): self { if (\PHP_INT_SIZE === 8) { - if ($dosTime < 0x00000000 || $dosTime > 0xffffffff) { + if ($dosTime < 0x00000000 || $dosTime > 0xFFFFFFFF) { throw new InvalidArgumentException('DosTime out of range'); } } @@ -706,7 +706,7 @@ class ZipEntry $this->externalAttributes = $externalAttributes; if (\PHP_INT_SIZE === 8) { - if ($externalAttributes < 0x00000000 || $externalAttributes > 0xffffffff) { + if ($externalAttributes < 0x00000000 || $externalAttributes > 0xFFFFFFFF) { throw new InvalidArgumentException('external attributes out of range: ' . $externalAttributes); } } @@ -735,7 +735,7 @@ class ZipEntry */ public function setInternalAttributes(int $internalAttributes): self { - if ($internalAttributes < 0x0000 || $internalAttributes > 0xffff) { + if ($internalAttributes < 0x0000 || $internalAttributes > 0xFFFF) { throw new InvalidArgumentException('internal attributes out of range'); } $this->internalAttributes = $internalAttributes; @@ -847,7 +847,7 @@ class ZipEntry if ($comment !== null) { $commentLength = \strlen($comment); - if ($commentLength > 0xffff) { + if ($commentLength > 0xFFFF) { throw new InvalidArgumentException('Comment too long'); } diff --git a/src/Util/DateTimeConverter.php b/src/Util/DateTimeConverter.php index b43a34d..4b9e00d 100644 --- a/src/Util/DateTimeConverter.php +++ b/src/Util/DateTimeConverter.php @@ -65,12 +65,12 @@ class DateTimeConverter } // date_default_timezone_set('UTC'); return mktime( - (($dosTime >> 11) & 0x1f), // hours - (($dosTime >> 5) & 0x3f), // minutes - (($dosTime << 1) & 0x3e), // seconds - (($dosTime >> 21) & 0x0f), // month - (($dosTime >> 16) & 0x1f), // day - ((($dosTime >> 25) & 0x7f) + 1980) // year + (($dosTime >> 11) & 0x1F), // hours + (($dosTime >> 5) & 0x3F), // minutes + (($dosTime << 1) & 0x3E), // seconds + (($dosTime >> 21) & 0x0F), // month + (($dosTime >> 16) & 0x1F), // day + ((($dosTime >> 25) & 0x7F) + 1980) // year ); } diff --git a/src/Util/MathUtil.php b/src/Util/MathUtil.php index bb25f45..ce72923 100644 --- a/src/Util/MathUtil.php +++ b/src/Util/MathUtil.php @@ -24,7 +24,7 @@ final class MathUtil public static function toSignedInt32(int $int): int { if (\PHP_INT_SIZE === 8) { - $int &= 0xffffffff; + $int &= 0xFFFFFFFF; if ($int & 0x80000000) { return $int - 0x100000000; diff --git a/tests/Extra/Fields/UnicodeCommentExtraFieldTest.php b/tests/Extra/Fields/UnicodeCommentExtraFieldTest.php index 7afcce5..cbcae20 100644 --- a/tests/Extra/Fields/UnicodeCommentExtraFieldTest.php +++ b/tests/Extra/Fields/UnicodeCommentExtraFieldTest.php @@ -21,7 +21,7 @@ use PhpZip\Model\Extra\Fields\UnicodeCommentExtraField; final class UnicodeCommentExtraFieldTest extends AbstractUnicodeExtraFieldTest { /** - * {@inheritdoc} + * {@inheritDoc} */ protected function getUnicodeExtraFieldClassName() { diff --git a/tests/Extra/Fields/UnicodePathExtraFieldTest.php b/tests/Extra/Fields/UnicodePathExtraFieldTest.php index 803aa37..f214411 100644 --- a/tests/Extra/Fields/UnicodePathExtraFieldTest.php +++ b/tests/Extra/Fields/UnicodePathExtraFieldTest.php @@ -23,7 +23,7 @@ use PhpZip\Model\Extra\Fields\UnicodePathExtraField; final class UnicodePathExtraFieldTest extends AbstractUnicodeExtraFieldTest { /** - * {@inheritdoc} + * {@inheritDoc} */ protected function getUnicodeExtraFieldClassName() { diff --git a/tests/Extra/Fields/Zip64ExtraFieldTest.php b/tests/Extra/Fields/Zip64ExtraFieldTest.php index 81987ca..4c8f5c6 100644 --- a/tests/Extra/Fields/Zip64ExtraFieldTest.php +++ b/tests/Extra/Fields/Zip64ExtraFieldTest.php @@ -66,9 +66,9 @@ final class Zip64ExtraFieldTest extends TestCase self::assertSame($extraField->getDiskStart(), $diskStart); $zipEntry = new ZipEntry('entry'); - $zipEntry->setUncompressedSize($uncompressedSize !== null ? ZipConstants::ZIP64_MAGIC : 0xfffff); - $zipEntry->setCompressedSize($compressedSize !== null ? ZipConstants::ZIP64_MAGIC : 0xffff); - $zipEntry->setLocalHeaderOffset($localHeaderOffset !== null ? ZipConstants::ZIP64_MAGIC : 0xfff); + $zipEntry->setUncompressedSize($uncompressedSize !== null ? ZipConstants::ZIP64_MAGIC : 0xFFFFF); + $zipEntry->setCompressedSize($compressedSize !== null ? ZipConstants::ZIP64_MAGIC : 0xFFFF); + $zipEntry->setLocalHeaderOffset($localHeaderOffset !== null ? ZipConstants::ZIP64_MAGIC : 0xFFF); if ($localBinaryData !== null) { self::assertSame($localBinaryData, $extraField->packLocalFileData()); diff --git a/tests/Zip64Test.php b/tests/Zip64Test.php index 798515c..fa3f176 100644 --- a/tests/Zip64Test.php +++ b/tests/Zip64Test.php @@ -36,7 +36,7 @@ class Zip64Test extends ZipTestCase static::markTestSkipped('Only php-64 bit.'); } - $countFiles = 0xffff + 1; + $countFiles = 0xFFFF + 1; $zipFile = new ZipFile(); for ($i = 0; $i < $countFiles; $i++) { diff --git a/tests/ZipEntryTest.php b/tests/ZipEntryTest.php index f8fc0b3..23ba810 100644 --- a/tests/ZipEntryTest.php +++ b/tests/ZipEntryTest.php @@ -380,7 +380,7 @@ class ZipEntryTest extends TestCase { return [ [-1], - [0xff + 1], + [0xFF + 1], ]; } @@ -808,7 +808,7 @@ class ZipEntryTest extends TestCase { return [ [-1], - [0xffffffff + 1], + [0xFFFFFFFF + 1], ]; } @@ -951,7 +951,7 @@ class ZipEntryTest extends TestCase { return [ [-1], - [0xffffffff + 1], + [0xFFFFFFFF + 1], ]; } @@ -980,7 +980,7 @@ class ZipEntryTest extends TestCase { return [ [-1], - [0xffff + 1], + [0xFFFF + 1], ]; } @@ -1066,7 +1066,7 @@ class ZipEntryTest extends TestCase $this->expectException(InvalidArgumentException::class); $this->expectExceptionMessage('Comment too long'); - $longComment = random_bytes(0xffff + 1); + $longComment = random_bytes(0xFFFF + 1); $zipEntry = new ZipEntry('entry'); $zipEntry->setComment($longComment); } diff --git a/tests/ZipFileTest.php b/tests/ZipFileTest.php index c987a03..c0823a2 100644 --- a/tests/ZipFileTest.php +++ b/tests/ZipFileTest.php @@ -747,7 +747,7 @@ class ZipFileTest extends ZipTestCase $comment = 'Very long comment' . \PHP_EOL . 'Очень длинный комментарий' . \PHP_EOL; - $comment = str_repeat($comment, (int) ceil(0xffff / \strlen($comment)) + \strlen($comment) + 1); + $comment = str_repeat($comment, (int) ceil(0xFFFF / \strlen($comment)) + \strlen($comment) + 1); $zipFile = new ZipFile(); $zipFile->setArchiveComment($comment); @@ -840,7 +840,7 @@ class ZipFileTest extends ZipTestCase $comment = 'Very long comment' . \PHP_EOL . 'Очень длинный комментарий' . \PHP_EOL; - $comment = str_repeat($comment, (int) ceil(0xffff / \strlen($comment)) + \strlen($comment) + 1); + $comment = str_repeat($comment, (int) ceil(0xFFFF / \strlen($comment)) + \strlen($comment) + 1); $zipFile = new ZipFile(); $zipFile->addFile(__FILE__, 'test'); @@ -925,7 +925,7 @@ class ZipFileTest extends ZipTestCase [-10], [-2], [10], - [0xffff], + [0xFFFF], ]; }