[5.2] Blade push with layouts weird ordering

src/Illuminate/View/Compilers/BladeCompiler.php

@@ -844,7 +844,7 @@ protected function compileStack($expression)
      */
     protected function compilePush($expression)
     {
-        return "<?php \$__env->startSection{$expression}; ?>";
+        return "<?php \$__env->startSectionPush{$expression}; ?>";
     }
 
     /**

src/Illuminate/View/Factory.php

@@ -516,6 +516,34 @@ public function callCreator(View $view)
      */
     public function startSection($section, $content = '')
     {
+        if (! isset($this->sections[$section])) {
+            $this->sections[$section] = [];
+            $this->sections[$section][0] = null;
+        }
+        if ($content === '') {
+            if (ob_start()) {
+                $this->sectionStack[] = $section;
+            }
+        } else {
+            $this->extendSection($section, $content);
+        }
+    }
+
+    /**
+     * Start injecting content into a push section.
+     *
+     * @param  string  $section
+     * @param  string  $content
+     * @return void
+     */
+    public function startSectionPush($section, $content = '')
+    {
+        if (! isset($this->sections[$section])) {
+            $this->sections[$section] = [];
+        }
+        if (! isset($this->sections[$section][$this->renderCount])) {
+            $this->sections[$section][$this->renderCount] = null;
+        }
         if ($content === '') {
             if (ob_start()) {
                 $this->sectionStack[] = $section;
@@ -567,7 +595,7 @@ public function stopSection($overwrite = false)
         $last = array_pop($this->sectionStack);
 
         if ($overwrite) {
-            $this->sections[$last] = ob_get_clean();
+            $this->setSectionContent($last, ob_get_clean());
         } else {
             $this->extendSection($last, ob_get_clean());
         }
@@ -589,11 +617,7 @@ public function appendSection()
 
         $last = array_pop($this->sectionStack);
 
-        if (isset($this->sections[$last])) {
-            $this->sections[$last] .= ob_get_clean();
-        } else {
-            $this->sections[$last] = ob_get_clean();
-        }
+        $this->setSectionContent($last, ob_get_clean(), true);
 
         return $last;
     }
@@ -607,11 +631,10 @@ public function appendSection()
      */
     protected function extendSection($section, $content)
     {
-        if (isset($this->sections[$section])) {
-            $content = str_replace('@parent', $content, $this->sections[$section]);
+        if (! is_null($this->getSectionContent($section))) {
+            $content = str_replace('@parent', $content, $this->getSectionContent($section));
         }
-
-        $this->sections[$section] = $content;
+        $this->setSectionContent($section, $content);
     }
 
     /**
@@ -626,7 +649,7 @@ public function yieldContent($section, $default = '')
         $sectionContent = $default;
 
         if (isset($this->sections[$section])) {
-            $sectionContent = $this->sections[$section];
+            $sectionContent = implode(array_reverse($this->sections[$section]));
         }
 
         $sectionContent = str_replace('@@parent', '--parent--holder--', $sectionContent);
@@ -874,6 +897,37 @@ public function getSections()
         return $this->sections;
     }
 
+    /**
+     * Get the section from the last element.
+     *
+     * @param  string  $section
+     * @return string|null
+     */
+    public function getSectionContent($section)
+    {
+        return end($this->sections[$section]);
+    }
+
+    /**
+     * Set the section to the last element.
+     *
+     * @param  string  $section
+     * @param  string  $content
+     * @param  bool  $append
+     * @return void
+     */
+    public function setSectionContent($section, $content, $append = false)
+    {
+        end($this->sections[$section]);
+        $key = key($this->sections[$section]);
+
+        if (is_null($this->sections[$section][$key]) || $append === false) {
+            $this->sections[$section][$key] = $content;
+        } else {
+            $this->sections[$section][$key] .= $content;
+        }
+    }
+
     /**
      * Get all of the registered named views in environment.
      *

tests/View/ViewBladeCompilerTest.php

@@ -192,7 +192,7 @@ public function testPushIsCompiled()
         $string = '@push(\'foo\')
 test
 @endpush';
-        $expected = '<?php $__env->startSection(\'foo\'); ?>
+        $expected = '<?php $__env->startSectionPush(\'foo\'); ?>
 test
 <?php $__env->appendSection(); ?>';
         $this->assertEquals($expected, $compiler->compileString($string));