Merge pull request #104 from SimonFrings/tests

Update PHPUnit configuration schema for PHPUnit 9.3

Author: clue

.gitattributes

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

.travis.yml

@@ -29,4 +29,5 @@ install:
   - composer install
 
 script:
-  - vendor/bin/phpunit --coverage-text
+  - if [[ "$TRAVIS_PHP_VERSION" > "7.2" ]]; then vendor/bin/phpunit --coverage-text; fi
+  - if [[ "$TRAVIS_PHP_VERSION" < "7.3" ]]; then vendor/bin/phpunit --coverage-text -c phpunit.xml.legacy; fi

composer.json

@@ -21,7 +21,7 @@
     },
     "require-dev": {
         "clue/block-react": "^1.1",
-        "phpunit/phpunit": "^9.0 || ^5.7 || ^4.8.35"
+        "phpunit/phpunit": "^9.3 || ^5.7 || ^4.8.35"
     },
     "autoload": {
         "psr-4": { "Clue\\React\\Redis\\": "src/" }

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="Redis 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/4.8/phpunit.xsd"
+         bootstrap="vendor/autoload.php"
+         colors="true">
+    <testsuites>
+        <testsuite name="Redis React Test Suite">
+            <directory>./tests/</directory>
+        </testsuite>
+    </testsuites>
+    <filter>
+        <whitelist>
+            <directory>./src/</directory>
+        </whitelist>
+    </filter>
+</phpunit>

tests/FactoryStreamingClientTest.php

@@ -136,27 +136,45 @@ public function testWillWriteAuthCommandIfRedisUnixUriContainsUserInfo()
 
     public function testWillResolveWhenAuthCommandReceivesOkResponseIfRedisUriContainsUserInfo()
     {
-        $stream = $this->getMockBuilder('React\Socket\Connection')->disableOriginalConstructor()->setMethods(array('write'))->getMock();
+        $dataHandler = null;
+        $stream = $this->getMockBuilder('React\Socket\ConnectionInterface')->getMock();
         $stream->expects($this->once())->method('write')->with("*2\r\n$4\r\nauth\r\n$5\r\nworld\r\n");
+        $stream->expects($this->exactly(2))->method('on')->withConsecutive(
+            array('data', $this->callback(function ($arg) use (&$dataHandler) {
+                $dataHandler = $arg;
+                return true;
+            })),
+            array('close', $this->anything())
+        );
 
         $this->connector->expects($this->once())->method('connect')->willReturn(Promise\resolve($stream));
         $promise = $this->factory->createClient('redis://:world@localhost');
 
-        $stream->emit('data', array("+OK\r\n"));
+        $this->assertTrue(is_callable($dataHandler));
+        $dataHandler("+OK\r\n");
 
         $promise->then($this->expectCallableOnceWith($this->isInstanceOf('Clue\React\Redis\Client')));
     }
 
     public function testWillRejectAndCloseAutomaticallyWhenAuthCommandReceivesErrorResponseIfRedisUriContainsUserInfo()
     {
-        $stream = $this->getMockBuilder('React\Socket\Connection')->disableOriginalConstructor()->setMethods(array('write', 'close'))->getMock();
+        $dataHandler = null;
+        $stream = $this->getMockBuilder('React\Socket\ConnectionInterface')->getMock();
         $stream->expects($this->once())->method('write')->with("*2\r\n$4\r\nauth\r\n$5\r\nworld\r\n");
         $stream->expects($this->once())->method('close');
+        $stream->expects($this->exactly(2))->method('on')->withConsecutive(
+            array('data', $this->callback(function ($arg) use (&$dataHandler) {
+                $dataHandler = $arg;
+                return true;
+            })),
+            array('close', $this->anything())
+        );
 
         $this->connector->expects($this->once())->method('connect')->willReturn(Promise\resolve($stream));
         $promise = $this->factory->createClient('redis://:world@localhost');
 
-        $stream->emit('data', array("-ERR invalid password\r\n"));
+        $this->assertTrue(is_callable($dataHandler));
+        $dataHandler("-ERR invalid password\r\n");
 
         $promise->then(null, $this->expectCallableOnceWith(
             $this->logicalAnd(
@@ -182,27 +200,45 @@ public function testWillWriteSelectCommandIfRedisUnixUriContainsDbQueryParameter
 
     public function testWillResolveWhenSelectCommandReceivesOkResponseIfRedisUriContainsPath()
     {
-        $stream = $this->getMockBuilder('React\Socket\Connection')->disableOriginalConstructor()->setMethods(array('write'))->getMock();
+        $dataHandler = null;
+        $stream = $this->getMockBuilder('React\Socket\ConnectionInterface')->getMock();
         $stream->expects($this->once())->method('write')->with("*2\r\n$6\r\nselect\r\n$3\r\n123\r\n");
+        $stream->expects($this->exactly(2))->method('on')->withConsecutive(
+            array('data', $this->callback(function ($arg) use (&$dataHandler) {
+                $dataHandler = $arg;
+                return true;
+            })),
+            array('close', $this->anything())
+        );
 
         $this->connector->expects($this->once())->method('connect')->willReturn(Promise\resolve($stream));
         $promise = $this->factory->createClient('redis://localhost/123');
 
-        $stream->emit('data', array("+OK\r\n"));
+        $this->assertTrue(is_callable($dataHandler));
+        $dataHandler("+OK\r\n");
 
         $promise->then($this->expectCallableOnceWith($this->isInstanceOf('Clue\React\Redis\Client')));
     }
 
     public function testWillRejectAndCloseAutomaticallyWhenSelectCommandReceivesErrorResponseIfRedisUriContainsPath()
     {
-        $stream = $this->getMockBuilder('React\Socket\Connection')->disableOriginalConstructor()->setMethods(array('write', 'close'))->getMock();
+        $dataHandler = null;
+        $stream = $this->getMockBuilder('React\Socket\ConnectionInterface')->getMock();
         $stream->expects($this->once())->method('write')->with("*2\r\n$6\r\nselect\r\n$3\r\n123\r\n");
         $stream->expects($this->once())->method('close');
+        $stream->expects($this->exactly(2))->method('on')->withConsecutive(
+            array('data', $this->callback(function ($arg) use (&$dataHandler) {
+                $dataHandler = $arg;
+                return true;
+            })),
+            array('close', $this->anything())
+        );
 
         $this->connector->expects($this->once())->method('connect')->willReturn(Promise\resolve($stream));
         $promise = $this->factory->createClient('redis://localhost/123');
 
-        $stream->emit('data', array("-ERR DB index is out of range\r\n"));
+        $this->assertTrue(is_callable($dataHandler));
+        $dataHandler("-ERR DB index is out of range\r\n");
 
         $promise->then(null, $this->expectCallableOnceWith(
             $this->logicalAnd(

tests/FunctionalTest.php

@@ -149,10 +149,11 @@ public function testPubSub()
         $deferred = new Deferred();
         $consumer->on('message', $this->expectCallableOnce());
         $consumer->on('message', array($deferred, 'resolve'));
-        $consumer->subscribe($channel)->then($this->expectCallableOnce());
-
-        // producer sends a single message
-        $producer->publish($channel, 'hello world')->then($this->expectCallableOnceWith(1));
+        $once = $this->expectCallableOnceWith(1);
+        $consumer->subscribe($channel)->then(function() use ($producer, $channel, $once){
+            // producer sends a single message
+            $producer->publish($channel, 'hello world')->then($once);
+        })->then($this->expectCallableOnce());
 
         // expect "message" event to take no longer than 0.1s
         Block\await($deferred->promise(), $this->loop, 0.1);