Merge pull request #29 from Miljar/rel/v0.3.0

Rel/v0.3.0

Author: Miljar

.travis.yml

@@ -24,7 +24,7 @@ after_script:
 
 before_install:
   - composer self-update
-  - wget http://www.sno.phy.queensu.ca/~phil/exiftool/Image-ExifTool-9.82.tar.gz
-  - tar -zxvf Image-ExifTool-9.82.tar.gz
-  - cd Image-ExifTool-9.82 && perl Makefile.PL && make test && sudo make install
-  - cd .. && rm -rf Image-ExifTool-9.82
+  - wget http://www.sno.phy.queensu.ca/~phil/exiftool/Image-ExifTool-9.90.tar.gz
+  - tar -zxvf Image-ExifTool-9.90.tar.gz
+  - cd Image-ExifTool-9.90 && perl Makefile.PL && make test && sudo make install
+  - cd .. && rm -rf Image-ExifTool-9.90

CHANGELOG.rst

@@ -0,0 +1,17 @@
+CHANGELOG
+=====
+
+0.3.0
+-----
+
+* Bugfix `#24`_: getRawData() does not return raw EXIF data
+* Bugfix `#18`_: Create CHANGELOG
+* Separated ``Adapter`` & ``Reader`` classes
+* Created ``ReaderInterface`` class
+* BC-break `#15`_: Exiftool adapter: add -n switch to exiftool call 
+* Composer.json: added semver version for phpmd; removed pdepend
+* added ``Orientation``, ``MimeType``, ``FileSize`` and ``ColorSpace`` options to EXIF
+
+.. _`#24`: https://github.com/Miljar/php-exif/issues/24
+.. _`#18`: https://github.com/Miljar/php-exif/issues/18
+.. _`#15`: https://github.com/Miljar/php-exif/issues/15

README.md

@@ -1,4 +1,4 @@
-# [PHPExif v0.2.1](http://github.com/Miljar/php-exif) [![Build Status](https://travis-ci.org/Miljar/php-exif.png?branch=master)](https://travis-ci.org/Miljar/php-exif) [![Coverage Status](https://coveralls.io/repos/Miljar/php-exif/badge.svg?branch=v0.2.2)](https://coveralls.io/r/Miljar/php-exif?branch=v0.2.2)
+# [PHPExif v0.3.0](http://github.com/Miljar/php-exif) [![Build Status](https://travis-ci.org/Miljar/php-exif.png?branch=master)](https://travis-ci.org/Miljar/php-exif) [![Coverage Status](https://coveralls.io/repos/Miljar/php-exif/badge.svg?branch=master)](https://coveralls.io/r/Miljar/php-exif?branch=master)
 
 PHPExif is a library which gives you easy access to the EXIF meta-data of an image.
 
@@ -7,33 +7,40 @@ PHPExif serves as a wrapper around some native or CLI tools which access this EX
 ## Supported tools
 
 * Native PHP functionality (exif_read_data, iptcparse)
