Merge branch 'master' into fix-coords

Author: maltehuebner

.gitignore

@@ -1,3 +1,4 @@
+composer.lock
 phpunit.xml
 tests/log
 vendor

.travis.yml

@@ -1,31 +1,33 @@
 language: php
 
+php:
+  - 5.4
+  - 5.5
+  - 5.6
+  - 7.0
+  - 7.1
+  - 7.2
+  - nightly
+
 env:
-  global:
-    - DEPENDENCIES=no
+  - DEPENDENCIES=no
+  - DEPENDENCIES=beta
+  - DEPENDENCIES=low
 
 matrix:
-  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
+    - env: DEPENDENCIES=beta
+    - env: DEPENDENCIES=low
 
 script:
   - mkdir -p build/logs
-  - php vendor/bin/phpunit -c phpunit.xml.dist
-  - ./vendor/bin/phpunit --coverage-clover ./build/logs/clover.xml
-  - ./vendor/bin/phpcs --standard=PSR2 ./lib/
+  - composer validate-files
+  - composer check-code-style
+  - composer run-tests
 
 before_script:
-  - composer install --prefer-source
+  - if [ "$DEPENDENCIES" = "low" ]; then composer --prefer-lowest --prefer-stable update; else composer update; fi;
 
 after_script:
   - php vendor/bin/coveralls -v 
@@ -36,3 +38,11 @@ before_install:
   - 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
+  # Set composer minimum-stability configuration filter to beta versions
+  - if [ "$DEPENDENCIES" = "beta" ]; then perl -pi -e 's/^}$/,"minimum-stability":"beta"}/' composer.json; fi;
+  # Disable xdebug, there is no use of it being enabled
+  - mv ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini{,.disabled} || echo "xdebug not available"
+  # Prevent Travis throwing an out of memory error
+  - echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
+  # Test if we have a token for github in case the project hits the 60 rph limit
+  - if [ -n "$GH_TOKEN" ]; then composer config github-oauth.github.com ${GH_TOKEN}; fi;

composer.json

@@ -12,12 +12,13 @@
     ],
     "keywords": ["EXIF", "IPTC", "jpeg", "tiff", "exiftool"],
     "require": {
-        "php": ">=5.3.0"
+        "php": ">=5.4"
     },
     "require-dev": {
-        "phpunit/phpunit": "3.7.*",
-        "satooshi/php-coveralls": "~0.6",
+        "jakub-onderka/php-parallel-lint": "^1.0",
         "phpmd/phpmd": "~2.2",
+        "phpunit/phpunit": ">=4.0 <6.0",
+        "satooshi/php-coveralls": "~0.6",
         "sebastian/phpcpd": "1.4.*@stable",
         "squizlabs/php_codesniffer": "1.4.*@stable"
     },
@@ -29,5 +30,21 @@
         "psr-0": {
             "PHPExif": "lib/"
         }
-    }
-}
+    },
+    "scripts": {
+        "check-code-style": [
+            "vendor/bin/phpcs --standard=PSR2 ./lib/"
+        ],
+        "run-tests": [
+            "vendor/bin/phpunit -c phpunit.xml.dist",
+            "vendor/bin/phpunit --coverage-clover ./build/logs/clover.xml"
+        ],
+        "validate-files": [
+            "vendor/bin/parallel-lint --exclude vendor ."
+        ]
+    },
+    "config": {
+        "sort-packages": true
+    },
+    "prefer-stable": true
+}

composer.lock

@@ -24,7 +24,9 @@ public function testHydrateCallsDetermineMutator()
         );
 
         // create mock
-        $mock = $this->getMock('\\PHPExif\\Hydrator\\Mutator', array('determineMutator'));
+        $mock = $this->getMockBuilder('\\PHPExif\\Hydrator\\Mutator')
+            ->setMethods(array('determineMutator'))
+            ->getMock();
 
         $mock->expects($this->exactly(count($input)))
             ->method('determineMutator')
@@ -48,7 +50,9 @@ public function testHydrateCallsMutatorsOnObject()
         );
 
         // create mock
-        $mock = $this->getMock('TestClass', array('setBar'));
+        $mock = $this->getMockBuilder('TestClass')
+            ->setMethods(array('setBar'))
+            ->getMock();
 
         $mock->expects($this->once())
             ->method('setBar')

tests/PHPExif/Hydrator/MutatorTest.php

@@ -16,7 +16,7 @@ class ReaderTest extends \PHPUnit_Framework_TestCase
      */
     public function setUp()
     {
-        $adapter = $this->getMock('\PHPExif\Adapter\AdapterInterface');
+        $adapter = $this->getMockBuilder('\PHPExif\Adapter\AdapterInterface')->getMockForAbstractClass();
         $this->reader = new \PHPExif\Reader\Reader($adapter);
     }
 
@@ -26,7 +26,7 @@ public function setUp()
      */
     public function testConstructorWithAdapter()
     {
-        $mock = $this->getMock('\PHPExif\Adapter\AdapterInterface');
+        $mock = $this->getMockBuilder('\PHPExif\Adapter\AdapterInterface')->getMockForAbstractClass();
         $reflProperty = new \ReflectionProperty('\PHPExif\Reader\Reader', 'adapter');
         $reflProperty->setAccessible(true);
 
@@ -41,7 +41,7 @@ public function testConstructorWithAdapter()
      */
     public function testGetAdapterFromProperty()
     {
-        $mock = $this->getMock('\PHPExif\Adapter\AdapterInterface');
+        $mock = $this->getMockBuilder('\PHPExif\Adapter\AdapterInterface')->getMockForAbstractClass();
 
         $reflProperty = new \ReflectionProperty('\PHPExif\Reader\Reader', 'adapter');
         $reflProperty->setAccessible(true);
@@ -71,7 +71,7 @@ public function testGetAdapterThrowsExceptionWhenNoAdapterIsSet()
      */
     public function testGetExifPassedToAdapter()
     {
-        $adapter = $this->getMock('\PHPExif\Adapter\AdapterInterface');
+        $adapter = $this->getMockBuilder('\PHPExif\Adapter\AdapterInterface')->getMockForAbstractClass();
         $adapter->expects($this->once())->method('getExifFromFile');
 
         $reflProperty = new \ReflectionProperty('\PHPExif\Reader\Reader', 'adapter');
@@ -138,13 +138,10 @@ public function testFactoryAdapterTypeExiftool()
      */
     public function testGetExifFromFileCallsReadMethod()
     {
-        $mock = $this->getMock(
-            '\\PHPExif\\Reader\\Reader',
-            array('read'),
-            array(),
-            '',
-            false
-        );
+        $mock = $this->getMockBuilder('\\PHPExif\\Reader\\Reader')
+            ->setMethods(array('read'))
+            ->disableOriginalConstructor()
+            ->getMock();
 
         $expected = '/foo/bar/baz';
         $expectedResult = 'test';