Updated tests.

Author: Marek Szymczuk

lib/PHPExif/Mapper/Native.php

@@ -219,7 +219,11 @@ protected function extractGPSCoordinate(array $components)
     {
         $components = array_map(array($this, 'normalizeGPSComponent'), $components);
 
-        return intval($components[0]) + (intval($components[1]) / 60) + (floatval($components[2]) / 3600);
+        if (count($components) > 2) {
+            return intval($components[0]) + (intval($components[1]) / 60) + (floatval($components[2]) / 3600);
+        }
+
+        return reset($components);
     }
 
     /**
@@ -232,14 +236,14 @@ protected function normalizeGPSComponent($component)
     {
         $parts = explode('/', $component);
 
-        if (count($parts) > 0) {
+        if (count($parts) > 1) {
             if ($parts[1]) {
-                return (int) $parts[0] / (int) $parts[1];
+                return intval($parts[0]) / intval($parts[1]);
             }
 
             return 0;
         }
 
-        return $parts[0];
+        return floatval(reset($parts));
     }
 }

tests/PHPExif/Mapper/ExiftoolMapperTest.php

@@ -116,6 +116,21 @@ public function testMapRawDataCorrectlyFormatsCreationDate()
         );
     }
 
+    /**
+     * @group mapper
+     * @covers \PHPExif\Mapper\Exiftool::mapRawData
+     */
+    public function testMapRawDataCorrectlyIgnoresIncorrectCreationDate()
+    {
+        $rawData = array(
+            \PHPExif\Mapper\Exiftool::CREATEDATE => '2015:04:01',
+        );
+
+        $mapped = $this->mapper->mapRawData($rawData);
+
+        $this->assertEquals(false, reset($mapped));
+    }
+
     /**
      * @group mapper
      * @covers \PHPExif\Mapper\Exiftool::mapRawData

tests/PHPExif/Mapper/NativeMapperTest.php

@@ -86,6 +86,21 @@ public function testMapRawDataCorrectlyFormatsDateTimeOriginal()
         );
     }
 
+    /**
+     * @group mapper
+     * @covers \PHPExif\Mapper\Native::mapRawData
+     */
+    public function testMapRawDataCorrectlyIgnoresIncorrectDateTimeOriginal()
+    {
+        $rawData = array(
+            \PHPExif\Mapper\Native::DATETIMEORIGINAL => '2015:04:01',
+        );
+
+        $mapped = $this->mapper->mapRawData($rawData);
+
+        $this->assertEquals(false, reset($mapped));
+    }
+
     /**
      * @group mapper
      * @covers \PHPExif\Mapper\Native::mapRawData
@@ -188,6 +203,12 @@ public function testMapRawDataCorrectlyFormatsGPSData()
                 'GPSLongitude'    => array('0/0', '0/0', '0/0'),
                 'GPSLongitudeRef' => 'W',
             ),
+            '71.706936,-42.604303' => array(
+                'GPSLatitude'     => array('71.706936'),
+                'GPSLatitudeRef'  => 'N',
+                'GPSLongitude'    => array('42.604303'),
+                'GPSLongitudeRef' => 'W',
+            ),
         );
 
         foreach ($expected as $key => $value) {