Update @foreach and @forelse regex to fix #16085 and similar cases (#…

…16087)
laravel · Oct 24, 2016 · f0cf6fa · f0cf6fa
1 parent e9ed079
commit f0cf6fa
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/Illuminate/View/Compilers/BladeCompiler.php b/src/Illuminate/View/Compilers/BladeCompiler.php
@@ -579,7 +579,7 @@ protected function compileFor($expression)
      */
     protected function compileForeach($expression)
     {
-        preg_match('/\( *(.*) +as *([^\)]*)/is', $expression, $matches);
+        preg_match('/\( *(.*) +as *(.*)\)$/is', $expression, $matches);
 
         $iteratee = trim($matches[1]);
 
@@ -624,7 +624,7 @@ protected function compileForelse($expression)
     {
         $empty = '$__empty_'.++$this->forelseCounter;
 
-        preg_match('/\( *(.*) +as *([^\)]*)/is', $expression, $matches);
+        preg_match('/\( *(.*) +as *(.*)\)$/is', $expression, $matches);
 
         $iteratee = trim($matches[1]);