Improved type annotations

orchidsoftware · Jan 26, 2025 · 3649762 · 3649762
1 parent 589178f
commit 3649762
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/src/Access/Impersonation.php b/src/Access/Impersonation.php
@@ -4,9 +4,8 @@
 
 namespace Orchid\Access;
 
+use Illuminate\Auth\SessionGuard;
 use Illuminate\Contracts\Auth\Authenticatable;
-use Illuminate\Contracts\Auth\Guard;
-use Illuminate\Contracts\Auth\StatefulGuard;
 use Illuminate\Support\Facades\Auth;
 
 class Impersonation
@@ -75,9 +74,9 @@ public static function isImpersonating(): bool
     /**
      * Returns the authentication guard.
      *
-     * @return \Illuminate\Contracts\Auth\Guard|\Illuminate\Contracts\Auth\StatefulGuard
+     * @return SessionGuard
      */
-    protected static function getAuth(): Guard|StatefulGuard
+    protected static function getAuth(): SessionGuard
     {
         // Get the authentication guard specified in the config file
         return Auth::guard(config('platform.guard'));

diff --git a/src/Attachment/Engines/Generator.php b/src/Attachment/Engines/Generator.php
@@ -11,6 +11,8 @@
 
 class Generator implements Engine
 {
+    protected const UNKNOWN = 'unknown';
+
     /**
      * The uploaded file instance.
      *
@@ -118,13 +120,16 @@ public function time(): int
 
     /**
      * Get the file extension.
+     *
+     * @psalm-suppress InvalidNullableReturnType
+     * @psalm-suppress NullableReturnStatement
      */
     public function extension(): string
     {
         $extension = $this->file->getClientOriginalExtension();
 
         return empty($extension)
-            ? $this->mimes->getExtension($this->file->getClientMimeType(), 'unknown')
+            ? $this->mimes->getExtension($this->file->getClientMimeType(), static::UNKNOWN)
             : $extension;
     }
 
@@ -135,6 +140,6 @@ public function mime(): string
     {
         return $this->mimes->getMimeType($this->extension())
             ?? $this->mimes->getMimeType($this->file->getClientMimeType())
-            ?? 'unknown';
+            ?? static::UNKNOWN;
     }
 }