Update to PHP 8.2

Author: daifma

.gitignore

@@ -4,3 +4,4 @@ composer.phar
 /vendor/
 docs/reactivex.github.io
 build/
+.idea

.phpunit.result.cache

@@ -20,7 +20,7 @@
         }
     ],
     "require": {
-        "php": ">=7.0.0",
+        "php": ">=8.2",
         "react/promise": "^3 || ~2.2"
     },
     "require-dev": {

composer.json

@@ -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();
 

demo/create/createObservable.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()
         );
     }
 }

demo/custom-operator/Rot13Operator.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()
     ));

demo/zip/zip.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;

src/Disposable/BinaryDisposable.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;

src/Disposable/CallbackDisposable.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 = [];

src/Disposable/CompositeDisposable.php

@@ -8,7 +8,7 @@
 
 class EmptyDisposable implements DisposableInterface
 {
-    public function dispose()
+    public function dispose(): void
     {
         // do nothing \o/
     }