Merge pull request #41 from jakubkulhan/travis-php7.2

travis - test also w/ PHP 7.2 & nightly

Author: freekmurze

.travis.yml

@@ -3,12 +3,18 @@ language: php
 php:
   - 7.0
   - 7.1
+  - 7.2
+  - nightly
 
 env:
   matrix:
     - COMPOSER_FLAGS="--prefer-lowest"
     - COMPOSER_FLAGS=""
 
+matrix:
+  allow_failures:
+    - php: nightly
+
 before_script:
   - travis_retry composer self-update
   - travis_retry composer update ${COMPOSER_FLAGS} --no-interaction --prefer-source

composer.json

@@ -21,7 +21,7 @@
     ],
     "require": {
         "php": "^7.0",
-        "phpunit/phpunit": "^5.7|^6.0|^7.0"
+        "phpunit/phpunit": "~6.0.5|^7.0"
     },
     "autoload": {
         "psr-4": {

src/MatchesSnapshots.php

@@ -3,7 +3,6 @@
 namespace Spatie\Snapshots;
 
 use PHPUnit\Framework\ExpectationFailedException;
-use PHPUnit_Framework_ExpectationFailedException;
 use ReflectionClass;
 use ReflectionObject;
 use Spatie\Snapshots\Drivers\JsonDriver;
@@ -129,17 +128,13 @@ protected function doSnapshotAssertion($actual, Driver $driver)
                 $snapshot->assertMatches($actual);
             } catch (ExpectationFailedException $exception) {
                 $this->updateSnapshotAndMarkTestIncomplete($snapshot, $actual);
-            } catch (PHPUnit_Framework_ExpectationFailedException $exception) {
-                $this->updateSnapshotAndMarkTestIncomplete($snapshot, $actual);
             }
         }
 
         try {
             $snapshot->assertMatches($actual);
         } catch (ExpectationFailedException $exception) {
             $this->rethrowExpectationFailedExceptionWithUpdateSnapshotsPrompt($exception);
-        } catch (PHPUnit_Framework_ExpectationFailedException $exception) {
-            $this->rethrowExpectationFailedExceptionWithUpdateSnapshotsPrompt($exception);
         }
     }
 

tests/Integration/MatchesSnapshotTest.php

@@ -2,6 +2,7 @@
 
 namespace Spatie\Snapshots\Test\Integration;
 
+use PHPUnit\Framework\ExpectationFailedException;
 use PHPUnit\Framework\TestCase;
 use PHPUnit_Framework_MockObject_MockObject;
 use Spatie\Snapshots\MatchesSnapshots;
@@ -331,11 +332,7 @@ private function expectFail(PHPUnit_Framework_MockObject_MockObject $matchesSnap
 
     private function expectFailedMatchesSnapshotTest()
     {
-        if (class_exists('PHPUnit\Framework\ExpectationFailedException')) {
-            $this->expectException('PHPUnit\Framework\ExpectationFailedException');
-        } else {
-            $this->expectException('PHPUnit_Framework_ExpectationFailedException');
-        }
+        $this->expectException(ExpectationFailedException::class);
     }
 
     /**