-* [Exiftool](http://www.sno.phy.queensu.ca/~phil/exiftool‎) adapter (wrapper for the exiftool binary)
+* [Exiftool](http://www.sno.phy.queensu.ca/~phil/exiftool) adapter (wrapper for the exiftool binary)
 
 ## Installation (composer)
 
 ```json
-"miljar/php-exif": "~0.2"
+"miljar/php-exif": "~0.3.0"
 ```
 
 
 ## Usage
 
-[Before v0.2.2](Resources/doc/usage_0.2.1.md)
+[Before v0.3.0](Resources/doc/usage_0.2.1.md)
 
-[v0.2.2+](Resources/doc/usage.md)
+[v0.3.0+](Resources/doc/usage.md)
 
 ## Contributing
 
 Please submit all pull requests against the correct branch. The release branch for the next version is a branch with the same name as the next version. Bugfixes should go in the master branch, unless they are for code in a new release branch.
 
-PHPExif is written according the [PSR-0/1/2 standards](http://www.php-fig.org/‎). When submitting code, please make sure it is conform these standards.
+PHPExif is written according the [PSR-0/1/2 standards](http://www.php-fig.org/). When submitting code, please make sure it is conform these standards.
 
 All contributions are welcomed and greatly appreciated.
 
 ## Feedback
 
 Have a bug or a feature request? [Please open a new issue](https://github.com/Miljar/php-exif/issues). Before opening any issue, please search for existing issues.
 
+## Contributors
+
+* [Tom Van Herreweghe](http://github.com/Miljar)
+* [Ingewikkeld](https://github.com/Ingewikkeld)
+* [Christophe Singer](https://github.com/wasinger)
+* [Hanov Ruslan](https://github.com/hanovruslan)
+
 ## License
 
 [MIT License](http://github.com/Miljar/php-exif/blob/master/LICENSE)

lib/PHPExif/Adapter/Exiftool.php

@@ -108,6 +108,7 @@ public function getExifFromFile($file)
         $data = json_decode($result, true);
         $mappedData = $this->mapData(reset($data));
         $exif = new Exif($mappedData);
+        $exif->setRawData(reset($data));
 
         return $exif;
     }

lib/PHPExif/Adapter/Native.php

@@ -191,6 +191,7 @@ public function getExifFromFile($file)
         $data = array_merge($data, array(self::SECTION_IPTC => $xmpData));
         $mappedData = $this->mapData($data);
         $exif = new Exif($mappedData);
+        $exif->setRawData($data);
 
         return $exif;
     }

lib/PHPExif/Exif.php

@@ -49,31 +49,38 @@ class Exif
     const WIDTH                 = 'width';
 
     /**
-     * The EXIF data
+     * The mapped EXIF data
      *
      * @var array
      */
     protected $data = array();
 
+    /**
+     * The raw EXIF data
+     *
+     * @var array
+     */
+    protected $rawData = array();
+
     /**
      * Class constructor
      *
      * @param array $data
      */
     public function __construct(array $data = array())
     {
-        $this->setRawData($data);
+        $this->setData($data);
     }
 
     /**
-     * Sets the EXIF data
+     * Sets the raw EXIF data
      *
      * @param array $data The data to set
      * @return \PHPExif\Exif Current instance for chaining
      */
     public function setRawData(array $data)
     {
-        $this->data = $data;
+        $this->rawData = $data;
 
         return $this;
     }
@@ -84,6 +91,29 @@ public function setRawData(array $data)
      * @return array
      */
     public function getRawData()
+    {
+        return $this->rawData;
+    }
+
+    /**
+     * Sets the mapped EXIF data
+     *
+     * @param array $data The data to set
+     * @return \PHPExif\Exif Current instance for chaining
+     */
+    public function setData(array $data)
+    {
+        $this->data = $data;
+
+        return $this;
+    }
+
+    /**
+     * Returns the mapped EXIF data
+     *
+     * @return array
+     */
+    public function getData()
     {
         return $this->data;
     }

tests/PHPExif/Reader/AdapterAbstractTest.php renamed to tests/PHPExif/Adapter/AdapterAbstractTest.php

@@ -69,6 +69,8 @@ public function testGetExifFromFile()
         $file = PHPEXIF_TEST_ROOT . '/files/morning_glory_pool_500.jpg';
         $result = $this->adapter->getExifFromFile($file);
         $this->assertInstanceOf('\PHPExif\Exif', $result);
+        $this->assertInternalType('array', $result->getRawData());
+        $this->assertNotEmpty($result->getRawData());
     }
 
     /**

tests/PHPExif/Reader/Adapter/ExiftoolTest.php renamed to tests/PHPExif/Adapter/ExiftoolTest.php

@@ -117,6 +117,8 @@ public function testGetExifFromFileHasData()
         $file = PHPEXIF_TEST_ROOT . '/files/morning_glory_pool_500.jpg';
         $result = $this->adapter->getExifFromFile($file);
         $this->assertInstanceOf('\PHPExif\Exif', $result);
+        $this->assertInternalType('array', $result->getRawData());
+        $this->assertNotEmpty($result->getRawData());
     }
 
     /**