Merge upstream

.github/workflows/tests.yml

@@ -58,6 +58,7 @@ jobs:
       continue-on-error: true
       run: |
         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/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
@@ -81,8 +82,5 @@ jobs:
 #        name: media-dumps
 #        path: tests/media-dumps/**/*.yml
 
-#    - name: "Install PHPStan"
-#      run: "composer require --dev phpstan/phpstan:^1.2 --ansi"
-
-#    - name: "Run a static analysis with phpstan/phpstan"
-#      run: vendor/bin/phpstan analyze
+    - name: "Run a static analysis with phpstan/phpstan"
+      run: vendor/bin/phpstan analyze

composer.json

@@ -12,27 +12,28 @@
         "ext-gd": "*",
         "ext-mbstring": "*",
         "composer-runtime-api": "^2.0.0",
-        "psr/log": "*",
+        "fileeye/mimemap": "^2.2",
         "monolog/monolog": "^3",
+        "psr/log": "*",
         "shanethehat/pretty-xml": "*",
         "sibche/plist": "*",
-        "symfony/stopwatch": "^7.2",
-        "fileeye/mimemap": "^2.2"
+        "symfony/stopwatch": "^7.2"
     },
     "require-dev" : {
         "ext-exif": "*",
+        "bramus/monolog-colored-line-formatter": "^3",
+        "phpstan/extension-installer": "*",
+        "phpstan/phpstan-deprecation-rules": "^2",
+        "phpstan/phpstan": "^2",
+        "phpstan/phpstan-phpunit": "^2",
         "phpunit/phpunit": "^11",
         "squizlabs/php_codesniffer": "*",
         "symfony/console": "^7.2",
-        "symfony/finder": "^7.2",
         "symfony/filesystem": "^7.2",
+        "symfony/finder": "^7.2",
         "symfony/process": "^7.2",
         "symfony/var-dumper": "^7.2",
-        "symfony/yaml": "^7.2",
-        "bramus/monolog-colored-line-formatter": "^3",
-        "phpstan/phpstan": "^2",
-        "phpstan/extension-installer": "*",
-        "phpstan/phpstan-deprecation-rules": "^2"
+        "symfony/yaml": "^7.2"
     },
     "autoload": {
         "psr-4": {

phpstan-baseline.neon

@@ -0,0 +1,49 @@
+parameters:
+	ignoreErrors:
+		-
+			message: '#^Call to an undefined method FileEye\\MediaProbe\\Model\\ElementInterface\:\:getCollection\(\)\.$#'
+			identifier: method.notFound
+			count: 1
+			path: examples/dump-media.php
+
+		-
+			message: '#^Variable \$curr_memory might not be defined\.$#'
+			identifier: variable.undefined
+			count: 1
+			path: examples/dump-media.php
+
+		-
+			message: '#^Variable \$max_memory might not be defined\.$#'
+			identifier: variable.undefined
+			count: 1
+			path: examples/dump-media.php
+
+		-
+			message: '#^Variable \$media might not be defined\.$#'
+			identifier: variable.undefined
+			count: 1
+			path: examples/dump-media.php
+
+		-
+			message: '#^Variable \$result might not be defined\.$#'
+			identifier: variable.undefined
+			count: 1
+			path: examples/dump-media.php
+
+		-
+			message: '#^Call to method add\(\) on an unknown class CFPropertyList\\CFDictionary\.$#'
+			identifier: class.notFound
+			count: 1
+			path: src/Block/Exif/Vendor/Apple/RunTime.php
+
+		-
+			message: '#^Instantiated class CFPropertyList\\CFDictionary not found\.$#'
+			identifier: class.notFound
+			count: 1
+			path: src/Block/Exif/Vendor/Apple/RunTime.php
+
+		-
+			message: '#^Instantiated class CFPropertyList\\CFNumber not found\.$#'
+			identifier: class.notFound
+			count: 1
+			path: src/Block/Exif/Vendor/Apple/RunTime.php

phpstan.neon.dist

@@ -1,3 +1,6 @@
+includes:
+    - phpstan-baseline.neon
+
 parameters:
     level: 2
     paths:

specs/ExifMakerNotes/Canon/Main.yaml

@@ -100,10 +100,6 @@ items:
                 g2: Image
                 DOMNode: 'Canon:CanonFileLength'
                 desc: 'Canon File Length'
-    15:
-        __todo: fix
-        name: CanonCustomFunctions
-        collection: ExifMakerNotes\CanonCustom\FunctionsResolver
     16:
         text:
             default: 'Unknown (0x{valuehex})'
@@ -614,18 +610,6 @@ items:
                 writable: true
                 DOMNode: 'Canon:OriginalDecisionDataOffset'
                 desc: 'Original Decision Data Offset'
-    144:
-        __todo: fix
-        name: CanonCustomFunctions1D
-        collection: ExifMakerNotes\CanonCustom\Functions1D
-    145:
-        __todo: fix
-        name: CanonCustomPersonalFuncs
-        collection: ExifMakerNotes\CanonCustom\PersonalFuncs
-    146:
-        __todo: fix
-        name: CanonCustomPersonalFuncValues
-        collection: ExifMakerNotes\CanonCustom\PersonalFuncValues
     147:
         name: CanonFileInfo
         collection: ExifMakerNotes\Canon\FileInfo