Merge pull request #947 from MKodde/bugfix/php56-bc-breaking-change-fix

Provide PHP 5.6 / PHPUnit 5.7.27 support
mockery · Feb 13, 2019 · 5337246 · 5337246
2 parents dc4f10b + 3071686
commit 5337246
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## x.y.z (unreleased)
 
+* Fix a BC breaking change for PHP 5.6/PHPUnit 5.7.27 (#947) 
+
 ## 1.2.1 (2019-02-07)
 
 * Support for PHPUnit 8 (#942)

diff --git a/library/Mockery/Adapter/Phpunit/Legacy/TestListenerTrait.php b/library/Mockery/Adapter/Phpunit/Legacy/TestListenerTrait.php
@@ -20,7 +20,7 @@
 
 namespace Mockery\Adapter\Phpunit\Legacy;
 
-if (class_exists('PHPUnit_Framework_TestCase') && ! class_exists('PHPUnit\Framework\TestCase')) {
+if (class_exists('PHPUnit_Framework_TestCase') && ! class_exists('PHPUnit\Util\Blacklist')) {
     class_alias('PHPUnit_Framework_ExpectationFailedException', 'PHPUnit\Framework\ExpectationFailedException');
     class_alias('PHPUnit_Framework_Test', 'PHPUnit\Framework\Test');
     class_alias('PHPUnit_Framework_TestCase', 'PHPUnit\Framework\TestCase');

diff --git a/...Mockery/Adapter/Phpunit/MockeryPHPUnitIntegrationAssertPostConditionsForV7AndPrevious.php b/...Mockery/Adapter/Phpunit/MockeryPHPUnitIntegrationAssertPostConditionsForV7AndPrevious.php
@@ -18,8 +18,6 @@
  * @license    https://github.com/mockery/mockery/blob/master/LICENSE New BSD License
  */
 
-declare(strict_types=1);
-
 namespace Mockery\Adapter\Phpunit;
 
 trait MockeryPHPUnitIntegrationAssertPostConditionsForV7AndPrevious