From 3464d0232cb75aeadb7b4483f788c1d1a30221d4 Mon Sep 17 00:00:00 2001
From: Taylor Otwell <taylorotwell@gmail.com>
Date: Thu, 21 Jan 2021 08:10:27 -0600
Subject: [PATCH 01/18] 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 30e8e7c358b1..35348d53f62b 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.13';
+    const VERSION = '6.20.14';
 
     /**
      * The base path for the Laravel installation.

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 02/18] 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 03/18] [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 04/18] 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.

From 9d7f75e0b3c61a07987aad87af801688e5011b98 Mon Sep 17 00:00:00 2001
From: Dries Vints <dries@vints.io>
Date: Tue, 26 Jan 2021 18:15:42 +0100
Subject: [PATCH 05/18] Typecast page number as integer (#36055)

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

diff --git a/src/Illuminate/Pagination/AbstractPaginator.php b/src/Illuminate/Pagination/AbstractPaginator.php
index e09ec3b2c89c..5fefab34ce06 100644
--- a/src/Illuminate/Pagination/AbstractPaginator.php
+++ b/src/Illuminate/Pagination/AbstractPaginator.php
@@ -446,7 +446,7 @@ public static function currentPathResolver(Closure $resolver)
     public static function resolveCurrentPage($pageName = 'page', $default = 1)
     {
         if (isset(static::$currentPageResolver)) {
-            return call_user_func(static::$currentPageResolver, $pageName);
+            return (int) call_user_func(static::$currentPageResolver, $pageName);
         }
 
         return $default;

From c0140c4cc54ab40f73b10d9368c7551c88fc1ba3 Mon Sep 17 00:00:00 2001
From: Tetiana Blindaruk <t.blindaruk@gmail.com>
Date: Wed, 27 Jan 2021 23:01:27 +0200
Subject: [PATCH 06/18] [6.x] update changelog

---
 CHANGELOG-6.x.md | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG-6.x.md b/CHANGELOG-6.x.md
index 42350000b97c..8e34966a1e95 100644
--- a/CHANGELOG-6.x.md
+++ b/CHANGELOG-6.x.md
@@ -1,6 +1,13 @@
 # Release Notes for 6.x
 
-## [Unreleased](https://github.com/laravel/framework/compare/v6.20.13...6.x)
+## [Unreleased](https://github.com/laravel/framework/compare/v6.20.14...6.x)
+
+
+## [v6.20.14 (2021-01-21)](https://github.com/laravel/framework/compare/v6.20.13...v6.20.14)
+
+### Fixed
+- Fixed type error in `Illuminate\Http\Concerns\InteractsWithContentTypes::isJson()` ([#35956](https://github.com/laravel/framework/pull/35956))
+- Limit expected bindings ([#35972](https://github.com/laravel/framework/pull/35972), [006873d](https://github.com/laravel/framework/commit/006873df411d28bfd03fea5e7f91a2afe3918498))
 
 
 ## [v6.20.13 (2021-01-19)](https://github.com/laravel/framework/compare/v6.20.12...v6.20.13)

From 0966a30d56a697426bb64babcddc32a19c44a639 Mon Sep 17 00:00:00 2001
From: Tetiana Blindaruk <t.blindaruk@gmail.com>
Date: Wed, 27 Jan 2021 23:21:23 +0200
Subject: [PATCH 07/18] [6.x] update changelog

---
 CHANGELOG-6.x.md | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG-6.x.md b/CHANGELOG-6.x.md
index 8e34966a1e95..71992b608e31 100644
--- a/CHANGELOG-6.x.md
+++ b/CHANGELOG-6.x.md
@@ -1,6 +1,12 @@
 # Release Notes for 6.x
 
-## [Unreleased](https://github.com/laravel/framework/compare/v6.20.14...6.x)
+## [Unreleased](https://github.com/laravel/framework/compare/v6.20.15...6.x)
+
+
+## [v6.20.15 (2021-01-26)](https://github.com/laravel/framework/compare/v6.20.14...v6.20.15)
+
+### Changed
+- Pipe new through render and report exception methods ([#36037](https://github.com/laravel/framework/pull/36037))
 
 
 ## [v6.20.14 (2021-01-21)](https://github.com/laravel/framework/compare/v6.20.13...v6.20.14)

From 818232948bd04b2601b58d4998955508f5064716 Mon Sep 17 00:00:00 2001
From: Dries Vints <dries@vints.io>
Date: Mon, 1 Feb 2021 15:20:21 +0100
Subject: [PATCH 08/18] [6.x] Fix report method for ViewException (#36110)

* Fix report method for ViewException

* Update ViewException.php

* Apply fixes from StyleCI (#36111)
---
 .../Console/stubs/exception-render-report.stub         |  2 +-
 .../Foundation/Console/stubs/exception-report.stub     |  2 +-
 src/Illuminate/View/ViewException.php                  | 10 +++++++---
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/Illuminate/Foundation/Console/stubs/exception-render-report.stub b/src/Illuminate/Foundation/Console/stubs/exception-render-report.stub
index 712a40789e76..4d1070c2f687 100644
--- a/src/Illuminate/Foundation/Console/stubs/exception-render-report.stub
+++ b/src/Illuminate/Foundation/Console/stubs/exception-render-report.stub
@@ -9,7 +9,7 @@ class DummyClass extends Exception
     /**
      * Report the exception.
      *
-     * @return void
+     * @return bool|null
      */
     public function report()
     {
diff --git a/src/Illuminate/Foundation/Console/stubs/exception-report.stub b/src/Illuminate/Foundation/Console/stubs/exception-report.stub
index 8db5c4f3c2b2..643149863e91 100644
--- a/src/Illuminate/Foundation/Console/stubs/exception-report.stub
+++ b/src/Illuminate/Foundation/Console/stubs/exception-report.stub
@@ -9,7 +9,7 @@ class DummyClass extends Exception
     /**
      * Report the exception.
      *
-     * @return void
+     * @return bool|null
      */
     public function report()
     {
diff --git a/src/Illuminate/View/ViewException.php b/src/Illuminate/View/ViewException.php
index 9c9463bc28ac..e6797a29a1e7 100644
--- a/src/Illuminate/View/ViewException.php
+++ b/src/Illuminate/View/ViewException.php
@@ -3,21 +3,25 @@
 namespace Illuminate\View;
 
 use ErrorException;
+use Illuminate\Container\Container;
+use Illuminate\Support\Reflector;
 
 class ViewException extends ErrorException
 {
     /**
      * Report the exception.
      *
-     * @return void
+     * @return bool|null
      */
     public function report()
     {
         $exception = $this->getPrevious();
 
-        if ($exception && method_exists($exception, 'report')) {
-            $exception->report();
+        if (Reflector::isCallable($reportCallable = [$exception, 'report'])) {
+            return Container::getInstance()->call($reportCallable);
         }
+
+        return false;
     }
 
     /**

From 3aa9657c9519b2ab73ab93f3917f750a029bfbcc Mon Sep 17 00:00:00 2001
From: Zing <zingimmick@outlook.com>
Date: Mon, 1 Feb 2021 22:54:22 +0800
Subject: [PATCH 09/18] [6.x] Fix the return type of spop for phpredis (#36106)

* PhpRedis return value of spop compatibility

* fix style

* use func_get_args() instead of [$key, $count]

* Update PhpRedisConnection.php

Co-authored-by: Taylor Otwell <taylor@laravel.com>
---
 .../Redis/Connections/PhpRedisConnection.php  |  2 +-
 tests/Redis/RedisConnectionTest.php           | 27 +++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/src/Illuminate/Redis/Connections/PhpRedisConnection.php b/src/Illuminate/Redis/Connections/PhpRedisConnection.php
index 0950ec97cdcb..0c4015df9880 100644
--- a/src/Illuminate/Redis/Connections/PhpRedisConnection.php
+++ b/src/Illuminate/Redis/Connections/PhpRedisConnection.php
@@ -197,7 +197,7 @@ public function brpop(...$arguments)
      */
     public function spop($key, $count = 1)
     {
-        return $this->command('spop', [$key, $count]);
+        return $this->command('spop', func_get_args());
     }
 
     /**
diff --git a/tests/Redis/RedisConnectionTest.php b/tests/Redis/RedisConnectionTest.php
index 5326a09dd608..e3a04e6db591 100644
--- a/tests/Redis/RedisConnectionTest.php
+++ b/tests/Redis/RedisConnectionTest.php
@@ -690,6 +690,33 @@ public function testItSscansForKeys()
         }
     }
 
+    public function testItSPopsForKeys()
+    {
+        foreach ($this->connections() as $redis) {
+            $members = ['test:spop:1', 'test:spop:2', 'test:spop:3', 'test:spop:4'];
+
+            foreach ($members as $member) {
+                $redis->sadd('set', $member);
+            }
+
+            $result = $redis->spop('set');
+            $this->assertIsNotArray($result);
+            $this->assertContains($result, $members);
+
+            $result = $redis->spop('set', 1);
+
+            $this->assertIsArray($result);
+            $this->assertCount(1, $result);
+
+            $result = $redis->spop('set', 2);
+
+            $this->assertIsArray($result);
+            $this->assertCount(2, $result);
+
+            $redis->flushAll();
+        }
+    }
+
     public function testPhpRedisScanOption()
     {
         foreach ($this->connections() as $redis) {

From 806082fb559fe595cb17cd6aa8571f03ed287814 Mon Sep 17 00:00:00 2001
From: Taylor Otwell <taylorotwell@gmail.com>
Date: Tue, 2 Feb 2021 07:50:12 -0600
Subject: [PATCH 10/18] 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 648a0cd2f21a..236cd15d06f3 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.15';
+    const VERSION = '6.20.16';
 
     /**
      * The base path for the Laravel installation.

From 7b99b40e2e190ed44b979f4bc647909c3960fcf0 Mon Sep 17 00:00:00 2001
From: Tetiana Blindaruk <t.blindaruk@gmail.com>
Date: Thu, 4 Feb 2021 22:22:33 +0200
Subject: [PATCH 11/18] [6.x] update changelog

---
 CHANGELOG-6.x.md | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG-6.x.md b/CHANGELOG-6.x.md
index 71992b608e31..8b7d54876d3f 100644
--- a/CHANGELOG-6.x.md
+++ b/CHANGELOG-6.x.md
@@ -1,6 +1,16 @@
 # Release Notes for 6.x
 
-## [Unreleased](https://github.com/laravel/framework/compare/v6.20.15...6.x)
+## [Unreleased](https://github.com/laravel/framework/compare/v6.20.16...6.x)
+
+
+## [v6.20.15 (2021-02-02)](https://github.com/laravel/framework/compare/v6.20.15...v6.20.16)
+
+### Fixed
+- Fixed `Illuminate\View\ViewException::report()` ([#36110](https://github.com/laravel/framework/pull/36110))
+- Fixed `Illuminate\Redis\Connections\PhpRedisConnection::spop()` ([#36106](https://github.com/laravel/framework/pull/36106))
+
+### Changed
+- Typecast page number as integer in `Illuminate\Pagination\AbstractPaginator::resolveCurrentPage()` ([#36055](https://github.com/laravel/framework/pull/36055))
 
 
 ## [v6.20.15 (2021-01-26)](https://github.com/laravel/framework/compare/v6.20.14...v6.20.15)

From d7e3b9b82b20b3a3440cbcb8a8f60914fad33812 Mon Sep 17 00:00:00 2001
From: Tetiana Blindaruk <t.blindaruk@gmail.com>
Date: Thu, 4 Feb 2021 22:24:52 +0200
Subject: [PATCH 12/18] [6.x] update changelog

---
 CHANGELOG-6.x.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG-6.x.md b/CHANGELOG-6.x.md
index 8b7d54876d3f..ee1b7ced29b4 100644
--- a/CHANGELOG-6.x.md
+++ b/CHANGELOG-6.x.md
@@ -3,7 +3,7 @@
 ## [Unreleased](https://github.com/laravel/framework/compare/v6.20.16...6.x)
 
 
-## [v6.20.15 (2021-02-02)](https://github.com/laravel/framework/compare/v6.20.15...v6.20.16)
+## [v6.20.16 (2021-02-02)](https://github.com/laravel/framework/compare/v6.20.15...v6.20.16)
 
 ### Fixed
 - Fixed `Illuminate\View\ViewException::report()` ([#36110](https://github.com/laravel/framework/pull/36110))

From a5e5afb61c1bd4231b3190bc1bdd9d8a19eb57da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?=
 <1005065+DeepDiver1975@users.noreply.github.com>
Date: Mon, 8 Feb 2021 20:49:57 +0100
Subject: [PATCH 13/18] feat: add query log methods to the DB facade (#36188)

---
 src/Illuminate/Support/Facades/DB.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Illuminate/Support/Facades/DB.php b/src/Illuminate/Support/Facades/DB.php
index a249b4a099b4..bcbe62ced0cc 100755
--- a/src/Illuminate/Support/Facades/DB.php
+++ b/src/Illuminate/Support/Facades/DB.php
@@ -24,6 +24,11 @@
  * @method static int transactionLevel()
  * @method static array pretend(\Closure $callback)
  * @method static void listen(\Closure $callback)
+ * @method static void enableQueryLog()
+ * @method static void disableQueryLog()
+ * @method static bool logging()
+ * @method static array getQueryLog()
+ * @method static void flushQueryLog()
  *
  * @see \Illuminate\Database\DatabaseManager
  * @see \Illuminate\Database\Connection

From d5ffd8efdd04b11a2b1199cc7f2148337418191f Mon Sep 17 00:00:00 2001
From: Dries Vints <dries@vints.io>
Date: Fri, 12 Feb 2021 22:02:52 +0100
Subject: [PATCH 14/18] Remove problem matchers (#36246)

---
 .github/workflows/tests.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 19e95cff1f99..476648be81cc 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -48,9 +48,6 @@ jobs:
           tools: composer:v2
           coverage: none
 
-      - name: Setup problem matchers
-        run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
-
       - name: Set Minimum Guzzle Version
         uses: nick-invision/retry@v1
         with:
@@ -100,9 +97,6 @@ jobs:
           tools: composer:v2
           coverage: none
 
-      - name: Setup problem matchers
-        run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
-
       - name: Set Minimum Guzzle Version
         uses: nick-invision/retry@v1
         with:

From 55d10a8138dbb86850b82614f34497d30403db1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rihards=20=C5=A0=C4=8Deredins?=
 <rihards.sceredins@gmail.com>
Date: Wed, 24 Feb 2021 15:50:12 +0200
Subject: [PATCH 15/18] When using managed PostgreSQL instances on DigitalOcean
 every now and then this pops out. After seeing #35744, #35790 and others
 decided to fix this. (#36373)

PDOException: SQLSTATE[08006] [7] could not translate host name "private-xxx-do-user-0.a.db.ondigitalocean.com" to address: Temporary failure in name resolution
---
 src/Illuminate/Database/DetectsLostConnections.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Illuminate/Database/DetectsLostConnections.php b/src/Illuminate/Database/DetectsLostConnections.php
index 07630c590d5c..1ecfc96140f4 100644
--- a/src/Illuminate/Database/DetectsLostConnections.php
+++ b/src/Illuminate/Database/DetectsLostConnections.php
@@ -49,6 +49,7 @@ protected function causedByLostConnection(Throwable $e)
             'SQLSTATE[HY000] [2002] Connection timed out',
             'SSL: Connection timed out',
             'SQLSTATE[HY000]: General error: 1105 The last transaction was aborted due to Seamless Scaling. Please retry.',
+            'Temporary failure in name resolution',
         ]);
     }
 }

From d0e4731e92ca88f4a78fe9e0c2c426a3e8c063c8 Mon Sep 17 00:00:00 2001
From: Taylor Otwell <taylorotwell@gmail.com>
Date: Tue, 2 Mar 2021 08:28:26 -0600
Subject: [PATCH 16/18] patch release

---
 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 236cd15d06f3..264e0deba796 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.16';
+    const VERSION = '6.20.17';
 
     /**
      * The base path for the Laravel installation.

From 3b1fa1ae2ccd64547d27236945dfe454ee9a23e2 Mon Sep 17 00:00:00 2001
From: Tetiana Blindaruk <t.blindaruk@gmail.com>
Date: Wed, 3 Mar 2021 21:15:47 +0200
Subject: [PATCH 17/18] [6.x] update changelog

---
 CHANGELOG-6.x.md | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG-6.x.md b/CHANGELOG-6.x.md
index ee1b7ced29b4..5fd976698b85 100644
--- a/CHANGELOG-6.x.md
+++ b/CHANGELOG-6.x.md
@@ -1,6 +1,12 @@
 # Release Notes for 6.x
 
-## [Unreleased](https://github.com/laravel/framework/compare/v6.20.16...6.x)
+## [Unreleased](https://github.com/laravel/framework/compare/v6.20.17...6.x)
+
+
+## [v6.20.17 (2021-03-02)](https://github.com/laravel/framework/compare/v6.20.16...v6.20.17)
+
+### Added
+- Added new line to `DetectsLostConnections` ([#36373](https://github.com/laravel/framework/pull/36373))
 
 
 ## [v6.20.16 (2021-02-02)](https://github.com/laravel/framework/compare/v6.20.15...v6.20.16)

From 448662c91540e237b846507fdf4cf22c7f8d59b5 Mon Sep 17 00:00:00 2001
From: Dries Vints <dries@vints.io>
Date: Thu, 4 Mar 2021 13:51:23 +0100
Subject: [PATCH 18/18] Use ubuntu-18.04

---
 .github/workflows/tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 476648be81cc..c7b91b6fe781 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -8,7 +8,7 @@ on:
 
 jobs:
   linux_tests:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
 
     services:
       memcached: