Skip to content

Commit 3b23c88

Browse files
indy2kroindy2kro
committed
Merge branch 'main' of https://github.com/indy2kro/php-iso 
2 parents 7dab64c + ee723a4 commit 3b23c88

File tree

3 files changed

+34
-34
lines changed

3 files changed

+34
-34
lines changed

‎tests/IsoFileTest.php‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -86,19 +86,19 @@ public function testDescriptorsTestDirIso(): void
8686
$this->assertSame('CDROM', $primaryVolumeDescriptor->volumeId);
8787
$this->assertSame(198, $primaryVolumeDescriptor->volumeSpaceSize);
8888
$this->assertSame('GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM', $primaryVolumeDescriptor->appId);
89-
$this->assertNotNull($primaryVolumeDescriptor->creationDate);
89+
$this->assertInstanceOf(Carbon::class, $primaryVolumeDescriptor->creationDate);
9090
$this->assertSame(Carbon::create(2025, 1, 15, 9, 41, 36, 'Europe/Paris')?->toDateTimeString(), $primaryVolumeDescriptor->creationDate->toDateTimeString());
91-
$this->assertNotNull($primaryVolumeDescriptor->modificationDate);
91+
$this->assertInstanceOf(Carbon::class, $primaryVolumeDescriptor->modificationDate);
9292
$this->assertSame(Carbon::create(2025, 1, 15, 9, 41, 36, 'Europe/Paris')?->toDateTimeString(), $primaryVolumeDescriptor->modificationDate->toDateTimeString());
93-
$this->assertNull($primaryVolumeDescriptor->expirationDate);
94-
$this->assertNotNull($primaryVolumeDescriptor->effectiveDate);
93+
$this->assertNotInstanceOf(Carbon::class, $primaryVolumeDescriptor->expirationDate);
94+
$this->assertInstanceOf(Carbon::class, $primaryVolumeDescriptor->effectiveDate);
9595
$this->assertSame(Carbon::create(2025, 1, 15, 9, 41, 36, 'Europe/Paris')?->toDateTimeString(), $primaryVolumeDescriptor->effectiveDate->toDateTimeString());
9696

9797
// check root directory
9898
$rootDirectory = $primaryVolumeDescriptor->rootDirectory;
9999
$this->assertSame('.', $rootDirectory->fileId);
100100
$this->assertTrue($rootDirectory->isDirectory());
101-
$this->assertNotNull($rootDirectory->recordingDate);
101+
$this->assertInstanceOf(Carbon::class, $rootDirectory->recordingDate);
102102
$this->assertSame(Carbon::create(2025, 1, 15, 9, 41, 9, 'Europe/Paris')?->toDateTimeString(), $rootDirectory->recordingDate->toDateTimeString());
103103

104104
// check path table
@@ -182,19 +182,19 @@ public function testDescriptorsSubdirIso(): void
182182
$this->assertSame('CDROM', $primaryVolumeDescriptor->volumeId);
183183
$this->assertSame(181, $primaryVolumeDescriptor->volumeSpaceSize);
184184
$this->assertSame('GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM', $primaryVolumeDescriptor->appId);
185-
$this->assertNotNull($primaryVolumeDescriptor->creationDate);
185+
$this->assertInstanceOf(Carbon::class, $primaryVolumeDescriptor->creationDate);
186186
$this->assertSame(Carbon::create(2025, 1, 15, 16, 7, 41, 'Europe/Paris')?->toDateTimeString(), $primaryVolumeDescriptor->creationDate->toDateTimeString());
187-
$this->assertNotNull($primaryVolumeDescriptor->modificationDate);
187+
$this->assertInstanceOf(Carbon::class, $primaryVolumeDescriptor->modificationDate);
188188
$this->assertSame(Carbon::create(2025, 1, 15, 16, 7, 41, 'Europe/Paris')?->toDateTimeString(), $primaryVolumeDescriptor->modificationDate->toDateTimeString());
189-
$this->assertNull($primaryVolumeDescriptor->expirationDate);
190-
$this->assertNotNull($primaryVolumeDescriptor->effectiveDate);
189+
$this->assertNotInstanceOf(Carbon::class, $primaryVolumeDescriptor->expirationDate);
190+
$this->assertInstanceOf(Carbon::class, $primaryVolumeDescriptor->effectiveDate);
191191
$this->assertSame(Carbon::create(2025, 1, 15, 16, 7, 41, 'Europe/Paris')?->toDateTimeString(), $primaryVolumeDescriptor->effectiveDate->toDateTimeString());
192192

193193
// check root directory
194194
$rootDirectory = $primaryVolumeDescriptor->rootDirectory;
195195
$this->assertSame('.', $rootDirectory->fileId);
196196
$this->assertTrue($rootDirectory->isDirectory());
197-
$this->assertNotNull($rootDirectory->recordingDate);
197+
$this->assertInstanceOf(Carbon::class, $rootDirectory->recordingDate);
198198
$this->assertSame(Carbon::create(2025, 1, 15, 16, 7, 30, 'Europe/Paris')?->toDateTimeString(), $rootDirectory->recordingDate->toDateTimeString());
199199

