improve path & name convention

joesama · Oct 29, 2019 · 2a988b1 · 2a988b1
1 parent 1f24294
commit 2a988b1
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/Routings/Concerns/Grammar.php b/src/Routings/Concerns/Grammar.php
@@ -25,7 +25,11 @@ public function pathConvention(string $type, string $function, array $attributes
         if (!\is_array($keymap) || empty($keymap)) {
             return $function;
         } else {
-            $keymap = collect($keymap)->map(function ($id) {
+            $keymap = collect($keymap)->map(function ($id, $key) use ($type) {
+                if (!is_int($key) && strtolower($key) === strtolower($type)) {
+                    return null;
+                }
+
                 return '{' . $id . '}';
             })->implode('/');
 
@@ -107,6 +111,6 @@ public function namedConvention(string $type, string $controller, string $functi
 
         $names = array_change_key_case($named, \CASE_LOWER);
 
-        return Str::lower(collect($names)->get($type));
+        return Str::lower(collect($names)->get($type)) ?? Str::lower($type . '.' . $controller . '.' . $function);
     }
 }