Skip to content
This repository has been archived by the owner on Jul 4, 2018. It is now read-only.

Commit

Permalink
feature #1514 Fixed WebTestCase compatibility with PHPUnit 6+ (skalpa)
Browse files Browse the repository at this point in the history
This PR was squashed before being merged into the 2.1.x-dev branch (closes #1514).

Discussion
----------

Fixed WebTestCase compatibility with PHPUnit 6+

Makes `WebTestCase` inherit from `PHPUnit\Framework\TestCase` instead of `PHPUnit_Framework_TestCase`.

Strictly speaking it's a BC break, but as the namespaced class is now available in PHPUnit 4.8.35, 5.4+ and 6.x it's probable safe.

Commits
-------

619018a Fixed WebTestCase compatibility with PHPUnit 6+
  • Loading branch information
fabpot committed May 9, 2017
2 parents 12c5c92 + 619018a commit 74a6de7
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
3 changes: 3 additions & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@
"monolog/monolog": "^1.4.1",
"symfony/web-link": "^3.3"
},
"conflict": {
"phpunit/phpunit": "<4.8.35 || >= 5.0, <5.4.3"
},
"replace": {
"silex/api": "self.version",
"silex/providers": "self.version"
Expand Down
3 changes: 2 additions & 1 deletion src/Silex/WebTestCase.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

namespace Silex;

use PHPUnit\Framework\TestCase;
use Symfony\Component\HttpKernel\Client;
use Symfony\Component\HttpKernel\HttpKernelInterface;

Expand All @@ -19,7 +20,7 @@
*
* @author Igor Wiedler <igor@wiedler.ch>
*/
abstract class WebTestCase extends \PHPUnit_Framework_TestCase
abstract class WebTestCase extends TestCase
{
/**
* HttpKernelInterface instance.
Expand Down

0 comments on commit 74a6de7

Please sign in to comment.