From 1c29a99559f88cfd6cbfd1c8ba3fd68508f97b9c Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Thu, 29 Oct 2020 13:56:34 -0500 Subject: [PATCH 1/5] fix columns that are already prefixed --- src/Illuminate/Database/Eloquent/Builder.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Illuminate/Database/Eloquent/Builder.php b/src/Illuminate/Database/Eloquent/Builder.php index b3e8bede7159..87ae422ef941 100755 --- a/src/Illuminate/Database/Eloquent/Builder.php +++ b/src/Illuminate/Database/Eloquent/Builder.php @@ -1145,6 +1145,10 @@ protected function createSelectWithConstraint($name) { return [explode(':', $name)[0], static function ($query) use ($name) { $query->select(array_map(static function ($column) use ($query) { + if (Str::contains($column, '.')) { + return $column; + } + return $query instanceof BelongsToMany ? $query->getRelated()->getTable().'.'.$column : $column; From 41915424bbd0939048e9b2d3701568dc2bc98790 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Thu, 29 Oct 2020 13:56:44 -0500 Subject: [PATCH 2/5] patch --- 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 7c53199cdf63..2809326688c2 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.1'; + const VERSION = '6.20.2'; /** * The base path for the Laravel installation. From f9c64887e4970ec92550d16b21c4d5d888666d56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Chris=20D=C3=B6hring?= Date: Sat, 31 Oct 2020 19:35:25 +0100 Subject: [PATCH 3/5] Add php 8 support for Illuminate Testing 7.x (#35045) --- src/Illuminate/Testing/composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Illuminate/Testing/composer.json b/src/Illuminate/Testing/composer.json index 0a659bad9a57..1c18d912e4d2 100644 --- a/src/Illuminate/Testing/composer.json +++ b/src/Illuminate/Testing/composer.json @@ -14,7 +14,7 @@ } ], "require": { - "php": "^7.2.5", + "php": "^7.2.5|^8.0", "illuminate/contracts": "^7.0", "illuminate/support": "^7.0", "symfony/polyfill-php73": "^1.17" From ab0aead7c2c9633effe0dba5229565a159ba4af4 Mon Sep 17 00:00:00 2001 From: Quynh Xuan Nguyen Date: Mon, 2 Nov 2020 10:46:23 +0700 Subject: [PATCH 4/5] Fix PendingRequest docblock --- src/Illuminate/Http/Client/PendingRequest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Illuminate/Http/Client/PendingRequest.php b/src/Illuminate/Http/Client/PendingRequest.php index 08587e1e1fd9..304151cacae0 100644 --- a/src/Illuminate/Http/Client/PendingRequest.php +++ b/src/Illuminate/Http/Client/PendingRequest.php @@ -87,7 +87,7 @@ class PendingRequest /** * The callbacks that should execute before the request is sent. * - * @var array + * @var \Illuminate\Support\Collection */ protected $beforeSendingCallbacks; From 93f6d565a07045baa0e4b941ae1f733cd5984d65 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Tue, 3 Nov 2020 08:12:58 -0600 Subject: [PATCH 5/5] 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 ded34a078d06..7633b00d5b12 100755 --- a/src/Illuminate/Foundation/Application.php +++ b/src/Illuminate/Foundation/Application.php @@ -33,7 +33,7 @@ class Application extends Container implements ApplicationContract, CachesConfig * * @var string */ - const VERSION = '7.29.2'; + const VERSION = '7.29.3'; /** * The base path for the Laravel installation.