PHP 8.4 (#225)

* add Rector as a dev dependency

* add rector.php file

* update code to PHP 8.4 via Rector

* make implicit nullable params explicit via Rector

* fix optional scheduler

* add type declarations via rector (level 1)

* add type declarations via rector (level 2)

* Update ci.yml for 8.4 and other updates

* Bump PHP version to >=7.1.0

---------

Co-authored-by: Matt Bonneau <[email protected]>

Author: makomweb

.github/workflows/ci.yml

@@ -9,24 +9,23 @@ jobs:
     name: PHPUnit (PHP ${{ matrix.php }} on ${{ matrix.os }})
     runs-on: ${{ matrix.os }}
     strategy:
-      fail-fast: false
+      fail-fast: true
       matrix:
         os:
-          - ubuntu-20.04
-          - windows-2019
+          - ubuntu-latest
+          - windows-latest
         php:
+          - 8.4
           - 8.3
           - 8.2
           - 8.1
-          - 8.0
-          - 7.4
-          - 7.3
-          - 7.2
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
           coverage: xdebug
-      - run: composer install
+          tools: composer
+          cache: composer
+      - run: composer install --prefer-dist --no-interaction --no-progress
       - run: vendor/bin/phpunit --coverage-text

composer.json

@@ -20,13 +20,14 @@
         }
     ],
     "require": {
-        "php": ">=7.0.0",
+        "php": ">=7.1.0",
         "react/promise": "^3 || ~2.2"
     },
     "require-dev": {
         "satooshi/php-coveralls": "~1.0",
         "phpunit/phpunit": "^8.5 || ^9",
-        "react/event-loop": "^1.0 || ^0.5 || ^0.4.2"
+        "react/event-loop": "^1.0 || ^0.5 || ^0.4.2",
+        "rector/rector": "^2.0"
     },
     "suggest": {
         "react/event-loop": "Used for scheduling async operations"

demo/bootstrap.php

@@ -30,9 +30,9 @@ function asString($value) {
 
 $createStdoutObserver = function ($prefix = '') {
     return new Rx\Observer\CallbackObserver(
-        function ($value) use ($prefix) { echo $prefix . "Next value: " . asString($value) . "\n"; },
-        function ($error) use ($prefix) { echo $prefix . "Exception: " . $error->getMessage() . "\n"; },
-        function ()       use ($prefix) { echo $prefix . "Complete!\n"; }
+        function ($value) use ($prefix): void { echo $prefix . "Next value: " . asString($value) . "\n"; },
+        function ($error) use ($prefix): void { echo $prefix . "Exception: " . $error->getMessage() . "\n"; },
+        function ()       use ($prefix): void { echo $prefix . "Complete!\n"; }
     );
 };
 
@@ -42,6 +42,6 @@ function ()       use ($prefix) { echo $prefix . "Complete!\n"; }
 Scheduler::setDefaultFactory(function () use ($loop) {
     return new Scheduler\EventLoopScheduler($loop);
 });
-register_shutdown_function(function () use ($loop) {
+register_shutdown_function(function () use ($loop): void {
     $loop->run();
 });

demo/create/create.php

@@ -9,7 +9,7 @@
     $observer->onNext(42);
     $observer->onCompleted();
 
-    return new CallbackDisposable(function () {
+    return new CallbackDisposable(function (): void {
         echo "Disposed\n";
     });
 });

demo/create/createObservable.php

@@ -9,7 +9,7 @@
     $observer->onNext(42);
     $observer->onCompleted();
 
-    return new CallbackDisposable(function () {
+    return new CallbackDisposable(function (): void {
         echo "Disposed\n";
     });
 });

demo/custom-operator/Rot13Operator.php

@@ -15,7 +15,7 @@ class Rot13Operator implements OperatorInterface
     public function __invoke(ObservableInterface $observable, ObserverInterface $observer): DisposableInterface
     {
         return $observable->subscribe(
-            function ($json) use ($observer) {
+            function ($json) use ($observer): void {
                 $observer->onNext(str_rot13($json));
             },
             [$observer, 'onError'],

demo/delay/delay.php

@@ -2,7 +2,7 @@
 require_once __DIR__ . '/../bootstrap.php';
 
 \Rx\Observable::interval(1000)
-    ->doOnNext(function ($x) {
+    ->doOnNext(function ($x): void {
         echo 'Side effect: ' . $x . "\n";
     })
     ->delay(500)

demo/do/do.php

@@ -4,13 +4,13 @@
 
 $source = \Rx\Observable::range(0, 3)
     ->do(
-        function ($x) {
+        function ($x): void {
             echo 'Do Next:', $x, PHP_EOL;
         },
-        function (Throwable $err) {
+        function (Throwable $err): void {
             echo 'Do Error:', $err->getMessage(), PHP_EOL;
         },
-        function () {
+        function (): void {
             echo 'Do Completed', PHP_EOL;
         }
     );

demo/do/doOnCompleted.php

@@ -3,7 +3,7 @@
 require_once __DIR__ . '/../bootstrap.php';
 
 $source = \Rx\Observable::empty()
-    ->doOnCompleted(function () {
+    ->doOnCompleted(function (): void {
         echo 'Do Completed', PHP_EOL;
     });
 

demo/do/doOnError.php

@@ -3,7 +3,7 @@
 require_once __DIR__ . '/../bootstrap.php';
 
 $source = \Rx\Observable::error(new Exception('Oops'))
-    ->doOnError(function (Throwable $err) {
+    ->doOnError(function (Throwable $err): void {
         echo 'Do Error:', $err->getMessage(), PHP_EOL;
     });