Skip to content

Commit

Permalink
Merge pull request #20 from Codeception/phpunit-8.4
Browse files Browse the repository at this point in the history
Compatibility with PHPUnit 8.4
  • Loading branch information
Naktibalda authored Oct 5, 2019
2 parents eea5187 + 4594329 commit 016a035
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 9 deletions.
2 changes: 0 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
language: php

php:
- 7
- 7.1
- 7.2
- 7.3

Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
}
},
"require": {
"codeception/phpunit-wrapper": "^6.6.1 | ^7.7.1 | ^8.0.3",
"phpunit/phpunit": ">=6.5 <9.0"
"codeception/phpunit-wrapper": "^8.0.4",
"phpunit/phpunit": "^8.4"
}
}
2 changes: 1 addition & 1 deletion src/Stub.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
use Codeception\Stub\ConsecutiveMap;
use Codeception\Stub\StubMarshaler;
use PHPUnit\Framework\MockObject\Generator;
use PHPUnit\Framework\MockObject\Matcher\AnyInvokedCount;
use PHPUnit\Framework\MockObject\Rule\AnyInvokedCount;
use PHPUnit\Framework\MockObject\Stub\ConsecutiveCalls;
use PHPUnit\Framework\MockObject\Stub\ReturnCallback;
use PHPUnit\Framework\MockObject\Stub\ReturnStub;
Expand Down
4 changes: 2 additions & 2 deletions src/Stub/Expected.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

namespace Codeception\Stub;

use PHPUnit\Framework\MockObject\Matcher\InvokedAtLeastOnce;
use PHPUnit\Framework\MockObject\Matcher\InvokedCount;
use PHPUnit\Framework\MockObject\Rule\InvokedAtLeastOnce;
use PHPUnit\Framework\MockObject\Rule\InvokedCount;

class Expected
{
Expand Down
4 changes: 2 additions & 2 deletions src/Stub/StubMarshaler.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace Codeception\Stub;

use PHPUnit\Framework\MockObject\Matcher\InvokedRecorder;
use PHPUnit\Framework\MockObject\Rule\InvocationOrder;

/**
* Holds matcher and value of mocked method
Expand All @@ -13,7 +13,7 @@ class StubMarshaler

private $methodValue;

public function __construct(InvokedRecorder $matcher, $value)
public function __construct(InvocationOrder $matcher, $value)
{
$this->methodMatcher = $matcher;
$this->methodValue = $value;
Expand Down

0 comments on commit 016a035

Please sign in to comment.