Skip to content

Support PHPUnit 6.x #45

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

Merged
merged 3 commits into from
Nov 3, 2018
Merged

Support PHPUnit 6.x #45

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
16876e4
Support PHPUnit 6.x
sagikazarmark Nov 3, 2018
b5b44da
Support PHPUnit 7
sagikazarmark Nov 3, 2018
fbcd93c
Use latest PHPUnit
sagikazarmark Nov 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"require-dev": {
"guzzlehttp/psr7": "^1.0",
"php-http/client-integration-tests": "dev-master",
"phpunit/phpunit": "^4.8.27",
"phpunit/phpunit": "^7.0",
"zendframework/zend-diactoros": "^1.0"
},
"autoload": {
Expand Down
4 changes: 2 additions & 2 deletions tests/PromiseCoreTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class PromiseCoreTest extends BaseUnitTestCase
*/
public function testHandleIsNotAResource()
{
$this->setExpectedException(
$this->expectException(
\InvalidArgumentException::class,
'Parameter $handle expected to be a cURL resource, NULL given'
);
Expand All @@ -38,7 +38,7 @@ public function testHandleIsNotAResource()
*/
public function testHandleIsNotACurlResource()
{
$this->setExpectedException(
$this->expectException(
\InvalidArgumentException::class,
'Parameter $handle expected to be a cURL resource, stream resource given'
);
Expand Down