merge upstream Feb 11, 2024 (#43)

mondrake · Feb 11, 2024 · 9b97ca7 · 9b97ca7
1 parent 8afb74f
commit 9b97ca7
Show file tree

Hide file tree

Showing 381 changed files with 12,012 additions and 11,895 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -52,6 +52,7 @@ jobs:
         # Remove the comment to the lines below during development, to let
         # re-compile the specification PHP file from the YAML files.
         # php bin/fileeye-mediaprobe compile
+        # php bin/fileeye-mediaprobe dump tests/media-samples tests/media-dumps
 
     - name: Image file dumps
       continue-on-error: true

diff --git a/INSTALL.md b/INSTALL.md
@@ -67,9 +67,9 @@ All in just four lines of code:
 
   ```php5
   <?php
-  use FileEye\MediaProbe\Image;
+  use FileEye\MediaProbe\Media;
 
-  $image = Image::loadFromFile($argv[1]);
+  $image = Media::parseFromFile($argv[1]);
   $entry = $image->getElement("tag[@name='ImageDescription']/entry");
   $entry->setDataElement(['Edited by MediaProbe']);
   $image->saveToFile($argv[1]);

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\Exif\Ifd
+class: FileEye\MediaProbe\Block\Tiff\Ifd
 alias:
   - '0'
   - 'Main'

diff --git a/composer.json b/composer.json
@@ -28,7 +28,10 @@
         "symfony/process": "^6 | ^7",
         "symfony/var-dumper": "^6 | ^7",
         "symfony/yaml": "^6 | ^7",
-        "bramus/monolog-colored-line-formatter": "^3"
+        "bramus/monolog-colored-line-formatter": "^3",
+        "phpstan/phpstan": "^1.10",
+        "phpstan/extension-installer": "^1.3",
+        "phpstan/phpstan-deprecation-rules": "^1.1"
     },
     "autoload": {
         "psr-4": {
@@ -40,5 +43,10 @@
             "FileEye\\MediaProbe\\Test\\": "tests/"
         }
     },
-    "bin": ["bin/fileeye-mediaprobe"]
+    "bin": ["bin/fileeye-mediaprobe"],
+    "config": {
+        "allow-plugins": {
+            "phpstan/extension-installer": true
+        }
+    }
 }
diff --git a/examples/dump-media.php b/examples/dump-media.php
@@ -14,8 +14,8 @@
 use FileEye\MediaProbe\Media;
 use FileEye\MediaProbe\Data\DataWindow;
 use FileEye\MediaProbe\Utility\ConvertBytes;
-use FileEye\MediaProbe\Block\Jpeg;
-use FileEye\MediaProbe\Block\Tiff;
+use FileEye\MediaProbe\Block\Jpeg\Jpeg;
+use FileEye\MediaProbe\Block\Tiff\Tiff;
 use FileEye\MediaProbe\Utility\DumpLogFormatter;
 use Monolog\Logger;
 use Monolog\Handler\StreamHandler;
@@ -135,7 +135,7 @@ function FileSizeConvert($bytes)
 try {
     /* Load data from file */
     $baseline_memory = FileSizeConvert(memory_get_usage());
-    $media = Media::loadFromFile($file, $logger, $fail_on_error);
+    $media = Media::parseFromFile($file, $logger, $fail_on_error);
     $max_memory = FileSizeConvert(memory_get_peak_usage());
     $curr_memory = FileSizeConvert(memory_get_usage());
     if ($media === null) {

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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