[5.2] Blade push with layouts weird ordering

src/Illuminate/View/Compilers/BladeCompiler.php

@@ -833,7 +833,7 @@ protected function compileInclude($expression)
      */
     protected function compileStack($expression)
     {
-        return "<?php echo \$__env->yieldContent{$expression}; ?>";
+        return "<?php echo \$__env->yieldPushContent{$expression}; ?>";
     }
 
     /**
@@ -844,7 +844,7 @@ protected function compileStack($expression)
      */
     protected function compilePush($expression)
     {
-        return "<?php \$__env->startSection{$expression}; ?>";
+        return "<?php \$__env->startPush{$expression}; ?>";
     }
 
     /**
@@ -855,7 +855,7 @@ protected function compilePush($expression)
      */
     protected function compileEndpush($expression)
     {
-        return '<?php $__env->appendSection(); ?>';
+        return '<?php $__env->stopPush(); ?>';
     }
 
     /**

src/Illuminate/View/Factory.php

@@ -84,13 +84,27 @@ class Factory implements FactoryContract
      */
     protected $sections = [];
 
+    /**
+     * All of the finished, captured push sections.
+     *
+     * @var array
+     */
+    protected $pushContentsStack = [];
+
     /**
      * The stack of in-progress sections.
      *
      * @var array
      */
     protected $sectionStack = [];
 
+    /**
+     * The stack of in-progress push sections.
+     *
+     * @var array
+     */
+    protected $pushStack = [];
+
     /**
      * The number of active rendering operations.
      *
@@ -636,6 +650,78 @@ public function yieldContent($section, $default = '')
         );
     }
 
+    /**
+     * Start injecting content into a push section.
+     *
+     * @param  string  $section
+     * @param  string  $content
+     * @return void
+     */
+    public function startPush($section, $content = '')
+    {
+        if ($content === '') {
+            if (ob_start()) {
+                $this->pushStack[] = $section;
+            }
+        } else {
+            $this->extendPush($section, $content);
+        }
+    }
+
+    /**
+     * Stop injecting content into a push section.
+     *
+     * @return string
+     * @throws \InvalidArgumentException
+     */
+    public function stopPush()
+    {
+        if (empty($this->pushStack)) {
+            throw new InvalidArgumentException('Cannot end a section without first starting one.');
+        }
+
+        $last = array_pop($this->pushStack);
+
+        $this->extendPush($last, ob_get_clean());
+
+        return $last;
+    }
+
+    /**
+     * Append content to a given push section.
+     *
+     * @param  string  $section
+     * @param  string  $content
+     * @return void
+     */
+    protected function extendPush($section, $content)
+    {
+        if (! isset($this->pushContentsStack[$section])) {
+            $this->pushContentsStack[$section] = [];
+        }
+        if (! isset($this->pushContentsStack[$section][$this->renderCount])) {
+            $this->pushContentsStack[$section][$this->renderCount] = $content;
+        } else {
+            $this->pushContentsStack[$section][$this->renderCount] .= $content;
+        }
+    }
+
+    /**
+     * Get the string contents of a push section.
+     *
+     * @param  string  $section
+     * @param  string  $default
+     * @return string
+     */
+    public function yieldPushContent($section, $default = '')
+    {
+        if (! isset($this->pushContentsStack[$section])) {
+            return $default;
+        }
+
+        return implode(array_reverse($this->pushContentsStack[$section]));
+    }
+
     /**
      * Flush all of the section contents.
      *

tests/View/ViewBladeCompilerTest.php

@@ -193,17 +193,17 @@ public function testPushIsCompiled()
         $string = '@push(\'foo\')
 test
 @endpush';
-        $expected = '<?php $__env->startSection(\'foo\'); ?>
+        $expected = '<?php $__env->startPush(\'foo\'); ?>
 test
-<?php $__env->appendSection(); ?>';
+<?php $__env->stopPush(); ?>';
         $this->assertEquals($expected, $compiler->compileString($string));
     }
 
     public function testStackIsCompiled()
     {
         $compiler = new BladeCompiler($this->getFiles(), __DIR__);
         $string = '@stack(\'foo\')';
-        $expected = '<?php echo $__env->yieldContent(\'foo\'); ?>';
+        $expected = '<?php echo $__env->yieldPushContent(\'foo\'); ?>';
         $this->assertEquals($expected, $compiler->compileString($string));
     }
 

tests/View/ViewFactoryTest.php

@@ -264,22 +264,34 @@ public function testSectionMultipleExtending()
     public function testSingleStackPush()
     {
         $factory = $this->getFactory();
-        $factory->startSection('foo');
+        $factory->startPush('foo');
         echo 'hi';
-        $factory->appendSection();
-        $this->assertEquals('hi', $factory->yieldContent('foo'));
+        $factory->stopPush();
+        $this->assertEquals('hi', $factory->yieldPushContent('foo'));
     }
 
     public function testMultipleStackPush()
     {
         $factory = $this->getFactory();
-        $factory->startSection('foo');
+        $factory->startPush('foo');
         echo 'hi';
-        $factory->appendSection();
-        $factory->startSection('foo');
+        $factory->stopPush();
+        $factory->startPush('foo');
         echo ', Hello!';
-        $factory->appendSection();
-        $this->assertEquals('hi, Hello!', $factory->yieldContent('foo'));
+        $factory->stopPush();
+        $this->assertEquals('hi, Hello!', $factory->yieldPushContent('foo'));
+
+        // mimic a parent view is rendering
+        $factory->incrementRender();
+        $factory->startPush('foo');
+        echo 'Dear ';
+        $factory->stopPush();
+        $factory->startPush('foo');
+        echo 'friend';
+        $factory->stopPush();
+        $factory->decrementRender();
+
+        $this->assertEquals('Dear friendhi, Hello!', $factory->yieldPushContent('foo'));
     }
 
     public function testSessionAppending()