mirror/php-zip
1
0
Fork 0
mirror of https://github.com/Ne-Lexa/php-zip.git synced 2025-10-25 03:56:18 +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

12
tests/Extra/Fields/AbstractUnicodeExtraFieldTest.php
View File

@@ -76,8 +76,10 @@ abstract class AbstractUnicodeExtraFieldTest extends TestCase
*/
public function testUnicodeErrorParse()
{
$this->setExpectedException(
ZipException::class,
$this->expectException(
ZipException::class
);
$this->expectExceptionMessage(
'Unicode path extra data must have at least 5 bytes.'
);
@@ -90,8 +92,10 @@ abstract class AbstractUnicodeExtraFieldTest extends TestCase
*/
public function testUnknownVersionParse()
{
$this->setExpectedException(
ZipException::class,
$this->expectException(
ZipException::class
);
$this->expectExceptionMessage(
'Unsupported version [2] for Unicode path extra data.'
);

6
tests/Extra/Fields/ApkAlignmentExtraFieldTest.php
View File

@@ -96,8 +96,10 @@ final class ApkAlignmentExtraFieldTest extends TestCase
*/
public function testInvalidParse()
{
$this->setExpectedException(
ZipException::class,
$this->expectException(
ZipException::class
);
$this->expectExceptionMessage(
'Minimum 6 bytes of the extensible data block/field used for alignment of uncompressed entries.'
);

6
tests/Extra/Fields/AsiExtraFieldTest.php
View File

@@ -91,8 +91,10 @@ final class AsiExtraFieldTest extends TestCase
*/
public function testInvalidParse()
{
$this->setExpectedException(
Crc32Exception::class,
$this->expectException(
Crc32Exception::class
);
$this->expectExceptionMessage(
'Asi Unix Extra Filed Data (expected CRC32 value'
);

24
tests/Extra/Fields/ExtendedTimestampExtraFieldTest.php
View File

@@ -66,9 +66,9 @@ final class ExtendedTimestampExtraFieldTest extends TestCase
{
return [
[
ExtendedTimestampExtraField::MODIFY_TIME_BIT |
ExtendedTimestampExtraField::ACCESS_TIME_BIT |
ExtendedTimestampExtraField::CREATE_TIME_BIT,
ExtendedTimestampExtraField::MODIFY_TIME_BIT
| ExtendedTimestampExtraField::ACCESS_TIME_BIT
| ExtendedTimestampExtraField::CREATE_TIME_BIT,
911512006,
911430000,
893709400,
@@ -76,8 +76,8 @@ final class ExtendedTimestampExtraFieldTest extends TestCase
"\x07\xC6\x91T6",
],
[
ExtendedTimestampExtraField::MODIFY_TIME_BIT |
ExtendedTimestampExtraField::ACCESS_TIME_BIT,
ExtendedTimestampExtraField::MODIFY_TIME_BIT
| ExtendedTimestampExtraField::ACCESS_TIME_BIT,
1492955702,
1492955638,
null,
@@ -115,8 +115,8 @@ final class ExtendedTimestampExtraFieldTest extends TestCase
$field->setAccessTime($atime);
self::assertSame(
$field->getFlags(),
ExtendedTimestampExtraField::MODIFY_TIME_BIT |
ExtendedTimestampExtraField::ACCESS_TIME_BIT
ExtendedTimestampExtraField::MODIFY_TIME_BIT
| ExtendedTimestampExtraField::ACCESS_TIME_BIT
);
self::assertSame($field->getModifyTime(), $mtime);
self::assertSame($field->getAccessTime(), $atime);
@@ -127,9 +127,9 @@ final class ExtendedTimestampExtraFieldTest extends TestCase
$field->setCreateTime($ctime);
self::assertSame(
$field->getFlags(),
ExtendedTimestampExtraField::MODIFY_TIME_BIT |
ExtendedTimestampExtraField::ACCESS_TIME_BIT |
ExtendedTimestampExtraField::CREATE_TIME_BIT
ExtendedTimestampExtraField::MODIFY_TIME_BIT
| ExtendedTimestampExtraField::ACCESS_TIME_BIT
| ExtendedTimestampExtraField::CREATE_TIME_BIT
);
self::assertSame($field->getModifyTime(), $mtime);
self::assertSame($field->getAccessTime(), $atime);
@@ -141,8 +141,8 @@ final class ExtendedTimestampExtraFieldTest extends TestCase
self::assertNull($field->getCreateDateTime());
self::assertSame(
$field->getFlags(),
ExtendedTimestampExtraField::MODIFY_TIME_BIT |
ExtendedTimestampExtraField::ACCESS_TIME_BIT
ExtendedTimestampExtraField::MODIFY_TIME_BIT
| ExtendedTimestampExtraField::ACCESS_TIME_BIT
);
$field->setAccessTime(null);

12
tests/Extra/Fields/JarMarkerExtraFieldTest.php
View File

@@ -32,8 +32,10 @@ final class JarMarkerExtraFieldTest extends TestCase
*/
public function testInvalidUnpackLocalData()
{
$this->setExpectedException(
ZipException::class,
$this->expectException(
ZipException::class
);
$this->expectExceptionMessage(
"JarMarker doesn't expect any data"
);
@@ -45,8 +47,10 @@ final class JarMarkerExtraFieldTest extends TestCase
*/
public function testInvalidUnpackCdData()
{
$this->setExpectedException(
ZipException::class,
$this->expectException(
ZipException::class
);
$this->expectExceptionMessage(
"JarMarker doesn't expect any data"
);

10
tests/Extra/Fields/NtfsExtraFieldTest.php
View File

@@ -14,8 +14,10 @@ use PhpZip\Model\Extra\Fields\NtfsExtraField;
*/
final class NtfsExtraFieldTest extends TestCase
{
protected function setUp()
protected function setUp(): void
{
parent::setUp();
if (\PHP_INT_SIZE === 4) {
self::markTestSkipped('only 64 bit test');
}
@@ -156,9 +158,9 @@ final class NtfsExtraFieldTest extends TestCase
$atimeTimestamp,
$ctimeTimestamp
) {
self::assertEquals(NtfsExtraField::ntfsTimeToTimestamp($mtimeNtfs), $mtimeTimestamp, '', 0.00001);
self::assertEquals(NtfsExtraField::ntfsTimeToTimestamp($atimeNtfs), $atimeTimestamp, '', 0.00001);
self::assertEquals(NtfsExtraField::ntfsTimeToTimestamp($ctimeNtfs), $ctimeTimestamp, '', 0.00001);
self::assertEqualsWithDelta(NtfsExtraField::ntfsTimeToTimestamp($mtimeNtfs), $mtimeTimestamp, 0.00001);
self::assertEqualsWithDelta(NtfsExtraField::ntfsTimeToTimestamp($atimeNtfs), $atimeTimestamp, 0.00001);
self::assertEqualsWithDelta(NtfsExtraField::ntfsTimeToTimestamp($ctimeNtfs), $ctimeTimestamp, 0.00001);
self::assertEqualsIntegerWithDelta(NtfsExtraField::timestampToNtfsTime($mtimeTimestamp), $mtimeNtfs, 10);
self::assertEqualsIntegerWithDelta(NtfsExtraField::timestampToNtfsTime($atimeTimestamp), $atimeNtfs, 10);

2
tests/Extra/Fields/UnicodeCommentExtraFieldTest.php
View File

@@ -12,7 +12,7 @@ use PhpZip\Model\Extra\Fields\UnicodeCommentExtraField;
final class UnicodeCommentExtraFieldTest extends AbstractUnicodeExtraFieldTest
{
/**
* {@inheritdoc}
* {@inheritDoc}
*/
protected function getUnicodeExtraFieldClassName()
{

2
tests/Extra/Fields/UnicodePathExtraFieldTest.php
View File

@@ -14,7 +14,7 @@ use PhpZip\Model\Extra\Fields\UnicodePathExtraField;
final class UnicodePathExtraFieldTest extends AbstractUnicodeExtraFieldTest
{
/**
* {@inheritdoc}
* {@inheritDoc}
*/
protected function getUnicodeExtraFieldClassName()
{

12
tests/Extra/Fields/UnrecognizedExtraFieldTest.php
View File

@@ -37,8 +37,10 @@ final class UnrecognizedExtraFieldTest extends TestCase
public function testUnpackLocalData()
{
$this->setExpectedException(
RuntimeException::class,
$this->expectException(
RuntimeException::class
);
$this->expectExceptionMessage(
'Unsupport parse'
);
@@ -47,8 +49,10 @@ final class UnrecognizedExtraFieldTest extends TestCase
public function testUnpackCentralDirData()
{
$this->setExpectedException(
RuntimeException::class,
$this->expectException(
RuntimeException::class
);
$this->expectExceptionMessage(
'Unsupport parse'
);

18
tests/Extra/Fields/WinZipAesExtraFieldTest.php
View File

@@ -157,7 +157,8 @@ final class WinZipAesExtraFieldTest extends TestCase
*/
public function testConstructUnsupportVendorVersion()
{
$this->setExpectedException(InvalidArgumentException::class, 'Unsupport WinZip AES vendor version: 3');
$this->expectException(InvalidArgumentException::class);
$this->expectExceptionMessage('Unsupport WinZip AES vendor version: 3');
new WinZipAesExtraField(
3,
@@ -171,7 +172,8 @@ final class WinZipAesExtraFieldTest extends TestCase
*/
public function testSetterUnsupportVendorVersion()
{
$this->setExpectedException(InvalidArgumentException::class, 'Unsupport WinZip AES vendor version: 3');
$this->expectException(InvalidArgumentException::class);
$this->expectExceptionMessage('Unsupport WinZip AES vendor version: 3');
$extraField = new WinZipAesExtraField(
WinZipAesExtraField::VERSION_AE1,
@@ -186,7 +188,8 @@ final class WinZipAesExtraFieldTest extends TestCase
*/
public function testConstructUnsupportCompressionMethod()
{
$this->setExpectedException(ZipUnsupportMethodException::class, 'Compression method 3 (Reduced compression factor 2) is not supported.');
$this->expectException(ZipUnsupportMethodException::class);
$this->expectExceptionMessage('Compression method 3 (Reduced compression factor 2) is not supported.');
new WinZipAesExtraField(
WinZipAesExtraField::VERSION_AE1,
@@ -200,7 +203,8 @@ final class WinZipAesExtraFieldTest extends TestCase
*/
public function testSetterUnsupportCompressionMethod()
{
$this->setExpectedException(ZipUnsupportMethodException::class, 'Compression method 3 (Reduced compression factor 2) is not supported.');
$this->expectException(ZipUnsupportMethodException::class);
$this->expectExceptionMessage('Compression method 3 (Reduced compression factor 2) is not supported.');
$extraField = new WinZipAesExtraField(
WinZipAesExtraField::VERSION_AE1,
@@ -215,7 +219,8 @@ final class WinZipAesExtraFieldTest extends TestCase
*/
public function testConstructUnsupportKeyStrength()
{
$this->setExpectedException(InvalidArgumentException::class, 'Key strength 16 not support value. Allow values: 1, 2, 3');
$this->expectException(InvalidArgumentException::class);
$this->expectExceptionMessage('Key strength 16 not support value. Allow values: 1, 2, 3');
new WinZipAesExtraField(
WinZipAesExtraField::VERSION_AE1,
@@ -229,7 +234,8 @@ final class WinZipAesExtraFieldTest extends TestCase
*/
public function testSetterUnsupportKeyStrength()
{
$this->setExpectedException(InvalidArgumentException::class, 'Key strength 16 not support value. Allow values: 1, 2, 3');
$this->expectException(InvalidArgumentException::class);
$this->expectExceptionMessage('Key strength 16 not support value. Allow values: 1, 2, 3');
new WinZipAesExtraField(
WinZipAesExtraField::VERSION_AE1,

4
tests/Extra/Fields/Zip64ExtraFieldTest.php
View File

@@ -15,8 +15,10 @@ use PhpZip\Model\ZipEntry;
*/
final class Zip64ExtraFieldTest extends TestCase
{
protected function setUp()
protected function setUp(): void
{
parent::setUp();
if (\PHP_INT_SIZE === 4) {
self::markTestSkipped('only 64 bit test');
}