mirror/php-zip
1
0
Fork 0
mirror of https://github.com/Ne-Lexa/php-zip.git synced 2025-10-10 04:44:28 +02:00
Code Issues Releases Wiki Activity

php 7.1 - 8.0 compatible version

Browse Source 
issue #78
This commit is contained in:
Ne-Lexa
2021-05-16 12:18:23 +03:00
parent 7283fc3402
commit 584784c119
73 changed files with 1446 additions and 958 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
tests/ZipEntryTest.php
View File

@@ -89,7 +89,8 @@ class ZipEntryTest extends TestCase
*/
public function testEmptyName($entryName, $exceptionMessage)
{
$this->setExpectedException(InvalidArgumentException::class, $exceptionMessage);
$this->expectException(InvalidArgumentException::class);
$this->expectExceptionMessage($exceptionMessage);
new ZipEntry($entryName);
}
@@ -174,7 +175,8 @@ class ZipEntryTest extends TestCase
*/
public function testOutOfRangeCompressionMethod($compressionMethod)
{
$this->setExpectedException(InvalidArgumentException::class, 'method out of range: ' . $compressionMethod);
$this->expectException(InvalidArgumentException::class);
$this->expectExceptionMessage('method out of range: ' . $compressionMethod);
$zipEntry = new ZipEntry('entry');
$zipEntry->setCompressionMethod($compressionMethod);
@@ -201,7 +203,8 @@ class ZipEntryTest extends TestCase
*/
public function testUnsupportCompressionMethod($compressionMethod, $exceptionMessage)
{
$this->setExpectedException(ZipUnsupportMethodException::class, $exceptionMessage);
$this->expectException(ZipUnsupportMethodException::class);
$this->expectExceptionMessage($exceptionMessage);
$zipEntry = new ZipEntry('entry');
$zipEntry->setCompressionMethod($compressionMethod);
@@ -253,7 +256,8 @@ class ZipEntryTest extends TestCase
public function testEmptyCharset()
{
$this->setExpectedException(InvalidArgumentException::class, 'Empty charset');
$this->expectException(InvalidArgumentException::class);
$this->expectExceptionMessage('Empty charset');
$zipEntry = new ZipEntry('entry');
$zipEntry->setCharset('');
@@ -398,7 +402,8 @@ class ZipEntryTest extends TestCase
*/
public function testInvalidCreatedOs($zipOS)
{
$this->setExpectedException(InvalidArgumentException::class, 'Platform out of range');
$this->expectException(InvalidArgumentException::class);
$this->expectExceptionMessage('Platform out of range');
$zipEntry = new ZipEntry('entry');
$zipEntry->setCreatedOS($zipOS);
@@ -422,7 +427,8 @@ class ZipEntryTest extends TestCase
*/
public function testInvalidExtractedOs($zipOS)
{
$this->setExpectedException(InvalidArgumentException::class, 'Platform out of range');
$this->expectException(InvalidArgumentException::class);
$this->expectExceptionMessage('Platform out of range');
$zipEntry = new ZipEntry('entry');
$zipEntry->setExtractedOS($zipOS);
@@ -545,7 +551,8 @@ class ZipEntryTest extends TestCase
public function testInvalidCompressedSize()
{
$this->setExpectedException(InvalidArgumentException::class, 'Compressed size < -1');
$this->expectException(InvalidArgumentException::class);
$this->expectExceptionMessage('Compressed size < -1');
$zipEntry = new ZipEntry('entry');
$zipEntry->setCompressedSize(-2);
@@ -553,7 +560,8 @@ class ZipEntryTest extends TestCase
public function testInvalidUncompressedSize()
{
$this->setExpectedException(InvalidArgumentException::class, 'Uncompressed size < -1');
$this->expectException(InvalidArgumentException::class);
$this->expectExceptionMessage('Uncompressed size < -1');
$zipEntry = new ZipEntry('entry');
$zipEntry->setUncompressedSize(-2);
@@ -568,7 +576,8 @@ class ZipEntryTest extends TestCase
$zipEntry->setLocalHeaderOffset($localHeaderOffset);
static::assertSame($zipEntry->getLocalHeaderOffset(), $localHeaderOffset);
$this->setExpectedException(InvalidArgumentException::class, 'Negative $localHeaderOffset');
$this->expectException(InvalidArgumentException::class);
$this->expectExceptionMessage('Negative $localHeaderOffset');
$zipEntry->setLocalHeaderOffset(-1);
}
@@ -652,7 +661,8 @@ class ZipEntryTest extends TestCase
*/
public function testInvalidGPBF($gpbf)
{
$this->setExpectedException(InvalidArgumentException::class, 'general purpose bit flags out of range');
$this->expectException(InvalidArgumentException::class);
$this->expectExceptionMessage('general purpose bit flags out of range');
$zipEntry = new ZipEntry('entry');
$zipEntry->setGeneralPurposeBitFlags($gpbf);
@@ -683,8 +693,8 @@ class ZipEntryTest extends TestCase
$zipEntry = new ZipEntry('entry');
$zipEntry->setCompressionMethod(ZipCompressionMethod::DEFLATED);
$gpbf = ($bit1 ? GeneralPurposeBitFlag::COMPRESSION_FLAG1 : 0) |
($bit2 ? GeneralPurposeBitFlag::COMPRESSION_FLAG2 : 0);
$gpbf = ($bit1 ? GeneralPurposeBitFlag::COMPRESSION_FLAG1 : 0)
| ($bit2 ? GeneralPurposeBitFlag::COMPRESSION_FLAG2 : 0);
$zipEntry->setGeneralPurposeBitFlags($gpbf);
static::assertSame($zipEntry->getCompressionLevel(), $compressionLevel);
@@ -791,10 +801,12 @@ class ZipEntryTest extends TestCase
*/
public function testInvalidCompressionLevel($compressionLevel)
{
$this->setExpectedException(
InvalidArgumentException::class,
'Invalid compression level. Minimum level ' . ZipCompressionLevel::LEVEL_MIN .
'. Maximum level ' . ZipCompressionLevel::LEVEL_MAX
$this->expectException(
InvalidArgumentException::class
);
$this->expectExceptionMessage(
'Invalid compression level. Minimum level ' . ZipCompressionLevel::LEVEL_MIN
. '. Maximum level ' . ZipCompressionLevel::LEVEL_MAX
);
$zipEntry = new ZipEntry('entry');
@@ -855,7 +867,8 @@ class ZipEntryTest extends TestCase
return;
}
$this->setExpectedException(InvalidArgumentException::class, 'DosTime out of range');
$this->expectException(InvalidArgumentException::class);
$this->expectExceptionMessage('DosTime out of range');
$zipEntry = new ZipEntry('entry');
$zipEntry->setDosTime($dosTime);
@@ -1012,7 +1025,8 @@ class ZipEntryTest extends TestCase
return;
}
$this->setExpectedException(InvalidArgumentException::class, 'external attributes out of range');
$this->expectException(InvalidArgumentException::class);
$this->expectExceptionMessage('external attributes out of range');
$zipEntry = new ZipEntry('entry');
$zipEntry->setExternalAttributes($externalAttributes);
@@ -1045,7 +1059,8 @@ class ZipEntryTest extends TestCase
*/
public function testInvalidInternalAttributes($internalAttributes)
{
$this->setExpectedException(InvalidArgumentException::class, 'internal attributes out of range');
$this->expectException(InvalidArgumentException::class);
$this->expectExceptionMessage('internal attributes out of range');
$zipEntry = new ZipEntry('entry');
$zipEntry->setInternalAttributes($internalAttributes);
@@ -1140,7 +1155,8 @@ class ZipEntryTest extends TestCase
*/
public function testLongComment()
{
$this->setExpectedException(InvalidArgumentException::class, 'Comment too long');
$this->expectException(InvalidArgumentException::class);
$this->expectExceptionMessage('Comment too long');
$longComment = random_bytes(0xffff + 1);
$zipEntry = new ZipEntry('entry');
@@ -1305,8 +1321,10 @@ class ZipEntryTest extends TestCase
*/
public function testInvalidEncryptionMethod($encryptionMethod)
{
$this->setExpectedException(
InvalidArgumentException::class,
$this->expectException(
InvalidArgumentException::class
);
$this->expectExceptionMessage(
'Encryption method ' . $encryptionMethod . ' is not supported.'
);
@@ -1456,7 +1474,7 @@ class ZipEntryTest extends TestCase
* @param \DateTimeInterface|null $atime
* @param \DateTimeInterface|null $ctime
*/
public function testMTimeATimeCTime(ExtraFieldsCollection $extraFieldsCollection, $mtime, $atime, $ctime)
public function testMTimeATimeCTime(ExtraFieldsCollection $extraFieldsCollection, \DateTimeInterface $mtime, \DateTimeInterface $atime = null, \DateTimeInterface $ctime = null)
{
$unixTimestamp = time();