From 4d5159f161fe271c322abdb21d9c3fff59678117 Mon Sep 17 00:00:00 2001
From: Tetiana Blindaruk <t.blindaruk@gmail.com>
Date: Tue, 8 Dec 2020 20:57:38 +0200
Subject: [PATCH 1/8] [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 7586408424bb..8ec4a08e9afe 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.6...6.x)
+## [Unreleased](https://github.com/laravel/framework/compare/v6.20.7...6.x)
+
+
+## [v6.20.7 (2020-12-08)](https://github.com/laravel/framework/compare/v6.20.6...v6.20.7)
+
+### Fixed
+- Backport for fix issue with polymorphic morphMaps with literal 0 ([#35487](https://github.com/laravel/framework/pull/35487))
+- Fixed mime validation for jpeg files ([#35518](https://github.com/laravel/framework/pull/35518))
 
 
 ## [v6.20.6 (2020-12-01)](https://github.com/laravel/framework/compare/v6.20.5...v6.20.6)

From 94171f04f1aaa79bdcf1f0f9e076f276cd46608d Mon Sep 17 00:00:00 2001
From: Dries Vints <dries@vints.io>
Date: Tue, 15 Dec 2020 00:33:42 +0100
Subject: [PATCH 2/8] Update phpunit.xml.dist (#35605)

---
 phpunit.xml.dist | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 3cb5a6c6ba63..bb20f5f6ded1 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -17,14 +17,6 @@
             <directory suffix="Test.php">./tests</directory>
         </testsuite>
     </testsuites>
-    <coverage processUncoveredFiles="true">
-        <include>
-            <directory suffix=".php">./src</directory>
-        </include>
-        <exclude>
-            <directory suffix=".blade.php">./src/</directory>
-        </exclude>
-    </coverage>
     <php>
         <ini name="memory_limit" value="2048M" />
         <!--

From df8fe15632d34529b4b843f8b55fce9b76a04c4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Aur=C3=A9lio=20Deleu?= <deleugyn@gmail.com>
Date: Thu, 17 Dec 2020 14:27:57 +0100
Subject: [PATCH 3/8] PHP 8: method_exists(): Argument #1 () must be of type
 object|string, array given (#35646)

---
 src/Illuminate/Validation/Concerns/ValidatesAttributes.php | 4 ++++
 tests/Validation/ValidationValidatorTest.php               | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/src/Illuminate/Validation/Concerns/ValidatesAttributes.php b/src/Illuminate/Validation/Concerns/ValidatesAttributes.php
index a7a6071ab5b5..d62ec0ee9513 100644
--- a/src/Illuminate/Validation/Concerns/ValidatesAttributes.php
+++ b/src/Illuminate/Validation/Concerns/ValidatesAttributes.php
@@ -1160,6 +1160,10 @@ public function validateIpv6($attribute, $value)
      */
     public function validateJson($attribute, $value)
     {
+        if (is_array($value)) {
+            return false;
+        }
+
         if (! is_scalar($value) && ! method_exists($value, '__toString')) {
             return false;
         }
diff --git a/tests/Validation/ValidationValidatorTest.php b/tests/Validation/ValidationValidatorTest.php
index b6c6ab2281ae..a176ce42a055 100755
--- a/tests/Validation/ValidationValidatorTest.php
+++ b/tests/Validation/ValidationValidatorTest.php
@@ -1510,6 +1510,10 @@ public function testValidateJson()
         $trans = $this->getIlluminateArrayTranslator();
         $v = new Validator($trans, ['foo' => '{"name":"John","age":"34"}'], ['foo' => 'json']);
         $this->assertTrue($v->passes());
+
+        $trans = $this->getIlluminateArrayTranslator();
+        $v = new Validator($trans, ['foo' => ['array']], ['foo' => 'json']);
+        $this->assertFalse($v->passes());
     }
 
     public function testValidateBoolean()

From 72c1d56853ee21230398c1ff04239e63102e42cc Mon Sep 17 00:00:00 2001
From: apreiml <apreiml@strohwolke.at>
Date: Fri, 18 Dec 2020 15:12:37 +0100
Subject: [PATCH 4/8] fix return type of Lock::release in PHPDoc (#35655)

---
 src/Illuminate/Contracts/Cache/Lock.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Illuminate/Contracts/Cache/Lock.php b/src/Illuminate/Contracts/Cache/Lock.php
index 4f98d68d9301..7f01b1be3f33 100644
--- a/src/Illuminate/Contracts/Cache/Lock.php
+++ b/src/Illuminate/Contracts/Cache/Lock.php
@@ -24,7 +24,7 @@ public function block($seconds, $callback = null);
     /**
      * Release the lock.
      *
-     * @return void
+     * @return bool
      */
     public function release();
 

From 7799c5f9a4bb6cf73985f2df5a1af535c1bc26ca Mon Sep 17 00:00:00 2001
From: Dries Vints <dries@vints.io>
Date: Fri, 18 Dec 2020 15:15:14 +0100
Subject: [PATCH 5/8] [6.x] Disable failing Memcached tests (#35647)

* Disable failing Memcached tests

* update true

* try verbose mode

* Switch to Mockery

* Skip test

* Update tests.yml
---
 tests/Cache/CacheMemcachedStoreTest.php | 32 ++++++++++++++++++++-----
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/tests/Cache/CacheMemcachedStoreTest.php b/tests/Cache/CacheMemcachedStoreTest.php
index edbc66fbc6ba..f65637e967b3 100755
--- a/tests/Cache/CacheMemcachedStoreTest.php
+++ b/tests/Cache/CacheMemcachedStoreTest.php
@@ -5,11 +5,19 @@
 use Illuminate\Cache\MemcachedStore;
 use Illuminate\Support\Carbon;
 use Memcached;
+use Mockery as m;
 use PHPUnit\Framework\TestCase;
 use stdClass;
 
 class CacheMemcachedStoreTest extends TestCase
 {
+    public function tearDown(): void
+    {
+        m::close();
+
+        parent::tearDown();
+    }
+
     public function testGetReturnsNullWhenNotFound()
     {
         if (! class_exists(Memcached::class)) {
@@ -80,9 +88,15 @@ public function testIncrementMethodProperlyCallsMemcache()
             $this->markTestSkipped('Memcached module not installed');
         }
 
-        $memcache = $this->getMockBuilder(Memcached::class)->setMethods(['increment'])->getMock();
-        $memcache->expects($this->once())->method('increment')->with($this->equalTo('foo'), $this->equalTo(5));
-        $store = new MemcachedStore($memcache);
+        /* @link https://github.com/php-memcached-dev/php-memcached/pull/468 */
+        if (version_compare(phpversion(), '8.0.0', '>=')) {
+            $this->markTestSkipped('Test broken due to parse error in PHP Memcached.');
+        }
+
+        $memcached = m::mock(Memcached::class);
+        $memcached->shouldReceive('increment')->with('foo', 5)->once()->andReturn(5);
+
+        $store = new MemcachedStore($memcached);
         $store->increment('foo', 5);
     }
 
@@ -92,9 +106,15 @@ public function testDecrementMethodProperlyCallsMemcache()
             $this->markTestSkipped('Memcached module not installed');
         }
 
-        $memcache = $this->getMockBuilder(Memcached::class)->setMethods(['decrement'])->getMock();
-        $memcache->expects($this->once())->method('decrement')->with($this->equalTo('foo'), $this->equalTo(5));
-        $store = new MemcachedStore($memcache);
+        /* @link https://github.com/php-memcached-dev/php-memcached/pull/468 */
+        if (version_compare(phpversion(), '8.0.0', '>=')) {
+            $this->markTestSkipped('Test broken due to parse error in PHP Memcached.');
+        }
+
+        $memcached = m::mock(Memcached::class);
+        $memcached->shouldReceive('decrement')->with('foo', 5)->once()->andReturn(0);
+
+        $store = new MemcachedStore($memcached);
         $store->decrement('foo', 5);
     }
 

From 97958fb008a6a80de0543120c9919749ba104043 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antoine=20Lam=C3=A9?= <antoine.lame@gmail.com>
Date: Sun, 20 Dec 2020 23:32:42 +0100
Subject: [PATCH 6/8] Fix DecryptException with invalid X-XSRF-TOKEN (#35671)

---
 .../Foundation/Http/Middleware/VerifyCsrfToken.php         | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Illuminate/Foundation/Http/Middleware/VerifyCsrfToken.php b/src/Illuminate/Foundation/Http/Middleware/VerifyCsrfToken.php
index 6a1f028f9ce8..59483200e4d0 100644
--- a/src/Illuminate/Foundation/Http/Middleware/VerifyCsrfToken.php
+++ b/src/Illuminate/Foundation/Http/Middleware/VerifyCsrfToken.php
@@ -3,6 +3,7 @@
 namespace Illuminate\Foundation\Http\Middleware;
 
 use Closure;
+use Illuminate\Contracts\Encryption\DecryptException;
 use Illuminate\Contracts\Encryption\Encrypter;
 use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Contracts\Support\Responsable;
@@ -152,7 +153,11 @@ protected function getTokenFromRequest($request)
         $token = $request->input('_token') ?: $request->header('X-CSRF-TOKEN');
 
         if (! $token && $header = $request->header('X-XSRF-TOKEN')) {
-            $token = CookieValuePrefix::remove($this->encrypter->decrypt($header, static::serialized()));
+            try {
+                $token = CookieValuePrefix::remove($this->encrypter->decrypt($header, static::serialized()));
+            } catch (DecryptException $e) {
+                $token = '';
+            }
         }
 
         return $token;

From 77620822afc96a9fd7c5ca147de2f16666e26ecd Mon Sep 17 00:00:00 2001
From: Rodrigo Pedra Brum <rodrigo.pedra@gmail.com>
Date: Mon, 21 Dec 2020 19:30:16 -0300
Subject: [PATCH 7/8] fix doc blocks (#35690)

---
 src/Illuminate/Mail/Mailer.php                           | 2 +-
 src/Illuminate/Mail/PendingMail.php                      | 1 -
 src/Illuminate/Notifications/NotificationSender.php      | 2 +-
 src/Illuminate/Support/Testing/Fakes/MailFake.php        | 2 +-
 src/Illuminate/Support/Testing/Fakes/PendingMailFake.php | 6 +++---
 src/Illuminate/Validation/Rules/Dimensions.php           | 2 +-
 6 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/Illuminate/Mail/Mailer.php b/src/Illuminate/Mail/Mailer.php
index 10a7ae6b6702..2d310a3a00a0 100755
--- a/src/Illuminate/Mail/Mailer.php
+++ b/src/Illuminate/Mail/Mailer.php
@@ -371,7 +371,7 @@ protected function setGlobalToAndRemoveCcAndBcc($message)
     /**
      * Queue a new e-mail message for sending.
      *
-     * @param  \Illuminate\Contracts\Mail\Mailable  $view
+     * @param  \Illuminate\Contracts\Mail\Mailable|string|array  $view
      * @param  string|null  $queue
      * @return mixed
      *
diff --git a/src/Illuminate/Mail/PendingMail.php b/src/Illuminate/Mail/PendingMail.php
index 0b19fed2a520..7150f8566be8 100644
--- a/src/Illuminate/Mail/PendingMail.php
+++ b/src/Illuminate/Mail/PendingMail.php
@@ -114,7 +114,6 @@ public function bcc($users)
      * Send a new mailable message instance.
      *
      * @param  \Illuminate\Contracts\Mail\Mailable  $mailable
-     *
      * @return mixed
      */
     public function send(MailableContract $mailable)
diff --git a/src/Illuminate/Notifications/NotificationSender.php b/src/Illuminate/Notifications/NotificationSender.php
index c65940aad3ea..19b9a7de15cd 100644
--- a/src/Illuminate/Notifications/NotificationSender.php
+++ b/src/Illuminate/Notifications/NotificationSender.php
@@ -171,7 +171,7 @@ protected function shouldSendNotification($notifiable, $notification, $channel)
      * Queue the given notification instances.
      *
      * @param  mixed  $notifiables
-     * @param  array[\Illuminate\Notifications\Channels\Notification]  $notification
+     * @param  \Illuminate\Notifications\Notification  $notification
      * @return void
      */
     protected function queueNotification($notifiables, $notification)
diff --git a/src/Illuminate/Support/Testing/Fakes/MailFake.php b/src/Illuminate/Support/Testing/Fakes/MailFake.php
index 172e020ffb7e..48fa7b955358 100644
--- a/src/Illuminate/Support/Testing/Fakes/MailFake.php
+++ b/src/Illuminate/Support/Testing/Fakes/MailFake.php
@@ -306,7 +306,7 @@ public function send($view, array $data = [], $callback = null)
     /**
      * Queue a new e-mail message for sending.
      *
-     * @param  string|array  $view
+     * @param  \Illuminate\Contracts\Mail\Mailable|string|array  $view
      * @param  string|null  $queue
      * @return mixed
      */
diff --git a/src/Illuminate/Support/Testing/Fakes/PendingMailFake.php b/src/Illuminate/Support/Testing/Fakes/PendingMailFake.php
index af33d02920bc..223dd44334a2 100644
--- a/src/Illuminate/Support/Testing/Fakes/PendingMailFake.php
+++ b/src/Illuminate/Support/Testing/Fakes/PendingMailFake.php
@@ -21,7 +21,7 @@ public function __construct($mailer)
     /**
      * Send a new mailable message instance.
      *
-     * @param  \Illuminate\Contracts\Mail\Mailable  $mailable;
+     * @param  \Illuminate\Contracts\Mail\Mailable  $mailable
      * @return mixed
      */
     public function send(Mailable $mailable)
@@ -32,7 +32,7 @@ public function send(Mailable $mailable)
     /**
      * Send a mailable message immediately.
      *
-     * @param  \Illuminate\Contracts\Mail\Mailable  $mailable;
+     * @param  \Illuminate\Contracts\Mail\Mailable  $mailable
      * @return mixed
      */
     public function sendNow(Mailable $mailable)
@@ -43,7 +43,7 @@ public function sendNow(Mailable $mailable)
     /**
      * Push the given mailable onto the queue.
      *
-     * @param  \Illuminate\Contracts\Mail\Mailable  $mailable;
+     * @param  \Illuminate\Contracts\Mail\Mailable  $mailable
      * @return mixed
      */
     public function queue(Mailable $mailable)
diff --git a/src/Illuminate/Validation/Rules/Dimensions.php b/src/Illuminate/Validation/Rules/Dimensions.php
index 354d071c3af4..e2326c7732b1 100644
--- a/src/Illuminate/Validation/Rules/Dimensions.php
+++ b/src/Illuminate/Validation/Rules/Dimensions.php
@@ -14,7 +14,7 @@ class Dimensions
     /**
      * Create a new dimensions rule instance.
      *
-     * @param  array  $constraints;
+     * @param  array  $constraints
      * @return void
      */
     public function __construct(array $constraints = [])

From 3d95575f4688e53e46d8d9a10f748a87698709f4 Mon Sep 17 00:00:00 2001
From: Taylor Otwell <taylorotwell@gmail.com>
Date: Tue, 22 Dec 2020 11:00:14 -0600
Subject: [PATCH 8/8] 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 451a0120b177..82860b6f7eb7 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.7';
+    const VERSION = '6.20.8';
 
     /**
      * The base path for the Laravel installation.