From 22d4530c2fbe815223eba7fe1fc1005d1f4d6cce Mon Sep 17 00:00:00 2001
From: CalebW <cdwhite3@pm.me>
Date: Wed, 20 Sep 2023 10:54:58 -0500
Subject: [PATCH] [10.x] Fix blade failing to compile when mixing inline/block
 @php directives (#48420)

* Fix mixed inline/block php blade bug

* added tests
---
 .../View/Compilers/BladeCompiler.php          |   2 +-
 tests/View/Blade/BladePhpStatementsTest.php   | 125 ++++++++++++++++++
 2 files changed, 126 insertions(+), 1 deletion(-)

diff --git a/src/Illuminate/View/Compilers/BladeCompiler.php b/src/Illuminate/View/Compilers/BladeCompiler.php
index 62005da34610..aec1b00425c8 100644
--- 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
index 21a7d9deab8e..b90cc74a12a2 100644
--- a/tests/View/Blade/BladePhpStatementsTest.php
+++ b/tests/View/Blade/BladePhpStatementsTest.php
@@ -11,6 +11,131 @@ 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 testCompilationOfMixedPhpStatements()
+    {
+        $string = '@php($set = true) @php ($hello = \'hi\') @php echo "Hello world" @endphp';
+        $expected = '<?php ($set = true); ?> <?php ($hello = \'hi\'); ?> <?php echo "Hello world" ?>';
+
+        $this->assertEquals($expected, $this->compiler->compileString($string));
+    }
+
+    public function testCompilationOfMixedUsageStatements()
+    {
+        $string = '@php (
+            $classes = [
+                \'admin-font-mono\', // Font weight
+            ])
+        @endphp';
+        $expected = '<?php (
+            $classes = [
+                \'admin-font-mono\', // Font weight
+            ])
+        ?>';
+
+        $this->assertEquals($expected, $this->compiler->compileString($string));
+    }
+
+    public function testMultilinePhpStatementsWithParenthesesCanBeCompiled()
+    {
+        $string = <<<'BLADE'
+            @php (
+                $classes = [
+                    'admin-font-mono'
+                ])
+            @endphp
+
+            <span class="{{ implode(' ', $classes) }}">Laravel</span>
+            BLADE;
+
+        $expected = <<<'PHP'
+            <?php (
+                $classes = [
+                    'admin-font-mono'
+                ])
+            ?>
+
+            <span class="<?php echo e(implode(' ', $classes)); ?>">Laravel</span>
+            PHP;
+
+        $this->assertEquals($expected, $this->compiler->compileString($string));
+    }
+
+    public function testMixedOfPhpStatementsCanBeCompiled()
+    {
+        $string = <<<'BLADE'
+            @php($total = 0)
+            {{-- ... --}}
+            <div>{{ $total }}</div>
+            @php
+                // ...
+            @endphp
+            BLADE;
+
+        $expected = <<<'PHP'
+            <?php ($total = 0); ?>
+
+            <div><?php echo e($total); ?></div>
+            <?php
+                // ...
+            ?>
+            PHP;
+
+        $this->assertEquals($expected, $this->compiler->compileString($string));
+    }
+
     public function testStringWithParenthesisWithEndPHP()
     {
         $string = "@php(\$data = ['related_to' => 'issue#45388'];) {{ \$data }} @endphp";