Improve metadata types && isExifSegment() verification for jpeg

Author: Nazar65

app/code/Magento/MediaGalleryMetadata/Model/GetIptcMetadata.php

@@ -9,7 +9,6 @@
 
 use Magento\MediaGalleryMetadataApi\Api\Data\MetadataInterface;
 use Magento\MediaGalleryMetadataApi\Api\Data\MetadataInterfaceFactory;
-use Magento\MediaGalleryMetadataApi\Model\SegmentInterface;
 
 /**
  * Get metadata from IPTC block
@@ -42,8 +41,8 @@ public function __construct(
      */
     public function execute(string $data): MetadataInterface
     {
-        $title = '';
-        $description = '';
+        $title = null;
+        $description = null;
         $keywords = [];
 
         if (is_callable('iptcparse')) {
@@ -65,7 +64,7 @@ public function execute(string $data): MetadataInterface
         return $this->metadataFactory->create([
             'title' => $title,
             'description' => $description,
-            'keywords' => $keywords
+            'keywords' => !empty($keywords) ? $keywords : null
         ]);
     }
 }

app/code/Magento/MediaGalleryMetadata/Model/Jpeg/Segment/ReadExif.php

@@ -70,20 +70,19 @@ private function getExifData(string $filePath): MetadataInterface
     {
         $title = null;
         $description = null;
-        $keywords = [];
+        $keywords = null;
 
         $data = exif_read_data($filePath);
 
-        if ($data) {
+        if (!empty($data)) {
             $title = isset($data['DocumentName']) ? $data['DocumentName'] : null;
             $description = isset($data['ImageDescription']) ? $data['ImageDescription'] : null;
-            $keywords = '';
         }
 
         return $this->metadataFactory->create([
             'title' => $title,
             'description' => $description,
-            'keywords' => !empty($keywords) ? $keywords : null
+            'keywords' => $keywords
         ]);
     }
 
@@ -97,9 +96,9 @@ private function isExifSegment(SegmentInterface $segment): bool
     {
         return $segment->getName() === self::EXIF_SEGMENT_NAME
             && strncmp(
-                substr($segment->getData(), self::EXIF_DATA_START_POSITION, 4),
+                substr($segment->getData(), self::EXIF_DATA_START_POSITION, 5),
                 self::EXIF_SEGMENT_START,
-                self::EXIF_DATA_START_POSITION
+                5
             ) == 0;
     }
 }

app/code/Magento/MediaGalleryMetadata/Model/Jpeg/Segment/ReadIptc.php

@@ -56,9 +56,9 @@ public function execute(FileInterface $file): MetadataInterface
             }
         }
         return $this->metadataFactory->create([
-            'title' => '',
-            'description' => '',
-            'keywords' => []
+            'title' => null,
+            'description' => null,
+            'keywords' => null
         ]);
     }
 

app/code/Magento/MediaGalleryMetadata/Model/Jpeg/Segment/ReadXmp.php

@@ -54,9 +54,9 @@ public function execute(FileInterface $file): MetadataInterface
             }
         }
         return $this->metadataFactory->create([
-            'title' => '',
-            'description' => '',
-            'keywords' => []
+            'title' => null,
+            'description' => null,
+            'keywords' => null
         ]);
     }
 

app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/ReadExif.php

@@ -75,7 +75,6 @@ private function getExifData(SegmentInterface $segment): MetadataInterface
         if ($data) {
             $title = isset($data['DocumentName']) ? $data['DocumentName'] : null;
             $description = isset($data['ImageDescription']) ? $data['ImageDescription'] : null;
-            $keywords = '';
         }
 
         return $this->metadataFactory->create([

app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/ReadXmp.php

@@ -55,9 +55,9 @@ public function execute(FileInterface $file): MetadataInterface
             }
         }
         return $this->metadataFactory->create([
-            'title' => '',
-            'description' => '',
-            'keywords' => []
+            'title' => null,
+            'description' => null,
+            'keywords' => null
         ]);
     }