Roderik Muit
--- a/core/modules/user/tests/src/Functional/UserRegistrationTest.php
+++ b/core/modules/user/tests/src/Functional/UserRegistrationTest.php
    $this->submitForm($edit, 'Create new account');
    $this->assertSession()->pageTextContains('A welcome message with further instructions has been sent to your email address.');

-    /** @var EntityStorageInterface $storage */
+    /** @var \Drupal\Core\Entity\EntityStorageInterface $storage */
--- a/core/modules/user/src/Form/UserPasswordResetForm.php
+++ b/core/modules/user/src/Form/UserPasswordResetForm.php
   *   The current timestamp.
   * @param string $hash
   *   Login link hash.
   */
  public function buildForm(array $form, FormStateInterface $form_state, ?AccountInterface $user = NULL, $expiration_date = NULL, $timestamp = NULL, $hash = NULL) {
+    // @todo Remove if clause / else block in Drupal 11.0.0. (We are allowed to
+    //   assume variables are populated, even though we're disallowed from
+    //   making them mandatory in this method definition.)
    if ($expiration_date) {
      $form['message'] = ['#markup' => $this->t('<p>This is a one-time login for %user_name and will expire on %expiration_date.</p><p>Click on this button to log in to the site and change your password.</p>', ['%user_name' => $user->getAccountName(), '%expiration_date' => $expiration_date])];
-      $form['#title'] = $this->t('Reset password');
+      $form['#title'] = $user->getLastLoginTime() ? $this->t('Reset password') : $this->t('Set password');
    }
    else {
-      // No expiration for first time login.
+      @trigger_error('The expiration date argument to UserPasswordResetForm::buildForm() is mandatory / not passing it is deprecated in drupal:10.1.0 and is removed from drupal:11.0.0. See https://www.drupal.org/node/3214529', E_USER_DEPRECATED);
-      @trigger_error('The expiration date argument to UserPasswordResetForm::buildForm() is mandatory / not passing it is deprecated in drupal:10.1.0 and is removed from drupal:11.0.0. See https://www.drupal.org/node/3214529', E_USER_DEPRECATED);
+      @trigger_error('The expiration date argument to UserPasswordResetForm::buildForm() is mandatory / not passing it is deprecated in drupal:11.3.0 and is removed from drupal:12.0.0. See https://www.drupal.org/node/3214529', E_USER_DEPRECATED);
--- a/core/modules/user/src/Form/UserPasswordResetForm.php
+++ b/core/modules/user/src/Form/UserPasswordResetForm.php
   * @param \Drupal\Core\Session\AccountInterface $user
   *   User requesting reset.
   * @param string $expiration_date
-   *   Formatted expiration date for the login link, or NULL if the link does
-   *   not expire.
+   *   Formatted expiration date for the login link.
   * @param int $timestamp
   *   The current timestamp.
   * @param string $hash
   *   Login link hash.
   */
  public function buildForm(array $form, FormStateInterface $form_state, ?AccountInterface $user = NULL, $expiration_date = NULL, $timestamp = NULL, $hash = NULL) {
+    // @todo Remove if clause / else block in Drupal 11.0.0. (We are allowed to
-    // @todo Remove if clause / else block in Drupal 11.0.0. (We are allowed to
+    // @todo Remove if clause / else block in Drupal 12.0.0. (We are allowed to
--- a/core/lib/Drupal/Core/Test/AssertMailTrait.php
+++ b/core/lib/Drupal/Core/Test/AssertMailTrait.php
   *   \Drupal\Component\Render\FormattableMarkup unless you cast the object to
   *   a string. If left blank, a default message will be displayed.
   */
-  protected function assertMailString($field_name, $string, $email_depth, $message = '') {
+  protected function assertMailString($field_name, $string, $email_depth, $message = ''): void {
--- a/core/lib/Drupal/Core/Test/AssertMailTrait.php
+++ b/core/lib/Drupal/Core/Test/AssertMailTrait.php
   *   \Drupal\Component\Render\FormattableMarkup unless you cast the object to
   *   a string. If left blank, a default message will be displayed.
   */
-  protected function assertMailPattern($field_name, $regex, $message = '') {
+  protected function assertMailPattern($field_name, $regex, $message = ''): void {