Merge branch '8.x'

Author: GrahamCampbell

src/Illuminate/Foundation/Exceptions/Handler.php

@@ -21,7 +21,6 @@
 use Illuminate\Session\TokenMismatchException;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\View;
 use Illuminate\Support\Reflector;
 use Illuminate\Support\Traits\ReflectsClosures;
 use Illuminate\Support\ViewErrorBag;

src/Illuminate/Support/Testing/Fakes/BusFake.php

@@ -200,6 +200,8 @@ public function assertChained(array $expectedChain)
 
         if ($command instanceof Closure) {
             [$command, $callback] = [$this->firstClosureParameterType($command), $command];
+        } elseif (! is_string($command)) {
+            $command = get_class($command);
         }
 
         PHPUnit::assertTrue(

src/Illuminate/View/Engines/CompilerEngine.php

@@ -2,9 +2,9 @@
 
 namespace Illuminate\View\Engines;
 
-use ErrorException;
 use Illuminate\Filesystem\Filesystem;
 use Illuminate\View\Compilers\CompilerInterface;
+use Illuminate\View\ViewException;
 use Throwable;
 
 class CompilerEngine extends PhpEngine
@@ -76,7 +76,7 @@ public function get($path, array $data = [])
      */
     protected function handleViewException(Throwable $e, $obLevel)
     {
-        $e = new ErrorException($this->getMessage($e), 0, 1, $e->getFile(), $e->getLine(), $e);
+        $e = new ViewException($this->getMessage($e), 0, 1, $e->getFile(), $e->getLine(), $e);
 
         parent::handleViewException($e, $obLevel);
     }

src/Illuminate/View/ViewException.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace Illuminate\View;
+
+use ErrorException;
+
+class ViewException extends ErrorException
+{
+    /**
+     * Report the exception.
+     *
+     * @return void
+     */
+    public function report()
+    {
+        $exception = $this->getPrevious();
+
+        if ($exception && method_exists('report', $exception)) {
+            $exception->report();
+        }
+    }
+
+    /**
+     * Render the exception into an HTTP response.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
+     */
+    public function render($request)
+    {
+        $exception = $this->getPrevious();
+
+        if ($exception && method_exists($exception, 'render')) {
+            return $exception->render($request);
+        }
+    }
+}

tests/Integration/View/RenderableViewExceptionTest.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace Illuminate\Tests\Integration\View;
+
+use Exception;
+use Illuminate\Http\Response;
+use Illuminate\Support\Facades\Route;
+use Illuminate\Support\Facades\View;
+use Orchestra\Testbench\TestCase;
+
+class RenderableViewExceptionTest extends TestCase
+{
+    public function testRenderMethodOfExceptionThrownInViewGetsHandled()
+    {
+        Route::get('/', function () {
+            return View::make('renderable-exception');
+        });
+
+        $response = $this->get('/');
+
+        $response->assertSee('This is a renderable exception.');
+    }
+
+    protected function getEnvironmentSetUp($app)
+    {
+        $app['config']->set('view.paths', [__DIR__.'/templates']);
+    }
+}
+
+class RenderableException extends Exception
+{
+    public function render($request)
+    {
+        return new Response('This is a renderable exception.');
+    }
+}

tests/Integration/View/templates/renderable-exception.blade.php

@@ -0,0 +1,3 @@
+@php
+    throw new Illuminate\Tests\Integration\View\RenderableException;
+@endphp

tests/View/fixtures/nested/basic.php

@@ -1 +0,0 @@
-Hello World