Fix Exif extraction logic when using ImageMagick (#65)

* Fix Exif extraction logic when using ImageMagick

This PR removes the mapping of the file's creation date to the Exif::CREATION_DATE.
This is done in order to align it to the logic of the other two tools used for Exif extraction: Exiftool & Native.
None of this two will fill in the Exif::CREATION_DATE with the file's creation time.

This is part of the #1729 enhancement for which we need to be able to figure out if the file has a creation time as exif field or not. We can't do this currently with Lychee & ImageMagick.

* Fix tests

---------

Co-authored-by: wladif <[email protected]>

Author: wladif

lib/PHPExif/Mapper/ImageMagick.php

@@ -23,7 +23,6 @@ class ImageMagick extends AbstractMapper
     public const ARTIST                   = 'exif:Artist';
     public const COLORSPACE               = 'exif:ColorSpace';
     public const COPYRIGHT                = 'exif:Copyright';
-    public const CREATION_DATE            = 'date:create';
     public const DATETIMEORIGINAL         = 'exif:DateTimeOriginal';
     public const DESCRIPTION              = 'exif:ImageDescription';
     public const EXPOSURETIME             = 'exif:ExposureTime';
@@ -74,7 +73,6 @@ class ImageMagick extends AbstractMapper
         self::ARTIST                   => Exif::AUTHOR,
         self::COLORSPACE               => Exif::COLORSPACE,
         self::COPYRIGHT                => Exif::COPYRIGHT,
-        self::CREATION_DATE            => Exif::CREATION_DATE,
         self::DATETIMEORIGINAL         => Exif::CREATION_DATE,
         self::DESCRIPTION              => Exif::DESCRIPTION,
         self::EXPOSURETIME             => Exif::EXPOSURE,
@@ -145,18 +143,6 @@ public function mapRawData(array $data): array
                     }
                     $value = sprintf('f/%01.1f', $value);
                     break;
-                case self::CREATION_DATE:
-                    if (!isset($mappedData[Exif::CREATION_DATE])
-                            && preg_match('/^0000[-:]00[-:]00.00:00:00/', $value) === 0) {
-                        try {
-                            $value = new DateTime($value);
-                        } catch (\Exception $e) {
-                            continue 2;
-                        }
-                    } else {
-                        continue 2;
-                    }
-                    break;
                 case self::DATETIMEORIGINAL:
                     if (preg_match('/^0000[-:]00[-:]00.00:00:00/', $value) === 1) {
                         continue 2;

tests/PHPExif/Mapper/ImageMagickMapperTest.php

@@ -53,7 +53,6 @@ public function testMapRawDataMapsFieldsCorrectly()
         unset($map[ImageMagick::HEIGHT]);
         unset($map[ImageMagick::IMAGEHEIGHT_PNG]);
         unset($map[ImageMagick::IMAGEWIDTH_PNG]);
-        unset($map[ImageMagick::CREATION_DATE]);
         unset($map[ImageMagick::COPYRIGHT_IPTC]);
 
         // create raw data
@@ -85,25 +84,6 @@ public function testMapRawDataCorrectlyFormatsAperture()
         $this->assertEquals('f/1.7', reset($mapped));
     }
 
-    /**
-     * @group mapper
-     */
-    public function testMapRawDataCorrectlyFormatsCreationDate()
-    {
-        $rawData = array(
-            ImageMagick::CREATION_DATE => '2015:04:01 12:11:09',
-        );
-
-        $mapped = $this->mapper->mapRawData($rawData);
-
-        $result = reset($mapped);
-        $this->assertInstanceOf('\\DateTime', $result);
-        $this->assertEquals(
-            reset($rawData),
-            $result->format('Y:m:d H:i:s')
-        );
-    }
-
     /**
      * @group mapper
      */
@@ -123,48 +103,6 @@ public function testMapRawDataCorrectlyFormatsDateTimeOriginal()
         );
     }
 
-    /**
-     * @group mapper
-     */
-    public function testMapRawDataCorrectlyFormatsCreationDateAndDateTimeOriginal1()
-    {
-        $rawData = array(
-            ImageMagick::CREATION_DATE => '2016:04:01 12:11:09',
-            ImageMagick::DATETIMEORIGINAL => '2015:04:01 12:11:09',
-        );
-
-        $mapped = $this->mapper->mapRawData($rawData);
-
-        $result = reset($mapped);
-        $expected = new \DateTime('2015:04:01 12:11:09');
-        $this->assertInstanceOf('\\DateTime', $result);
-        $this->assertEquals(
-            $expected,
-            $result
-        );
-    }
-
-    /**
-     * @group mapper
-     */
-    public function testMapRawDataCorrectlyFormatsCreationDateAndDateTimeOriginal2()
-    {
-        $rawData = array(
-            ImageMagick::DATETIMEORIGINAL => '2015:04:01 12:11:09',
-            ImageMagick::CREATION_DATE => '2016:04:01 12:11:09',
-        );
-
-        $mapped = $this->mapper->mapRawData($rawData);
-
-        $result = reset($mapped);
-        $expected = new \DateTime('2015:04:01 12:11:09');
-        $this->assertInstanceOf('\\DateTime', $result);
-        $this->assertEquals(
-            $expected,
-            $result
-        );
-    }
-
     /**
      * @group mapper
      */
@@ -233,21 +171,6 @@ public function testMapRawDataCorrectlyFormatsCreationDateWithTimeZone2()
         );
     }
 
-    /**
-     * @group mapper
-     */
-    public function testMapRawDataCorrectlyIgnoresIncorrectCreationDate()
-    {
-        $rawData = array(
-            ImageMagick::CREATION_DATE => '2015:04:01',
-        );
-
-        $mapped = $this->mapper->mapRawData($rawData);
-
-        $this->assertEquals(false, reset($mapped));
-    }
-
-
     /**
      * @group mapper
      */