Merge branch '7.0' into 7.1

* 7.0:
  Fix implicit nullable parameters
  stop marking parameters implicitly as nullable
  include message id provided by the MTA when dispatching the SentMessageEvent
  Remove whitespaces from block form_help
  Fix TypeError on ProgressBar

Author: xabbuh

src/Symfony/Bridge/PsrHttpMessage/Tests/Fixtures/ServerRequest.php

@@ -26,10 +26,10 @@ class ServerRequest extends Message implements ServerRequestInterface
     public function __construct(
         string $version = '1.1',
         array $headers = [],
-        StreamInterface $body = null,
+        ?StreamInterface $body = null,
         private readonly string $requestTarget = '/',
         private readonly string $method = 'GET',
-        UriInterface|string $uri = null,
+        UriInterface|string|null $uri = null,
         private readonly array $server = [],
         private readonly array $cookies = [],
         private readonly array $query = [],

src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_5_layout.html.twig

@@ -361,12 +361,12 @@
 {# Help #}
 
 {%- block form_help -%}
-    {% set row_class = row_attr.class|default('') %}
-    {% set help_class = ' form-text' %}
-    {% if 'input-group' in row_class %}
+    {%- set row_class = row_attr.class|default('') -%}
+    {%- set help_class = ' form-text' -%}
+    {%- if 'input-group' in row_class -%}
         {#- Hack to properly display help with input group -#}
-        {% set help_class = ' input-group-text' %}
-    {% endif %}
+        {%- set help_class = ' input-group-text' -%}
+    {%- endif -%}
     {%- if help is not empty -%}
         {%- set help_attr = help_attr|merge({class: (help_attr.class|default('') ~ help_class ~ ' mb-0')|trim}) -%}
     {%- endif -%}

src/Symfony/Component/Console/Helper/ProgressBar.php

@@ -183,9 +183,9 @@ public function setMessage(string $message, string $name = 'message'): void
         $this->messages[$name] = $message;
     }
 
-    public function getMessage(string $name = 'message'): string
+    public function getMessage(string $name = 'message'): ?string
     {
-        return $this->messages[$name];
+        return $this->messages[$name] ?? null;
     }
 
     public function getStartTime(): int

src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes.php

@@ -16,7 +16,7 @@ class Foo
     public static int $counter = 0;
 
     #[Required]
-    public function cloneFoo(\stdClass $bar = null): static
+    public function cloneFoo(?\stdClass $bar = null): static
     {
         ++self::$counter;
 

src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes_80.php

@@ -108,7 +108,7 @@ public function __construct(string $arg1, #[AutowireDecorated] AsDecoratorInterf
 #[AsDecorator(decorates: \NonExistent::class, onInvalid: ContainerInterface::NULL_ON_INVALID_REFERENCE)]
 class AsDecoratorBaz implements AsDecoratorInterface
 {
-    public function __construct(#[AutowireDecorated] AsDecoratorInterface $inner = null)
+    public function __construct(#[AutowireDecorated] ?AsDecoratorInterface $inner = null)
     {
     }
 }

src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/classes.php

@@ -83,7 +83,7 @@ public function callPassed()
 
 class DummyProxyDumper implements DumperInterface
 {
-    public function isProxyCandidate(Definition $definition, bool &$asGhostObject = null, string $id = null): bool
+    public function isProxyCandidate(Definition $definition, ?bool &$asGhostObject = null, ?string $id = null): bool
     {
         $asGhostObject = false;
 

src/Symfony/Component/Form/Tests/Fixtures/TranslatableTextAlign.php

@@ -20,7 +20,7 @@ enum TranslatableTextAlign implements TranslatableInterface
     case Center;
     case Right;
 
-    public function trans(TranslatorInterface $translator, string $locale = null): string
+    public function trans(TranslatorInterface $translator, ?string $locale = null): string
     {
         return $translator->trans($this->name, locale: $locale);
     }

src/Symfony/Component/Mailer/Tests/Transport/Smtp/DummyStream.php

@@ -77,7 +77,7 @@ public function write(string $bytes, $debug = true): void
         } elseif (str_starts_with($bytes, 'QUIT')) {
             $this->nextResponse = '221 Goodbye';
         } else {
-            $this->nextResponse = '250 OK';
+            $this->nextResponse = '250 OK queued as 000501c4054c';
         }
     }
 

src/Symfony/Component/Mailer/Tests/Transport/Smtp/SmtpTransportTest.php

@@ -13,6 +13,8 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Mailer\Envelope;
+use Symfony\Component\Mailer\Event\MessageEvent;
+use Symfony\Component\Mailer\Event\SentMessageEvent;
 use Symfony\Component\Mailer\Exception\LogicException;
 use Symfony\Component\Mailer\Exception\TransportException;
 use Symfony\Component\Mailer\Transport\Smtp\SmtpTransport;
@@ -24,6 +26,7 @@
 use Symfony\Component\Mime\Part\DataPart;
 use Symfony\Component\Mime\Part\File;
 use Symfony\Component\Mime\RawMessage;
+use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
 
 /**
  * @group time-sensitive
@@ -137,6 +140,37 @@ public function testWriteEncodedRecipientAndSenderAddresses()
         $this->assertContains("RCPT TO:<[email protected]>\r\n", $stream->getCommands());
     }
 
+    public function testMessageIdFromServerIsEmbeddedInSentMessageEvent()
+    {
+        $calls = 0;
+        $eventDispatcher = $this->createMock(EventDispatcherInterface::class);
+        $eventDispatcher->expects($this->any())
+            ->method('dispatch')
+            ->with($this->callback(static function ($event) use (&$calls): bool {
+                ++$calls;
+
+                if (1 === $calls && $event instanceof MessageEvent) {
+                    return true;
+                }
+
+                if (2 === $calls && $event instanceof SentMessageEvent && '000501c4054c' === $event->getMessage()->getMessageId()) {
+                    return true;
+                }
+
+                return false;
+            }));
+        $transport = new SmtpTransport(new DummyStream(), $eventDispatcher);
+
+        $email = new Email();
+        $email->from('[email protected]');
+        $email->to('[email protected]');
+        $email->text('.');
+
+        $transport->send($email);
+
+        $this->assertSame(2, $calls);
+    }
+
     public function testAssertResponseCodeNoCodes()
     {
         $this->expectException(LogicException::class);

src/Symfony/Component/Mailer/Transport/Smtp/SmtpTransport.php

@@ -39,7 +39,6 @@ class SmtpTransport extends AbstractTransport
     private int $pingThreshold = 100;
     private float $lastMessageTime = 0;
     private AbstractStream $stream;
-    private string $mtaResult = '';
     private string $domain = '[127.0.0.1]';
 
     public function __construct(?AbstractStream $stream = null, ?EventDispatcherInterface $dispatcher = null, ?LoggerInterface $logger = null)
@@ -148,10 +147,6 @@ public function send(RawMessage $message, ?Envelope $envelope = null): ?SentMess
             throw $e;
         }
 
-        if ($this->mtaResult && $messageId = $this->parseMessageId($this->mtaResult)) {
-            $message->setMessageId($messageId);
-        }
-
         $this->checkRestartThreshold();
 
         return $message;
@@ -235,9 +230,13 @@ protected function doSend(SentMessage $message): void
                 $this->getLogger()->debug(sprintf('Email transport "%s" stopped', __CLASS__));
                 throw $e;
             }
-            $this->mtaResult = $this->executeCommand("\r\n.\r\n", [250]);
+            $mtaResult = $this->executeCommand("\r\n.\r\n", [250]);
             $message->appendDebug($this->stream->getDebug());
             $this->lastMessageTime = microtime(true);
+
+            if ($mtaResult && $messageId = $this->parseMessageId($mtaResult)) {
+                $message->setMessageId($messageId);
+            }
         } catch (TransportExceptionInterface $e) {
             $e->appendDebug($this->stream->getDebug());
             $this->lastMessageTime = 0;