Merge remote-tracking branch 'upstream/8.x' into 8.x

Author: TBlindaruk

.github/workflows/tests.yml

@@ -33,6 +33,11 @@ jobs:
       matrix:
         php: ['7.3', '7.4', '8.0']
         stability: [prefer-lowest, prefer-stable]
+        include:
+          - php: '8.1'
+            flags: "--ignore-platform-req=php"
+            stability: prefer-stable
+
 
     name: PHP ${{ matrix.php }} - ${{ matrix.stability }}
 
@@ -61,9 +66,10 @@ jobs:
         with:
           timeout_minutes: 5
           max_attempts: 5
-          command: composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-progress
+          command: composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-progress ${{ matrix.flags }}
 
       - name: Execute tests
+        continue-on-error: ${{ matrix.php > 8 }}
         run: vendor/bin/phpunit --verbose
         env:
           DB_PORT: ${{ job.services.mysql.ports[3306] }}
@@ -77,6 +83,10 @@ jobs:
       matrix:
         php: ['7.3', '7.4', '8.0']
         stability: [prefer-lowest, prefer-stable]
+        include:
+          - php: '8.1'
+            flags: "--ignore-platform-req=php"
+            stability: prefer-stable
 
     name: PHP ${{ matrix.php }} - ${{ matrix.stability }} - Windows
 
@@ -110,7 +120,8 @@ jobs:
         with:
           timeout_minutes: 5
           max_attempts: 5
-          command: composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-progress
+          command: composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-progress ${{ matrix.flags }}
 
       - name: Execute tests
+        continue-on-error: ${{ matrix.php > 8 }}
         run: vendor/bin/phpunit --verbose

CHANGELOG-6.x.md

@@ -1,6 +1,12 @@
 # Release Notes for 6.x
 
