wip

src/Illuminate/View/Concerns/ManagesLayouts.php

@@ -171,34 +171,6 @@ public static function parentPlaceholder()
         return static::$parentPlaceholder;
     }
 
-    /**
-     * Flush all of the section contents.
-     *
-     * @return void
-     */
-    public function flushSections()
-    {
-        $this->renderCount = 0;
-
-        $this->sections = [];
-        $this->sectionStack = [];
-
-        $this->pushes = [];
-        $this->pushStack = [];
-    }
-
-    /**
-     * Flush all of the section contents if done rendering.
-     *
-     * @return void
-     */
-    public function flushSectionsIfDoneRendering()
-    {
-        if ($this->doneRendering()) {
-            $this->flushSections();
-        }
-    }
-
     /**
      * Check if section exists.
      *
@@ -219,4 +191,15 @@ public function getSections()
     {
         return $this->sections;
     }
+
+    /**
+     * Flush all of the sections.
+     *
+     * @return void
+     */
+    public function flushSections()
+    {
+        $this->sections = [];
+        $this->sectionStack = [];
+    }
 }

src/Illuminate/View/Concerns/ManagesStacks.php

@@ -84,10 +84,21 @@ protected function extendPush($section, $content)
      */
     public function yieldPushContent($section, $default = '')
     {
-        if (! isset($this->pushes[$section])) {
-            return $default;
+        if (isset($this->pushes[$section])) {
+            return implode($this->pushes[$section]);
         }
 
-        return implode($this->pushes[$section]);
+        return $default;
+    }
+
+    /**
+     * Flush all of the stacks.
+     *
+     * @return void
+     */
+    public function flushStacks()
+    {
+        $this->pushes = [];
+        $this->pushStack = [];
     }
 }

src/Illuminate/View/Factory.php

@@ -403,6 +403,31 @@ public function addExtension($extension, $engine, $resolver = null)
         $this->extensions = array_merge([$extension => $engine], $this->extensions);
     }
 
+    /**
+     * Flush all of the factory state like sections and stacks.
+     *
+     * @return void
+     */
+    public function flushState()
+    {
+        $this->renderCount = 0;
+
+        $this->flushSections();
+        $this->flushStacks();
+    }
+
+    /**
+     * Flush all of the section contents if done rendering.
+     *
+     * @return void
+     */
+    public function flushStateIfDoneRendering()
+    {
+        if ($this->doneRendering()) {
+            $this->flushState();
+        }
+    }
+
     /**
      * Get the extension to engine bindings.
      *

src/Illuminate/View/View.php

@@ -89,15 +89,15 @@ public function render(callable $callback = null)
             // Once we have the contents of the view, we will flush the sections if we are
             // done rendering all views so that there is nothing left hanging over when
             // another view gets rendered in the future by the application developer.
-            $this->factory->flushSectionsIfDoneRendering();
+            $this->factory->flushStateIfDoneRendering();
 
             return ! is_null($response) ? $response : $contents;
         } catch (Exception $e) {
-            $this->factory->flushSections();
+            $this->factory->flushState();
 
             throw $e;
         } catch (Throwable $e) {
-            $this->factory->flushSections();
+            $this->factory->flushState();
 
             throw $e;
         }

tests/View/ViewTest.php

@@ -30,7 +30,7 @@ public function testRenderProperlyRendersView()
         $view->getFactory()->shouldReceive('getShared')->once()->andReturn(['shared' => 'foo']);
         $view->getEngine()->shouldReceive('get')->once()->with('path', ['foo' => 'bar', 'shared' => 'foo'])->andReturn('contents');
         $view->getFactory()->shouldReceive('decrementRender')->once()->ordered();
-        $view->getFactory()->shouldReceive('flushSectionsIfDoneRendering')->once();
+        $view->getFactory()->shouldReceive('flushStateIfDoneRendering')->once();
 
         $callback = function (View $rendered, $contents) use ($view) {
             $this->assertEquals($view, $rendered);
@@ -48,7 +48,7 @@ public function testRenderHandlingCallbackReturnValues()
         $view->getFactory()->shouldReceive('getShared')->andReturn(['shared' => 'foo']);
         $view->getEngine()->shouldReceive('get')->andReturn('contents');
         $view->getFactory()->shouldReceive('decrementRender');
-        $view->getFactory()->shouldReceive('flushSectionsIfDoneRendering');
+        $view->getFactory()->shouldReceive('flushStateIfDoneRendering');
 
         $this->assertEquals('new contents', $view->render(function () {
             return 'new contents';
@@ -86,7 +86,7 @@ public function testSectionsAreNotFlushedWhenNotDoneRendering()
         $view->getFactory()->shouldReceive('getShared')->twice()->andReturn(['shared' => 'foo']);
         $view->getEngine()->shouldReceive('get')->twice()->with('path', ['foo' => 'bar', 'shared' => 'foo'])->andReturn('contents');
         $view->getFactory()->shouldReceive('decrementRender')->twice();
-        $view->getFactory()->shouldReceive('flushSectionsIfDoneRendering')->twice();
+        $view->getFactory()->shouldReceive('flushStateIfDoneRendering')->twice();
 
         $this->assertEquals('contents', $view->render());
         $this->assertEquals('contents', (string) $view);
@@ -177,7 +177,7 @@ public function testViewGatherDataWithRenderable()
         $view->getFactory()->shouldReceive('getShared')->once()->andReturn(['shared' => 'foo']);
         $view->getEngine()->shouldReceive('get')->once()->andReturn('contents');
         $view->getFactory()->shouldReceive('decrementRender')->once()->ordered();
-        $view->getFactory()->shouldReceive('flushSectionsIfDoneRendering')->once();
+        $view->getFactory()->shouldReceive('flushStateIfDoneRendering')->once();
 
         $view->renderable = m::mock('Illuminate\Contracts\Support\Renderable');
         $view->renderable->shouldReceive('render')->once()->andReturn('text');
@@ -192,7 +192,7 @@ public function testViewRenderSections()
         $view->getFactory()->shouldReceive('getShared')->once()->andReturn(['shared' => 'foo']);
         $view->getEngine()->shouldReceive('get')->once()->andReturn('contents');
         $view->getFactory()->shouldReceive('decrementRender')->once()->ordered();
-        $view->getFactory()->shouldReceive('flushSectionsIfDoneRendering')->once();
+        $view->getFactory()->shouldReceive('flushStateIfDoneRendering')->once();
 
         $view->getFactory()->shouldReceive('getSections')->once()->andReturn(['foo', 'bar']);
         $sections = $view->renderSections();