From 6e79268aa8b0d242ab78a54bce304f0cc7735876 Mon Sep 17 00:00:00 2001
From: Graham Campbell <GrahamCampbell@users.noreply.github.com>
Date: Mon, 25 Jan 2021 16:20:15 +0000
Subject: [PATCH 1/3] Fix PHP 8.0 showing as 8 (#36039)

---
 .github/workflows/tests.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index d2a186904407..19e95cff1f99 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -31,7 +31,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [7.2, 7.3, 7.4, 8.0]
+        php: ['7.2', '7.3', '7.4', '8.0']
         stability: [prefer-lowest, prefer-stable]
 
     name: PHP ${{ matrix.php }} - ${{ matrix.stability }}
@@ -78,7 +78,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [7.2, 7.3, 7.4, 8.0]
+        php: ['7.2', '7.3', '7.4', '8.0']
         stability: [prefer-lowest, prefer-stable]
 
     name: PHP ${{ matrix.php }} - ${{ matrix.stability }} - Windows

From fdf46c336f90b1c7eb94ae6bda4202aa0ea64600 Mon Sep 17 00:00:00 2001
From: Dries Vints <dries@vints.io>
Date: Mon, 25 Jan 2021 18:07:55 +0100
Subject: [PATCH 2/3] [6.x] Backport of Pipe through render and report
 exception methods (#36037)

* Pipe through render and report exception methods (#36032)

* Fix method_exists call

* Re-add facade
---
 .../View/Engines/CompilerEngine.php           |  4 +-
 src/Illuminate/View/ViewException.php         | 37 +++++++++++++++++++
 .../View/RenderableViewExceptionTest.php      | 36 ++++++++++++++++++
 .../templates/renderable-exception.blade.php  |  3 ++
 tests/View/fixtures/nested/basic.php          |  1 -
 5 files changed, 78 insertions(+), 3 deletions(-)
 create mode 100644 src/Illuminate/View/ViewException.php
 create mode 100644 tests/Integration/View/RenderableViewExceptionTest.php
 create mode 100644 tests/Integration/View/templates/renderable-exception.blade.php

diff --git a/src/Illuminate/View/Engines/CompilerEngine.php b/src/Illuminate/View/Engines/CompilerEngine.php
index 03717bad0b51..cf6dac70e8a1 100755
--- a/src/Illuminate/View/Engines/CompilerEngine.php
+++ b/src/Illuminate/View/Engines/CompilerEngine.php
@@ -2,9 +2,9 @@
 
 namespace Illuminate\View\Engines;
 
-use ErrorException;
 use Exception;
 use Illuminate\View\Compilers\CompilerInterface;
+use Illuminate\View\ViewException;
 
 class CompilerEngine extends PhpEngine
 {
@@ -74,7 +74,7 @@ public function get($path, array $data = [])
      */
     protected function handleViewException(Exception $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);
     }
diff --git a/src/Illuminate/View/ViewException.php b/src/Illuminate/View/ViewException.php
new file mode 100644
index 000000000000..9c9463bc28ac
--- /dev/null
+++ b/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($exception, 'report')) {
+            $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);
+        }
+    }
+}
diff --git a/tests/Integration/View/RenderableViewExceptionTest.php b/tests/Integration/View/RenderableViewExceptionTest.php
new file mode 100644
index 000000000000..93c91cb31387
--- /dev/null
+++ b/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.');
+    }
+}
diff --git a/tests/Integration/View/templates/renderable-exception.blade.php b/tests/Integration/View/templates/renderable-exception.blade.php
new file mode 100644
index 000000000000..28649eefa7f9
--- /dev/null
+++ b/tests/Integration/View/templates/renderable-exception.blade.php
@@ -0,0 +1,3 @@
+@php
+    throw new Illuminate\Tests\Integration\View\RenderableException;
+@endphp
diff --git a/tests/View/fixtures/nested/basic.php b/tests/View/fixtures/nested/basic.php
index 557db03de997..e69de29bb2d1 100755
--- a/tests/View/fixtures/nested/basic.php
+++ b/tests/View/fixtures/nested/basic.php
@@ -1 +0,0 @@
-Hello World

From b42c2d845cdd827ac5a53cacf16af4a0b5dd8be1 Mon Sep 17 00:00:00 2001
From: Taylor Otwell <taylorotwell@gmail.com>
Date: Tue, 26 Jan 2021 08:39:47 -0600
Subject: [PATCH 3/3] version

---
 src/Illuminate/Foundation/Application.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Illuminate/Foundation/Application.php b/src/Illuminate/Foundation/Application.php
index 35348d53f62b..648a0cd2f21a 100755
--- a/src/Illuminate/Foundation/Application.php
+++ b/src/Illuminate/Foundation/Application.php
@@ -31,7 +31,7 @@ class Application extends Container implements ApplicationContract, HttpKernelIn
      *
      * @var string
      */
-    const VERSION = '6.20.14';
+    const VERSION = '6.20.15';
 
     /**
      * The base path for the Laravel installation.