FileEye · mondrake · Feb 28, 2025 · Feb 9, 2025 · Feb 12, 2025 · Feb 13, 2025
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -60,7 +60,7 @@ jobs:
         php examples/dump-media.php -d tests/media-samples/image/camera/canon_eos_850d_08.jpg
         php examples/dump-media.php -d tests/media-samples/image/broken/canon-eos-650d.jpg
         php examples/dump-media.php -d tests/media-samples/image/camera/COPYING
-        php examples/dump-media.php -d composer.json
+        php examples/dump-media.php -d tests/media-samples/image/exiftool/Canon1DmkIII.jpg
 #        php examples/dump-media.php -d tests/media-samples/image/broken/gh-10-b.jpg
 #        php examples/dump-media.php -d tests/media-samples/image/broken/gh-11.jpg
 #        php examples/dump-media.php -d tests/media-samples/image/broken/pel-176-RPT200076_03.jpg
@@ -73,16 +73,17 @@ jobs:
       continue-on-error: true
       run: ./vendor/bin/phpcs --runtime-set ignore_warnings_on_exit 1
 
+    - name: "Run a static analysis with phpstan/phpstan"
+      run: vendor/bin/phpstan analyze
+#      continue-on-error: true
+
 # Remove the comment to the lines below during development, to refresh the
 # media file dumps.
 #    - name: Update media dumps
 #      run: php bin/fileeye-mediaprobe dump tests/media-samples tests/media-dumps
 
 #    - name: Upload media dumps
-#      uses: actions/upload-artifact@v3
+#      uses: actions/upload-artifact@v4
 #      with:
 #        name: media-dumps
 #        path: tests/media-dumps/**/*.yml
