Merge branch 'main' of https://github.com/indy2kro/php-iso

Author: indy2kro

.github/dependabot.yml

@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+
+version: 2
+updates:
+  - package-ecosystem: "composer" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"

composer.lock

@@ -10,14 +10,13 @@
 class IsoFile
 {
     /**
-     * @var resource
+     * @var array<int, Descriptor>
      */
-    protected mixed $fileHandle;
-
+    public array $descriptors = [];
     /**
-     * @var array<int, Descriptor>
+     * @var resource
      */
-    protected array $descriptors = [];
+    protected mixed $fileHandle;
 
     public function __construct(protected string $isoFilePath)
     {

src/IsoFile.php

@@ -51,8 +51,8 @@ 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);
-        $utcOffset = $buffer[16];
+        $ms = (int) substr($date, 14, 2);
+        $utcOffset = (int) substr($date, 16, 2);
         $utcOffsetHours = (int) round($utcOffset / 4);
 
         $offset += 1;
@@ -61,6 +61,12 @@ public static function init17(array &$buffer, int &$offset): ?Carbon
             return null;
         }
 
-        return Carbon::create($year, $month, $day, $hour, $min, $sec, $utcOffsetHours);
+        $date = Carbon::create($year, $month, $day, $hour, $min, $sec, $utcOffsetHours);
+
+        if ($date !== null) {
+            $date->addMilliseconds($ms);
+        }
+
+        return $date;
     }
 }

src/Util/IsoDate.php

@@ -29,15 +29,17 @@ public function testConstructorInvalidFile(): void
     }
 
     #[DataProvider('isoFilesDataProvider')]
-    public function testConstructorExistingFile(string $testFile): void
+    public function testConstructorExistingFile(string $testFile, int $descriptorCount): void
     {
         $isoFile = new IsoFile($testFile);
         $this->assertInstanceOf(IsoFile::class, $isoFile);
+        $this->assertCount($descriptorCount, $isoFile->descriptors);
+        print_r($isoFile);
     }
 
     public static function isoFilesDataProvider(): Iterator
     {
-        yield [dirname(__FILE__, 2) . '/fixtures/1mb.iso'];
-        yield [dirname(__FILE__, 2) . '/fixtures/test.iso'];
+        yield [dirname(__FILE__, 2) . '/fixtures/1mb.iso', 3];
+        yield [dirname(__FILE__, 2) . '/fixtures/test.iso', 2];
     }
 }