Merge pull request #61 from nicolasmure/case-sensibility

[field mapping] first letter case insensibility

Author: Miljar

lib/PHPExif/Mapper/Native.php

@@ -133,7 +133,7 @@ public function mapRawData(array $data)
                 continue;
             }
 
-            if (!array_key_exists($field, $this->map)) {
+            if (!$this->isFieldKnown($field)) {
                 // silently ignore unknown fields
                 continue;
             }
@@ -214,6 +214,33 @@ protected function isSection($field)
         return (in_array($field, $this->sections));
     }
 
+    /**
+     * Determines if the given field is known,
+     * in a case insensitive way for its first letter.
+     * Also update $field to keep it valid against the known fields.
+     *
+     * @param  string  &$field
+     * @return bool
+     */
+    protected function isFieldKnown(&$field)
+    {
+        $lcfField = lcfirst($field);
+        if (array_key_exists($lcfField, $this->map)) {
+            $field = $lcfField;
+
+            return true;
+        }
+
+        $ucfField = ucfirst($field);
+        if (array_key_exists($ucfField, $this->map)) {
+            $field = $ucfField;
+
+            return true;
+        }
+
+        return false;
+    }
+
     /**
      * Extract GPS coordinates from components array
      *

tests/PHPExif/Mapper/NativeMapperTest.php

@@ -191,6 +191,27 @@ public function testMapRawDataFlattensRawDataWithSections()
         $this->assertEquals($expected, $keys);
     }
 
+    /**
+     * @group mapper
+     * @covers \PHPExif\Mapper\Native::mapRawData
+     */
+    public function testMapRawDataMacthesFieldsWithoutCaseSensibilityOnFirstLetter()
+    {
+        $rawData = array(
+            \PHPExif\Mapper\Native::ORIENTATION => 'Portrait',
+            'Copyright' => 'Acme',
+        );
+        $mapped = $this->mapper->mapRawData($rawData);
+        $this->assertCount(2, $mapped);
+        $keys = array_keys($mapped);
+
+        $expected = array(
+            \PHPExif\Mapper\Native::ORIENTATION,
+            \PHPExif\Mapper\Native::COPYRIGHT
+        );
+        $this->assertEquals($expected, $keys);
+    }
+
     /**
      * @group mapper
      * @covers \PHPExif\Mapper\Native::mapRawData