refactor: Fix phpstan nullCoalesce

codeigniter4 · Jan 5, 2025 · a6e76e2 · a6e76e2
1 parent 33110c5
commit a6e76e2
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 17 deletions.
diff --git a/system/HTTP/Files/UploadedFile.php b/system/HTTP/Files/UploadedFile.php
@@ -325,7 +325,7 @@ public function guessExtension(): string
      */
     public function getClientExtension(): string
     {
-        return pathinfo($this->originalName, PATHINFO_EXTENSION) ?? '';
+        return pathinfo($this->originalName, PATHINFO_EXTENSION);
     }
 
     /**

diff --git a/system/Router/Router.php b/system/Router/Router.php
@@ -51,7 +51,7 @@ class Router implements RouterInterface
     /**
      * A RouteCollection instance.
      *
-     * @var RouteCollectionInterface
+     * @var RouteCollection|RouteCollectionInterface
      */
     protected $collection;
 
@@ -144,6 +144,7 @@ class Router implements RouterInterface
     public function __construct(RouteCollectionInterface $routes, ?Request $request = null)
     {
         $config = config(App::class);
+
         if (isset($config->permittedURIChars)) {
             $this->permittedURIChars = $config->permittedURIChars;
         }
@@ -154,7 +155,7 @@ public function __construct(RouteCollectionInterface $routes, ?Request $request
         $this->controller = $this->collection->getDefaultController();
         $this->method     = $this->collection->getDefaultMethod();
 
-        $this->collection->setHTTPVerb($request->getMethod() ?? $_SERVER['REQUEST_METHOD']);
+        $this->collection->setHTTPVerb($request->getMethod() === '' ? $_SERVER['REQUEST_METHOD'] : $request->getMethod());
 
         $this->translateURIDashes = $this->collection->shouldTranslateURIDashes();
 

diff --git a/utils/phpstan-baseline/loader.neon b/utils/phpstan-baseline/loader.neon
@@ -34,7 +34,6 @@ includes:
     - missingType.property.neon
     - missingType.return.neon
     - notIdentical.alwaysTrue.neon
-    - nullCoalesce.expr.neon
     - nullCoalesce.property.neon
     - nullCoalesce.variable.neon
     - offsetAccess.notFound.neon

diff --git a/utils/phpstan-baseline/nullCoalesce.expr.neon b/utils/phpstan-baseline/nullCoalesce.expr.neon
-Original file line number
+Diff line change
@@ Expand Up / @@ -325,7 +325,7 @@ public function guessExtension(): string @@
          */
         public function getClientExtension(): string
         {
-            return pathinfo($this->originalName, PATHINFO_EXTENSION) ?? '';
+            return pathinfo($this->originalName, PATHINFO_EXTENSION);
         }
         /**
@@ Expand Down @@