fix missing route path & name

joesama · Oct 29, 2019 · 2419d97 · 2419d97
1 parent 2a988b1
commit 2419d97
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/src/Routings/Concerns/Grammar.php b/src/Routings/Concerns/Grammar.php
@@ -46,11 +46,11 @@ public function pathConvention(string $type, string $function, array $attributes
      */
     private function keymapIsString($keymap): array
     {
-        if (\is_string($keymap) && Str::length($keymap) > 0) {
-            return [$keymap];
+        if (\is_string($keymap)) {
+            return (Str::length($keymap) > 0) ? Arr::wrap($keymap) : [];
         }
 
-        return [];
+        return $keymap;
     }
 
     /**
@@ -111,6 +111,10 @@ public function namedConvention(string $type, string $controller, string $functi
 
         $names = array_change_key_case($named, \CASE_LOWER);
 
-        return Str::lower(collect($names)->get($type)) ?? Str::lower($type . '.' . $controller . '.' . $function);
+        if (collect($names)->has($type)) {
+            return Str::lower(collect($names)->get($type, \null));
+        } else {
+            return Str::lower($type . '.' . $controller . '.' . $function);
+        }
     }
 }