Added more tests

Author: indy2kro

fixtures/1mb.iso

@@ -19,7 +19,7 @@ public static function create(int $type, string $stdId = '', int $version = 0, ?
             Type::SUPPLEMENTARY_VOLUME_DESC => new SupplementaryVolume($stdId, $version, $bytes),
             Type::PARTITION_VOLUME_DESC => new Partition($stdId, $version, $bytes),
             Type::TERMINATOR_DESC => new Terminator($stdId, $version, $bytes),
-            default => throw new Exception('Invalid descriptoin type received: ' . $type),
+            default => throw new Exception('Invalid descriptor type received: ' . $type),
         };
     }
 }

src/Descriptor/Factory.php

@@ -4,14 +4,8 @@
 
 namespace PhpIso\Descriptor;
 
-use PhpIso\IsoFile;
-
 class SupplementaryVolume extends Volume
 {
     protected int $type = Type::SUPPLEMENTARY_VOLUME_DESC;
     protected string $name = 'Supplementary volume descriptor';
-
-    public function init(IsoFile $isoFile, int &$offset): void
-    {
-    }
 }

src/Descriptor/SupplementaryVolume.php

@@ -8,24 +8,33 @@
 
 class IsoDate
 {
+    /*
+     * UTC offset = Offset from Greenwich Mean Time in number of 15 min intervals from -48 (West) to +52 (East) recorded according to 7.1.2
+     */
+
     /**
      * Create from a "7 bytes" date
      *
      * @param array<int, mixed> $buffer
      */
     public static function init7(array &$buffer, int &$offset): ?Carbon
     {
-        $year = 1900 + $buffer[$offset + 0];
-        $month = $buffer[$offset + 1];
-        $day = $buffer[$offset + 2];
-        $hour = $buffer[$offset + 3];
-        $min = $buffer[$offset + 4];
-        $sec = $buffer[$offset + 5];
-        // $tz = $buffer[$offset + 6];
+        $year = 1900 + (int) $buffer[$offset + 0];
+        $month = (int) $buffer[$offset + 1];
+        $day = (int) $buffer[$offset + 2];
+        $hour = (int) $buffer[$offset + 3];
+        $min = (int) $buffer[$offset + 4];
+        $sec = (int) $buffer[$offset + 5];
+        $utcOffset = $buffer[$offset + 6];
+        $utcOffsetHours = (int) round($utcOffset / 4);
 
         $offset += 7;
 
-        return Carbon::create($year, $month, $day, $hour, $min, $sec);
+        if ($year === 1900 || $month === 0 || $day === 0) {
+            return null;
+        }
+
+        return Carbon::create($year, $month, $day, $hour, $min, $sec, $utcOffsetHours);
     }
     /**
      * Create from a "17 bytes" date
@@ -42,11 +51,16 @@ public static function init17(array &$buffer, int &$offset): ?Carbon
         $hour = (int) substr($date, 8, 2);
         $min = (int) substr($date, 10, 2);
         $sec = (int) substr($date, 12, 2);
-        // $ms = (int) substr($date, 14, 2);
-        // $tz = $buffer[16];
+        $ms = (int) substr($date, 14, 2);
+        $utcOffset = $buffer[16];
+        $utcOffsetHours = (int) round($utcOffset / 4);
 
         $offset += 1;
 
-        return Carbon::create($year, $month, $day, $hour, $min, $sec);
+        if ($year === 0 || $month === 0 || $day === 0) {
+            return null;
+        }
+
+        return Carbon::create($year, $month, $day, $hour, $min, $sec, $utcOffsetHours);
     }
 }

src/Util/IsoDate.php

@@ -4,7 +4,9 @@
 
 namespace PhpIso\Test;
 
+use Iterator;
 use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PhpIso\IsoFile;
 use PhpIso\Exception;
 
@@ -26,10 +28,16 @@ public function testConstructorInvalidFile(): void
         new IsoFile($testFile);
     }
 
-    public function testConstructorExistingFile(): void
+    #[DataProvider('isoFilesDataProvider')]
+    public function testConstructorExistingFile(string $testFile): void
     {
-        $testFile = dirname(__FILE__, 2) . '/fixtures/test.iso';
         $isoFile = new IsoFile($testFile);
         $this->assertInstanceOf(IsoFile::class, $isoFile);
     }
+
+    public static function isoFilesDataProvider(): Iterator
+    {
+        yield [dirname(__FILE__, 2) . '/fixtures/1mb.iso'];
+        yield [dirname(__FILE__, 2) . '/fixtures/test.iso'];
+    }
 }