Merge pull request clue#101 from SimonFrings/tests

Run tests on PHPUnit 9

Author: clue

.travis.yml

@@ -3,7 +3,7 @@ language: php
 # lock distro so new future defaults will not break the build
 dist: trusty
 
-matrix:
+jobs:
   include:
     - php: 5.3
       dist: precise
@@ -16,21 +16,17 @@ matrix:
     - php: 7.3
     - php: 7.4
     - php: hhvm-3.18
-      install:
-        - composer require phpunit/phpunit:^5 --dev --no-interaction # requires legacy phpunit
   allow_failures:
     - php: hhvm-3.18
 
 services:
   - redis-server
 
-sudo: false
-
 env:
   - REDIS_URI=localhost
 
 install:
-  - composer install --no-interaction
+  - composer install
 
 script:
   - vendor/bin/phpunit --coverage-text

composer.json

@@ -19,14 +19,14 @@
         "react/promise-timer": "^1.5",
         "react/socket": "^1.1"
     },
+    "require-dev": {
+        "clue/block-react": "^1.1",
+        "phpunit/phpunit": "^9.0 || ^5.7 || ^4.8.35"
+    },
     "autoload": {
         "psr-4": { "Clue\\React\\Redis\\": "src/" }
     },
     "autoload-dev": {
         "psr-4": { "Clue\\Tests\\React\\Redis\\": "tests/" }
-    },
-    "require-dev": {
-        "clue/block-react": "^1.1",
-        "phpunit/phpunit": "^7.0 || ^6.0 || ^5.0 || ^4.8.35"
     }
 }

tests/FactoryLazyClientTest.php

@@ -11,7 +11,10 @@ class FactoryLazyClientTest extends TestCase
     private $connector;
     private $factory;
 
-    public function setUp()
+    /**
+     * @before
+     */
+    public function setUpFactory()
     {
         $this->loop = $this->getMockBuilder('React\EventLoop\LoopInterface')->getMock();
         $this->connector = $this->getMockBuilder('React\Socket\ConnectorInterface')->getMock();

tests/FactoryStreamingClientTest.php

@@ -12,7 +12,10 @@ class FactoryStreamingClientTest extends TestCase
     private $connector;
     private $factory;
 
-    public function setUp()
+    /**
+     * @before
+     */
+    public function setUpFactory()
     {
         $this->loop = $this->getMockBuilder('React\EventLoop\LoopInterface')->getMock();
         $this->connector = $this->getMockBuilder('React\Socket\ConnectorInterface')->getMock();

tests/FunctionalTest.php

@@ -16,7 +16,10 @@ class FunctionalTest extends TestCase
     private $factory;
     private $uri;
 
-    public function setUp()
+    /**
+     * @before
+     */
+    public function setUpFactory()
     {
         $this->uri = getenv('REDIS_URI');
         if ($this->uri === false) {

tests/LazyClientTest.php

@@ -21,7 +21,10 @@ class LazyClientTest extends TestCase
     private $loop;
     private $client;
 
-    public function setUp()
+    /**
+     * @before
+     */
+    public function setUpClient()
     {
         $this->factory = $this->getMockBuilder('Clue\React\Redis\Factory')->disableOriginalConstructor()->getMock();
         $this->loop = $this->getMockBuilder('React\EventLoop\LoopInterface')->getMock();

tests/StreamingClientTest.php

@@ -18,7 +18,10 @@ class StreamingClientTest extends TestCase
     private $serializer;
     private $client;
 
-    public function setUp()
+    /**
+     * @before
+     */
+    public function setUpClient()
     {
         $this->stream = $this->getMockBuilder('React\Stream\DuplexStreamInterface')->getMock();
         $this->parser = $this->getMockBuilder('Clue\Redis\Protocol\Parser\ParserInterface')->getMock();

tests/TestCase.php

@@ -9,37 +9,36 @@ class TestCase extends BaseTestCase
     protected function expectCallableOnce()
     {
         $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke');
+        $mock->expects($this->once())->method('__invoke');
 
         return $mock;
     }
 
     protected function expectCallableOnceWith($argument)
     {
         $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($argument);
+        $mock->expects($this->once())->method('__invoke')->with($argument);
 
         return $mock;
     }
 
     protected function expectCallableNever()
     {
         $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->never())
-            ->method('__invoke');
+        $mock->expects($this->never())->method('__invoke');
 
         return $mock;
     }
 
     protected function createCallableMock()
     {
-        return $this->getMockBuilder('stdClass')->setMethods(array('__invoke'))->getMock();
+        if (method_exists('PHPUnit\Framework\MockObject\MockBuilder', 'addMethods')) {
+            // PHPUnit 9+
+            return $this->getMockBuilder('stdClass')->addMethods(array('__invoke'))->getMock();
+        } else {
+            // legacy PHPUnit 4 - PHPUnit 8
+            return $this->getMockBuilder('stdClass')->setMethods(array('__invoke'))->getMock();
+        }
     }
 
     protected function expectPromiseResolve($promise)