Skip to content

Commit 4b0fea9

Browse files
committed
drop support for PHPUnit <6.0.5, so PHP 7.2 can be supported
- PHPUnit <6.0.0 does not work with PHP 7.2 - PHPUnit <6.0.5 errors with "PHP Deprecated: The each() function is deprecated. This message will be suppressed on further calls in ./vendor/phpunit/phpunit/src/Util/Getopt.php on line 39"
1 parent 80e4049 commit 4b0fea9

File tree

3 files changed

+3
-11
lines changed

3 files changed

+3
-11
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
],
2222
"require": {
2323
"php": "^7.0",
24-
"phpunit/phpunit": "^5.7|^6.0|^7.0"
24+
"phpunit/phpunit": "~6.0.5|^7.0"
2525
},
2626
"autoload": {
2727
"psr-4": {

src/MatchesSnapshots.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
namespace Spatie\Snapshots;
44

55
use PHPUnit\Framework\ExpectationFailedException;
6-
use PHPUnit_Framework_ExpectationFailedException;
76
use ReflectionClass;
87
use ReflectionObject;
98
use Spatie\Snapshots\Drivers\JsonDriver;
@@ -129,17 +128,13 @@ protected function doSnapshotAssertion($actual, Driver $driver)
129128
$snapshot->assertMatches($actual);
130129
} catch (ExpectationFailedException $exception) {
131130
$this->updateSnapshotAndMarkTestIncomplete($snapshot, $actual);
132-
} catch (PHPUnit_Framework_ExpectationFailedException $exception) {
133-
$this->updateSnapshotAndMarkTestIncomplete($snapshot, $actual);
134131
}
135132
}
136133

137134
try {
138135
$snapshot->assertMatches($actual);
139136
} catch (ExpectationFailedException $exception) {
140137
$this->rethrowExpectationFailedExceptionWithUpdateSnapshotsPrompt($exception);
141-
} catch (PHPUnit_Framework_ExpectationFailedException $exception) {
142-
$this->rethrowExpectationFailedExceptionWithUpdateSnapshotsPrompt($exception);
143138
}
144139
}
145140

tests/Integration/MatchesSnapshotTest.php

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace Spatie\Snapshots\Test\Integration;
44

5+
use PHPUnit\Framework\ExpectationFailedException;
56
use PHPUnit\Framework\TestCase;
67
use PHPUnit_Framework_MockObject_MockObject;
78
use Spatie\Snapshots\MatchesSnapshots;
@@ -331,11 +332,7 @@ private function expectFail(PHPUnit_Framework_MockObject_MockObject $matchesSnap
331332

332333
private function expectFailedMatchesSnapshotTest()
333334
{
334-
if (class_exists('PHPUnit\Framework\ExpectationFailedException')) {
335-
$this->expectException('PHPUnit\Framework\ExpectationFailedException');
336-
} else {
337-
$this->expectException('PHPUnit_Framework_ExpectationFailedException');
338-
}
335+
$this->expectException(ExpectationFailedException::class);
339336
}
340337

341338
/**

0 commit comments

Comments
 (0)