Fixes #45424 blade issue with "(" character

laravel · Jan 4, 2023 · 8aee92f · 8aee92f
1 parent 37fc9b8
commit 8aee92f
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 2 deletions.
diff --git a/src/Illuminate/View/Compilers/BladeCompiler.php b/src/Illuminate/View/Compilers/BladeCompiler.php
@@ -504,7 +504,7 @@ protected function compileExtensions($value)
      */
     protected function compileStatements($template)
     {
-        preg_match_all('/\B@(@?\w+(?:::\w+)?)([ \t]*)(\( ( (?>[^()]+) | (?3) )* \))?/x', $template, $matches);
+        preg_match_all('/\B@(@?\w+(?:::\w+)?)([ \t]*)(\( ( [\S\s]*? ) \))?/x', $template, $matches);
         for ($i = 0; isset($matches[0][$i]); $i++) {
             $match = [
                 $matches[0][$i],
@@ -517,7 +517,7 @@ protected function compileStatements($template)
             // Here we check to see if we have properly found the closing parenthesis by
             // regex pattern or not, and will recursively continue on to the next ")"
             // then check again until the tokenizer confirms we found the right one
-            while (isset($match[4]) && Str::endsWith($match[0], ')') && Arr::last(token_get_all('<?php '.$match[0])) !== ')') {
+            while (isset($match[4]) && Str::endsWith($match[0], ')') && ! $this->isProperMatch($match[0])) {
                 $rest = Str::before(Str::after($template, $match[0]), ')');
                 $match[0] = $match[0].$rest.')';
                 $match[3] = $match[3].$rest.')';
@@ -920,4 +920,25 @@ public function withoutComponentTags()
     {
         $this->compilesComponentTags = false;
     }
+
+    protected function isProperMatch($match)
+    {
+        $tokens = token_get_all('<?php '.$match);
+
+        if (Arr::last($tokens) !== ')') {
+            return false;
+        }
+
+        $openings = 0;
+        $closings = 0;
+        foreach ($tokens as $token) {
+            if ($token == ')') {
+                $closings++;
+            } elseif ($token == '(') {
+                $openings++;
+            }
+        }
+
+        return $openings === $closings;
+    }
 }
diff --git a/tests/View/Blade/BladePhpStatementsTest.php b/tests/View/Blade/BladePhpStatementsTest.php
@@ -44,6 +44,21 @@ public function testVerbatimAndPhpStatementsDontGetMixedUp()
         $this->assertEquals($expected, $this->compiler->compileString($string));
     }
 
+    public function testStringWithOpeningParenthesisCanBeCompiled()
+    {
+        $string = "@php(\$data = ['single' => ':(('])";
+        $expected = "<?php (\$data = ['single' => ':((']); ?>";
+        $this->assertEquals($expected, $this->compiler->compileString($string));
+
+        $string = "@php(\$data = ['single' => (string)':(('])";
+        $expected = "<?php (\$data = ['single' => (string)':((']); ?>";
+        $this->assertEquals($expected, $this->compiler->compileString($string));
+
+        $string = "@php(\$data = ['single' => '(()(('])";
+        $expected = "<?php (\$data = ['single' => '(()((']); ?>";
+        $this->assertEquals($expected, $this->compiler->compileString($string));
+    }
+
     public function testStringWithParenthesisCanBeCompiled()
     {
         $string = "@php(\$data = ['single' => ')'])";