Support PHPUnit 5.7 closes #18

Author: sebastiandedeyne

composer.json

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

src/Drivers/JsonDriver.php

@@ -25,9 +25,6 @@ public function extension(): string
 
     public function match($expected, $actual)
     {
-        Assert::assertJson($expected);
-        Assert::assertJson($actual);
-
-        Assert::assertThat($actual, new JsonMatches($expected));
+        Assert::assertJsonStringEqualsJsonString($actual, $expected);
     }
 }

src/Drivers/XmlDriver.php

@@ -4,7 +4,6 @@
 
 use DOMDocument;
 use PHPUnit\Framework\Assert;
-use PHPUnit\Util\Xml;
 use Spatie\Snapshots\Driver;
 use Spatie\Snapshots\Exceptions\CantBeSerialized;
 
@@ -32,6 +31,6 @@ public function extension(): string
 
     public function match($expected, $actual)
     {
-        Assert::assertEquals(Xml::load($expected), Xml::load($actual));
+        Assert::assertXmlStringEqualsXmlString($expected, $actual);
     }
 }

src/MatchesSnapshots.php

@@ -2,6 +2,7 @@
 
 namespace Spatie\Snapshots;
 
+use PHPUnit_Framework_ExpectationFailedException;
 use PHPUnit\Framework\ExpectationFailedException;
 use ReflectionClass;
 use Spatie\Snapshots\Drivers\JsonDriver;
@@ -100,6 +101,10 @@ protected function doSnapshotAssertion($actual, Driver $driver)
             } catch (ExpectationFailedException $exception) {
                 $snapshot->create($actual);
 
+                return $this->markTestIncomplete("Snapshot updated for {$snapshot->id()}");
+            } catch (PHPUnit_Framework_ExpectationFailedException $exception) {
+                $snapshot->create($actual);
+
                 return $this->markTestIncomplete("Snapshot updated for {$snapshot->id()}");
             }
         }

tests/Integration/MatchesSnapshotTest.php

@@ -2,8 +2,8 @@
 
 namespace Spatie\Snapshots\Test\Integration;
 
-use PHPUnit\Framework\ExpectationFailedException;
 use PHPUnit\Framework\TestCase;
+use PHPUnit\Runner\Version;
 use PHPUnit_Framework_MockObject_MockObject;
 use Spatie\Snapshots\MatchesSnapshots;
 
@@ -98,7 +98,7 @@ public function it_can_mismatch_a_string_snapshot()
     {
         $mockTrait = $this->getMatchesSnapshotMock();
 
-        $this->expectException(ExpectationFailedException::class);
+        $this->expectFailedMatchesSnapshotTest();
 
         $mockTrait->assertMatchesSnapshot('Bar');
     }
@@ -108,7 +108,7 @@ public function it_can_mismatch_a_xml_snapshot()
     {
         $mockTrait = $this->getMatchesSnapshotMock();
 
-        $this->expectException(ExpectationFailedException::class);
+        $this->expectFailedMatchesSnapshotTest();
 
         $mockTrait->assertMatchesXmlSnapshot('<foo><bar>Foo</bar></foo>');
     }
@@ -118,7 +118,7 @@ public function it_can_mismatch_a_json_snapshot()
     {
         $mockTrait = $this->getMatchesSnapshotMock();
 
-        $this->expectException(ExpectationFailedException::class);
+        $this->expectFailedMatchesSnapshotTest();
 
         $mockTrait->assertMatchesJsonSnapshot('{"foo":"baz","bar":"baz","baz":"foo"}');
     }
@@ -174,17 +174,26 @@ public function it_can_update_a_json_snapshot()
         );
     }
 
-    protected function expectIncompleteMatchesSnapshotTest(PHPUnit_Framework_MockObject_MockObject $matchesSnapshotMock)
+    private function expectIncompleteMatchesSnapshotTest(PHPUnit_Framework_MockObject_MockObject $matchesSnapshotMock)
     {
         $matchesSnapshotMock
             ->expects($this->once())
             ->method('markTestIncomplete');
     }
 
+    private function expectFailedMatchesSnapshotTest()
+    {
+        if (class_exists('PHPUnit\Framework\ExpectationFailedException')) {
+            $this->expectException('PHPUnit\Framework\ExpectationFailedException');
+        } else {
+            $this->expectException('PHPUnit_Framework_ExpectationFailedException');
+        }
+    }
+
     /**
      * @return \PHPUnit_Framework_MockObject_MockObject
      */
-    protected function getMatchesSnapshotMock(): PHPUnit_Framework_MockObject_MockObject
+    private function getMatchesSnapshotMock(): PHPUnit_Framework_MockObject_MockObject
     {
         $mockMethods = [
             'markTestIncomplete',