Psalm lvl 1 (#13)

yiisoft · Jan 12, 2024 · ed919f4 · ed919f4
1 parent 39f6c34
commit ed919f4
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/psalm.xml b/psalm.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <psalm
-    errorLevel="2"
+    errorLevel="1"
     findUnusedBaselineEntry="true"
     findUnusedCode="false"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

diff --git a/src/FileRouter.php b/src/FileRouter.php
@@ -87,6 +87,9 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
         $possibleEntrypoints = $this->parseRequestPath($request);
 
         foreach ($possibleEntrypoints as $possibleEntrypoint) {
+            if (!is_array($possibleEntrypoint)) {
+                continue;
+            }
             /**
              * @psalm-var class-string $controllerClass
              * @psalm-var string|null $possibleAction
@@ -96,7 +99,7 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
                 continue;
             }
 
-            /** @psalm-suppress InvalidPropertyFetch */
+            /** @psalm-suppress InvalidPropertyFetch, MixedArrayAccess */
             $action = $possibleAction ?? ($controllerClass::$actions ?? [
                 'HEAD' => 'head',
                 'OPTIONS' => 'options',
@@ -107,18 +110,24 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
                 'DELETE' => 'delete',
             ])[$request->getMethod()] ?? null;
 
-            if ($action === null) {
+            if (!is_string($action)) {
                 continue;
             }
 
             if (!method_exists($controllerClass, $action)) {
                 continue;
             }
 
-            /** @psalm-suppress InvalidPropertyFetch */
+            /** @psalm-suppress InvalidPropertyFetch, MixedArrayAccess */
             $middlewares = $controllerClass::$middlewares[$action] ?? [];
+
+            if (!is_array($middlewares)) {
+                $middlewares = [];
+            }
+
             $middlewares[] = [$controllerClass, $action];
 
+            /** @psalm-suppress MixedArgumentTypeCoercion */
             $middlewareDispatcher = $this->middlewareDispatcher->withMiddlewares($middlewares);
 
             return $middlewareDispatcher->dispatch($request, $handler);