Merge pull request #1 from PHPExif/master

Get main repo changes

Author: martin-georgiev

.travis.yml

@@ -1,14 +1,22 @@
 language: php
 
-php:
-  - 5.3
-  - 5.4
-  - 5.5
-  - 5.6
+env:
+  global:
+    - DEPENDENCIES=no
 
 matrix:
-  allow_failures:
+  include:
+    - php: 5.3
+      dist: precise
+    - php: 5.4
+      dist: precise
     - php: 5.6
+    - php: 7.0
+    - php: 7.1
+    - php: nightly
+  allow_failures:
+    - php: 7.2
+    - php: nightly
 
 script:
   - mkdir -p build/logs

README.md

@@ -1,4 +1,4 @@
-# [PHPExif v0.6.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=master)](https://coveralls.io/r/Miljar/php-exif?branch=master) [![Code Climate](https://codeclimate.com/github/Miljar/php-exif/badges/gpa.svg)](https://codeclimate.com/github/Miljar/php-exif)
+# [PHPExif v0.6.1](http://github.com/PHPExif/php-exif) [![Build Status](https://travis-ci.org/PHPExif/php-exif.png?branch=master)](https://travis-ci.org/PHPExif/php-exif) [![Coverage Status](https://coveralls.io/repos/PHPExif/php-exif/badge.svg?branch=master)](https://coveralls.io/r/PHPExif/php-exif?branch=master) [![Code Climate](https://codeclimate.com/github/PHPExif/php-exif/badges/gpa.svg)](https://codeclimate.com/github/PHPExif/php-exif)
 
 PHPExif is a library which gives you easy access to the EXIF meta-data of an image.
 
@@ -12,7 +12,7 @@ PHPExif serves as a wrapper around some native or CLI tools which access this EX
 ## Installation (composer)
 
 ```json
-"miljar/php-exif": "~0.6.0"
+composer require miljar/php-exif
 ```
 
 

lib/PHPExif/Mapper/Native.php

@@ -249,11 +249,14 @@ protected function isFieldKnown(&$field)
     /**
      * Extract GPS coordinates from components array
      *
-     * @param array $components
+     * @param array|string $components
      * @return float
      */
-    protected function extractGPSCoordinate(array $components)
+    protected function extractGPSCoordinate($components)
     {
+        if (!is_array($components)) {
+            $components = array($components);
+        }
         $components = array_map(array($this, 'normalizeComponent'), $components);
 
         if (count($components) > 2) {

tests/PHPExif/ExifTest.php

@@ -611,7 +611,8 @@ public function testAdapterConsistency()
         $methods = $reflClass->getMethods(ReflectionMethod::IS_PUBLIC);
         $testfiles = array(
             PHPEXIF_TEST_ROOT . '/files/morning_glory_pool_500.jpg',
-            PHPEXIF_TEST_ROOT . '/files/dsc_5794.jpg'
+            PHPEXIF_TEST_ROOT . '/files/dsc_5794.jpg',
+            PHPEXIF_TEST_ROOT . '/files/dsc_0003.jpg'
         );
 
         $adapter_exiftool = new \PHPExif\Adapter\Exiftool();