Fix mixed inline/block php blade bug

laravel · Sep 18, 2023 · f587857 · f587857
1 parent 9ac653d
commit f587857
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 1 deletion.
diff --git a/src/Illuminate/View/Compilers/BladeCompiler.php b/src/Illuminate/View/Compilers/BladeCompiler.php
@@ -401,7 +401,7 @@ protected function storeVerbatimBlocks($value)
      */
     protected function storePhpBlocks($value)
     {
-        return preg_replace_callback('/(?<!@)@php(.*?)@endphp/s', function ($matches) {
+        return preg_replace_callback('/(?<!@)@php((?:.(?!(?<!@)@php))*?)@endphp/s', function ($matches) {
             return $this->storeRawBlock("<?php{$matches[1]}?>");
         }, $value);
     }

diff --git a/tests/View/Blade/BladePhpStatementsTest.php b/tests/View/Blade/BladePhpStatementsTest.php
@@ -11,6 +11,59 @@ public function testPhpStatementsWithExpressionAreCompiled()
         $this->assertEquals($expected, $this->compiler->compileString($string));
     }
 
+    public function testMixedPhpStatementsAreCompiled()
+    {
+        $string = <<<'BLADE'
+            @php($set = true)
+            @php($set = true) @php ($set = false;) @endphp
+            @php ($set = true) @php($set = false;)@endphp
+            <div>{{ $set }}</div>
+            @php
+                $set = false;
+            @endphp
+            @php (
+                $set = false;
+            )@endphp
+            @php(
+                $set = false;
+            )@endphp
+            @php (
+                $set = false
+            )
+            @php(
+                $set = false
+            )
+            @php
+                $set = '@@php';
+            @endphp
+            BLADE;
+        $expected = <<<'PHP'
+            <?php ($set = true); ?>
+            <?php ($set = true); ?> <?php ($set = false;) ?>
+            <?php ($set = true); ?> <?php($set = false;)?>
+            <div><?php echo e($set); ?></div>
+            <?php
+                $set = false;
+            ?>
+            <?php (
+                $set = false;
+            )?>
+            <?php(
+                $set = false;
+            )?>
+            <?php (
+                $set = false
+            ); ?>
+            <?php (
+                $set = false
+            ); ?>
+            <?php
+                $set = '@@php';
+            ?>
+            PHP;
+        $this->assertEquals($expected, $this->compiler->compileString($string));
+    }
+
     public function testStringWithParenthesisWithEndPHP()
     {
         $string = "@php(\$data = ['related_to' => 'issue#45388'];) {{ \$data }} @endphp";