Merge branch 'fixing-custom-views-folder' into 7.x

Author: taylorotwell

src/Illuminate/Console/GeneratorCommand.php

@@ -366,6 +366,19 @@ protected function isReservedName($name)
         return in_array($name, $this->reservedNames);
     }
 
+    /**
+     * Get the first view directory path from the application configuration.
+     *
+     * @param  string  $path
+     * @return string
+     */
+    protected function viewPath($path = '')
+    {
+        $views = $this->laravel['config']['view.paths'][0] ?? resource_path('views');
+
+        return $views.($path ? DIRECTORY_SEPARATOR.$path : $path);
+    }
+
     /**
      * Get the console command arguments.
      *

src/Illuminate/Foundation/Console/ComponentMakeCommand.php

@@ -53,9 +53,9 @@ public function handle()
      */
     protected function writeView()
     {
-        $view = $this->getView();
-
-        $path = resource_path('views').'/'.str_replace('.', '/', 'components.'.$view);
+        $path = $this->viewPath(
+            str_replace('.', '/', 'components.'.$this->getView())
+        );
 
         if (! $this->files->isDirectory(dirname($path))) {
             $this->files->makeDirectory(dirname($path), 0777, true, true);

src/Illuminate/Foundation/Console/MailMakeCommand.php

@@ -51,7 +51,9 @@ public function handle()
      */
     protected function writeMarkdownTemplate()
     {
-        $path = resource_path('views/'.str_replace('.', '/', $this->option('markdown'))).'.blade.php';
+        $path = $this->viewPath(
+            str_replace('.', '/', $this->option('markdown')).'.blade.php'
+        );
 
         if (! $this->files->isDirectory(dirname($path))) {
             $this->files->makeDirectory(dirname($path), 0755, true);

src/Illuminate/Foundation/Console/NotificationMakeCommand.php

@@ -51,7 +51,9 @@ public function handle()
      */
     protected function writeMarkdownTemplate()
     {
-        $path = resource_path('views/'.str_replace('.', '/', $this->option('markdown'))).'.blade.php';
+        $path = $this->viewPath(
+            str_replace('.', '/', $this->option('markdown')).'.blade.php'
+        );
 
         if (! $this->files->isDirectory(dirname($path))) {
             $this->files->makeDirectory(dirname($path), 0755, true);