Allow PHP 8 and Update PHPUnit (#208)

* Update travis.yml - drop 7.0 and 7.1, test 7.4

* Allow php >7, Update tests for phpunit >8 compatibility

* Drop 7.1 on travis, remove optional argument before required on VirtualTimeScheduler

* Get rid of assertion in doc delinter, remove accidentally added operator WIP

* Add new line at end of travis file back

Author: mbonneau

.travis.yml

@@ -1,45 +1,10 @@
 language: php
 
-matrix:
-  include:
-    - php: 7.0
-      env:
-        - qaExtended=true
-    - php: 7.1
-    - php: 7.2
-      env:
-        - dropPlatform=false
-    - php: nightly
-      env:
-        - dropPlatform=false
-    - php: 7.0
-      env:
-        - dependencies=lowest
-    - php: 7.1
-      env:
-        - dependencies=lowest
-    - php: 7.2
-      env:
-        - dependencies=lowest
-        - dropPlatform=false
-    - php: nightly
-      env:
-        - dependencies=lowest
-        - dropPlatform=false
-    - php: 7.0
-      env:
-        - dependencies=highest
-    - php: 7.1
-      env:
-        - dependencies=highest
-    - php: 7.2
-      env:
-        - dependencies=highest
-        - dropPlatform=false
-    - php: nightly
-      env:
-        - dependencies=highest
-        - dropPlatform=false
+php:
+  - 7.2
+  - 7.3
+  - 7.4
+  - 8.0
 
 before_script: composer install
 

composer.json

@@ -20,13 +20,12 @@
         }
     ],
     "require": {
-        "php": "~7.0",
+        "php": ">=7.0.0",
         "react/promise": "~2.2"
     },
     "require-dev": {
         "satooshi/php-coveralls": "~1.0",
-        "phpunit/phpcov": "^3.1",
-        "phpunit/phpunit": "^5.7",
+        "phpunit/phpunit": "^8.5 || ^9",
         "react/event-loop": "^1.0 || ^0.5 || ^0.4.2"
     },
     "suggest": {

docs/doc-loader.php

@@ -77,7 +77,8 @@ public static function fromPath($path) {
         $outputPath = __DIR__ . '/../demo/' . $path . '.expect';
 
         assert(file_exists($codePath), "code does not exist $codePath");
-        assert(file_exists($outputPath), "output does not exist $outputPath");
+        // allow demos without expect files - we will just get a warning later
+        // assert(file_exists($outputPath), "output does not exist $outputPath");
 
         return new Demo(
             $path,

phpunit.xml.dist

@@ -1,31 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit backupGlobals="false"
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         backupGlobals="false"
          backupStaticAttributes="false"
          colors="true"
          convertErrorsToExceptions="true"
          convertNoticesToExceptions="true"
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
-         syntaxCheck="false"
          bootstrap="test/bootstrap.php"
->
-  <testsuites>
-    <testsuite name="RxPHP Test Suite">
-      <directory>./test/Rx/</directory>
-    </testsuite>
-  </testsuites>
-
-  <filter>
-    <whitelist>
-      <directory suffix=".php">./src/</directory>
-      <exclude>
-        <directory suffix="Interface.php">./src/</directory>
-      </exclude>
-    </whitelist>
-  </filter>
-  <logging>
-    <log type="coverage-clover" target="build/logs/clover.xml"/>
-  </logging>
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+    <coverage>
+        <include>
+            <directory suffix=".php">./src/</directory>
+        </include>
+        <exclude>
+            <directory suffix="Interface.php">./src/</directory>
+        </exclude>
+        <report>
+            <clover outputFile="build/logs/clover.xml"/>
+        </report>
+    </coverage>
+    <testsuites>
+        <testsuite name="RxPHP Test Suite">
+            <directory>./test/Rx/</directory>
+        </testsuite>
+    </testsuites>
+    <logging/>
 </phpunit>

src/Scheduler/VirtualTimeScheduler.php

@@ -21,7 +21,7 @@ class VirtualTimeScheduler implements AsyncSchedulerInterface
      * @param integer $initialClock Initial value for the clock.
      * @param callable $comparer Comparer to determine causality of events based on absolute time.
      */
-    public function __construct(int $initialClock = 0, callable $comparer)
+    public function __construct(int $initialClock, callable $comparer)
     {
         $this->clock    = $initialClock;
         $this->comparer = $comparer;

src/Testing/Recorded.php

@@ -11,7 +11,7 @@ public function __construct(int $time, $value, callable $comparer = null)
         $this->time     = $time;
         $this->value    = $value;
         $this->comparer = $comparer ?: function ($a, $b) {
-            if (method_exists($a, 'equals')) {
+            if (is_object($a) && method_exists($a, 'equals')) {
                 return $a->equals($b);
             }
 

test/Rx/Disposable/CompositeDisposableTest.php

@@ -200,6 +200,7 @@ public function clear_disposes_all_contained_disposables_but_not_the_composite_d
 
     /**
      * @test
+     * @doesNotPerformAssertions
      */
     public function it_can_be_disposed_multiple_times()
     {

test/Rx/Disposable/EmptyDisposableTest.php

@@ -10,6 +10,7 @@ class EmptyDisposableTest extends TestCase
 {
     /**
      * @test
+     * @doesNotPerformAssertions
      */
     public function it_can_be_disposed()
     {

test/Rx/Disposable/SingleAssignmentDisposableTest.php

@@ -48,10 +48,10 @@ public function it_disposes_newly_set_disposable_if_already_disposed()
 
     /**
      * @test
-     * @expectedException RuntimeException
      */
     public function it_cannot_be_assignmed_multiple_times()
     {
+        $this->expectException(\RuntimeException::class);
         $d1         = new CallbackDisposable(function(){});
         $d2         = new CallbackDisposable(function(){});
         $disposable = new SingleAssignmentDisposable();

test/Rx/Functional/FunctionalTestCase.php

@@ -21,7 +21,7 @@ abstract class FunctionalTestCase extends TestCase
 
     const TIME_FACTOR = 10;
 
-    public function setup()
+    public function setup() : void
     {
         $this->scheduler = $this->createTestScheduler();
     }
@@ -105,14 +105,15 @@ public function assertSubscriptions(array $expected, array $recorded)
     /**
      * @param callable $callback
      */
-    protected function assertException(callable $callback)
+    protected static function assertException(callable $callback)
     {
+        $exception = null;
         try {
             $callback();
         } catch (\Exception $e) {
-            return;
+            $exception = $e;
         }
-        $this->fail('Expected the callback to throw an exception.');
+        static::assertThat($e instanceof \Exception, static::isTrue(), 'Expected the callback to throw an exception.');
     }