Blade : add else in the custom if directive (#21611)

Signed-off-by: Benjamin Michotte <[email protected]>
laravel · Oct 11, 2017 · b9a3279 · b9a3279
1 parent f2838f1
commit b9a3279
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
diff --git a/src/Illuminate/View/Compilers/BladeCompiler.php b/src/Illuminate/View/Compilers/BladeCompiler.php
@@ -387,6 +387,12 @@ public function if($name, callable $callback)
                     : "<?php if (\Illuminate\Support\Facades\Blade::check('{$name}')): ?>";
         });
 
+        $this->directive('else'.$name, function ($expression) use ($name) {
+            return $expression
+                ? "<?php elseif (\Illuminate\Support\Facades\Blade::check('{$name}', {$expression})): ?>"
+                : "<?php elseif (\Illuminate\Support\Facades\Blade::check('{$name}')): ?>";
+        });
+
         $this->directive('end'.$name, function () {
             return '<?php endif; ?>';
         });

diff --git a/tests/View/Blade/BladeCustomTest.php b/tests/View/Blade/BladeCustomTest.php
@@ -70,6 +70,23 @@ public function testCustomConditions()
         $string = '@custom($user)
 @endcustom';
         $expected = '<?php if (\Illuminate\Support\Facades\Blade::check(\'custom\', $user)): ?>
+<?php endif; ?>';
+        $this->assertEquals($expected, $this->compiler->compileString($string));
+    }
+
+    public function testCustomIfElseConditions()
+    {
+        $this->compiler->if('custom', function ($anything) {
+            return true;
+        });
+
+        $string = '@custom($user)
+@elsecustom($product)
+@else
+@endcustom';
+        $expected = '<?php if (\Illuminate\Support\Facades\Blade::check(\'custom\', $user)): ?>
+<?php elseif (\Illuminate\Support\Facades\Blade::check(\'custom\', $product)): ?>
+<?php else: ?>
 <?php endif; ?>';
         $this->assertEquals($expected, $this->compiler->compileString($string));
     }