200200
// check path table
@@ -284,10 +284,10 @@ public function testDescriptorsDosIso(): void
284284
$this->assertSame('DOS4.01', $primaryVolumeDescriptor->volumeId);
285285
$this->assertSame(848, $primaryVolumeDescriptor->volumeSpaceSize);
286286
$this->assertSame('', $primaryVolumeDescriptor->appId);
287-
$this->assertNull($primaryVolumeDescriptor->creationDate);
288-
$this->assertNull($primaryVolumeDescriptor->modificationDate);
289-
$this->assertNull($primaryVolumeDescriptor->expirationDate);
290-
$this->assertNull($primaryVolumeDescriptor->effectiveDate);
287+
$this->assertNotInstanceOf(Carbon::class, $primaryVolumeDescriptor->creationDate);
288+
$this->assertNotInstanceOf(Carbon::class, $primaryVolumeDescriptor->modificationDate);
289+
$this->assertNotInstanceOf(Carbon::class, $primaryVolumeDescriptor->expirationDate);
290+
$this->assertNotInstanceOf(Carbon::class, $primaryVolumeDescriptor->effectiveDate);
291291

292292
/** @var Boot $bootDescriptor */
293293
$bootDescriptor = $isoFile->descriptors[Type::BOOT_RECORD_DESC];
@@ -312,10 +312,10 @@ public function testDescriptorsDosIso(): void
312312
$this->assertSame(848, $supplementaryVolumeDescriptor->volumeSpaceSize);
313313
$this->assertSame('', $supplementaryVolumeDescriptor->appId);
314314
$this->assertSame(3, $supplementaryVolumeDescriptor->jolietLevel);
315-
$this->assertNull($supplementaryVolumeDescriptor->creationDate);
316-
$this->assertNull($supplementaryVolumeDescriptor->modificationDate);
317-
$this->assertNull($supplementaryVolumeDescriptor->expirationDate);
318-
$this->assertNull($supplementaryVolumeDescriptor->effectiveDate);
315+
$this->assertNotInstanceOf(Carbon::class, $supplementaryVolumeDescriptor->creationDate);
316+
$this->assertNotInstanceOf(Carbon::class, $supplementaryVolumeDescriptor->modificationDate);
317+
$this->assertNotInstanceOf(Carbon::class, $supplementaryVolumeDescriptor->expirationDate);
318+
$this->assertNotInstanceOf(Carbon::class, $supplementaryVolumeDescriptor->effectiveDate);
319319
}
320320

321321
public function testDescriptorsIso9660HfsPartIso(): void

‎tests/IsoFileTestUdf.php‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,12 @@ public function testDescriptorsTestIso(): void
6060
$this->assertSame('PHP_ISO_FILE', $primaryVolumeDescriptor->volumeId);
6161
$this->assertSame(599, $primaryVolumeDescriptor->volumeSpaceSize);
6262
$this->assertSame('IMGBURN V2.5.8.0 - THE ULTIMATE IMAGE BURNER!', $primaryVolumeDescriptor->appId);
63-
$this->assertNotNull($primaryVolumeDescriptor->creationDate);
63+
$this->assertInstanceOf(Carbon::class, $primaryVolumeDescriptor->creationDate);
6464
$this->assertSame(Carbon::create(2025, 1, 12, 15, 0, 53, 'Europe/Paris')?->toDateTimeString(), $primaryVolumeDescriptor->creationDate->toDateTimeString());
65-
$this->assertNotNull($primaryVolumeDescriptor->modificationDate);
65+
$this->assertInstanceOf(Carbon::class, $primaryVolumeDescriptor->modificationDate);
6666
$this->assertSame(Carbon::create(2025, 1, 12, 15, 0, 53, 'Europe/Paris')?->toDateTimeString(), $primaryVolumeDescriptor->modificationDate->toDateTimeString());
67-
$this->assertNull($primaryVolumeDescriptor->expirationDate);
68-
$this->assertNull($primaryVolumeDescriptor->effectiveDate);
67+
$this->assertNotInstanceOf(Carbon::class, $primaryVolumeDescriptor->expirationDate);
68+
$this->assertNotInstanceOf(Carbon::class, $primaryVolumeDescriptor->effectiveDate);
6969

7070
// check root directory
7171
$rootDirectory = $primaryVolumeDescriptor->rootDirectory;
@@ -78,7 +78,7 @@ public function testDescriptorsTestIso(): void
7878
$this->assertFalse($rootDirectory->isMultiExtent());
7979
$this->assertTrue($rootDirectory->isThis());
8080
$this->assertFalse($rootDirectory->isParent());
81-
$this->assertNotNull($rootDirectory->recordingDate);
81+
$this->assertInstanceOf(Carbon::class, $rootDirectory->recordingDate);
8282
$this->assertSame(Carbon::create(2025, 1, 12, 15, 0, 53, 'Europe/Paris')?->toDateTimeString(), $rootDirectory->recordingDate->toDateTimeString());
8383

