Merge remote-tracking branch 'origin/10.x' into 10.x

laravel · Jul 12, 2023 · 7c52521 · 7c52521
2 parents 5c8ddad + 3cd9bcb
commit 7c52521
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/src/Illuminate/Foundation/Console/Kernel.php b/src/Illuminate/Foundation/Console/Kernel.php
@@ -484,6 +484,7 @@ protected function getArtisan()
 
             if ($this->symfonyDispatcher instanceof EventDispatcher) {
                 $this->artisan->setDispatcher($this->symfonyDispatcher);
+                $this->artisan->setSignalsToDispatchEvent();
             }
         }
 

diff --git a/src/Illuminate/Mail/Mailable.php b/src/Illuminate/Mail/Mailable.php
@@ -1330,6 +1330,8 @@ private function formatAssertionRecipient($address, $name = null)
      */
     public function assertHasSubject($subject)
     {
+        $this->renderForAssertions();
+
         PHPUnit::assertTrue(
             $this->hasSubject($subject),
             "Did not see expected text [{$subject}] in email subject."