Bugfixes

Author: tmp-hallenser

lib/PHPExif/Exif.php

@@ -56,7 +56,6 @@ class Exif
     const LATITUDE              = 'latitude';
     const IMGDIRECTION          = 'imgDirection';
     const LENS                  = 'lens';
-    const SUBJECT               = 'subject';
     const CONTENTIDENTIFIER     = 'contentIdentifier';
     const FRAMERATE             = 'framerate';
     const DURATION              = 'duration';
@@ -1072,33 +1071,6 @@ public function getLens()
         return $this->data[self::LENS];
     }
 
-    /**
-     * Sets the subject value
-     *
-     * @param string $value
-     * @return \PHPExif\Exif
-     */
-    public function setSubject($value)
-    {
-        $this->data[self::SUBJECT] = $value;
-
-        return $this;
-    }
-
-    /**
-     * Returns subject, if it exists
-     *
-     * @return string|boolean
-     */
-    public function getSubject()
-    {
-        if (!isset($this->data[self::SUBJECT])) {
-            return false;
-        }
-
-        return $this->data[self::SUBJECT];
-    }
-
     /**
      * Sets the content identifier value
      *

lib/PHPExif/Mapper/Exiftool.php

@@ -118,7 +118,7 @@ class Exiftool implements MapperInterface
         self::IMGDIRECTION             => Exif::IMGDIRECTION,
         self::LENS                     => Exif::LENS,
         self::DESCRIPTION              => Exif::DESCRIPTION,
-        self::SUBJECT                  => Exif::SUBJECT,
+        self::SUBJECT                  => Exif::KEYWORDS,
         self::CONTENTIDENTIFIER        => Exif::CONTENTIDENTIFIER,
         self::DATETIMEORIGINAL_QUICKTIME  => Exif::CREATION_DATE,
         self::MAKE_QUICKTIME              => Exif::MAKE,
@@ -185,7 +185,12 @@ public function mapRawData(array $data)
                 case self::DATETIMEORIGINAL:
                 case self::DATETIMEORIGINAL_QUICKTIME:
                     try {
-                        $value = new DateTime(date('Y-m-d H:i:s', strtotime($value)));
+                        if(!(strtotime($value)==false)) {
+                          $value = new DateTime(date('Y-m-d H:i:s', strtotime($value)));
+                        } else {
+                          continue 2;
+                        }
+
                     } catch (\Exception $exception) {
                         continue 2;
                     }

lib/PHPExif/Mapper/Native.php

@@ -131,7 +131,7 @@ class Native implements MapperInterface
         self::LENS_LR          => Exif::LENS,
         self::LENS_TYPE        => Exif::LENS,
         self::DESCRIPTION      => Exif::DESCRIPTION,
-        self::SUBJECT          => Exif::SUBJECT,
+        self::SUBJECT          => Exif::KEYWORDS,
         self::FRAMERATE        => Exif::FRAMERATE,
         self::DURATION         => Exif::DURATION
 
@@ -148,7 +148,7 @@ public function mapRawData(array $data)
     {
         $mappedData = array();
         $gpsData = array();
-        $mappedData['description']="";
+
         foreach ($data as $field => $value) {
             if ($this->isSection($field) && is_array($value)) {
                 $subData = $this->mapRawData($value);
@@ -168,7 +168,11 @@ public function mapRawData(array $data)
             switch ($field) {
                 case self::DATETIMEORIGINAL:
                     try {
-                        $value = new DateTime($value);
+                      if(!(strtotime($value)==false)) {
+                        $value = new DateTime(date('Y-m-d H:i:s', strtotime($value)));
+                      } else {
+                        continue 2;
+                      }
                     } catch (Exception $exception) {
                         continue 2;
                     }

tests/PHPExif/Mapper/ExiftoolMapperTest.php

@@ -111,7 +111,7 @@ public function testMapRawDataCorrectlyFormatsCreationDate()
         $result = reset($mapped);
         $this->assertInstanceOf('\\DateTime', $result);
         $this->assertEquals(
-            reset($rawData), 
+            reset($rawData),
             $result->format('Y:m:d H:i:s')
         );
     }
@@ -184,9 +184,13 @@ public function testMapRawDataCorrectlyFormatsGPSData()
             )
         );
 
-        $expected = '40.333452380556,-20.167314813889';
-        $this->assertCount(1, $result);
-        $this->assertEquals($expected, reset($result));
+        $expected_gps = '40.333452380556,-20.167314813889';
+        $expected_lat = '40.333452380556';
+        $expected_lon = '40.333452380556';
+        $this->assertCount(3, $result);
+        $this->assertEquals($expected_gps, $result['gps']);
+        $this->assertEquals($expected_lat, $result['latitude']);
+        $this->assertEquals($expected_lon, $result['longitude']);
     }
 
     /**
@@ -204,9 +208,13 @@ public function testMapRawDataCorrectlyFormatsNumericGPSData()
             )
         );
 
-        $expected = '40.333452381,-20.167314814';
-        $this->assertCount(1, $result);
-        $this->assertEquals($expected, reset($result));
+        $expected_gps = '40.333452381,-20.167314814';
+        $expected_lat = '40.333452381';
+        $expected_lon = '-20.167314814';
+        $this->assertCount(3, $result);
+        $this->assertEquals($expected_gps, $result['gps']);
+        $this->assertEquals($expected_lat, $result['latitude']);
+        $this->assertEquals($expected_lon, $result['longitude']);
     }
 
     /**
@@ -232,7 +240,7 @@ public function testMapRawDataCorrectlyIgnoresIncorrectGPSData()
      * @group mapper
      * @covers \PHPExif\Mapper\Exiftool::mapRawData
      */
-    public function testMapRawDataCorrectlyIgnoresIncompleteGPSData()
+    public function testMapRawDataOnlyLatitude()
     {
         $result = $this->mapper->mapRawData(
             array(
@@ -241,7 +249,7 @@ public function testMapRawDataCorrectlyIgnoresIncompleteGPSData()
             )
         );
 
-        $this->assertCount(0, $result);
+        $this->assertCount(1, $result);
     }
 
     /**

tests/PHPExif/Mapper/NativeMapperTest.php

@@ -210,7 +210,7 @@ public function testMapRawDataFlattensRawDataWithSections()
      * @group mapper
      * @covers \PHPExif\Mapper\Native::mapRawData
      */
-    public function testMapRawDataMacthesFieldsWithoutCaseSensibilityOnFirstLetter()
+    public function testMapRawDataMatchesFieldsWithoutCaseSensibilityOnFirstLetter()
     {
         $rawData = array(
             \PHPExif\Mapper\Native::ORIENTATION => 'Portrait',