From 212d7f41c6f26fa842c45b78f775dbac4320788a Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Thu, 14 Jan 2021 17:08:36 +0100 Subject: [PATCH 1/4] Re-enable query builder tests (#35894) --- tests/Database/DatabaseQueryBuilderTest.php | 28 ++++++++++----------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/tests/Database/DatabaseQueryBuilderTest.php b/tests/Database/DatabaseQueryBuilderTest.php index 407b312ee5bf..f7d20c532223 100755 --- a/tests/Database/DatabaseQueryBuilderTest.php +++ b/tests/Database/DatabaseQueryBuilderTest.php @@ -305,20 +305,20 @@ public function testWheresWithArrayValue() $this->assertSame('select * from "users" where "id" = ?', $builder->toSql()); $this->assertEquals([0 => 12], $builder->getBindings()); - // $builder = $this->getBuilder(); - // $builder->select('*')->from('users')->where('id', '=', [12, 30]); - // $this->assertSame('select * from "users" where "id" = ?', $builder->toSql()); - // $this->assertEquals([0 => 12, 1 => 30], $builder->getBindings()); - - // $builder = $this->getBuilder(); - // $builder->select('*')->from('users')->where('id', '!=', [12, 30]); - // $this->assertSame('select * from "users" where "id" != ?', $builder->toSql()); - // $this->assertEquals([0 => 12, 1 => 30], $builder->getBindings()); - - // $builder = $this->getBuilder(); - // $builder->select('*')->from('users')->where('id', '<>', [12, 30]); - // $this->assertSame('select * from "users" where "id" <> ?', $builder->toSql()); - // $this->assertEquals([0 => 12, 1 => 30], $builder->getBindings()); + $builder = $this->getBuilder(); + $builder->select('*')->from('users')->where('id', '=', [12, 30]); + $this->assertSame('select * from "users" where "id" = ?', $builder->toSql()); + $this->assertEquals([0 => 12], $builder->getBindings()); + + $builder = $this->getBuilder(); + $builder->select('*')->from('users')->where('id', '!=', [12, 30]); + $this->assertSame('select * from "users" where "id" != ?', $builder->toSql()); + $this->assertEquals([0 => 12], $builder->getBindings()); + + $builder = $this->getBuilder(); + $builder->select('*')->from('users')->where('id', '<>', [12, 30]); + $this->assertSame('select * from "users" where "id" <> ?', $builder->toSql()); + $this->assertEquals([0 => 12], $builder->getBindings()); } public function testMySqlWrappingProtectsQuotationMarks() From 49f9db00a754517f07d365ee5b0806df82e37029 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Fri, 15 Jan 2021 09:35:47 -0600 Subject: [PATCH 2/4] 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 97a41bb7711c..f58255d51049 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.11'; + const VERSION = '6.20.12'; /** * The base path for the Laravel installation. From 1a146d2c170390def0b017146b21c9f8c21691ce Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Tue, 19 Jan 2021 14:24:34 +0100 Subject: [PATCH 3/4] Fix empty email with attachments (#35941) --- src/Illuminate/Mail/Mailer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Illuminate/Mail/Mailer.php b/src/Illuminate/Mail/Mailer.php index 2d310a3a00a0..7a11e58f68fc 100755 --- a/src/Illuminate/Mail/Mailer.php +++ b/src/Illuminate/Mail/Mailer.php @@ -325,7 +325,7 @@ protected function parseView($view) protected function addContent($message, $view, $plain, $raw, $data) { if (isset($view)) { - $message->setBody($this->renderView($view, $data), 'text/html'); + $message->setBody($this->renderView($view, $data) ?: ' ', 'text/html'); } if (isset($plain)) { From 12ed06da14e3fe4257cb1ece91c2d3439cc2d34b Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Tue, 19 Jan 2021 07:41:17 -0600 Subject: [PATCH 4/4] 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 f58255d51049..30e8e7c358b1 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.12'; + const VERSION = '6.20.13'; /** * The base path for the Laravel installation. pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy