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

compatibility with PHPUnit 6 #20

Merged
merged 1 commit into from
Mar 17, 2017
Merged

compatibility with PHPUnit 6 #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
],
"require": {
"php": ">=5.4",
"phpunit/phpunit": "^4.5 || ^5.0",
"phpunit/phpunit": "^4.8.35 || ^5.4.3 || ^6.0",
"php-http/httplug": "^1.0",
"php-http/message": "^1.0",
"guzzlehttp/psr7": "^1.0",
Expand Down
3 changes: 2 additions & 1 deletion src/HttpBaseTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@
use Http\Message\MessageFactory;
use Http\Message\MessageFactory\GuzzleMessageFactory;
use Nerd\CartesianProduct\CartesianProduct;
use PHPUnit\Framework\TestCase;
use Psr\Http\Message\ResponseInterface;

abstract class HttpBaseTest extends \PHPUnit_Framework_TestCase
abstract class HttpBaseTest extends TestCase
{
/**
* @var string
Expand Down
3 changes: 2 additions & 1 deletion src/HttpFeatureTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@
use Http\Client\HttpClient;
use Http\Message\MessageFactory;
use Http\Message\MessageFactory\GuzzleMessageFactory;
use PHPUnit\Framework\TestCase;

abstract class HttpFeatureTest extends \PHPUnit_Framework_TestCase
abstract class HttpFeatureTest extends TestCase
{
/**
* @var MessageFactory
Expand Down