Skip to content

Commit 3f9b3c2

Browse files
clueclue
committed
Compatibility with PHPUnit v5
1 parent f1818fc commit 3f9b3c2

File tree

4 files changed

+57
-57
lines changed

4 files changed

+57
-57
lines changed

‎composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"psr-4": { "Clue\\React\\Stdio\\": "src/" }
2525
},
2626
"require-dev": {
27-
"phpunit/phpunit": "^4.8",
27+
"phpunit/phpunit": "^5.0 || ^4.8",
2828
"clue/commander": "^1.2",
2929
"clue/arguments": "^2.0"
3030
}

‎tests/ReadlineTest.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class ReadlineTest extends TestCase
1212
public function setUp()
1313
{
1414
$this->input = new ReadableStream();
15-
$this->output = $this->getMock('React\Stream\WritableStreamInterface');
15+
$this->output = $this->getMockBuilder('React\Stream\WritableStreamInterface')->getMock();
1616

1717
$this->readline = new Readline($this->input, $this->output);
1818
}
@@ -983,7 +983,7 @@ public function testEmitCloseWillEmitClose()
983983

984984
public function testClosedStdinWillCloseReadline()
985985
{
986-
$this->input = $this->getMock('React\Stream\ReadableStreamInterface');
986+
$this->input = $this->getMockBuilder('React\Stream\ReadableStreamInterface')->getMock();
987987
$this->input->expects($this->once())->method('isReadable')->willReturn(false);
988988

989989
$this->readline = new Readline($this->input, $this->output);
@@ -993,7 +993,7 @@ public function testClosedStdinWillCloseReadline()
993993

994994
public function testPauseWillBeForwarded()
995995
{
996-
$this->input = $this->getMock('React\Stream\ReadableStreamInterface');
996+
$this->input = $this->getMockBuilder('React\Stream\ReadableStreamInterface')->getMock();
997997
$this->input->expects($this->once())->method('pause');
998998

999999
$this->readline = new Readline($this->input, $this->output);
@@ -1003,7 +1003,7 @@ public function testPauseWillBeForwarded()
10031003

10041004
public function testResumeWillBeForwarded()
10051005
{
1006-
$this->input = $this->getMock('React\Stream\ReadableStreamInterface');
1006+
$this->input = $this->getMockBuilder('React\Stream\ReadableStreamInterface')->getMock();
10071007
$this->input->expects($this->once())->method('resume');
10081008

10091009
$this->readline = new Readline($this->input, $this->output);
@@ -1013,7 +1013,7 @@ public function testResumeWillBeForwarded()
10131013

10141014
public function testPipeWillReturnDest()
10151015
{
1016-
$dest = $this->getMock('React\Stream\WritableStreamInterface');
1016+
$dest = $this->getMockBuilder('React\Stream\WritableStreamInterface')->getMock();
10171017

10181018
$ret = $this->readline->pipe($dest);
10191019

‎tests/StdioTest.php

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ public function testCtorDefaultArgs()
2323

2424
public function testCtorArgsWillBeReturnedByGetters()
2525
{
26-
$input = $this->getMock('React\Stream\ReadableStreamInterface');
27-
$output = $this->getMock('React\Stream\WritableStreamInterface');
26+
$input = $this->getMockBuilder('React\Stream\ReadableStreamInterface')->getMock();
27+
$output = $this->getMockBuilder('React\Stream\WritableStreamInterface')->getMock();
2828

2929
//$readline = $this->getMockBuilder('Clue\React\Stdio\Readline')->disableOriginalConstructor()->getMock();
3030
$readline = new Readline($input, $output);
@@ -38,8 +38,8 @@ public function testCtorArgsWillBeReturnedByGetters()
3838

3939
public function testWriteEmptyStringWillNotWriteToOutput()
4040
{
41-
$input = $this->getMock('React\Stream\ReadableStreamInterface');
42-
$output = $this->getMock('React\Stream\WritableStreamInterface');
41+
$input = $this->getMockBuilder('React\Stream\ReadableStreamInterface')->getMock();
42+
$output = $this->getMockBuilder('React\Stream\WritableStreamInterface')->getMock();
4343

4444
//$readline = $this->getMockBuilder('Clue\React\Stdio\Readline')->disableOriginalConstructor()->getMock();
4545
$readline = new Readline($input, $output);
@@ -55,8 +55,8 @@ public function testWriteEmptyStringWillNotWriteToOutput()
5555

5656
public function testWriteWillClearReadlineWriteOutputAndRestoreReadline()
5757
{
58-
$input = $this->getMock('React\Stream\ReadableStreamInterface');
59-
$output = $this->getMock('React\Stream\WritableStreamInterface');
58+
$input = $this->getMockBuilder('React\Stream\ReadableStreamInterface')->getMock();
59+
$output = $this->getMockBuilder('React\Stream\WritableStreamInterface')->getMock();
6060

6161
//$readline = $this->getMockBuilder('Clue\React\Stdio\Readline')->disableOriginalConstructor()->getMock();
6262
$readline = new Readline($input, $output);
@@ -77,8 +77,8 @@ public function testWriteWillClearReadlineWriteOutputAndRestoreReadline()
7777

7878
public function testWriteAgainWillMoveToPreviousLineWriteOutputAndRestoreReadlinePosition()
7979
{
80-
$input = $this->getMock('React\Stream\ReadableStreamInterface');
81-
$output = $this->getMock('React\Stream\WritableStreamInterface');
80+
$input = $this->getMockBuilder('React\Stream\ReadableStreamInterface')->getMock();
81+
$output = $this->getMockBuilder('React\Stream\WritableStreamInterface')->getMock();
8282

8383
//$readline = $this->getMockBuilder('Clue\React\Stdio\Readline')->disableOriginalConstructor()->getMock();
8484
$readline = new Readline($input, $output);
@@ -101,8 +101,8 @@ public function testWriteAgainWillMoveToPreviousLineWriteOutputAndRestoreReadlin
101101

102102
public function testWriteAgainWithBackspaceWillMoveToPreviousLineWriteOutputAndRestoreReadlinePosition()
103103
{
104-
$input = $this->getMock('React\Stream\ReadableStreamInterface');
105-
$output = $this->getMock('React\Stream\WritableStreamInterface');
104+
$input = $this->getMockBuilder('React\Stream\ReadableStreamInterface')->getMock();
105+
$output = $this->getMockBuilder('React\Stream\WritableStreamInterface')->getMock();
106106

107107
//$readline = $this->getMockBuilder('Clue\React\Stdio\Readline')->disableOriginalConstructor()->getMock();
108108
$readline = new Readline($input, $output);
@@ -125,8 +125,8 @@ public function testWriteAgainWithBackspaceWillMoveToPreviousLineWriteOutputAndR
125125

126126
public function testWriteAgainWithNewlinesWillClearReadlineMoveToPreviousLineWriteOutputAndRestoreReadline()
127127
{
128-
$input = $this->getMock('React\Stream\ReadableStreamInterface');
129-
$output = $this->getMock('React\Stream\WritableStreamInterface');
128+
$input = $this->getMockBuilder('React\Stream\ReadableStreamInterface')->getMock();
129+
$output = $this->getMockBuilder('React\Stream\WritableStreamInterface')->getMock();
130130

131131
//$readline = $this->getMockBuilder('Clue\React\Stdio\Readline')->disableOriginalConstructor()->getMock();
132132
$readline = new Readline($input, $output);
@@ -149,8 +149,8 @@ public function testWriteAgainWithNewlinesWillClearReadlineMoveToPreviousLineWri
149149

150150
public function testWriteAfterReadlineInputWillClearReadlineWriteOutputAndRestoreReadline()
151151
{
152-
$input = $this->getMock('React\Stream\ReadableStreamInterface');
153-
$output = $this->getMock('React\Stream\WritableStreamInterface');
152+
$input = $this->getMockBuilder('React\Stream\ReadableStreamInterface')->getMock();
153+
$output = $this->getMockBuilder('React\Stream\WritableStreamInterface')->getMock();
154154

155155
//$readline = $this->getMockBuilder('Clue\React\Stdio\Readline')->disableOriginalConstructor()->getMock();
156156
$readline = new Readline($input, $output);
@@ -175,8 +175,8 @@ public function testWriteAfterReadlineInputWillClearReadlineWriteOutputAndRestor
175175

176176
public function testOverwriteWillClearReadlineMoveToPreviousLineWriteOutputAndRestoreReadline()
177177
{
178-
$input = $this->getMock('React\Stream\ReadableStreamInterface');
179-
$output = $this->getMock('React\Stream\WritableStreamInterface');
178+
$input = $this->getMockBuilder('React\Stream\ReadableStreamInterface')->getMock();
179+
$output = $this->getMockBuilder('React\Stream\WritableStreamInterface')->getMock();
180180

181181
//$readline = $this->getMockBuilder('Clue\React\Stdio\Readline')->disableOriginalConstructor()->getMock();
182182
$readline = new Readline($input, $output);
@@ -199,8 +199,8 @@ public function testOverwriteWillClearReadlineMoveToPreviousLineWriteOutputAndRe
199199

200200
public function testOverwriteAfterNewlineWillClearReadlineAndWriteOutputAndRestoreReadline()
201201
{
202-
$input = $this->getMock('React\Stream\ReadableStreamInterface');
203-
$output = $this->getMock('React\Stream\WritableStreamInterface');
202+
$input = $this->getMockBuilder('React\Stream\ReadableStreamInterface')->getMock();
203+
$output = $this->getMockBuilder('React\Stream\WritableStreamInterface')->getMock();
204204

205205
//$readline = $this->getMockBuilder('Clue\React\Stdio\Readline')->disableOriginalConstructor()->getMock();
206206
$readline = new Readline($input, $output);
@@ -223,8 +223,8 @@ public function testOverwriteAfterNewlineWillClearReadlineAndWriteOutputAndResto
223223

224224
public function testWriteLineWillClearReadlineWriteOutputAndRestoreReadline()
225225
{
226-
$input = $this->getMock('React\Stream\ReadableStreamInterface');
227-
$output = $this->getMock('React\Stream\WritableStreamInterface');
226+
$input = $this->getMockBuilder('React\Stream\ReadableStreamInterface')->getMock();
227+
$output = $this->getMockBuilder('React\Stream\WritableStreamInterface')->getMock();
228228

229229
//$readline = $this->getMockBuilder('Clue\React\Stdio\Readline')->disableOriginalConstructor()->getMock();
230230
$readline = new Readline($input, $output);
@@ -245,8 +245,8 @@ public function testWriteLineWillClearReadlineWriteOutputAndRestoreReadline()
245245

246246
public function testWriteTwoLinesWillClearReadlineWriteOutputAndRestoreReadline()
247247
{
248-
$input = $this->getMock('React\Stream\ReadableStreamInterface');
249-
$output = $this->getMock('React\Stream\WritableStreamInterface');
248+
$input = $this->getMockBuilder('React\Stream\ReadableStreamInterface')->getMock();
249+
$output = $this->getMockBuilder('React\Stream\WritableStreamInterface')->getMock();
250250

251251
//$readline = $this->getMockBuilder('Clue\React\Stdio\Readline')->disableOriginalConstructor()->getMock();
252252
$readline = new Readline($input, $output);
@@ -268,8 +268,8 @@ public function testWriteTwoLinesWillClearReadlineWriteOutputAndRestoreReadline(
268268

269269
public function testPauseWillBeForwardedToInput()
270270
{
271-
$input = $this->getMock('React\Stream\ReadableStreamInterface');
272-
$output = $this->getMock('React\Stream\WritableStreamInterface');
271+
$input = $this->getMockBuilder('React\Stream\ReadableStreamInterface')->getMock();
272+
$output = $this->getMockBuilder('React\Stream\WritableStreamInterface')->getMock();
273273

274274
//$readline = $this->getMockBuilder('Clue\React\Stdio\Readline')->disableOriginalConstructor()->getMock();
275275
$readline = new Readline($input, $output);
@@ -283,8 +283,8 @@ public function testPauseWillBeForwardedToInput()
283283

284284
public function testResumeWillBeForwardedToInput()
285285
{
286-
$input = $this->getMock('React\Stream\ReadableStreamInterface');
287-
$output = $this->getMock('React\Stream\WritableStreamInterface');
286+
$input = $this->getMockBuilder('React\Stream\ReadableStreamInterface')->getMock();
287+
$output = $this->getMockBuilder('React\Stream\WritableStreamInterface')->getMock();
288288

289289
//$readline = $this->getMockBuilder('Clue\React\Stdio\Readline')->disableOriginalConstructor()->getMock();
290290
$readline = new Readline($input, $output);
@@ -298,8 +298,8 @@ public function testResumeWillBeForwardedToInput()
298298

299299
public function testReadableWillBeForwardedToInput()
300300
{
301-
$input = $this->getMock('React\Stream\ReadableStreamInterface');
302-
$output = $this->getMock('React\Stream\WritableStreamInterface');
301+
$input = $this->getMockBuilder('React\Stream\ReadableStreamInterface')->getMock();
302+
$output = $this->getMockBuilder('React\Stream\WritableStreamInterface')->getMock();
303303

304304
//$readline = $this->getMockBuilder('Clue\React\Stdio\Readline')->disableOriginalConstructor()->getMock();
305305
$readline = new Readline($input, $output);
@@ -313,15 +313,15 @@ public function testReadableWillBeForwardedToInput()
313313

314314
public function testPipeWillReturnDestStream()
315315
{
316-
$input = $this->getMock('React\Stream\ReadableStreamInterface');
317-
$output = $this->getMock('React\Stream\WritableStreamInterface');
316+
$input = $this->getMockBuilder('React\Stream\ReadableStreamInterface')->getMock();
317+
$output = $this->getMockBuilder('React\Stream\WritableStreamInterface')->getMock();
318318

319319
//$readline = $this->getMockBuilder('Clue\React\Stdio\Readline')->disableOriginalConstructor()->getMock();
320320
$readline = new Readline($input, $output);
321321

322322
$stdio = new Stdio($this->loop, $input, $output, $readline);
323323

324-
$dest = $this->getMock('React\Stream\WritableStreamInterface');
324+
$dest = $this->getMockBuilder('React\Stream\WritableStreamInterface')->getMock();
325325

326326
$ret = $stdio->pipe($dest);
327327

@@ -330,8 +330,8 @@ public function testPipeWillReturnDestStream()
330330

331331
public function testWritableWillBeForwardedToOutput()
332332
{
333-
$input = $this->getMock('React\Stream\ReadableStreamInterface');
334-
$output = $this->getMock('React\Stream\WritableStreamInterface');
333+
$input = $this->getMockBuilder('React\Stream\ReadableStreamInterface')->getMock();
334+
$output = $this->getMockBuilder('React\Stream\WritableStreamInterface')->getMock();
335335

336336
//$readline = $this->getMockBuilder('Clue\React\Stdio\Readline')->disableOriginalConstructor()->getMock();
337337
$readline = new Readline($input, $output);
@@ -345,8 +345,8 @@ public function testWritableWillBeForwardedToOutput()
345345

346346
public function testCloseWillCloseInputAndOutput()
347347
{
348-
$input = $this->getMock('React\Stream\ReadableStreamInterface');
349-
$output = $this->getMock('React\Stream\WritableStreamInterface');
348+
$input = $this->getMockBuilder('React\Stream\ReadableStreamInterface')->getMock();
349+
$output = $this->getMockBuilder('React\Stream\WritableStreamInterface')->getMock();
350350

351351
//$readline = $this->getMockBuilder('Clue\React\Stdio\Readline')->disableOriginalConstructor()->getMock();
352352
$readline = new Readline($input, $output);
@@ -361,8 +361,8 @@ public function testCloseWillCloseInputAndOutput()
361361

362362
public function testCloseTwiceWillCloseInputAndOutputOnlyOnce()
363363
{
364-
$input = $this->getMock('React\Stream\ReadableStreamInterface');
365-
$output = $this->getMock('React\Stream\WritableStreamInterface');
364+
$input = $this->getMockBuilder('React\Stream\ReadableStreamInterface')->getMock();
365+
$output = $this->getMockBuilder('React\Stream\WritableStreamInterface')->getMock();
366366

367367
//$readline = $this->getMockBuilder('Clue\React\Stdio\Readline')->disableOriginalConstructor()->getMock();
368368
$readline = new Readline($input, $output);
@@ -378,8 +378,8 @@ public function testCloseTwiceWillCloseInputAndOutputOnlyOnce()
378378

379379
public function testEndWillCloseInputAndEndOutput()
380380
{
381-
$input = $this->getMock('React\Stream\ReadableStreamInterface');
382-
$output = $this->getMock('React\Stream\WritableStreamInterface');
381+
$input = $this->getMockBuilder('React\Stream\ReadableStreamInterface')->getMock();
382+
$output = $this->getMockBuilder('React\Stream\WritableStreamInterface')->getMock();
383383

384384
//$readline = $this->getMockBuilder('Clue\React\Stdio\Readline')->disableOriginalConstructor()->getMock();
385385
$readline = new Readline($input, $output);
@@ -394,8 +394,8 @@ public function testEndWillCloseInputAndEndOutput()
394394

395395
public function testEndWithDataWillWriteAndCloseInputAndEndOutput()
396396
{
397-
$input = $this->getMock('React\Stream\ReadableStreamInterface');
398-
$output = $this->getMock('React\Stream\WritableStreamInterface');
397+
$input = $this->getMockBuilder('React\Stream\ReadableStreamInterface')->getMock();
398+
$output = $this->getMockBuilder('React\Stream\WritableStreamInterface')->getMock();
399399

400400
//$readline = $this->getMockBuilder('Clue\React\Stdio\Readline')->disableOriginalConstructor()->getMock();
401401
$readline = new Readline($input, $output);
@@ -412,8 +412,8 @@ public function testEndWithDataWillWriteAndCloseInputAndEndOutput()
412412

413413
public function testWriteAfterEndWillNotWriteToOutput()
414414
{
415-
$input = $this->getMock('React\Stream\ReadableStreamInterface');
416-
$output = $this->getMock('React\Stream\WritableStreamInterface');
415+
$input = $this->getMockBuilder('React\Stream\ReadableStreamInterface')->getMock();
416+
$output = $this->getMockBuilder('React\Stream\WritableStreamInterface')->getMock();
417417

418418
//$readline = $this->getMockBuilder('Clue\React\Stdio\Readline')->disableOriginalConstructor()->getMock();
419419
$readline = new Readline($input, $output);
@@ -428,8 +428,8 @@ public function testWriteAfterEndWillNotWriteToOutput()
428428

429429
public function testEndTwiceWillCloseInputAndEndOutputOnce()
430430
{
431-
$input = $this->getMock('React\Stream\ReadableStreamInterface');
432-
$output = $this->getMock('React\Stream\WritableStreamInterface');
431+
$input = $this->getMockBuilder('React\Stream\ReadableStreamInterface')->getMock();
432+
$output = $this->getMockBuilder('React\Stream\WritableStreamInterface')->getMock();
433433

434434
//$readline = $this->getMockBuilder('Clue\React\Stdio\Readline')->disableOriginalConstructor()->getMock();
435435
$readline = new Readline($input, $output);
@@ -445,8 +445,8 @@ public function testEndTwiceWillCloseInputAndEndOutputOnce()
445445

446446
public function testDataEventWillBeForwarded()
447447
{
448-
$input = $this->getMock('React\Stream\ReadableStreamInterface');
449-
$output = $this->getMock('React\Stream\WritableStreamInterface');
448+
$input = $this->getMockBuilder('React\Stream\ReadableStreamInterface')->getMock();
449+
$output = $this->getMockBuilder('React\Stream\WritableStreamInterface')->getMock();
450450

451451
//$readline = $this->getMockBuilder('Clue\React\Stdio\Readline')->disableOriginalConstructor()->getMock();
452452
$readline = new Readline($input, $output);
@@ -462,7 +462,7 @@ public function testDataEventWillBeForwarded()
462462
public function testEndEventWillBeForwarded()
463463
{
464464
$input = new ReadableStream();
465-
$output = $this->getMock('React\Stream\WritableStreamInterface');
465+
$output = $this->getMockBuilder('React\Stream\WritableStreamInterface')->getMock();
466466

467467
//$readline = $this->getMockBuilder('Clue\React\Stdio\Readline')->disableOriginalConstructor()->getMock();
468468
$readline = new Readline($input, $output);
@@ -477,7 +477,7 @@ public function testEndEventWillBeForwarded()
477477
public function testErrorEventFromInputWillBeForwarded()
478478
{
479479
$input = new ReadableStream();
480-
$output = $this->getMock('React\Stream\WritableStreamInterface');
480+
$output = $this->getMockBuilder('React\Stream\WritableStreamInterface')->getMock();
481481

482482
//$readline = $this->getMockBuilder('Clue\React\Stdio\Readline')->disableOriginalConstructor()->getMock();
483483
$readline = new Readline($input, $output);
@@ -491,7 +491,7 @@ public function testErrorEventFromInputWillBeForwarded()
491491

492492
public function testErrorEventFromOutputWillBeForwarded()
493493
{
494-
$input = $this->getMock('React\Stream\ReadableStreamInterface');
494+
$input = $this->getMockBuilder('React\Stream\ReadableStreamInterface')->getMock();
495495
$output = new WritableStream();
496496

497497
//$readline = $this->getMockBuilder('Clue\React\Stdio\Readline')->disableOriginalConstructor()->getMock();

‎tests/bootstrap.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ protected function expectCallableOnceWith($value)
4242
*/
4343
protected function createCallableMock()
4444
{
45-
return $this->getMock('CallableStub');
45+
return $this->getMockBuilder('CallableStub')->getMock();
4646
}
4747

4848
protected function expectPromiseResolve($promise)

0 commit comments

Comments
 (0)