Merge branch 'autoload-class-components' into 8.x

Author: taylorotwell

src/Illuminate/Support/Facades/Blade.php

@@ -15,6 +15,7 @@
  * @method static void compile(string|null $path = null)
  * @method static void component(string $class, string|null $alias = null, string $prefix = '')
  * @method static void components(array $components, string $prefix = '')
+ * @method static void componentNamespace(string $namespace, string $prefix)
  * @method static void directive(string $name, callable $handler)
  * @method static void extend(callable $compiler)
  * @method static void if(string $name, callable $callback)

src/Illuminate/View/Compilers/BladeCompiler.php

@@ -120,6 +120,13 @@ class BladeCompiler extends Compiler implements CompilerInterface
      */
     protected $classComponentAliases = [];
 
+    /**
+     * The array of class component namespaces to autoload from.
+     *
+     * @var array
+     */
+    protected $classComponentNamespaces = [];
+
     /**
      * Indicates if component tags should be compiled.
      *
@@ -318,7 +325,7 @@ protected function compileComponentTags($value)
         }
 
         return (new ComponentTagCompiler(
-            $this->classComponentAliases, $this
+            $this->classComponentAliases, $this->classComponentNamespaces, $this
         ))->compile($value);
     }
 
@@ -585,6 +592,28 @@ public function getClassComponentAliases()
         return $this->classComponentAliases;
     }
 
+    /**
+     * Register a class-based component namespace.
+     *
+     * @param  string  $namespace
+     * @param  string  $prefix
+     * @return void
+     */
+    public function componentNamespace($namespace, $prefix)
+    {
+        $this->classComponentNamespaces[$prefix] = $namespace;
+    }
+
+    /**
+     * Get the registered class component namespaces.
+     *
+     * @return array
+     */
+    public function getClassComponentNamespaces()
+    {
+        return $this->classComponentNamespaces;
+    }
+
     /**
      * Register a component alias directive.
      *
@@ -616,7 +645,7 @@ public function aliasComponent($path, $alias = null)
      */
     public function include($path, $alias = null)
     {
-        return $this->aliasInclude($path, $alias);
+        $this->aliasInclude($path, $alias);
     }
 
     /**

src/Illuminate/View/Compilers/ComponentTagCompiler.php

@@ -32,6 +32,13 @@ class ComponentTagCompiler
      */
     protected $aliases = [];
 
+    /**
+     * The component class namespaces.
+     *
+     * @var array
+     */
+    protected $namespaces = [];
+
     /**
      * The "bind:" attributes that have been compiled for the current component.
      *
@@ -46,9 +53,10 @@ class ComponentTagCompiler
      * @param  \Illuminate\View\Compilers\BladeCompiler|null
      * @return void
      */
-    public function __construct(array $aliases = [], ?BladeCompiler $blade = null)
+    public function __construct(array $aliases = [], array $namespaces = [], ?BladeCompiler $blade = null)
     {
         $this->aliases = $aliases;
+        $this->namespaces = $namespaces;
 
         $this->blade = $blade ?: new BladeCompiler(new Filesystem, sys_get_temp_dir());
     }
@@ -250,6 +258,10 @@ public function componentClass(string $component)
             );
         }
 
+        if ($class = $this->findClassByComponent($component)) {
+            return $class;
+        }
+
         if (class_exists($class = $this->guessClassName($component))) {
             return $class;
         }
@@ -263,6 +275,27 @@ public function componentClass(string $component)
         );
     }
 
+    /**
+     * Find the class for the given component using the registered namespaces.
+     *
+     * @param  string  $component
+     * @return string|null
+     */
+    public function findClassByComponent(string $component)
+    {
+        $segments = explode('::', $component);
+
+        $prefix = $segments[0];
+
+        if (! isset($this->namespaces[$prefix]) || ! isset($segments[1])) {
+            return;
+        }
+
+        if (class_exists($class = $this->namespaces[$prefix].'\\'.$this->formatClassName($segments[1]))) {
+            return $class;
+        }
+    }
+
     /**
      * Guess the class name for the given component.
      *
@@ -275,11 +308,24 @@ public function guessClassName(string $component)
                     ->make(Application::class)
                     ->getNamespace();
 
+        $class = $this->formatClassName($component);
+
+        return $namespace.'View\\Components\\'.$class;
+    }
+
+    /**
+     * Format the class name for the given component.
+     *
+     * @param  string  $component
+     * @return string
+     */
+    public function formatClassName(string $component)
+    {
         $componentPieces = array_map(function ($componentPiece) {
             return ucfirst(Str::camel($componentPiece));
         }, explode('.', $component));
 
-        return $namespace.'View\\Components\\'.implode('\\', $componentPieces);
+        return implode('\\', $componentPieces);
     }
 
     /**

src/Illuminate/View/DynamicComponent.php

@@ -172,6 +172,7 @@ protected function compiler()
         if (! static::$compiler) {
             static::$compiler = new ComponentTagCompiler(
                 Container::getInstance()->make('blade.compiler')->getClassComponentAliases(),
+                Container::getInstance()->make('blade.compiler')->getClassComponentNamespaces(),
                 Container::getInstance()->make('blade.compiler')
             );
         }