Run tests on PHPUnit 9 and update PHPUnit configuration schema for PHPUnit 9.3

.gitattributes

@@ -3,4 +3,5 @@
 /.gitignore export-ignore
 /examples/ export-ignore
 /phpunit.xml.dist export-ignore
+/phpunit.xml.legacy export-ignore
 /tests/ export-ignore

.github/workflows/ci.yml

@@ -28,3 +28,6 @@ jobs:
           coverage: xdebug
       - run: composer install
       - run: vendor/bin/phpunit --coverage-text
+        if: ${{ matrix.php >= 7.3 }}
+      - run: vendor/bin/phpunit --coverage-text -c phpunit.xml.legacy
+        if: ${{ matrix.php < 7.3 }}

composer.json

@@ -16,7 +16,7 @@
         "react/stream": "^1.0 || ^0.7 || ^0.6"
     },
     "require-dev": {
-        "phpunit/phpunit": "^7.0 || ^6.0",
+        "phpunit/phpunit": "^9.3 || ^6.5",
         "react/event-loop": "^1.0 || ^0.5 || ^0.4 || ^0.3"
     },
     "suggest": {

phpunit.xml.dist

@@ -1,14 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<phpunit bootstrap="vendor/autoload.php" colors="true">
+<!-- PHPUnit configuration file with new format for PHPUnit 9.3+ -->
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
+         bootstrap="vendor/autoload.php"
+         colors="true"
+         cacheResult="false">
     <testsuites>
         <testsuite name="zlib React Test Suite">
             <directory>./tests/</directory>
         </testsuite>
     </testsuites>
-    <filter>
-        <whitelist>
+    <coverage>
+        <include>
             <directory>./src/</directory>
-        </whitelist>
-    </filter>
-</phpunit>
+        </include>
+    </coverage>
+</phpunit>

phpunit.xml.legacy

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- PHPUnit configuration file with old format for PHPUnit 9.2 or older -->
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/6.5/phpunit.xsd"
+         bootstrap="vendor/autoload.php"
+         colors="true">
+    <testsuites>
+        <testsuite name="zlib React Test Suite">
+            <directory>./tests/</directory>
+        </testsuite>
+    </testsuites>
+    <filter>
+        <whitelist>
+            <directory>./src/</directory>
+        </whitelist>
+    </filter>
+</phpunit>

tests/CompressorTest.php

@@ -6,11 +6,9 @@
 
 class CompressorTest extends TestCase
 {
-    /**
-     * @expectedException InvalidArgumentException
-     */
     public function testCtorThrowsForInvalidEncoding()
     {
+        $this->expectException('InvalidArgumentException');
         new Compressor(0);
     }
 }

tests/DecompressorTest.php

@@ -6,11 +6,9 @@
 
 class DecompressorTest extends TestCase
 {
-    /**
-     * @expectedException InvalidArgumentException
-     */
     public function testCtorThrowsForInvalidEncoding()
     {
+        $this->expectException('InvalidArgumentException');
         new Decompressor(0);
     }
 }

tests/DeflateDecompressorTest.php

@@ -8,7 +8,10 @@ class DeflateDecompressorTest extends TestCase
 {
     private $decompressor;
 
-    public function setUp()
+    /**
+     * @before
+     */
+    public function setUpDecompressor()
     {
         $this->decompressor = new Decompressor(ZLIB_ENCODING_RAW);
     }

tests/DelateCompressorTest.php

@@ -8,7 +8,10 @@ class DeflateCompressorTest extends TestCase
 {
     private $compressor;
 
-    public function setUp()
+    /**
+     * @before
+     */
+    public function setUpCompressor()
     {
         $this->compressor = new Compressor(ZLIB_ENCODING_RAW);
     }

tests/FunctionalExamplesTest.php

@@ -4,7 +4,10 @@
 
 class FunctionalExamplesTest extends TestCase
 {
-    public function setUp()
+    /**
+     * @before
+     */
+    public function setUpSkipTest()
     {
         if (DIRECTORY_SEPARATOR === '\\') {
             $this->markTestSkipped('Non-blocking console I/O not supported on Windows');

tests/GzipCompressorTest.php

@@ -8,7 +8,10 @@ class GzipCompressorTest extends TestCase
 {
     private $compressor;
 
-    public function setUp()
+    /**
+     * @before
+     */
+    public function setUpCompressor()
     {
         $this->compressor = new Compressor(ZLIB_ENCODING_GZIP);
     }

tests/GzipDecompressorTest.php

@@ -8,7 +8,10 @@ class GzipDecompressorTest extends TestCase
 {
     private $decompressor;
 
-    public function setUp()
+    /**
+     * @before
+     */
+    public function setUpDecompressor()
     {
         $this->decompressor = new Decompressor(ZLIB_ENCODING_GZIP);
     }

tests/TestCase.php

@@ -39,6 +39,12 @@ protected function expectCallableNever()
 
     protected function createCallableMock()
     {
-        return $this->getMockBuilder('stdClass')->setMethods(array('__invoke'))->getMock();
+        if (method_exists('PHPUnit\Framework\MockObject\MockBuilder', 'addMethods')) {
+            // PHPUnit 8.5+
+            return $this->getMockBuilder('stdClass')->addMethods(array('__invoke'))->getMock();
+        } else {
+            // legacy PHPUnit 4 - PHPUnit 8.4
+            return $this->getMockBuilder('stdClass')->setMethods(array('__invoke'))->getMock();
+        }
     }
 }

tests/ZlibCompressorTest.php

@@ -8,7 +8,10 @@ class ZlibCompressorTest extends TestCase
 {
     private $compressor;
 
-    public function setUp()
+    /**
+     * @before
+     */
+    public function setUpCompressor()
     {
         $this->compressor = new Compressor(ZLIB_ENCODING_DEFLATE);
     }

tests/ZlibDecompressorTest.php

@@ -8,7 +8,10 @@ class ZlibDecompressorTest extends TestCase
 {
     private $decompressor;
 
-    public function setUp()
+    /**
+     * @before
+     */
+    public function setUpDecompressor()
     {
         $this->decompressor = new Decompressor(ZLIB_ENCODING_DEFLATE);
     }