Merge branch '7.x' into 8.x

# Conflicts:
#	src/Illuminate/Foundation/Application.php
#	src/Illuminate/Support/Facades/DB.php
#	src/Illuminate/View/Engines/CompilerEngine.php

.github/workflows/tests.yml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   linux_tests:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
 
     services:
       memcached:

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)

src/Illuminate/Support/Facades/DB.php

@@ -7,10 +7,12 @@
  * @method static \Illuminate\Database\ConnectionInterface connection(string $name = null)
  * @method static \Illuminate\Database\Query\Builder table(string $table, string $as = null)
  * @method static \Illuminate\Database\Query\Expression raw($value)
+ * @method static array getQueryLog()
  * @method static array prepareBindings(array $bindings)
  * @method static array pretend(\Closure $callback)
  * @method static array select(string $query, array $bindings = [], bool $useReadPdo = true)
  * @method static bool insert(string $query, array $bindings = [])
+ * @method static bool logging()
  * @method static bool statement(string $query, array $bindings = [])
  * @method static bool unprepared(string $query)
  * @method static int affectingStatement(string $query, array $bindings = [])
@@ -20,16 +22,14 @@
  * @method static mixed selectOne(string $query, array $bindings = [], bool $useReadPdo = true)
  * @method static mixed transaction(\Closure $callback, int $attempts = 1)
  * @method static string getDefaultConnection()
+ * @method static void afterCommit(\Closure $callback)
  * @method static void beginTransaction()
  * @method static void commit()
- * @method static void afterCommit(\Closure $callback)
- * @method static void listen(\Closure $callback)
- * @method static void rollBack(int $toLevel = null)
  * @method static void enableQueryLog()
  * @method static void disableQueryLog()
- * @method static bool logging()
- * @method static array getQueryLog()
  * @method static void flushQueryLog()
+ * @method static void listen(\Closure $callback)
+ * @method static void rollBack(int $toLevel = null)
  * @method static void setDefaultConnection(string $name)
  *
  * @see \Illuminate\Database\DatabaseManager