Merge pull request #393 from SimonFrings/tests

Update PHPUnit configuration schema for PHPUnit 9.3 and replace deprecated at() Mocks

.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

@@ -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
@@ -23,9 +23,10 @@ matrix:
     - php: hhvm-3.18
 
 install:
-  - composer install --no-interaction
+  - composer install
   - if [ "$DEPENDENCIES" = "lowest" ]; then composer update --prefer-lowest -n; fi
 
 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
   - if [ "$DEPENDENCIES" = "lowest" ]; then php -n tests/benchmark-middleware-runner.php; fi

composer.json

@@ -41,7 +41,7 @@
         "clue/http-proxy-react": "^1.3",
         "clue/reactphp-ssh-proxy": "^1.0",
         "clue/socks-react": "^1.0",
-        "phpunit/phpunit": "^9.0 || ^5.7 || ^4.8.35"
+        "phpunit/phpunit": "^9.3 || ^5.7 || ^4.8.35"
     },
     "autoload": {
         "psr-4": { "React\\Http\\": "src" }

phpunit.xml.dist

@@ -1,15 +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="React Test Suite">
             <directory>./tests/</directory>
         </testsuite>
     </testsuites>
-
-    <filter>
-        <whitelist>
+    <coverage>
+        <include>
             <directory>./src/</directory>
-        </whitelist>
-    </filter>
+        </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="React Test Suite">
+            <directory>./tests/</directory>
+        </testsuite>
+    </testsuites>
+    <filter>
+        <whitelist>
+            <directory>./src/</directory>
+        </whitelist>
+    </filter>
+</phpunit>

tests/Client/RequestTest.php

@@ -36,46 +36,21 @@ public function requestShouldBindToStreamEventsAndUseconnector()
 
         $this->successfulConnectionMock();
 
-        $this->stream
-            ->expects($this->at(0))
-            ->method('on')
-            ->with('drain', $this->identicalTo(array($request, 'handleDrain')));
-        $this->stream
-            ->expects($this->at(1))
-            ->method('on')
-            ->with('data', $this->identicalTo(array($request, 'handleData')));
-        $this->stream
-            ->expects($this->at(2))
-            ->method('on')
-            ->with('end', $this->identicalTo(array($request, 'handleEnd')));
-        $this->stream
-            ->expects($this->at(3))
-            ->method('on')
-            ->with('error', $this->identicalTo(array($request, 'handleError')));
-        $this->stream
-            ->expects($this->at(4))
-            ->method('on')
-            ->with('close', $this->identicalTo(array($request, 'handleClose')));
-        $this->stream
-            ->expects($this->at(6))
-            ->method('removeListener')
-            ->with('drain', $this->identicalTo(array($request, 'handleDrain')));
-        $this->stream
-            ->expects($this->at(7))
-            ->method('removeListener')
-            ->with('data', $this->identicalTo(array($request, 'handleData')));
-        $this->stream
-            ->expects($this->at(8))
-            ->method('removeListener')
-            ->with('end', $this->identicalTo(array($request, 'handleEnd')));
-        $this->stream
-            ->expects($this->at(9))
-            ->method('removeListener')
-            ->with('error', $this->identicalTo(array($request, 'handleError')));
-        $this->stream
-            ->expects($this->at(10))
-            ->method('removeListener')
-            ->with('close', $this->identicalTo(array($request, 'handleClose')));
+        $this->stream->expects($this->exactly(6))->method('on')->withConsecutive(
+            array('drain', $this->identicalTo(array($request, 'handleDrain'))),
+            array('data', $this->identicalTo(array($request, 'handleData'))),
+            array('end', $this->identicalTo(array($request, 'handleEnd'))),
+            array('error', $this->identicalTo(array($request, 'handleError'))),
+            array('close', $this->identicalTo(array($request, 'handleClose')))
+        );
+
+        $this->stream->expects($this->exactly(5))->method('removeListener')->withConsecutive(
+            array('drain', $this->identicalTo(array($request, 'handleDrain'))),
+            array('data', $this->identicalTo(array($request, 'handleData'))),
+            array('end', $this->identicalTo(array($request, 'handleEnd'))),
+            array('error', $this->identicalTo(array($request, 'handleError'))),
+            array('close', $this->identicalTo(array($request, 'handleClose')))
+        );
 
         $request->on('end', $this->expectCallableNever());
 
@@ -223,18 +198,11 @@ public function writeWithAPostRequestShouldSendToTheStream()
 
         $this->successfulConnectionMock();
 
-        $this->stream
-            ->expects($this->at(5))
-            ->method('write')
-            ->with($this->matchesRegularExpression("#^POST / HTTP/1\.0\r\nHost: www.example.com\r\nUser-Agent:.*\r\n\r\nsome$#"));
-        $this->stream
-            ->expects($this->at(6))
-            ->method('write')
-            ->with($this->identicalTo("post"));
-        $this->stream
-            ->expects($this->at(7))
-            ->method('write')
-            ->with($this->identicalTo("data"));
+        $this->stream->expects($this->exactly(3))->method('write')->withConsecutive(
+            array($this->matchesRegularExpression("#^POST / HTTP/1\.0\r\nHost: www.example.com\r\nUser-Agent:.*\r\n\r\nsome$#")),
+            array($this->identicalTo("post")),
+            array($this->identicalTo("data"))
+        );
 
         $request->write("some");
         $request->write("post");
@@ -253,15 +221,12 @@ public function writeWithAPostRequestShouldSendBodyAfterHeadersAndEmitDrainEvent
 
         $resolveConnection = $this->successfulAsyncConnectionMock();
 
-        $this->stream
-            ->expects($this->at(5))
-            ->method('write')
-            ->with($this->matchesRegularExpression("#^POST / HTTP/1\.0\r\nHost: www.example.com\r\nUser-Agent:.*\r\n\r\nsomepost$#"))
-            ->willReturn(true);
-        $this->stream
-            ->expects($this->at(6))
-            ->method('write')
-            ->with($this->identicalTo("data"));
+        $this->stream->expects($this->exactly(2))->method('write')->withConsecutive(
+            array($this->matchesRegularExpression("#^POST / HTTP/1\.0\r\nHost: www.example.com\r\nUser-Agent:.*\r\n\r\nsomepost$#")),
+            array($this->identicalTo("data"))
+        )->willReturn(
+            true
+        );
 
         $this->assertFalse($request->write("some"));
         $this->assertFalse($request->write("post"));
@@ -292,15 +257,12 @@ public function writeWithAPostRequestShouldForwardDrainEventIfFirstChunkExceedsB
 
         $resolveConnection = $this->successfulAsyncConnectionMock();
 
-        $this->stream
-            ->expects($this->at(0))
-            ->method('write')
-            ->with($this->matchesRegularExpression("#^POST / HTTP/1\.0\r\nHost: www.example.com\r\nUser-Agent:.*\r\n\r\nsomepost$#"))
-            ->willReturn(false);
-        $this->stream
-            ->expects($this->at(1))
-            ->method('write')
-            ->with($this->identicalTo("data"));
+        $this->stream->expects($this->exactly(2))->method('write')->withConsecutive(
+            array($this->matchesRegularExpression("#^POST / HTTP/1\.0\r\nHost: www.example.com\r\nUser-Agent:.*\r\n\r\nsomepost$#")),
+            array($this->identicalTo("data"))
+        )->willReturn(
+            false
+        );
 
         $this->assertFalse($request->write("some"));
         $this->assertFalse($request->write("post"));
@@ -327,18 +289,11 @@ public function pipeShouldPipeDataIntoTheRequestBody()
 
         $this->successfulConnectionMock();
 
-        $this->stream
-            ->expects($this->at(5))
-            ->method('write')
-            ->with($this->matchesRegularExpression("#^POST / HTTP/1\.0\r\nHost: www.example.com\r\nUser-Agent:.*\r\n\r\nsome$#"));
-        $this->stream
-            ->expects($this->at(6))
-            ->method('write')
-            ->with($this->identicalTo("post"));
-        $this->stream
-            ->expects($this->at(7))
-            ->method('write')
-            ->with($this->identicalTo("data"));
+        $this->stream->expects($this->exactly(3))->method('write')->withConsecutive(
+            array($this->matchesRegularExpression("#^POST / HTTP/1\.0\r\nHost: www.example.com\r\nUser-Agent:.*\r\n\r\nsome$#")),
+            array($this->identicalTo("post")),
+            array($this->identicalTo("data"))
+        );
 
         $loop = $this
             ->getMockBuilder('React\EventLoop\LoopInterface')