[5.6] Add Blade::include for include aliases

src/Illuminate/View/Compilers/BladeCompiler.php

@@ -458,6 +458,24 @@ public function directive($name, callable $handler)
         $this->customDirectives[$name] = $handler;
     }
 
+    /**
+     * Register an include alias directive.
+     *
+     * @param  string  $path
+     * @param  string  $alias
+     * @return void
+     */
+    public function include($path, $alias = null)
+    {
+        $alias = $alias ?: array_last(explode('.', $path));
+
+        $this->directive($alias, function ($expression) use ($path) {
+            $expression = $this->stripParentheses($expression) ?: '[]';
+
+            return "<?php echo \$__env->make('{$path}', {$expression}, array_except(get_defined_vars(), array('__data', '__path')))->render(); ?>";
+        });
+    }
+
     /**
      * Get the list of custom directives.
      *

tests/View/Blade/BladeCustomTest.php

@@ -123,4 +123,51 @@ public function testCustomComponentsDefaultAlias()
 <?php echo $__env->renderComponent(); ?>';
         $this->assertEquals($expected, $this->compiler->compileString($string));
     }
+
+    public function testCustomComponentsWithExistingDirective()
+    {
+        $this->compiler->component('app.components.foreach');
+
+        $string = '@foreach
+@endforeach';
+        $expected = '<?php $__env->startComponent(\'app.components.foreach\'); ?>
+<?php echo $__env->renderComponent(); ?>';
+        $this->assertEquals($expected, $this->compiler->compileString($string));
+    }
+
+    public function testCustomIncludes()
+    {
+        $this->compiler->include('app.includes.input', 'input');
+
+        $string = '@input';
+        $expected = '<?php echo $__env->make(\'app.includes.input\', [], array_except(get_defined_vars(), array(\'__data\', \'__path\')))->render(); ?>';
+        $this->assertEquals($expected, $this->compiler->compileString($string));
+    }
+
+    public function testCustomIncludesWithData()
+    {
+        $this->compiler->include('app.includes.input', 'input');
+
+        $string = '@input([\'type\' => \'email\'])';
+        $expected = '<?php echo $__env->make(\'app.includes.input\', [\'type\' => \'email\'], array_except(get_defined_vars(), array(\'__data\', \'__path\')))->render(); ?>';
+        $this->assertEquals($expected, $this->compiler->compileString($string));
+    }
+
+    public function testCustomIncludesDefaultAlias()
+    {
+        $this->compiler->include('app.includes.input');
+
+        $string = '@input';
+        $expected = '<?php echo $__env->make(\'app.includes.input\', [], array_except(get_defined_vars(), array(\'__data\', \'__path\')))->render(); ?>';
+        $this->assertEquals($expected, $this->compiler->compileString($string));
+    }
+
+    public function testCustomIncludesWithExistingDirective()
+    {
+        $this->compiler->include('app.includes.foreach');
+
+        $string = '@foreach';
+        $expected = '<?php echo $__env->make(\'app.includes.foreach\', [], array_except(get_defined_vars(), array(\'__data\', \'__path\')))->render(); ?>';
+        $this->assertEquals($expected, $this->compiler->compileString($string));
+    }
 }