8484
// check path table
@@ -191,12 +191,12 @@ public function testDescriptorsIso9660UdfIso(): void
191191
$this->assertSame('UDF Bridge', $primaryVolumeDescriptor->volumeId);
192192
$this->assertSame(460, $primaryVolumeDescriptor->volumeSpaceSize);
193193
$this->assertSame('GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM', $primaryVolumeDescriptor->appId);
194-
$this->assertNotNull($primaryVolumeDescriptor->creationDate);
194+
$this->assertInstanceOf(Carbon::class, $primaryVolumeDescriptor->creationDate);
195195
$this->assertSame(Carbon::create(2022, 4, 7, 20, 31, 13, 'Europe/Paris')?->toDateTimeString(), $primaryVolumeDescriptor->creationDate->toDateTimeString());
196-
$this->assertNotNull($primaryVolumeDescriptor->modificationDate);
196+
$this->assertInstanceOf(Carbon::class, $primaryVolumeDescriptor->modificationDate);
197197
$this->assertSame(Carbon::create(2022, 4, 7, 20, 31, 13, 'Europe/Paris')?->toDateTimeString(), $primaryVolumeDescriptor->modificationDate->toDateTimeString());
198-
$this->assertNull($primaryVolumeDescriptor->expirationDate);
199-
$this->assertNotNull($primaryVolumeDescriptor->effectiveDate);
198+
$this->assertNotInstanceOf(Carbon::class, $primaryVolumeDescriptor->expirationDate);
199+
$this->assertInstanceOf(Carbon::class, $primaryVolumeDescriptor->effectiveDate);
200200
$this->assertSame(Carbon::create(2022, 4, 7, 20, 31, 13, 'Europe/Paris')?->toDateTimeString(), $primaryVolumeDescriptor->effectiveDate->toDateTimeString());
201201

202202
/** @var SupplementaryVolume $supplementaryVolumeDescriptor */
@@ -214,12 +214,12 @@ public function testDescriptorsIso9660UdfIso(): void
214214
$this->assertSame(460, $supplementaryVolumeDescriptor->volumeSpaceSize);
215215
// TODO - fix encoding
216216
// $this->assertSame('GENISOIMAGE ISO 9660_HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE', $supplementaryVolumeDescriptor->appId);
217-
$this->assertNotNull($supplementaryVolumeDescriptor->creationDate);
217+
$this->assertInstanceOf(Carbon::class, $supplementaryVolumeDescriptor->creationDate);
218218
$this->assertSame(Carbon::create(2022, 4, 7, 20, 31, 13, 'Europe/Paris')?->toDateTimeString(), $supplementaryVolumeDescriptor->creationDate->toDateTimeString());
219-
$this->assertNotNull($supplementaryVolumeDescriptor->modificationDate);
219+
$this->assertInstanceOf(Carbon::class, $supplementaryVolumeDescriptor->modificationDate);
220220
$this->assertSame(Carbon::create(2022, 4, 7, 20, 31, 13, 'Europe/Paris')?->toDateTimeString(), $supplementaryVolumeDescriptor->modificationDate->toDateTimeString());
221-
$this->assertNull($supplementaryVolumeDescriptor->expirationDate);
222-
$this->assertNotNull($supplementaryVolumeDescriptor->effectiveDate);
221+
$this->assertNotInstanceOf(Carbon::class, $supplementaryVolumeDescriptor->expirationDate);
222+
$this->assertInstanceOf(Carbon::class, $supplementaryVolumeDescriptor->effectiveDate);
223223
$this->assertSame(Carbon::create(2022, 4, 7, 20, 31, 13, 'Europe/Paris')?->toDateTimeString(), $supplementaryVolumeDescriptor->effectiveDate->toDateTimeString());
224224

225225
// TODO - add assert for UDF volumes

‎tests/Util/IsoDateTest.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public function testInit7InvalidDate(): void
3030

3131
$date = IsoDate::init7($buffer, $offset);
3232

33-
$this->assertNull($date);
33+
$this->assertNotInstanceOf(Carbon::class, $date);
3434
$this->assertSame(7, $offset);
3535
}
3636

@@ -39,7 +39,7 @@ public function testInit17ValidDate(): void
3939
$buffer = array_map('ord', str_split('2023051510304516')); // Represents 2023-05-15 10:30:45.16 UTC
4040
$offset = 0;
4141
$expectedDate = Carbon::create(2023, 5, 15, 10, 30, 45, 0);
42-
$this->assertNotNull($expectedDate);
42+
$this->assertInstanceOf(Carbon::class, $expectedDate);
4343
$expectedDate->addMilliseconds(16);
4444

4545
$date = IsoDate::init17($buffer, $offset);
@@ -56,7 +56,7 @@ public function testInit17InvalidDate(): void
5656

5757
$date = IsoDate::init17($buffer, $offset);
5858

59-
$this->assertNull($date);
59+
$this->assertNotInstanceOf(Carbon::class, $date);
6060
$this->assertSame(17, $offset);
6161
}
6262
}

0 commit comments

Comments
 (0)