Skip to content

Commit dc05fc1

Browse files
committed
updated phpunit version to ^6.1
1 parent 392d7e1 commit dc05fc1

File tree

6 files changed

+437
-234
lines changed

6 files changed

+437
-234
lines changed

.travis.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,6 @@ language: php
33
matrix:
44
fast_finish: true
55
include:
6-
- php: 5.3
7-
- env: COMPOSER_FLAGS="--prefer-lowest"
8-
php: 5.3
9-
- php: 5.4
10-
- php: 5.5
11-
- php: 5.6
12-
- env: COMPOSER_FLAGS="--prefer-lowest"
13-
php: 5.6
146
- php: 7.0
157
- php: 7.1
168
- env: COMPOSER_FLAGS="--prefer-lowest"

PHPUnit/Util/Log/VCR.php

Lines changed: 39 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
<?php
2+
use PHPUnit\Framework\AssertionFailedError;
3+
use PHPUnit\Framework\Test;
4+
use PHPUnit\Framework\TestListener;
5+
use PHPUnit\Framework\Warning;
6+
use PHPUnit\Framework\TestSuite;
27

38
/**
49
* A TestListener that integrates with PHP-VCR.
@@ -20,7 +25,7 @@
2025
* @link http://www.phpunit.de/
2126
* @since Class available since Release 1.0.0
2227
*/
23-
class PHPUnit_Util_Log_VCR implements PHPUnit_Framework_TestListener
28+
class PHPUnit_Util_Log_VCR implements TestListener
2429
{
2530
/**
2631
* @var array
@@ -49,79 +54,79 @@ public function __construct(array $options = array())
4954
/**
5055
* An error occurred.
5156
*
52-
* @param PHPUnit_Framework_Test $test
53-
* @param Exception $e
54-
* @param float $time
57+
* @param Test $test
58+
* @param Exception $e
59+
* @param float $time
5560
*/
56-
public function addError(PHPUnit_Framework_Test $test, Exception $e, $time)
61+
public function addError(Test $test, Exception $e, $time)
5762
{
5863
}
59-
64+
6065
/**
6166
* A warning occurred.
6267
*
63-
* @param PHPUnit_Framework_Test $test
64-
* @param PHPUnit_Framework_Warning $e
65-
* @param float $time
68+
* @param Test $test
69+
* @param Warning $e
70+
* @param float $time
6671
*
6772
* @since Method available since Release 5.1.0
6873
*/
69-
public function addWarning(PHPUnit_Framework_Test $test, PHPUnit_Framework_Warning $e, $time)
74+
public function addWarning(Test $test, Warning $e, $time)
7075
{
7176
}
7277

7378
/**
7479
* A failure occurred.
7580
*
76-
* @param PHPUnit_Framework_Test $test
77-
* @param PHPUnit_Framework_AssertionFailedError $e
78-
* @param float $time
81+
* @param Test $test
82+
* @param AssertionFailedError $e
83+
* @param float $time
7984
*/
80-
public function addFailure(PHPUnit_Framework_Test $test, PHPUnit_Framework_AssertionFailedError $e, $time)
85+
public function addFailure(Test $test, AssertionFailedError $e, $time)
8186
{
8287
}
8388

8489
/**
8590
* Incomplete test.
8691
*
87-
* @param PHPUnit_Framework_Test $test
88-
* @param Exception $e
89-
* @param float $time
92+
* @param Test $test
93+
* @param Exception $e
94+
* @param float $time
9095
*/
91-
public function addIncompleteTest(PHPUnit_Framework_Test $test, Exception $e, $time)
96+
public function addIncompleteTest(Test $test, Exception $e, $time)
9297
{
9398
}
9499

95100
/**
96101
* Skipped test.
97102
*
98-
* @param PHPUnit_Framework_Test $test
99-
* @param Exception $e
100-
* @param float $time
103+
* @param Test $test
104+
* @param Exception $e
105+
* @param float $time
101106
*/
102-
public function addSkippedTest(PHPUnit_Framework_Test $test, Exception $e, $time)
107+
public function addSkippedTest(Test $test, Exception $e, $time)
103108
{
104109
}
105110

106111
/**
107112
* Risky test.
108113
*
109-
* @param PHPUnit_Framework_Test $test
110-
* @param Exception $e
111-
* @param float $time
114+
* @param Test $test
115+
* @param Exception $e
116+
* @param float $time
112117
*/
113-
public function addRiskyTest(PHPUnit_Framework_Test $test, Exception $e, $time)
118+
public function addRiskyTest(Test $test, Exception $e, $time)
114119
{
115120

116121
}
117122

118123
/**
119124
* A test started.
120125
*
121-
* @param PHPUnit_Framework_Test $test
126+
* @param Test $test
122127
* @return bool|null
123128
*/
124-
public function startTest(PHPUnit_Framework_Test $test)
129+
public function startTest(Test $test)
125130
{
126131
$class = get_class($test);
127132
$method = $test->getName(false);
@@ -177,29 +182,29 @@ private static function parseDocBlock($doc_block, $tag)
177182
/**
178183
* A test ended.
179184
*
180-
* @param PHPUnit_Framework_Test $test
185+
* @param Test $test
181186
* @param float $time
182187
*/
183-
public function endTest(PHPUnit_Framework_Test $test, $time)
188+
public function endTest(Test $test, $time)
184189
{
185190
\VCR\VCR::turnOff();
186191
}
187192

188193
/**
189194
* A test suite started.
190195
*
191-
* @param PHPUnit_Framework_TestSuite $suite
196+
* @param TestSuite $suite
192197
*/
193-
public function startTestSuite(PHPUnit_Framework_TestSuite $suite)
198+
public function startTestSuite(TestSuite $suite)
194199
{
195200
}
196201

197202
/**
198203
* A test suite ended.
199204
*
200-
* @param PHPUnit_Framework_TestSuite $suite
205+
* @param TestSuite $suite
201206
*/
202-
public function endTestSuite(PHPUnit_Framework_TestSuite $suite)
207+
public function endTestSuite(TestSuite $suite)
203208
{
204209

205210
}

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@
1414
"php-vcr/php-vcr": "^1.1.8"
1515
},
1616
"require-dev": {
17-
"phpunit/phpunit": "^4.8|^5.0"
17+
"phpunit/phpunit": "^6.1"
1818
}
1919
}

0 commit comments

Comments
 (0)