fix conflicts

Author: taylorotwell

src/Illuminate/Foundation/Application.php

@@ -33,7 +33,7 @@ class Application extends Container implements ApplicationContract, CachesConfig
      *
      * @var string
      */
-    const VERSION = '8.23.0';
+    const VERSION = '8.23.1';
 
     /**
      * The base path for the Laravel installation.

src/Illuminate/Mail/Mailer.php

@@ -352,7 +352,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)) {

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()