Update to PHP 8.2

ReactiveX · Oct 6, 2024 · 788e535 · 788e535
1 parent 50152f5
commit 788e535
Show file tree

Hide file tree

Showing 108 changed files with 702 additions and 1,331 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,4 @@ composer.phar
 /vendor/
 docs/reactivex.github.io
 build/
+.idea
diff --git a/.phpunit.result.cache b/.phpunit.result.cache
diff --git a/composer.json b/composer.json
@@ -20,7 +20,7 @@
         }
     ],
     "require": {
-        "php": ">=7.0.0",
+        "php": ">=8.2",
         "react/promise": "^3 || ~2.2"
     },
     "require-dev": {

diff --git a/demo/create/createObservable.php b/demo/create/createObservable.php
@@ -1,11 +1,13 @@
 <?php
 
 use Rx\Disposable\CallbackDisposable;
+use Rx\Observable\AnonymousObservable;
+use Rx\ObserverInterface;
 
 require_once __DIR__ . '/../bootstrap.php';
 
 //With Class
-$source = new \Rx\Observable\AnonymousObservable(function (\Rx\ObserverInterface $observer) {
+$source = new AnonymousObservable(function (ObserverInterface $observer) {
     $observer->onNext(42);
     $observer->onCompleted();
 

diff --git a/demo/custom-operator/Rot13Operator.php b/demo/custom-operator/Rot13Operator.php
@@ -15,11 +15,9 @@ class Rot13Operator implements OperatorInterface
     public function __invoke(ObservableInterface $observable, ObserverInterface $observer): DisposableInterface
     {
         return $observable->subscribe(
-            function ($json) use ($observer) {
-                $observer->onNext(str_rot13($json));
-            },
-            [$observer, 'onError'],
-            [$observer, 'onCompleted']
+            fn ($json) => $observer->onNext(str_rot13($json)),
+            fn ($e) => $observer->onError($e),
+            fn () => $observer->onCompleted()
         );
     }
 }
diff --git a/demo/zip/zip.php b/demo/zip/zip.php
@@ -20,6 +20,6 @@
         function ($array) use ($observer) {
             $observer->onNext(json_encode($array));
         },
-        [$observer, 'onError'],
-        [$observer, 'onCompleted']
+        fn ($e) => $observer->onError($e),
+        fn () => $observer->onCompleted()
     ));
diff --git a/src/Disposable/BinaryDisposable.php b/src/Disposable/BinaryDisposable.php
@@ -6,33 +6,16 @@
 
 use Rx\DisposableInterface;
 
-/**
- * Class BinaryDisposable
- * @package Rx\Disposable
- */
 class BinaryDisposable implements DisposableInterface
 {
-    /** @var \Rx\DisposableInterface */
-    private $first;
-
-    /** @var \Rx\DisposableInterface */
-    private $second;
-
-    /** @var bool */
-    protected $isDisposed = false;
-
-    /**
-     * BinaryDisposable constructor.
-     * @param $first
-     * @param $second
-     */
-    public function __construct(DisposableInterface $first, DisposableInterface $second)
-    {
-        $this->first  = $first;
-        $this->second = $second;
+    public function __construct(
+        private null|DisposableInterface $first,
+        private null|DisposableInterface $second,
+        protected bool $isDisposed = false
+    ) {
     }
 
-    public function dispose()
+    public function dispose(): void
     {
         if ($this->isDisposed) {
             return;

diff --git a/src/Disposable/CallbackDisposable.php b/src/Disposable/CallbackDisposable.php
@@ -8,15 +8,13 @@
 
 class CallbackDisposable implements DisposableInterface
 {
-    private $action;
-    private $disposed = false;
-
-    public function __construct(callable $action)
-    {
-        $this->action = $action;
+    public function __construct(
+        private \Closure $action,
+        private bool $disposed = false
+    ) {
     }
 
-    public function dispose()
+    public function dispose(): void
     {
         if ($this->disposed) {
             return;

diff --git a/src/Disposable/CompositeDisposable.php b/src/Disposable/CompositeDisposable.php
@@ -8,15 +8,14 @@
 
 class CompositeDisposable implements DisposableInterface
 {
-    private $disposables;
-    private $isDisposed = false;
 
-    public function __construct(array $disposables = [])
-    {
-        $this->disposables = $disposables;
+    public function __construct(
+        private array $disposables = [],
+        private bool $isDisposed = false
+    ) {
     }
 
-    public function dispose()
+    public function dispose(): void
     {
         if ($this->isDisposed) {
             return;
@@ -32,7 +31,7 @@ public function dispose()
         }
     }
 
-    public function add(DisposableInterface $disposable)
+    public function add(DisposableInterface $disposable): void
     {
         if ($this->isDisposed) {
             $disposable->dispose();
@@ -65,12 +64,12 @@ public function contains(DisposableInterface $disposable): bool
         return in_array($disposable, $this->disposables, true);
     }
 
-    public function count()
+    public function count(): int
     {
         return count($this->disposables);
     }
 
-    public function clear()
+    public function clear(): void
     {
         $disposables       = $this->disposables;
         $this->disposables = [];

diff --git a/src/Disposable/EmptyDisposable.php b/src/Disposable/EmptyDisposable.php
@@ -8,7 +8,7 @@
 
 class EmptyDisposable implements DisposableInterface
 {
-    public function dispose()
+    public function dispose(): void
     {
         // do nothing \o/
     }

diff --git a/src/Disposable/RefCountDisposable.php b/src/Disposable/RefCountDisposable.php
@@ -8,17 +8,16 @@
 
 class RefCountDisposable implements DisposableInterface
 {
-    private $count = 0;
-    private $disposable;
-    private $isDisposed = false;
-    private $isPrimaryDisposed = false;
 
-    public function __construct(DisposableInterface $disposable)
-    {
-        $this->disposable = $disposable;
+    public function __construct(
+        private readonly DisposableInterface $disposable,
+        private int                          $count = 0,
+        private bool                         $isDisposed = false,
+        private bool                         $isPrimaryDisposed = false
+    ) {
     }
 
-    public function dispose()
+    public function dispose(): void
     {
         if ($this->isDisposed) {
             return;
@@ -32,13 +31,13 @@ public function dispose()
         }
     }
 
-    public function getDisposable()
+    public function getDisposable(): DisposableInterface|CallbackDisposable
     {
         if (!$this->isDisposed) {
             return $this->createInnerDisposable();
         }
 
-        return new CallbackDisposable(function () {
+        return new CallbackDisposable(function (): void {
         }); // no op
     }
 
@@ -57,7 +56,7 @@ private function createInnerDisposable(): DisposableInterface
         $this->count++;
         $isInnerDisposed = false;
 
-        return new CallbackDisposable(function () use (&$isInnerDisposed) {
+        return new CallbackDisposable(function () use (&$isInnerDisposed): void {
             if ($this->isDisposed()) {
                 return;
             }

diff --git a/src/Disposable/ScheduledDisposable.php b/src/Disposable/ScheduledDisposable.php
@@ -9,30 +9,22 @@
 
 class ScheduledDisposable implements DisposableInterface
 {
-    /** @var DisposableInterface */
-    private $disposable;
-
-    /** @var SchedulerInterface */
-    private $scheduler;
-
-    /** @var bool */
-    protected $isDisposed = false;
-
-    public function __construct(SchedulerInterface $scheduler, DisposableInterface $disposable)
-    {
-        $this->scheduler  = $scheduler;
-        $this->disposable = $disposable;
+    public function __construct(
+        private SchedulerInterface   $scheduler,
+        private  DisposableInterface $disposable,
+        protected bool               $isDisposed = false
+    ) {
     }
 
-    public function dispose()
+    public function dispose(): void
     {
         if ($this->isDisposed) {
             return;
         }
 
         $this->isDisposed = true;
 
-        $this->scheduler->schedule(function () {
+        $this->scheduler->schedule(function (): void {
             $this->disposable->dispose();
         });
     }

diff --git a/src/Disposable/SerialDisposable.php b/src/Disposable/SerialDisposable.php
@@ -6,19 +6,13 @@
 
 use Rx\DisposableInterface;
 
-/**
- * Class SerialDisposable
- * @package Rx\Disposable
- */
 class SerialDisposable implements DisposableInterface
 {
-    /** @var bool */
-    private $isDisposed = false;
+    private bool $isDisposed = false;
 
-    /** @var DisposableInterface */
-    private $disposable = null;
+    private ?DisposableInterface $disposable = null;
 
-    public function dispose()
+    public function dispose(): void
     {
         if ($this->isDisposed) {
             return;
@@ -33,18 +27,12 @@ public function dispose()
         }
     }
 
-    /**
-     * @return DisposableInterface
-     */
-    public function getDisposable()
+    public function getDisposable(): null|DisposableInterface
     {
         return $this->disposable;
     }
 
-    /**
-     * @param DisposableInterface $disposable
-     */
-    public function setDisposable(DisposableInterface $disposable)
+    public function setDisposable(DisposableInterface $disposable): void
     {
         $shouldDispose = $this->isDisposed;
 

diff --git a/src/Disposable/SingleAssignmentDisposable.php b/src/Disposable/SingleAssignmentDisposable.php
@@ -9,10 +9,10 @@
 
 class SingleAssignmentDisposable implements DisposableInterface
 {
-    private $current;
-    private $isDisposed = false;
+    private null|DisposableInterface $current = null;
+    private bool $isDisposed = false;
 
-    public function dispose()
+    public function dispose(): void
     {
         $old = null;
 
@@ -27,7 +27,7 @@ public function dispose()
         }
     }
 
-    public function setDisposable(DisposableInterface $disposable = null)
+    public function setDisposable(DisposableInterface $disposable = null): void
     {
         if ($this->current) {
             throw new RuntimeException('Disposable has already been assigned.');
@@ -42,12 +42,12 @@ public function setDisposable(DisposableInterface $disposable = null)
         }
     }
 
-    public function getDisposable()
+    public function getDisposable(): null|DisposableInterface
     {
         return $this->current;
     }
 
-    public function isDisposed()
+    public function isDisposed(): bool
     {
         return $this->isDisposed;
     }

diff --git a/src/Notification.php b/src/Notification.php
@@ -9,30 +9,28 @@
  */
 abstract class Notification
 {
-    private $kind;
 
     /**
      * @param mixed $kind Kind of notification
      */
-    public function __construct($kind)
+    public function __construct(private $kind)
     {
-        $this->kind = $kind;
     }
 
     public function accept($observerOrOnNext, $onError = null, $onCompleted = null)
     {
         if (null === $onError && null === $onCompleted && $observerOrOnNext instanceof ObserverInterface) {
             $this->doAcceptObservable($observerOrOnNext);
 
-            return;
+            return null;
         }
 
         return $this->doAccept($observerOrOnNext, $onError, $onCompleted);
     }
 
     public function equals($other): bool
     {
-        return (string)$this === (string)$other;
+        return (string) $this === (string)$other;
     }
 
     abstract protected function doAcceptObservable(ObserverInterface $observer);

diff --git a/src/Notification/OnErrorNotification.php b/src/Notification/OnErrorNotification.php
@@ -9,7 +9,7 @@
 
 class OnErrorNotification extends Notification
 {
-    private $exception;
+    private \Throwable $exception;
 
     public function __construct(\Throwable $exception)
     {