Merge branch '9.x'

Author: driesvints

src/Illuminate/Mail/Mailable.php

@@ -1664,6 +1664,10 @@ private function ensureContentIsHydrated()
             $this->markdown($content->markdown);
         }
 
+        if ($content->htmlString) {
+            $this->html($content->htmlString);
+        }
+
         foreach ($content->with as $key => $value) {
             $this->with($key, $value);
         }

src/Illuminate/Mail/Mailables/Content.php

@@ -38,6 +38,13 @@ class Content
      */
     public $markdown;
 
+    /**
+     * The pre-rendered HTML of the message.
+     *
+     * @var string|null
+     */
+    public $htmlString;
+
     /**
      * The message's view data.
      *
@@ -53,16 +60,18 @@ class Content
      * @param  string|null  $text
      * @param  string|null  $markdown
      * @param  array  $with
+     * @param  string|null  $htmlString
      *
      * @named-arguments-supported
      */
-    public function __construct(string $view = null, string $html = null, string $text = null, $markdown = null, array $with = [])
+    public function __construct(string $view = null, string $html = null, string $text = null, $markdown = null, array $with = [], string $htmlString = null)
     {
         $this->view = $view;
         $this->html = $html;
         $this->text = $text;
         $this->markdown = $markdown;
         $this->with = $with;
+        $this->htmlString = $htmlString;
     }
 
     /**
@@ -115,6 +124,19 @@ public function markdown(string $view)
         return $this;
     }
 
+    /**
+     * Set the pre-rendered HTML for the message.
+     *
+     * @param  string  $html
+     * @return $this
+     */
+    public function htmlString(string $html)
+    {
+        $this->htmlString = $html;
+
+        return $this;
+    }
+
     /**
      * Add a piece of view data to the message.
      *

src/Illuminate/Testing/PendingCommand.php

@@ -419,6 +419,8 @@ private function createABufferedOutputMock()
 
         foreach ($this->test->expectedOutputSubstrings as $i => $text) {
             $mock->shouldReceive('doWrite')
+                ->atLeast()
+                ->times(0)
                 ->withArgs(fn ($output) => str_contains($output, $text))
                 ->andReturnUsing(function () use ($i) {
                     unset($this->test->expectedOutputSubstrings[$i]);
@@ -427,6 +429,8 @@ private function createABufferedOutputMock()
 
         foreach ($this->test->unexpectedOutput as $output => $displayed) {
             $mock->shouldReceive('doWrite')
+                ->atLeast()
+                ->times(0)
                 ->ordered()
                 ->with($output, Mockery::any())
                 ->andReturnUsing(function () use ($output) {
@@ -436,6 +440,8 @@ private function createABufferedOutputMock()
 
         foreach ($this->test->unexpectedOutputSubstrings as $text => $displayed) {
             $mock->shouldReceive('doWrite')
+                 ->atLeast()
+                 ->times(0)
                  ->withArgs(fn ($output) => str_contains($output, $text))
                  ->andReturnUsing(function () use ($text) {
                      $this->test->unexpectedOutputSubstrings[$text] = true;

tests/Integration/Database/EloquentModelCustomCastingTest.php

@@ -59,7 +59,7 @@ protected function tearDown(): void
     }
 
     /**
-     * Tests...
+     * @requires extension gmp
      */
     public function testSavingCastedAttributesToDatabase()
     {
@@ -97,6 +97,9 @@ public function testSavingCastedAttributesToDatabase()
         $this->assertInstanceOf(GMP::class, $model->amount);
     }
 
+    /**
+     * @requires extension gmp
+     */
     public function testInvalidArgumentExceptionOnInvalidValue()
     {
         /** @var \Illuminate\Tests\Integration\Database\CustomCasts $model */
@@ -115,6 +118,9 @@ public function testInvalidArgumentExceptionOnInvalidValue()
         $this->assertSame('address_line_two_value', $model->address->lineTwo);
     }
 
+    /**
+     * @requires extension gmp
+     */
     public function testInvalidArgumentExceptionOnNull()
     {
         /** @var \Illuminate\Tests\Integration\Database\CustomCasts $model */
@@ -133,6 +139,9 @@ public function testInvalidArgumentExceptionOnNull()
         $this->assertSame('address_line_two_value', $model->address->lineTwo);
     }
 
+    /**
+     * @requires extension gmp
+     */
     public function testModelsWithCustomCastsCanBeConvertedToArrays()
     {
         /** @var \Illuminate\Tests\Integration\Database\CustomCasts $model */