Php8 compat

prooph · Mar 31, 2021 · ddc6aea · ddc6aea
1 parent 60d7c57
commit ddc6aea
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 12 deletions.
diff --git a/src/Plugin/Router/RegexRouter.php b/src/Plugin/Router/RegexRouter.php
@@ -129,7 +129,8 @@ private function onRouteToSingleHandler(ActionEvent $actionEvent): void
         $alreadyMatched = false;
 
         foreach ($this->patternMap as $map) {
-            list($pattern, $handler) = \each($map);
+            $pattern = \key($map);
+            $handler = \current($map);
             if (\preg_match($pattern, $messageName)) {
                 if ($alreadyMatched) {
                     throw new Exception\RuntimeException(\sprintf(
@@ -155,7 +156,8 @@ private function onRouteEvent(ActionEvent $actionEvent): void
         }
 
         foreach ($this->patternMap as $map) {
-            list($pattern, $handler) = \each($map);
+            $pattern = \key($map);
+            $handler = \current($map);
             if (\preg_match($pattern, $messageName)) {
                 $listeners = $actionEvent->getParam(EventBus::EVENT_PARAM_EVENT_LISTENERS, []);
                 $listeners[] = $handler;

diff --git a/tests/Plugin/ListenerExceptionCollectionModeTest.php b/tests/Plugin/ListenerExceptionCollectionModeTest.php
@@ -28,7 +28,7 @@ protected function setUp(): void
         $this->eventBus = new class() extends EventBus {
             public function isCollectExceptionsModeOn(): bool
             {
-                return (bool)$this->collectExceptions;
+                return (bool) $this->collectExceptions;
             }
         };
 

diff --git a/tests/QueryBusTest.php b/tests/QueryBusTest.php
@@ -211,9 +211,13 @@ function () {
 
         $promise = $this->queryBus->dispatch('throw it');
 
-        $promise->otherwise(function ($ex) use (&$exception): void {
-            $exception = $ex;
-        });
+        $promise->then(
+            function () {
+            },
+            function (\Throwable $ex) use (&$exception): void {
+                $exception = $ex;
+            }
+        );
 
         $this->assertInstanceOf(MessageDispatchException::class, $exception);
     }
@@ -235,9 +239,13 @@ function (ActionEvent $e): void {
 
         $promise = $this->queryBus->dispatch('throw it');
 
-        $promise->otherwise(function ($ex) use (&$exception): void {
-            $exception = $ex;
-        });
+        $promise->then(
+            function () {
+            },
+            function (\Throwable $ex) use (&$exception): void {
+                $exception = $ex;
+            }
+        );
 
         $this->assertInstanceOf(RuntimeException::class, $exception);
         $this->assertEquals('Message dispatch failed. See previous exception for details.', $exception->getMessage());
@@ -260,9 +268,13 @@ function (ActionEvent $e): void {
 
         $promise = $this->queryBus->dispatch('throw it');
 
-        $promise->otherwise(function ($ex) use (&$exception): void {
-            $exception = $ex;
-        });
+        $promise->then(
+            function () {
+            },
+            function (\Throwable $ex) use (&$exception): void {
+                $exception = $ex;
+            }
+        );
 
         $this->assertInstanceOf(MessageDispatchException::class, $exception);
         $this->assertEquals('Message dispatch failed. See previous exception for details.', $exception->getMessage());