-
-    - name: "Run a static analysis with phpstan/phpstan"
-      run: vendor/bin/phpstan analyze
diff --git a/SPECIFICATION.md b/SPECIFICATION.md
@@ -33,7 +33,7 @@ An IFD is fully described by a single YAML file. The file name should convention
 
 ```
 type: 'IFD0'
-class: FileEye\MediaProbe\Block\Tiff\Ifd
+class: FileEye\MediaProbe\Block\Media\Tiff\Ifd
 alias:
   - '0'
   - 'Main'

diff --git a/composer.json b/composer.json
@@ -9,6 +9,7 @@
     "license": "GPL-3.0",
     "require": {
         "php": ">=8.2",
+        "ext-bcmath": "*",
         "ext-gd": "*",
         "ext-mbstring": "*",
         "composer-runtime-api": "^2.0.0",
@@ -23,17 +24,17 @@
         "bramus/monolog-colored-line-formatter": "^3",
         "phpstan/extension-installer": "*",
         "phpstan/phpstan-deprecation-rules": "^2",
-        "phpstan/phpstan": "^2",
         "phpstan/phpstan-phpunit": "^2",
+        "phpstan/phpstan": "^2",
         "phpunit/phpunit": "^11",
+        "slevomat/coding-standard": "^8.15",
         "squizlabs/php_codesniffer": "*",
         "symfony/console": "^7.2",
         "symfony/filesystem": "^7.2",
         "symfony/finder": "^7.2",
         "symfony/process": "^7.2",
         "symfony/var-dumper": "^7.2",
-        "symfony/yaml": "^7.2",
-        "slevomat/coding-standard": "^8.15"
+        "symfony/yaml": "^7.2"
     },
     "autoload": {
         "psr-4": {

diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -2,7 +2,7 @@ includes:
     - phpstan-baseline.neon
 
 parameters:
-    level: 2
+    level: 3
     paths:
         - src
         - tests

diff --git a/specs/ExiftoolFormat.yaml b/specs/ExiftoolFormat.yaml
@@ -36,6 +36,20 @@ items:
         format: Float
     double:
         format: Double
+#    ifd:
+#        13, # IFD (with int32u format)
+#    unicode:
+#        14, # UNICODE
+#    complex:
+#        15, # COMPLEX
+    int64u:
+        format: Long64
+    int64s:
+        format: SignedLong64
+#    ifd64:
+#        18, # IFD8 (with int64u format) [BigTIFF]
+#    utf8:
+#        129,# UTF-8 (Exif 3.0)
     # var_int16u is present in ExifMakerNotes\CanonVRD\Ver2
     var_int16u:
         format: Undefined

diff --git a/specs/Format.yaml b/specs/Format.yaml
@@ -90,6 +90,38 @@ items:
         name: Double
         title: 'Double'
         length: 8
+#    13:
+#        # IFD (with int32u format)
+#        name: Ifd
+#        title: 'Ifd'
+#    14:
+#        # Unicode
+#        name: Unicode
+#        title: 'Unicode'
+#    15:
+#        # Complex
+#        name: Complex
+#        title: 'Complex'
+    16:
+        # BigTIFF unsigned 64-bit integer.
+        name: Long64
+        title: 'Long (64-bit)'
+        length: 8
+        class: FileEye\MediaProbe\Entry\Core\Long64
+    17:
+        # BigTIFF signed 64-bit integer.
+        name: SignedLong64
+        title: 'SignedLong (64-bit)'
+        length: 8
+        class: FileEye\MediaProbe\Entry\Core\SignedLong64
+#    18:
+#        # IFD8 (with int64u format) [BigTIFF]
+#        name: Ifd8
+#        title: 'Ifd8'
+#    129:
+#        # UTF-8 (Exif 3.0)
+#        name: Utf8
+#        title: 'UTF-8'
     1000:
         # Unsigned 16-bit integer (Short), reversed byte order.
         name: ShortRev

diff --git a/specs/Media/ExifMakerNotes/Apple/Main.yaml → specs/Maker/Apple/Exif/MakerNote.yaml b/specs/Media/ExifMakerNotes/Apple/Main.yaml → specs/Maker/Apple/Exif/MakerNote.yaml
@@ -1,9 +1,7 @@
-collection: ExifMakerNotes\Apple\Main
 name: Apple
 title: 'Apple Maker Notes'
-handler: FileEye\MediaProbe\Block\Exif\Vendor\Apple\MakerNote
 DOMNode: makerNote
-defaultItemCollection: Tiff\Tag
+defaultItemCollection: Media\Tiff\Tag
 compiler:
     exiftool:
         g1: Apple

diff --git a/specs/Media/ExifMakerNotes/Canon/Main.yaml → specs/Maker/Canon/Exif/MakerNote.yaml b/specs/Media/ExifMakerNotes/Canon/Main.yaml → specs/Maker/Canon/Exif/MakerNote.yaml
@@ -1,9 +1,7 @@
-collection: ExifMakerNotes\Canon\Main
 name: Canon
 title: 'Canon Maker Notes'
-handler: FileEye\MediaProbe\Block\Tiff\Ifd
 DOMNode: makerNote
-defaultItemCollection: Tiff\Tag
+defaultItemCollection: Media\Tiff\Tag
 compiler:
     exiftool:
         g1: Canon

diff --git a/specs/Media/ExifMakerNotes/Apple/RunTime.yaml b/specs/Media/ExifMakerNotes/Apple/RunTime.yaml
@@ -3,7 +3,7 @@ name: AppleRuntime
 title: 'Apple Runtime'
 handler: FileEye\MediaProbe\Block\Exif\Vendor\Apple\RunTime
 DOMNode: plist
-defaultItemCollection: Tiff\Tag
+defaultItemCollection: Media\Tiff\Tag
 compiler:
     exiftool:
         g1: Apple

diff --git a/specs/Media/ExifMakerNotes/Canon/AFConfig.yaml b/specs/Media/ExifMakerNotes/Canon/AFConfig.yaml
@@ -5,7 +5,7 @@ handler: FileEye\MediaProbe\Block\Index
 DOMNode: index
 format: Long
 hasIndexSize: true
-defaultItemCollection: Tiff\Tag
+defaultItemCollection: Media\Tiff\Tag
 compiler:
     exiftool:
         g1: Canon

diff --git a/specs/Media/ExifMakerNotes/Canon/AFInfo.yaml b/specs/Media/ExifMakerNotes/Canon/AFInfo.yaml
@@ -4,7 +4,7 @@ title: 'Canon AF Info'
 handler: FileEye\MediaProbe\Block\Exif\Vendor\Canon\AFInfoIndex
 DOMNode: index
 format: Short
-defaultItemCollection: Tiff\Tag
+defaultItemCollection: Media\Tiff\Tag
 compiler:
     exiftool:
         g1: Canon

diff --git a/specs/Media/ExifMakerNotes/Canon/AFInfo2.yaml b/specs/Media/ExifMakerNotes/Canon/AFInfo2.yaml
@@ -5,7 +5,7 @@ handler: FileEye\MediaProbe\Block\Exif\Vendor\Canon\AFInfoIndex
 DOMNode: index
 format: Short
 hasIndexSize: true
-defaultItemCollection: Tiff\Tag
+defaultItemCollection: Media\Tiff\Tag
 compiler:
     exiftool:
         g1: Canon

diff --git a/specs/Media/ExifMakerNotes/Canon/AFMicroAdj.yaml b/specs/Media/ExifMakerNotes/Canon/AFMicroAdj.yaml
@@ -5,7 +5,7 @@ handler: FileEye\MediaProbe\Block\Map
 DOMNode: map
 format: Long
 hasIndexSize: true
-defaultItemCollection: Tiff\Tag
+defaultItemCollection: Media\Tiff\Tag
 compiler:
     exiftool:
         g1: Canon

diff --git a/specs/Media/ExifMakerNotes/Canon/Ambience.yaml b/specs/Media/ExifMakerNotes/Canon/Ambience.yaml
@@ -5,7 +5,7 @@ handler: FileEye\MediaProbe\Block\Map
 DOMNode: map
 format: Long
 hasIndexSize: true
-defaultItemCollection: Tiff\Tag
+defaultItemCollection: Media\Tiff\Tag
 compiler:
     exiftool:
         g1: Canon

diff --git a/specs/Media/ExifMakerNotes/Canon/AspectInfo.yaml b/specs/Media/ExifMakerNotes/Canon/AspectInfo.yaml
@@ -4,7 +4,7 @@ title: 'Canon AspectInfo'
 handler: FileEye\MediaProbe\Block\Index
 DOMNode: index
 format: Long
-defaultItemCollection: Tiff\Tag
+defaultItemCollection: Media\Tiff\Tag
 compiler:
     exiftool:
         g1: Canon

diff --git a/specs/Media/ExifMakerNotes/Canon/CNTH.yaml b/specs/Media/ExifMakerNotes/Canon/CNTH.yaml
@@ -4,7 +4,7 @@ name: CanonCNTH
 title: 'Canon CNTH'
 handler: FileEye\MediaProbe\Block\Index
 DOMNode: index
-defaultItemCollection: Tiff\Tag
+defaultItemCollection: Media\Tiff\Tag
 compiler:
     exiftool:
         g1: Canon

diff --git a/specs/Media/ExifMakerNotes/Canon/CTMD.yaml b/specs/Media/ExifMakerNotes/Canon/CTMD.yaml
@@ -4,7 +4,7 @@ name: CanonCTMD
 title: 'Canon CTMD'
 handler: FileEye\MediaProbe\Block\Index
 DOMNode: index
-defaultItemCollection: Tiff\Tag
+defaultItemCollection: Media\Tiff\Tag
 compiler:
     exiftool:
         g1: Canon

diff --git a/specs/Media/ExifMakerNotes/Canon/CameraInfo1000D.yaml b/specs/Media/ExifMakerNotes/Canon/CameraInfo1000D.yaml
@@ -4,7 +4,7 @@ title: 'Canon CameraInfo1000D'
 handler: FileEye\MediaProbe\Block\Exif\Vendor\Canon\CameraInfoMap
 DOMNode: map
 format: Byte
-defaultItemCollection: Tiff\Tag
+defaultItemCollection: Media\Tiff\Tag
 compiler:
     exiftool:
         g1: Canon

diff --git a/specs/Media/ExifMakerNotes/Canon/CameraInfo1D.yaml b/specs/Media/ExifMakerNotes/Canon/CameraInfo1D.yaml
@@ -4,7 +4,7 @@ title: 'Canon CameraInfo1D'
 handler: FileEye\MediaProbe\Block\Exif\Vendor\Canon\CameraInfoMap
 DOMNode: map
 format: Byte
-defaultItemCollection: Tiff\Tag
+defaultItemCollection: Media\Tiff\Tag
 compiler:
     exiftool:
         g1: Canon

diff --git a/specs/Media/ExifMakerNotes/Canon/CameraInfo1DX.yaml b/specs/Media/ExifMakerNotes/Canon/CameraInfo1DX.yaml
@@ -4,7 +4,7 @@ title: 'Canon CameraInfo1DX'
 handler: FileEye\MediaProbe\Block\Exif\Vendor\Canon\CameraInfoMap
 DOMNode: map
 format: Byte
-defaultItemCollection: Tiff\Tag
+defaultItemCollection: Media\Tiff\Tag
 compiler:
     exiftool:
         g1: Canon

diff --git a/specs/Media/ExifMakerNotes/Canon/CameraInfo1DmkII.yaml b/specs/Media/ExifMakerNotes/Canon/CameraInfo1DmkII.yaml
@@ -4,7 +4,7 @@ title: 'Canon CameraInfo1DmkII'
 handler: FileEye\MediaProbe\Block\Exif\Vendor\Canon\CameraInfoMap
 DOMNode: map
 format: Byte
-defaultItemCollection: Tiff\Tag
+defaultItemCollection: Media\Tiff\Tag
 compiler:
     exiftool:
         g1: Canon

diff --git a/specs/Media/ExifMakerNotes/Canon/CameraInfo1DmkIII.yaml b/specs/Media/ExifMakerNotes/Canon/CameraInfo1DmkIII.yaml
@@ -4,7 +4,7 @@ title: 'Canon CameraInfo1DmkIII'
 handler: FileEye\MediaProbe\Block\Exif\Vendor\Canon\CameraInfoMap
 DOMNode: map
 format: Byte
-defaultItemCollection: Tiff\Tag
+defaultItemCollection: Media\Tiff\Tag
 compiler:
     exiftool:
         g1: Canon

diff --git a/specs/Media/ExifMakerNotes/Canon/CameraInfo1DmkIIN.yaml b/specs/Media/ExifMakerNotes/Canon/CameraInfo1DmkIIN.yaml
@@ -4,7 +4,7 @@ title: 'Canon CameraInfo1DmkIIN'
 handler: FileEye\MediaProbe\Block\Exif\Vendor\Canon\CameraInfoMap
 DOMNode: map
 format: Byte
-defaultItemCollection: Tiff\Tag
+defaultItemCollection: Media\Tiff\Tag
 compiler:
     exiftool:
         g1: Canon

diff --git a/specs/Media/ExifMakerNotes/Canon/CameraInfo1DmkIV.yaml b/specs/Media/ExifMakerNotes/Canon/CameraInfo1DmkIV.yaml
@@ -4,7 +4,7 @@ title: 'Canon CameraInfo1DmkIV'
 handler: FileEye\MediaProbe\Block\Exif\Vendor\Canon\CameraInfoMap
 DOMNode: map
 format: Byte
-defaultItemCollection: Tiff\Tag
+defaultItemCollection: Media\Tiff\Tag
 compiler:
     exiftool:
         g1: Canon

diff --git a/specs/Media/ExifMakerNotes/Canon/CameraInfo40D.yaml b/specs/Media/ExifMakerNotes/Canon/CameraInfo40D.yaml
@@ -4,7 +4,7 @@ title: 'Canon CameraInfo40D'
 handler: FileEye\MediaProbe\Block\Exif\Vendor\Canon\CameraInfoMap
 DOMNode: map
 format: Byte
-defaultItemCollection: Tiff\Tag
+defaultItemCollection: Media\Tiff\Tag
 compiler:
     exiftool:
         g1: Canon

diff --git a/specs/Media/ExifMakerNotes/Canon/CameraInfo450D.yaml b/specs/Media/ExifMakerNotes/Canon/CameraInfo450D.yaml
@@ -4,7 +4,7 @@ title: 'Canon CameraInfo450D'
 handler: FileEye\MediaProbe\Block\Exif\Vendor\Canon\CameraInfoMap
 DOMNode: map
 format: Byte
-defaultItemCollection: Tiff\Tag
+defaultItemCollection: Media\Tiff\Tag
 compiler:
     exiftool:
         g1: Canon

diff --git a/specs/Media/ExifMakerNotes/Canon/CameraInfo500D.yaml b/specs/Media/ExifMakerNotes/Canon/CameraInfo500D.yaml
@@ -4,7 +4,7 @@ title: 'Canon CameraInfo500D'
 handler: FileEye\MediaProbe\Block\Exif\Vendor\Canon\CameraInfoMap
 DOMNode: map
 format: Byte
-defaultItemCollection: Tiff\Tag
+defaultItemCollection: Media\Tiff\Tag
 compiler:
     exiftool:
         g1: Canon

diff --git a/specs/Media/ExifMakerNotes/Canon/CameraInfo50D.yaml b/specs/Media/ExifMakerNotes/Canon/CameraInfo50D.yaml
@@ -4,7 +4,7 @@ title: 'Canon CameraInfo50D'
 handler: FileEye\MediaProbe\Block\Exif\Vendor\Canon\CameraInfoMap
 DOMNode: map
 format: Byte
-defaultItemCollection: Tiff\Tag
+defaultItemCollection: Media\Tiff\Tag
 compiler:
     exiftool:
         g1: Canon

diff --git a/specs/Media/ExifMakerNotes/Canon/CameraInfo550D.yaml b/specs/Media/ExifMakerNotes/Canon/CameraInfo550D.yaml
@@ -4,7 +4,7 @@ title: 'Canon CameraInfo550D'
 handler: FileEye\MediaProbe\Block\Exif\Vendor\Canon\CameraInfoMap
 DOMNode: map
 format: Byte
-defaultItemCollection: Tiff\Tag
+defaultItemCollection: Media\Tiff\Tag
 compiler:
     exiftool:
         g1: Canon

diff --git a/specs/Media/ExifMakerNotes/Canon/CameraInfo5D.yaml b/specs/Media/ExifMakerNotes/Canon/CameraInfo5D.yaml
@@ -4,7 +4,7 @@ title: 'Canon CameraInfo5D'
 handler: FileEye\MediaProbe\Block\Exif\Vendor\Canon\CameraInfoMap
 DOMNode: map
 format: Byte
-defaultItemCollection: Tiff\Tag
+defaultItemCollection: Media\Tiff\Tag
 compiler:
     exiftool:
         g1: Canon

diff --git a/specs/Media/ExifMakerNotes/Canon/CameraInfo5DmkII.yaml b/specs/Media/ExifMakerNotes/Canon/CameraInfo5DmkII.yaml
@@ -4,7 +4,7 @@ title: 'Canon CameraInfo5DmkII'
 handler: FileEye\MediaProbe\Block\Exif\Vendor\Canon\CameraInfoMap
 DOMNode: map
 format: Byte
-defaultItemCollection: Tiff\Tag
+defaultItemCollection: Media\Tiff\Tag
 compiler:
     exiftool:
         g1: Canon

diff --git a/specs/Media/ExifMakerNotes/Canon/CameraInfo5DmkIII.yaml b/specs/Media/ExifMakerNotes/Canon/CameraInfo5DmkIII.yaml
@@ -4,7 +4,7 @@ title: 'Canon CameraInfo5DmkIII'
 handler: FileEye\MediaProbe\Block\Exif\Vendor\Canon\CameraInfoMap
 DOMNode: map
 format: Byte
-defaultItemCollection: Tiff\Tag
+defaultItemCollection: Media\Tiff\Tag
 compiler:
     exiftool:
         g1: Canon

diff --git a/specs/Media/ExifMakerNotes/Canon/CameraInfo600D.yaml b/specs/Media/ExifMakerNotes/Canon/CameraInfo600D.yaml
@@ -4,7 +4,7 @@ title: 'Canon CameraInfo600D'
 handler: FileEye\MediaProbe\Block\Exif\Vendor\Canon\CameraInfoMap
 DOMNode: map
 format: Byte
-defaultItemCollection: Tiff\Tag
+defaultItemCollection: Media\Tiff\Tag
 compiler:
     exiftool:
         g1: Canon

diff --git a/specs/Media/ExifMakerNotes/Canon/CameraInfo60D.yaml b/specs/Media/ExifMakerNotes/Canon/CameraInfo60D.yaml
@@ -4,7 +4,7 @@ title: 'Canon CameraInfo60D'
 handler: FileEye\MediaProbe\Block\Exif\Vendor\Canon\CameraInfoMap
 DOMNode: map
 format: Byte
-defaultItemCollection: Tiff\Tag
+defaultItemCollection: Media\Tiff\Tag
 compiler:
     exiftool:
         g1: Canon
-Original file line number
+Diff line change
@@ Expand Up @@
     ```
     type: 'IFD0'
-    class: FileEye\MediaProbe\Block\Tiff\Ifd
+    class: FileEye\MediaProbe\Block\Media\Tiff\Ifd
     alias:
       - '0'
       - 'Main'
@@ Expand Down @@