Merge branch '6.4' into 7.0

* 6.4:
  Fix implicit nullable parameters
  Remove whitespaces from block form_help
  Fix TypeError on ProgressBar

Author: xabbuh

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/Routing/Tests/Fixtures/AttributeFixtures/ExtendedRoute.php

@@ -7,7 +7,7 @@
 #[\Attribute(\Attribute::IS_REPEATABLE | \Attribute::TARGET_CLASS | \Attribute::TARGET_METHOD)]
 class ExtendedRoute extends Route
 {
-    public function __construct(array|string $path = null, ?string $name = null, array $defaults = [])
+    public function __construct(array|string|null $path = null, ?string $name = null, array $defaults = [])
     {
         parent::__construct("/{section<(foo|bar|baz)>}" . $path, $name, [], [], array_merge(['section' => 'foo'], $defaults));
     }