Fixes a bug with where generating create/edit views

Author: MikeAlhayek

src/Commands/CreateControllerCommand.php

@@ -141,7 +141,7 @@ public function handle()
             ->replaceRelationCollections($stub, $this->getRequiredRelationCollections($fields))
             ->replaceOnStoreAction($stub, $this->getOnStoreAction($fields))
             ->replaceOnUpdateAction($stub, $this->getOnUpdateAction($fields))
-            ->replaceAppName($stub, $this->getAppName())
+            ->replaceAppName($stub, Helpers::getAppName())
             ->replaceControllerName($stub, $input->controllerName)
             ->replaceDataVariable($stub, 'data')
             ->replaceRequestName($stub, $requestName)

src/Support/Helpers.php

@@ -48,6 +48,16 @@ public static function eliminateDupilcates($subject, $eliminate = "\\")
         return $subject;
     }
 
+    /**
+     * Gets the app folder name,
+     *
+     * @return string
+     */
+    public static function getAppName()
+    {
+        return rtrim(self::getAppNamespace(), '\\');
+    }
+
     /**
      * Gets the model full path.
      *

src/Traits/CommonCommand.php

@@ -191,7 +191,7 @@ protected function getIndent($stub, $template)
      *
      * @return string
      */
-    protected function Indent($multiplier)
+    protected function indent($multiplier)
     {
         if ($multiplier < 1) {
             return '';
@@ -217,6 +217,8 @@ public function options()
     /**
      * Override Laravel's option method
      *
+     * @param string $key
+     *
      * @return string
      */
     public function generatorOption($key)
@@ -237,17 +239,16 @@ public function generatorOption($key)
      *
      * @param string $stub
      * @param string $viewDirectory
+     * @param string $routesPrefix
      * @param array $views
      *
      * @return $this
      */
     protected function replaceViewNames(&$stub, $viewDirectory, $routesPrefix, array $views = null)
     {
-        $views = empty($views) ? $this->views : $views;
-
-        foreach ($views as $view) {
+        foreach (($views ?: $this->views) as $view) {
             $viewName = $this->getDotNotationName($viewDirectory, $routesPrefix, $view);
-            $viewTemplate = $this->getViewName($view);
+            $viewTemplate = $this->getViewTemplateName($view);
             $stub = $this->strReplace($viewTemplate, $viewName, $stub);
         }
 
@@ -302,9 +303,7 @@ protected function getStubByName($name, $template = null)
      */
     protected function replaceRouteNames(&$stub, $modelName, $routesPrefix, array $actions = null)
     {
-        $actions = empty($actions) ? $this->actions : $actions;
-
-        foreach ($actions as $action) {
+        foreach (($actions ?: $this->actions) as $action) {
             $routeName = $this->getDotNotationName($modelName, $routesPrefix, $action);
             $routeTemplate = $this->getRouteName($action);
             $stub = $this->strReplace($routeTemplate, $routeName, $stub);
@@ -326,13 +325,13 @@ protected function getRouteName($action)
     }
 
     /**
-     * Gets a view name
+     * Gets a view template name
      *
-     * @param string $action
+     * @param string $view
      *
      * @return string
      */
-    protected function getViewName($view)
+    protected function getViewTemplateName($view)
     {
         return sprintf('%s_view_name', $view);
     }
@@ -350,28 +349,6 @@ protected function getStubContent($name, $template = null)
         return $this->getFileContent($this->getStubByName($name, $template));
     }
 
-    /**
-     * Gets the app namespace.
-     *
-     * @return string
-     */
-    /*
-    protected function getAppNamespace()
-    {
-    return Container::getInstance()->getNamespace();
-    }
-     */
-
-    /**
-     * Gets the app folder name,
-     *
-     * @return string
-     */
-    protected function getAppName()
-    {
-        return rtrim(Helpers::getAppNamespace(), '\\');
-    }
-
     /**
      * Determine if a file already exists after checking for a --force option in the command.
      *

src/Traits/GeneratorReplacers.php

@@ -57,6 +57,7 @@ protected function replaceStandardLabels(&$stub, array $items)
         }
         return $this;
     }
+
     /**
      * Gets the
      *
@@ -68,6 +69,7 @@ protected function modelNamePlainEnglish($modelName)
     {
         return str_replace('_', ' ', snake_case($modelName));
     }
+
     /**
      * Replace the controller_name fo the given stub.
      *
@@ -81,6 +83,7 @@ protected function replaceControllerName(&$stub, $name)
         $stub = $this->strReplace('controller_name', $name, $stub);
         return $this;
     }
+
     /**
      * It Replaces the primary key in a giving stub
      *
@@ -93,6 +96,7 @@ protected function replacePrimaryKey(&$stub, $primaryKey)
     {
         return $this->replaceTemplate('primary_key', $primaryKey, $stub);
     }
+
     /**
      * Replace the app_name fo the given stub.
      *
@@ -105,6 +109,7 @@ protected function replaceAppName(&$stub, $name)
     {
         return $this->replaceTemplate('app_name', $name, $stub);
     }
+
     /**
      * Replace the namespace fo the given stub.
      *
@@ -117,6 +122,7 @@ protected function replaceNamespace(&$stub, $namespace)
     {
         return $this->replaceTemplate('namespace', $namespace, $stub);
     }
+
     /**
      * Replace the validation rules for the given stub.
      *
@@ -129,6 +135,7 @@ protected function replaceValidationRules(&$stub, $rules)
     {
         return $this->replaceTemplate('validation_rules', $rules, $stub);
     }
+
     /**
      * Replaces the field's name for the given stub.
      *
@@ -141,6 +148,7 @@ protected function replaceFieldName(&$stub, $name)
     {
         return $this->replaceTemplate('field_name', $name, $stub);
     }
+
     /**
      * Gets a model.
      *
@@ -152,6 +160,7 @@ protected function getModelCapName($name)
     {
         return ucwords($name);
     }
+
     /**
      * Gets a model name.
      *
@@ -163,6 +172,7 @@ protected function getModelName($name)
     {
         return snake_case($name);
     }
+
     /**
      * Gets a model name in a plural formal.
      *
@@ -174,6 +184,7 @@ protected function getModelPluralName($name)
     {
         return Str::plural(strtolower($name));
     }
+
     /**
      * Gets a model name in a plural formal "Caps".
      *