Update PHPUnit and clean up test suite

clue · clue · commit 5245b18e51c6 · 2020-04-25T23:45:08.000+02:00
diff --git a/composer.json b/composer.json
@@ -16,13 +16,16 @@
         "react/stream": "^1.0 || ^0.7 || ^0.6"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.0 || ^4.8",
+        "phpunit/phpunit": "^7.0 || ^6.0",
         "react/event-loop": "^1.0 || ^0.5 || ^0.4 || ^0.3"
     },
     "suggest": {
         "ext-zlib": "Requires ext-zlib extension"
     },
     "autoload": {
         "psr-4": { "Clue\\React\\Zlib\\": "src/" }
+    },
+    "autoload-dev": {
+        "psr-4": { "Clue\\Tests\\React\\Zlib\\": "tests/" }
     }
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<phpunit bootstrap="tests/bootstrap.php"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
->
+<phpunit bootstrap="vendor/autoload.php" colors="true">
     <testsuites>
         <testsuite name="zlib React Test Suite">
             <directory>./tests/</directory>
diff --git a/tests/CompressorTest.php b/tests/CompressorTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Clue\Tests\React\Zlib;
+
 use Clue\React\Zlib\Compressor;
 
 class CompressorTest extends TestCase
diff --git a/tests/DecompressorTest.php b/tests/DecompressorTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Clue\Tests\React\Zlib;
+
 use Clue\React\Zlib\Decompressor;
 
 class DecompressorTest extends TestCase
diff --git a/tests/DeflateDecompressorTest.php b/tests/DeflateDecompressorTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Clue\Tests\React\Zlib;
+
 use Clue\React\Zlib\Decompressor;
 
 class DeflateDecompressorTest extends TestCase
diff --git a/tests/DelateCompressorTest.php b/tests/DelateCompressorTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Clue\Tests\React\Zlib;
+
 use Clue\React\Zlib\Compressor;
 
 class DeflateCompressorTest extends TestCase
diff --git a/tests/FunctionalExamplesTest.php b/tests/FunctionalExamplesTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Clue\Tests\React\Zlib;
+
 class FunctionalExamplesTest extends TestCase
 {
     public function setUp()
diff --git a/tests/GzipCompressorTest.php b/tests/GzipCompressorTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Clue\Tests\React\Zlib;
+
 use Clue\React\Zlib\Compressor;
 
 class GzipCompressorTest extends TestCase
diff --git a/tests/GzipDecompressorTest.php b/tests/GzipDecompressorTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Clue\Tests\React\Zlib;
+
 use Clue\React\Zlib\Decompressor;
 
 class GzipDecompressorTest extends TestCase
diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -1,8 +1,8 @@
 <?php
 
-require __DIR__ . '/../vendor/autoload.php';
+namespace Clue\Tests\React\Zlib;
 
-class TestCase extends PHPUnit_Framework_TestCase
+class TestCase extends \PHPUnit\Framework\TestCase
 {
     protected function expectCallableOnce()
     {
@@ -37,18 +37,8 @@ protected function expectCallableNever()
         return $mock;
     }
 
-    /**
-     * @link https://github.com/reactphp/react/blob/master/tests/React/Tests/Socket/TestCase.php (taken from reactphp/react)
-     */
     protected function createCallableMock()
     {
-        return $this->getMockBuilder('CallableStub')->getMock();
-    }
-}
-
-class CallableStub
-{
-    public function __invoke()
-    {
+        return $this->getMockBuilder('stdClass')->setMethods(array('__invoke'))->getMock();
     }
 }
diff --git a/tests/TransformStreamTest.php b/tests/TransformStreamTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Clue\Tests\React\Zlib;
+
 use Clue\React\Zlib\TransformStream;
 use React\Stream\ThroughStream;
 
diff --git a/tests/ZlibCompressorTest.php b/tests/ZlibCompressorTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Clue\Tests\React\Zlib;
+
 use Clue\React\Zlib\Compressor;
 
 class ZlibCompressorTest extends TestCase
diff --git a/tests/ZlibDecompressorTest.php b/tests/ZlibDecompressorTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Clue\Tests\React\Zlib;
+
 use Clue\React\Zlib\Decompressor;
 
 class ZlibDecompressorTest extends TestCase

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,7 @@`
`1`	`1`	`<?php`
`2`	`2`
	`3`	`+namespace Clue\Tests\React\Zlib;`
	`4`	`+`
`3`	`5`	`class FunctionalExamplesTest extends TestCase`
`4`	`6`	`{`
`5`	`7`	`public function setUp()`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`		`-require __DIR__ . '/../vendor/autoload.php';`
	`3`	`+namespace Clue\Tests\React\Zlib;`
`4`	`4`
`5`		`-class TestCase extends PHPUnit_Framework_TestCase`
	`5`	`+class TestCase extends \PHPUnit\Framework\TestCase`
`6`	`6`	`{`
`7`	`7`	`protected function expectCallableOnce()`
`8`	`8`	`{`
`@@ -37,18 +37,8 @@ protected function expectCallableNever()`
`37`	`37`	`return $mock;`
`38`	`38`	`}`
`39`	`39`
`40`		`- /**`
`41`		`- * @link https://github.com/reactphp/react/blob/master/tests/React/Tests/Socket/TestCase.php (taken from reactphp/react)`
`42`		`- */`
`43`	`40`	`protected function createCallableMock()`
`44`	`41`	`{`
`45`		`- return $this->getMockBuilder('CallableStub')->getMock();`
`46`		`- }`
`47`		`-}`
`48`		`-`
`49`		`-class CallableStub`
`50`		`-{`
`51`		`- public function __invoke()`
`52`		`- {`
	`42`	`+ return $this->getMockBuilder('stdClass')->setMethods(array('__invoke'))->getMock();`
`53`	`43`	`}`
`54`	`44`	`}`