Compile Blade comments first in order to prevent Blade from compiling…

… statements inside comments (#17952)
laravel · Feb 16, 2017 · b7f2c69 · b7f2c69
1 parent 6f13147
commit b7f2c69
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/Illuminate/View/Compilers/BladeCompiler.php b/src/Illuminate/View/Compilers/BladeCompiler.php
@@ -49,9 +49,9 @@ class BladeCompiler extends Compiler implements CompilerInterface
      * @var array
      */
     protected $compilers = [
+        'Comments',
         'Extensions',
         'Statements',
-        'Comments',
         'Echos',
     ];
 

diff --git a/tests/View/Blade/BladeCommentsTest.php b/tests/View/Blade/BladeCommentsTest.php
@@ -28,6 +28,14 @@ public function testCommentsAreCompiled()
         $this->assertEmpty($compiler->compileString($string));
     }
 
+    public function testBladeCodeInsideCommentsIsNotCompiled()
+    {
+        $compiler = new BladeCompiler($this->getFiles(), __DIR__);
+        $string = '{{-- @foreach() --}}';
+
+        $this->assertEmpty($compiler->compileString($string));
+    }
+
     protected function getFiles()
     {
         return m::mock('Illuminate\Filesystem\Filesystem');