allow for nullable result on find redirect method

neurony · Jun 3, 2019 · 3256f86 · 3256f86
1 parent 8517c41
commit 3256f86
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/Contracts/RedirectModelContract.php b/src/Contracts/RedirectModelContract.php
@@ -44,5 +44,5 @@ public function syncOldRedirects(self $model, string $finalUrl): void;
      * @param string $path
      * @return RedirectModelContract|null
      */
-    public static function findValidOrNull($path): self;
+    public static function findValidOrNull($path): ?self;
 }
diff --git a/src/Models/Redirect.php b/src/Models/Redirect.php
@@ -25,7 +25,7 @@ class Redirect extends Model implements RedirectModelContract
         'old_url',
         'new_url',
         'status',
-    ];
+    ];\
 
     /**
      * Boot the model.
@@ -129,9 +129,9 @@ public function syncOldRedirects(RedirectModelContract $model, string $finalUrl)
      * @param string $path
      * @return Redirect|null
      */
-    public static function findValidOrNull($path): RedirectModelContract
+    public static function findValidOrNull($path): ?RedirectModelContract
     {
-        return static::where('old_url', trim($path, '/'))
+        return static::where('old_url', $path === '/' ? $path : trim($path, '/'))
             ->whereNotNull('new_url')
             ->whereIn('status', array_keys(self::getStatuses()))
             ->latest()->first();