Run tests on PHPUnit 9

Author: SimonFrings

composer.json

@@ -22,6 +22,6 @@
     },
     "require-dev": {
         "react/event-loop": "^1.0 || ^0.5 || ^0.4 || ^0.3",
-        "phpunit/phpunit": "^7.0 || ^6.0 || ^5.7 || ^4.8.35"
+        "phpunit/phpunit": "^9.3 || ^5.7 || ^4.8.35"
     }
 }

tests/DecoderTest.php

@@ -10,7 +10,10 @@ class DecoderTest extends TestCase
     private $input;
     private $decoder;
 
-    public function setUp()
+    /**
+     * @before
+     */
+    public function setUpDecoder()
     {
         $this->input = new ThroughStream();
         $this->decoder = new Decoder($this->input);
@@ -76,7 +79,7 @@ public function testEmitDataErrorWillForwardError()
         $this->input->emit('data', array("invalid\n"));
 
         $this->assertInstanceOf('RuntimeException', $error);
-        $this->assertContains('Syntax error', $error->getMessage());
+        $this->assertContainsString('Syntax error', $error->getMessage());
         $this->assertEquals(JSON_ERROR_SYNTAX, $error->getCode());
     }
 

tests/EncoderTest.php

@@ -10,7 +10,10 @@ class EncoderTest extends TestCase
     private $output;
     private $encoder;
 
-    public function setUp()
+    /**
+     * @before
+     */
+    public function setUpEncoder()
     {
         $stream = fopen('php://temp', 'r+');
         $loop = $this->getMockBuilder('React\EventLoop\LoopInterface')->getMock();
@@ -19,15 +22,13 @@ public function setUp()
         $this->encoder = new Encoder($this->output);
     }
 
-    /**
-     * @expectedException InvalidArgumentException
-     */
     public function testPrettyPrintDoesNotMakeSenseForNDJson()
     {
         if (!defined('JSON_PRETTY_PRINT')) {
             $this->markTestSkipped('Const JSON_PRETTY_PRINT only available in PHP 5.4+');
         }
 
+        $this->setExpectedException('InvalidArgumentException');
         $this->encoder = new Encoder($this->output, JSON_PRETTY_PRINT);
     }
 
@@ -77,11 +78,11 @@ public function testWriteInfiniteWillEmitErrorAndClose()
         $this->assertInstanceOf('RuntimeException', $error);
         if (PHP_VERSION_ID >= 50500) {
             // PHP 5.5+ reports error with proper code
-            $this->assertContains('Inf and NaN cannot be JSON encoded', $error->getMessage());
+            $this->assertContainsString('Inf and NaN cannot be JSON encoded', $error->getMessage());
             $this->assertEquals(JSON_ERROR_INF_OR_NAN, $error->getCode());
         } else {
             // PHP < 5.5 reports error message without code
-            $this->assertContains('double INF does not conform to the JSON spec', $error->getMessage());
+            $this->assertContainsString('double INF does not conform to the JSON spec', $error->getMessage());
             $this->assertEquals(0, $error->getCode());
         }
     }
@@ -109,7 +110,7 @@ public function testWriteInvalidUtf8WillEmitErrorAndClose()
         $this->assertInstanceOf('RuntimeException', $error);
         if (PHP_VERSION_ID >= 50500) {
             // PHP 5.5+ reports error with proper code
-            $this->assertContains('Malformed UTF-8 characters, possibly incorrectly encoded', $error->getMessage());
+            $this->assertContainsString('Malformed UTF-8 characters, possibly incorrectly encoded', $error->getMessage());
             $this->assertEquals(JSON_ERROR_UTF8, $error->getCode());
         } elseif (PHP_VERSION_ID >= 50303) {
             // PHP 5.3.3+ reports error with proper code (const JSON_ERROR_UTF8 added in PHP 5.3.3)

tests/TestCase.php

@@ -41,4 +41,32 @@ protected function createCallableMock()
     {
         return $this->getMockBuilder('stdClass')->setMethods(array('__invoke'))->getMock();
     }
+
+    public function assertContainsString($needle, $haystack)
+    {
+        if (method_exists($this, 'assertStringContainsString')) {
+            // PHPUnit 7.5+
+            $this->assertStringContainsString($needle, $haystack);
+        } else {
+            // legacy PHPUnit 4 - PHPUnit 7.5
+            $this->assertContains($needle, $haystack);
+        }
+    }
+
+    public function setExpectedException($exception, $exceptionMessage = '', $exceptionCode = null)
+    {
+        if (method_exists($this, 'expectException')) {
+            // PHPUnit 5+
+            $this->expectException($exception);
+            if ($exceptionMessage !== '') {
+                $this->expectExceptionMessage($exceptionMessage);
+            }
+            if ($exceptionCode !== null) {
+                $this->expectExceptionCode($exceptionCode);
+            }
+        } else {
+            // legacy PHPUnit 4
+            parent::setExpectedException($exception, $exceptionMessage, $exceptionCode);
+        }
+    }
 }