Skip to content

Updated PHPUnit version to ^6.1 #21

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.

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

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 0 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,6 @@ language: php
matrix:
fast_finish: true
include:
- php: 5.3
- env: COMPOSER_FLAGS="--prefer-lowest"
php: 5.3
- php: 5.4
- php: 5.5
- php: 5.6
- env: COMPOSER_FLAGS="--prefer-lowest"
php: 5.6
- php: 7.0
- php: 7.1
- env: COMPOSER_FLAGS="--prefer-lowest"
Expand Down
73 changes: 39 additions & 34 deletions PHPUnit/Util/Log/VCR.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
<?php
use PHPUnit\Framework\AssertionFailedError;
use PHPUnit\Framework\Test;
use PHPUnit\Framework\TestListener;
use PHPUnit\Framework\Warning;
use PHPUnit\Framework\TestSuite;

/**
* A TestListener that integrates with PHP-VCR.
Expand All @@ -20,7 +25,7 @@
* @link http://www.phpunit.de/
* @since Class available since Release 1.0.0
*/
class PHPUnit_Util_Log_VCR implements PHPUnit_Framework_TestListener
class PHPUnit_Util_Log_VCR implements TestListener
{
/**
* @var array
Expand Down Expand Up @@ -49,79 +54,79 @@ public function __construct(array $options = array())
/**
* An error occurred.
*
* @param PHPUnit_Framework_Test $test
* @param Exception $e
* @param float $time
* @param Test $test
* @param Exception $e
* @param float $time
*/
public function addError(PHPUnit_Framework_Test $test, Exception $e, $time)
public function addError(Test $test, Exception $e, $time)
{
}

/**
* A warning occurred.
*
* @param PHPUnit_Framework_Test $test
* @param PHPUnit_Framework_Warning $e
* @param float $time
* @param Test $test
* @param Warning $e
* @param float $time
*
* @since Method available since Release 5.1.0
*/
public function addWarning(PHPUnit_Framework_Test $test, PHPUnit_Framework_Warning $e, $time)
public function addWarning(Test $test, Warning $e, $time)
{
}

/**
* A failure occurred.
*
* @param PHPUnit_Framework_Test $test
* @param PHPUnit_Framework_AssertionFailedError $e
* @param float $time
* @param Test $test
* @param AssertionFailedError $e
* @param float $time
*/
public function addFailure(PHPUnit_Framework_Test $test, PHPUnit_Framework_AssertionFailedError $e, $time)
public function addFailure(Test $test, AssertionFailedError $e, $time)
{
}

/**
* Incomplete test.
*
* @param PHPUnit_Framework_Test $test
* @param Exception $e
* @param float $time
* @param Test $test
* @param Exception $e
* @param float $time
*/
public function addIncompleteTest(PHPUnit_Framework_Test $test, Exception $e, $time)
public function addIncompleteTest(Test $test, Exception $e, $time)
{
}

/**
* Skipped test.
*
* @param PHPUnit_Framework_Test $test
* @param Exception $e
* @param float $time
* @param Test $test
* @param Exception $e
* @param float $time
*/
public function addSkippedTest(PHPUnit_Framework_Test $test, Exception $e, $time)
public function addSkippedTest(Test $test, Exception $e, $time)
{
}

/**
* Risky test.
*
* @param PHPUnit_Framework_Test $test
* @param Exception $e
* @param float $time
* @param Test $test
* @param Exception $e
* @param float $time
*/
public function addRiskyTest(PHPUnit_Framework_Test $test, Exception $e, $time)
public function addRiskyTest(Test $test, Exception $e, $time)
{

}

/**
* A test started.
*
* @param PHPUnit_Framework_Test $test
* @param Test $test
* @return bool|null
*/
public function startTest(PHPUnit_Framework_Test $test)
public function startTest(Test $test)
{
$class = get_class($test);
$method = $test->getName(false);
Expand Down Expand Up @@ -177,29 +182,29 @@ private static function parseDocBlock($doc_block, $tag)
/**
* A test ended.
*
* @param PHPUnit_Framework_Test $test
* @param Test $test
* @param float $time
*/
public function endTest(PHPUnit_Framework_Test $test, $time)
public function endTest(Test $test, $time)
{
\VCR\VCR::turnOff();
}

/**
* A test suite started.
*
* @param PHPUnit_Framework_TestSuite $suite
* @param TestSuite $suite
*/
public function startTestSuite(PHPUnit_Framework_TestSuite $suite)
public function startTestSuite(TestSuite $suite)
{
}

/**
* A test suite ended.
*
* @param PHPUnit_Framework_TestSuite $suite
* @param TestSuite $suite
*/
public function endTestSuite(PHPUnit_Framework_TestSuite $suite)
public function endTestSuite(TestSuite $suite)
{

}
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@
"php-vcr/php-vcr": "^1.1.8"
},
"require-dev": {
"phpunit/phpunit": "^4.8|^5.0"
"phpunit/phpunit": "^6.1"
}
}
Loading