Skip to content

Support PHP 7.1 #2

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
zonuexe merged 2 commits into from
Jun 18, 2017
Merged

Support PHP 7.1 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f41012c
Add test target to 7.0 and 7.1
zonuexe Jun 18, 2017
6f89717
Remove "Exception" type declaration
zonuexe Jun 18, 2017
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: 2 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ php:
- 5.4
- 5.5
- 5.6
- "7.0"
- "7.1"

env:
matrix:
Expand Down
16 changes: 8 additions & 8 deletions src/Extensions/TicketListener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ abstract class PHPUnit_Extensions_TicketListener implements PHPUnit_Framework_Te
* An error occurred.
*
* @param PHPUnit_Framework_Test $test
* @param Exception $e
* @param \Exception|\Throwable $e
* @param float $time
*/
public function addError(PHPUnit_Framework_Test $test, Exception $e, $time)
public function addError(PHPUnit_Framework_Test $test, $e, $time)
{
}

Expand All @@ -51,36 +51,36 @@ public function addFailure(PHPUnit_Framework_Test $test, PHPUnit_Framework_Asser
* Incomplete test.
*
* @param PHPUnit_Framework_Test $test
* @param Exception $e
* @param \Exception|\Throwable $e
* @param float $time
*/
public function addIncompleteTest(PHPUnit_Framework_Test $test, Exception $e, $time)
public function addIncompleteTest(PHPUnit_Framework_Test $test, $e, $time)
{
}

/**
* Risky test.
*
* @param PHPUnit_Framework_Test $test
* @param Exception $e
* @param \Exception|\Throwable $e
* @param float $time
*
* @since Method available since Release 4.0.0
*/
public function addRiskyTest(PHPUnit_Framework_Test $test, Exception $e, $time)
public function addRiskyTest(PHPUnit_Framework_Test $test, $e, $time)
{
}

/**
* Skipped test.
*
* @param PHPUnit_Framework_Test $test
* @param Exception $e
* @param \Exception|\Throwable $e
* @param float $time
*
* @since Method available since Release 3.0.0
*/
public function addSkippedTest(PHPUnit_Framework_Test $test, Exception $e, $time)
public function addSkippedTest(PHPUnit_Framework_Test $test, $e, $time)
{
}

Expand Down
8 changes: 4 additions & 4 deletions src/Framework/BaseTestListener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,23 +17,23 @@
*/
abstract class PHPUnit_Framework_BaseTestListener implements PHPUnit_Framework_TestListener
{
public function addError(PHPUnit_Framework_Test $test, Exception $e, $time)
public function addError(PHPUnit_Framework_Test $test, $e, $time)
{
}

public function addFailure(PHPUnit_Framework_Test $test, PHPUnit_Framework_AssertionFailedError $e, $time)
{
}

public function addIncompleteTest(PHPUnit_Framework_Test $test, Exception $e, $time)
public function addIncompleteTest(PHPUnit_Framework_Test $test, $e, $time)
{
}

public function addRiskyTest(PHPUnit_Framework_Test $test, Exception $e, $time)
public function addRiskyTest(PHPUnit_Framework_Test $test, $e, $time)
{
}

public function addSkippedTest(PHPUnit_Framework_Test $test, Exception $e, $time)
public function addSkippedTest(PHPUnit_Framework_Test $test, $e, $time)
{
}

Expand Down
4 changes: 2 additions & 2 deletions src/Framework/TestFailure.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ class PHPUnit_Framework_TestFailure
* Constructs a TestFailure with the given test and exception.
*
* @param PHPUnit_Framework_Test $failedTest
* @param Exception $thrownException
* @param \Exception|\Throwable $thrownException
*/
public function __construct(PHPUnit_Framework_Test $failedTest, Exception $thrownException)
public function __construct(PHPUnit_Framework_Test $failedTest, $thrownException)
{
if ($failedTest instanceof PHPUnit_Framework_SelfDescribing) {
$this->testName = $failedTest->toString();
Expand Down
16 changes: 8 additions & 8 deletions src/Framework/TestListener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ interface PHPUnit_Framework_TestListener
* An error occurred.
*
* @param PHPUnit_Framework_Test $test
* @param Exception $e
* @param \Exception|\Throwable $e
* @param float $time
*/
public function addError(PHPUnit_Framework_Test $test, Exception $e, $time);
public function addError(PHPUnit_Framework_Test $test, $e, $time);

/**
* A failure occurred.
Expand All @@ -37,32 +37,32 @@ public function addFailure(PHPUnit_Framework_Test $test, PHPUnit_Framework_Asser
* Incomplete test.
*
* @param PHPUnit_Framework_Test $test
* @param Exception $e
* @param \Exception|\Throwable $e
* @param float $time
*/
public function addIncompleteTest(PHPUnit_Framework_Test $test, Exception $e, $time);
public function addIncompleteTest(PHPUnit_Framework_Test $test, $e, $time);

/**
* Risky test.
*
* @param PHPUnit_Framework_Test $test
* @param Exception $e
* @param \Exception|\Throwable $e
* @param float $time
*
* @since Method available since Release 4.0.0
*/
public function addRiskyTest(PHPUnit_Framework_Test $test, Exception $e, $time);
public function addRiskyTest(PHPUnit_Framework_Test $test, $e, $time);

/**
* Skipped test.
*
* @param PHPUnit_Framework_Test $test
* @param Exception $e
* @param \Exception|\Throwable $e
* @param float $time
*
* @since Method available since Release 3.0.0
*/
public function addSkippedTest(PHPUnit_Framework_Test $test, Exception $e, $time);
public function addSkippedTest(PHPUnit_Framework_Test $test, $e, $time);

/**
* A test suite started.
Expand Down
16 changes: 8 additions & 8 deletions src/TextUI/ResultPrinter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,10 +388,10 @@ public function printWaitPrompt()
* An error occurred.
*
* @param PHPUnit_Framework_Test $test
* @param Exception $e
* @param \Exception|\Throwable $e
* @param float $time
*/
public function addError(PHPUnit_Framework_Test $test, Exception $e, $time)
public function addError(PHPUnit_Framework_Test $test, $e, $time)
{
$this->writeProgressWithColor('fg-red, bold', 'E');
$this->lastTestFailed = true;
Expand All @@ -414,10 +414,10 @@ public function addFailure(PHPUnit_Framework_Test $test, PHPUnit_Framework_Asser
* Incomplete test.
*
* @param PHPUnit_Framework_Test $test
* @param Exception $e
* @param \Exception|\Throwable $e
* @param float $time
*/
public function addIncompleteTest(PHPUnit_Framework_Test $test, Exception $e, $time)
public function addIncompleteTest(PHPUnit_Framework_Test $test, $e, $time)
{
$this->writeProgressWithColor('fg-yellow, bold', 'I');
$this->lastTestFailed = true;
Expand All @@ -427,12 +427,12 @@ public function addIncompleteTest(PHPUnit_Framework_Test $test, Exception $e, $t
* Risky test.
*
* @param PHPUnit_Framework_Test $test
* @param Exception $e
* @param \Exception|\Throwable $e
* @param float $time
*
* @since Method available since Release 4.0.0
*/
public function addRiskyTest(PHPUnit_Framework_Test $test, Exception $e, $time)
public function addRiskyTest(PHPUnit_Framework_Test $test, $e, $time)
{
$this->writeProgressWithColor('fg-yellow, bold', 'R');
$this->lastTestFailed = true;
Expand All @@ -442,12 +442,12 @@ public function addRiskyTest(PHPUnit_Framework_Test $test, Exception $e, $time)
* Skipped test.
*
* @param PHPUnit_Framework_Test $test
* @param Exception $e
* @param \Exception|\Throwable $e
* @param float $time
*
* @since Method available since Release 3.0.0
*/
public function addSkippedTest(PHPUnit_Framework_Test $test, Exception $e, $time)
public function addSkippedTest(PHPUnit_Framework_Test $test, $e, $time)
{
$this->writeProgressWithColor('fg-cyan, bold', 'S');
$this->lastTestFailed = true;
Expand Down
16 changes: 8 additions & 8 deletions src/Util/Log/JSON.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ class PHPUnit_Util_Log_JSON extends PHPUnit_Util_Printer implements PHPUnit_Fram
* An error occurred.
*
* @param PHPUnit_Framework_Test $test
* @param Exception $e
* @param \Exception|\Throwable $e
* @param float $time
*/
public function addError(PHPUnit_Framework_Test $test, Exception $e, $time)
public function addError(PHPUnit_Framework_Test $test, $e, $time)
{
$this->writeCase(
'error',
Expand Down Expand Up @@ -74,10 +74,10 @@ public function addFailure(PHPUnit_Framework_Test $test, PHPUnit_Framework_Asser
* Incomplete test.
*
* @param PHPUnit_Framework_Test $test
* @param Exception $e
* @param \Exception|\Throwable $e
* @param float $time
*/
public function addIncompleteTest(PHPUnit_Framework_Test $test, Exception $e, $time)
public function addIncompleteTest(PHPUnit_Framework_Test $test, $e, $time)
{
$this->writeCase(
'error',
Expand All @@ -94,12 +94,12 @@ public function addIncompleteTest(PHPUnit_Framework_Test $test, Exception $e, $t
* Risky test.
*
* @param PHPUnit_Framework_Test $test
* @param Exception $e
* @param \Exception|\Throwable $e
* @param float $time
*
* @since Method available since Release 4.0.0
*/
public function addRiskyTest(PHPUnit_Framework_Test $test, Exception $e, $time)
public function addRiskyTest(PHPUnit_Framework_Test $test, $e, $time)
{
$this->writeCase(
'error',
Expand All @@ -116,10 +116,10 @@ public function addRiskyTest(PHPUnit_Framework_Test $test, Exception $e, $time)
* Skipped test.
*
* @param PHPUnit_Framework_Test $test
* @param Exception $e
* @param \Exception|\Throwable $e
* @param float $time
*/
public function addSkippedTest(PHPUnit_Framework_Test $test, Exception $e, $time)
public function addSkippedTest(PHPUnit_Framework_Test $test, $e, $time)
{
$this->writeCase(
'error',
Expand Down
16 changes: 8 additions & 8 deletions src/Util/Log/JUnit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,10 +117,10 @@ public function flush()
* An error occurred.
*
* @param PHPUnit_Framework_Test $test
* @param Exception $e
* @param \Exception|\Throwable $e
* @param float $time
*/
public function addError(PHPUnit_Framework_Test $test, Exception $e, $time)
public function addError(PHPUnit_Framework_Test $test, $e, $time)
{
if ($this->currentTestCase === null) {
return;
Expand Down Expand Up @@ -192,10 +192,10 @@ public function addFailure(PHPUnit_Framework_Test $test, PHPUnit_Framework_Asser
* Incomplete test.
*
* @param PHPUnit_Framework_Test $test
* @param Exception $e
* @param \Exception|\Throwable $e
* @param float $time
*/
public function addIncompleteTest(PHPUnit_Framework_Test $test, Exception $e, $time)
public function addIncompleteTest(PHPUnit_Framework_Test $test, $e, $time)
{
if ($this->logIncompleteSkipped && $this->currentTestCase !== null) {
$error = $this->document->createElement(
Expand All @@ -220,12 +220,12 @@ public function addIncompleteTest(PHPUnit_Framework_Test $test, Exception $e, $t
* Risky test.
*
* @param PHPUnit_Framework_Test $test
* @param Exception $e
* @param \Exception|\Throwable $e
* @param float $time
*
* @since Method available since Release 4.0.0
*/
public function addRiskyTest(PHPUnit_Framework_Test $test, Exception $e, $time)
public function addRiskyTest(PHPUnit_Framework_Test $test, $e, $time)
{
if ($this->logIncompleteSkipped && $this->currentTestCase !== null) {
$error = $this->document->createElement(
Expand All @@ -250,12 +250,12 @@ public function addRiskyTest(PHPUnit_Framework_Test $test, Exception $e, $time)
* Skipped test.
*
* @param PHPUnit_Framework_Test $test
* @param Exception $e
* @param \Exception|\Throwable $e
* @param float $time
*
* @since Method available since Release 3.0.0
*/
public function addSkippedTest(PHPUnit_Framework_Test $test, Exception $e, $time)
public function addSkippedTest(PHPUnit_Framework_Test $test, $e, $time)
{
if ($this->logIncompleteSkipped && $this->currentTestCase !== null) {
$error = $this->document->createElement(
Expand Down
16 changes: 8 additions & 8 deletions src/Util/Log/TAP.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,10 @@ public function __construct($out = null)
* An error occurred.
*
* @param PHPUnit_Framework_Test $test
* @param Exception $e
* @param \Exception|\Throwable $e
* @param float $time
*/
public function addError(PHPUnit_Framework_Test $test, Exception $e, $time)
public function addError(PHPUnit_Framework_Test $test, $e, $time)
{
$this->writeNotOk($test, 'Error');
}
Expand Down Expand Up @@ -104,10 +104,10 @@ public function addFailure(PHPUnit_Framework_Test $test, PHPUnit_Framework_Asser
* Incomplete test.
*
* @param PHPUnit_Framework_Test $test
* @param Exception $e
* @param \Exception|\Throwable $e
* @param float $time
*/
public function addIncompleteTest(PHPUnit_Framework_Test $test, Exception $e, $time)
public function addIncompleteTest(PHPUnit_Framework_Test $test, $e, $time)
{
$this->writeNotOk($test, '', 'TODO Incomplete Test');
}
Expand All @@ -116,12 +116,12 @@ public function addIncompleteTest(PHPUnit_Framework_Test $test, Exception $e, $t
* Risky test.
*
* @param PHPUnit_Framework_Test $test
* @param Exception $e
* @param \Exception|\Throwable $e
* @param float $time
*
* @since Method available since Release 4.0.0
*/
public function addRiskyTest(PHPUnit_Framework_Test $test, Exception $e, $time)
public function addRiskyTest(PHPUnit_Framework_Test $test, $e, $time)
{
$this->write(
sprintf(
Expand All @@ -138,12 +138,12 @@ public function addRiskyTest(PHPUnit_Framework_Test $test, Exception $e, $time)
* Skipped test.
*
* @param PHPUnit_Framework_Test $test
* @param Exception $e
* @param \Exception|\Throwable $e
* @param float $time
*
* @since Method available since Release 3.0.0
*/
public function addSkippedTest(PHPUnit_Framework_Test $test, Exception $e, $time)
public function addSkippedTest(PHPUnit_Framework_Test $test, $e, $time)
{
$this->write(
sprintf(
Expand Down
Loading