Add AVIF format in Exif

- Allow avif format image to get exif data

Author: min-peter

lib/PHPExif/Adapter/Native.php

@@ -10,6 +10,9 @@
 use function Safe\filesize;
 use function Safe\getimagesize;
 use function Safe\iptcparse;
+use function Safe\exec;
+use function Safe\json_decode;
+use function Safe\preg_replace;
 
 /**
  * PHP Exif Native Reader Adapter
@@ -198,6 +201,27 @@ public function getExifFromFile(string $file): Exif
             $this->getIncludeThumbnail()
         );
 
+        if ($mimeType === 'image/avif') {
+            $output_array = [];
+            exec("exiftool -j " . escapeshellarg($file), $output_array); // Safe\exec will throw exception if fails
+            $tempExif = [];
+
+            if (count($output_array) > 0) {
+                $json = implode("\n", $output_array);
+                $tempExif = json_decode($json, true)[0] ?? [];
+            }
+
+            $data = array_merge(
+                ['FileName' => basename($file), 'MimeType' => $mimeType],
+                $tempExif
+            );
+            
+            // Ensure FileSize is integer
+            if (isset($data['FileSize'])) {
+                $data['FileSize'] = (int) preg_replace('/\D/', '', $data['FileSize']);
+            }
+        }
+
         // exif_read_data failed to read exif data (i.e. not a jpg/tiff)
         if (false === $data) {
             $data = [];

tests/PHPExif/Adapter/ExiftoolTest.php

@@ -112,6 +112,19 @@ public function testGetExifFromFileWithUtf8()
         $this->assertNotEmpty($result->getRawData());
     }
 
+    /**
+     * @group exiftool
+     */
+    public function testGetExifFromFileWithAvif()
+    {
+        $file = PHPEXIF_TEST_ROOT . '/files/fox.profile0.10bpc.yuv420.avif';
+        $this->adapter->setOptions(array('encoding' => array('utf8')));
+        $result = $this->adapter->getExifFromFile($file);
+        $this->assertInstanceOf('\PHPExif\Exif', $result);
+        $this->assertIsArray($result->getRawData());
+        $this->assertNotEmpty($result->getRawData());
+    }
+
     /**
      * @group exiftool
      */

tests/PHPExif/ExifTest.php

@@ -788,5 +788,20 @@ public function testAdapterConsistency()
                 );
             }
         }
+
+        // Test for .avif type image for Native adapter
+        $testfiles = array(
+            PHPEXIF_TEST_ROOT . '/files/fox.profile0.10bpc.yuv420.avif',
+        );
+
+        foreach ($testfiles as $file) {
+            $file_name = basename($file);
+            $adapter_native = new \PHPExif\Adapter\Native();
+            $result_exif_native = $adapter_native->getExifFromFile($file);
+
+            $this->assertEquals($file_name, $result_exif_native->getFileName());
+            $this->assertEquals('image/avif', $result_exif_native->getMimeType());
+            $this->assertIsNumeric($result_exif_native->getWidth());
+        }
     }
 }