-## [Unreleased](https://github.com/laravel/framework/compare/v6.20.18...6.x)
+## [Unreleased](https://github.com/laravel/framework/compare/v6.20.19...6.x)
+
+
+## [v6.20.19 (2021-03-16)](https://github.com/laravel/framework/compare/v6.20.18...v6.20.19)
+
+### Added
+- Added broken pipe exception as lost connection error ([#36601](https://github.com/laravel/framework/pull/36601))
 
 
 ## [v6.20.18 (2021-03-09)](https://github.com/laravel/framework/compare/v6.20.17...v6.20.18)

src/Illuminate/Collections/LazyCollection.php

@@ -1071,7 +1071,7 @@ public function chunkWhile(callable $callback)
         return new static(function () use ($callback) {
             $iterator = $this->getIterator();
 
-            $chunk = new Collection();
+            $chunk = new Collection;
 
             if ($iterator->valid()) {
                 $chunk[$iterator->key()] = $iterator->current();
@@ -1083,7 +1083,7 @@ public function chunkWhile(callable $callback)
                 if (! $callback($iterator->current(), $iterator->key(), $chunk)) {
                     yield new static($chunk);
 
-                    $chunk = new Collection();
+                    $chunk = new Collection;
                 }
 
                 $chunk[$iterator->key()] = $iterator->current();

src/Illuminate/Console/Scheduling/ScheduleWorkCommand.php

@@ -51,7 +51,7 @@ public function handle()
 
                 if (! empty($output)) {
                     if ($key !== $keyOfLastExecutionWithOutput) {
-                        $this->info(PHP_EOL.'Execution #'.($key + 1).' output:');
+                        $this->info(PHP_EOL.'['.date('c').'] Execution #'.($key + 1).' output:');
 
                         $keyOfLastExecutionWithOutput = $key;
                     }

src/Illuminate/Container/Container.php

@@ -842,9 +842,9 @@ public function build($concrete)
             return $this->notInstantiable($concrete);
         }
 
-        if (in_array($concrete, $this->buildStack)) {
-            throw new CircularDependencyException("Circular dependency detected while resolving [{$concrete}].");
-        }
+        // if (in_array($concrete, $this->buildStack)) {
+        //     throw new CircularDependencyException("Circular dependency detected while resolving [{$concrete}].");
+        // }
 
         $this->buildStack[] = $concrete;
 

src/Illuminate/Database/Concerns/BuildsQueries.php

@@ -8,6 +8,8 @@
 use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\Pagination\Paginator;
 use Illuminate\Support\Collection;
+use Illuminate\Support\LazyCollection;
+use InvalidArgumentException;
 
 trait BuildsQueries
 {
@@ -159,6 +161,76 @@ public function eachById(callable $callback, $count = 1000, $column = null, $ali
         }, $column, $alias);
     }
 
+    /**
+     * Query lazily, by chunks of the given size.
+     *
+     * @param  int  $chunkSize
+     * @return \Illuminate\Support\LazyCollection
+     */
+    public function lazy($chunkSize = 1000)
+    {
+        if ($chunkSize < 1) {
+            throw new InvalidArgumentException('The chunk size should be at least 1');
+        }
+
+        $this->enforceOrderBy();
+
+        return LazyCollection::make(function () use ($chunkSize) {
+            $page = 1;
+
+            while (true) {
+                $results = $this->forPage($page++, $chunkSize)->get();
+
+                foreach ($results as $result) {
+                    yield $result;
+                }
+
+                if ($results->count() < $chunkSize) {
+                    return;
+                }
+            }
+        });
+    }
+
+    /**
+     * Query lazily, by chunking the results of a query by comparing IDs.
+     *
+     * @param  int  $count
+     * @param  string|null  $column
+     * @param  string|null  $alias
+     * @return \Illuminate\Support\LazyCollection
+     */
+    public function lazyById($chunkSize = 1000, $column = null, $alias = null)
+    {
+        if ($chunkSize < 1) {
+            throw new InvalidArgumentException('The chunk size should be at least 1');
+        }
+
+        $column = $column ?? $this->defaultKeyName();
+
+        $alias = $alias ?? $column;
+
+        return LazyCollection::make(function () use ($chunkSize, $column, $alias) {
+            $lastId = null;
+
+            while (true) {
+                $clone = clone $this;
+
+                $results = $clone->forPageAfterId($chunkSize, $lastId, $column)->get();
+
+                foreach ($results as $result) {
+                    yield $result;
+                }
+
+                if ($results->count() < $chunkSize) {
+                    return;
+                }
+
+                $lastId = $results->last()->{$alias};
+            }
+        });
+    }
+
     /**
      * Execute the query and get the first result.
      *

src/Illuminate/Database/DetectsLostConnections.php

@@ -51,6 +51,7 @@ protected function causedByLostConnection(Throwable $e)
             'SQLSTATE[HY000]: General error: 1105 The last transaction was aborted due to Seamless Scaling. Please retry.',
             'Temporary failure in name resolution',
             'SSL: Broken pipe',
+            'SQLSTATE[08S01]: Communication link failure',
         ]);
     }
 }

src/Illuminate/Database/Eloquent/Relations/MorphPivot.php

@@ -74,6 +74,16 @@ public function delete()
         });
     }
 
+    /**
+     * Get the morph type for the pivot.
+     *
+     * @return string
+     */
+    public function getMorphType()
+    {
+        return $this->morphType;
+    }
+
     /**
      * Set the morph type for the pivot.
      *

src/Illuminate/Database/Schema/MySqlSchemaState.php

@@ -149,6 +149,12 @@ protected function executeDumpProcess(Process $process, $output, array $variable
                 ), $output, $variables);
             }
 
+            if (Str::contains($e->getMessage(), ['set-gtid-purged'])) {
+                return $this->executeDumpProcess(Process::fromShellCommandLine(
+                    str_replace(' --set-gtid-purged=OFF', '', $process->getCommandLine())
+                ), $output, $variables);
+            }
+
             throw $e;
         }
 

src/Illuminate/Filesystem/LockableFile.php

@@ -2,6 +2,7 @@
 
 namespace Illuminate\Filesystem;
 
+use Exception;
 use Illuminate\Contracts\Filesystem\LockTimeoutException;
 
 class LockableFile
@@ -65,6 +66,10 @@ protected function ensureDirectoryExists($path)
     protected function createResource($path, $mode)
     {
         $this->handle = @fopen($path, $mode);
+
+        if (! $this->handle) {
+            throw new Exception('Unable to create lockable file: '.$path.'. Please ensure you have permission to create files in this location.');
+        }
     }
 
     /**