Skip to content

Commit

Permalink
Merge pull request #20 from xabbuh/phpunit6-compat
Browse files Browse the repository at this point in the history
compatibility with PHPUnit 6
  • Loading branch information
sagikazarmark committed Mar 17, 2017
2 parents 2b23de9 + 41738ac commit 10484ce
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion composer.json
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
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
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

0 comments on commit 10484ce

Please sign in to comment.