Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Provide PHP 5.6 / PHPUnit 5.7.27 support #947

Merged
merged 3 commits into from Feb 13, 2019
Merged

Provide PHP 5.6 / PHPUnit 5.7.27 support #947

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e242bdd
Be PHPUnit 5 compliant
MKodde Feb 13, 2019
51f9e5d
Support PHPUnit 5.7.27
MKodde Feb 13, 2019
3071686
Update CHANGELOG.md
MKodde Feb 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion library/Mockery/Adapter/Phpunit/Legacy/TestListenerTrait.php
View file
Open in desktop
Expand Up @@ -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');
Expand Down
2 changes: 0 additions & 2 deletions ...Mockery/Adapter/Phpunit/MockeryPHPUnitIntegrationAssertPostConditionsForV7AndPrevious.php
View file
Open in desktop
Expand Up @@ -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
Expand Down