Updated Unit Tests to check for more date strings/invalid date strings when mapping the data, also updated the mapRawData method to ignore false values

Author: Scott Pringle

lib/PHPExif/Hydrator/Mutator.php

@@ -33,9 +33,6 @@ class Mutator implements HydratorInterface
     public function hydrate($object, array $data)
     {
         foreach ($data as $property => $value) {
-            if ($value === false) {
-                continue;
-            }
 
             $mutator = $this->determineMutator($property);
 

lib/PHPExif/Mapper/Exiftool.php

@@ -136,7 +136,11 @@ public function mapRawData(array $data)
                     $value = sprintf('%1$sm', $value);
                     break;
                 case self::CREATEDATE:
-                    $value = DateTime::createFromFormat('Y:m:d H:i:s', $value);
+                    try {
+                        $value = new DateTime($value);
+                    } catch (\Exception $exception) {
+                        $value = false;
+                    }
                     break;
                 case self::EXPOSURETIME:
                     $value = '1/' . round(1 / $value);
@@ -154,7 +158,10 @@ public function mapRawData(array $data)
             }
 
             // set end result
-            $mappedData[$key] = $value;
+            if ($value !== false) {
+                // Only map data when it does not equal a false value
+                $mappedData[$key] = $value;
+            }
         }
 
         // add GPS coordinates, if available

tests/PHPExif/Mapper/ExiftoolMapperTest.php

@@ -236,4 +236,39 @@ public function testSetNumericInProperty()
 
         $this->assertEquals($expected, $reflProperty->getValue($this->mapper));
     }
+
+    public function testMapRawDataCorrectlyFormatsDifferentDateTimeString()
+    {
+        $rawData = [
+            \PHPExif\Mapper\Exiftool::CREATEDATE => '2014-12-15 00:12:00'
+        ];
+
+        $mapped = $this->mapper->mapRawData(
+            $rawData
+        );
+
+        $result = reset($mapped);
+        $this->assertInstanceOf('\DateTime', $result);
+        $this->assertEquals(
+            reset($rawData),
+            $result->format("Y-m-d H:i:s")
+        );
+    }
+
+    public function testMapRawDataCorrectlyIgnoresInvalidCreateDate()
+    {
+        $rawData = [
+            \PHPExif\Mapper\Exiftool::CREATEDATE => 'Invalid Date String'
+        ];
+
+        $result = $this->mapper->mapRawData(
+            $rawData
+        );
+
+        $this->assertCount(0, $result);
+        $this->assertNotEquals(
+            reset($rawData),
+            $result
+        );
+    }
 }