core/includes/install.core.inc

@@ -631,8 +631,8 @@ function install_run_task($task, &$install_state) {
       if (isset($batches['operations'])) {
         $batches = [$batches];
       }
-      foreach ($batches as $batch) {
-        batch_set($batch);
+      foreach ($batches as $batch_definition) {
+        batch_set($batch_definition);
         // For interactive batches, we need to store the fact that this batch
         // task is currently running. Otherwise, we need to make sure the batch
         // will complete in one page request.

core/modules/ckeditor5/tests/modules/ckeditor4to5upgrade_plugin_test/ckeditor4to5upgrade_plugin_test.info.yml

@@ -2,6 +2,5 @@ name: CKEditor 4 to 5 Upgrade plugin Test
 type: module
 description: "Provides test plugins for testing CKEditor 4 to 5 upgrade infrastructure."
 package: Testing
-core_version_requirement: ^9
 dependencies:
   - ckeditor5:ckeditor5

core/modules/ckeditor5/tests/modules/ckeditor5_definition_supporting_element/ckeditor5_definition_supporting_element.info.yml

@@ -2,6 +2,5 @@ name: CKEditor 5 Definition Supporting Tags Test
 type: module
 description: "Provides test plugins for CKEditor 5 to test finding plugin definitions that support specific tags."
 package: Testing
-core_version_requirement: ^9
 dependencies:
   - ckeditor5:ckeditor5

core/modules/ckeditor5/tests/modules/ckeditor5_plugin_conditions_test/ckeditor5_plugin_conditions_test.info.yml

@@ -2,6 +2,5 @@ name: CKEditor 5 Plugin Conditions Test
 type: module
 description: "Provides test plugins for CKEditor 5 to test plugin conditions."
 package: Testing
-core_version_requirement: ^9
 dependencies:
   - ckeditor5:ckeditor5

core/modules/ckeditor5/tests/modules/ckeditor5_plugin_elements_subset/ckeditor5_plugin_elements_subset.info.yml

@@ -2,6 +2,5 @@ name: CKEditor 5 Plugin Elements Subset Test
 type: module
 description: "Provides test plugin to test CKEditor5PluginElementsSubsetInterface"
 package: Testing
-core_version_requirement: ^9
 dependencies:
   - ckeditor5:ckeditor5

core/modules/ckeditor5/tests/modules/ckeditor5_plugin_elements_test/ckeditor5_plugin_elements_test.info.yml

@@ -2,6 +2,5 @@ name: CKEditor 5 Plugin Elements Test
 type: module
 description: "Provides test plugins for CKEditor 5 to test allowed elements parsing."
 package: Testing
-core_version_requirement: ^9
 dependencies:
   - ckeditor5:ckeditor5

core/modules/ckeditor5/tests/modules/ckeditor5_test/ckeditor5_test.info.yml

@@ -2,7 +2,6 @@ name: CKEditor 5 Test
 type: module
 description: "Provides test layout and component plugins for CKEditor 5."
 package: Testing
-core_version_requirement: ^9
 dependencies:
   - drupal:editor
   - ckeditor5:ckeditor5

core/modules/system/tests/modules/system_core_semver_test/system_core_semver_test.info.yml

@@ -3,4 +3,4 @@ type: module
 description: 'Support module for testing core using semver.'
 package: Testing
 version: 1.0.0
-core_version_requirement: ^8|^9
+core_version_requirement: ^8 || ^9 || ^10

core/modules/system/tests/modules/update_test_semver_update_n/update_test_semver_update_n.info.yml

@@ -3,4 +3,3 @@ type: module
 description: 'Support module for update testing with core semver value.'
 package: Testing
 version: VERSION
-core_version_requirement: ^9

core/modules/system/tests/src/Functional/UpdateSystem/UpdateScriptTest.php

@@ -279,7 +279,7 @@ public function providerExtensionCompatibilityChange() {
     return [
       'module: core_version_requirement key incompatible' => [
         [
-          'core_version_requirement' => '^8 || ^9',
+          'core_version_requirement' => '>= 8',
           'type' => 'module',
         ],
         [
@@ -290,7 +290,7 @@ public function providerExtensionCompatibilityChange() {
       ],
       'theme: core_version_requirement key incompatible' => [
         [
-          'core_version_requirement' => '^8 || ^9',
+          'core_version_requirement' => '>= 8',
           'type' => 'theme',
         ],
         [
@@ -301,12 +301,12 @@ public function providerExtensionCompatibilityChange() {
       ],
       'module: php requirement' => [
         [
-          'core_version_requirement' => '^8 || ^9',
+          'core_version_requirement' => '>= 8',
           'type' => 'module',
           'php' => 1,
         ],
         [
-          'core_version_requirement' => '^8 || ^9',
+          'core_version_requirement' => '>= 8',
           'type' => 'module',
           'php' => 1000000000,
         ],
@@ -314,12 +314,12 @@ public function providerExtensionCompatibilityChange() {
       ],
       'theme: php requirement' => [
         [
-          'core_version_requirement' => '^8 || ^9',
+          'core_version_requirement' => '>= 8',
           'type' => 'theme',
           'php' => 1,
         ],
         [
-          'core_version_requirement' => '^8 || ^9',
+          'core_version_requirement' => '>= 8',
           'type' => 'theme',
           'php' => 1000000000,
         ],
@@ -327,7 +327,7 @@ public function providerExtensionCompatibilityChange() {
       ],
       'module: core_version_requirement key missing' => [
         [
-          'core_version_requirement' => '^8 || ^9',
+          'core_version_requirement' => '>= 8',
           'type' => 'module',
         ],
         [
@@ -338,7 +338,7 @@ public function providerExtensionCompatibilityChange() {
       ],
       'theme: core_version_requirement key missing' => [
         [
-          'core_version_requirement' => '^8 || ^9',
+          'core_version_requirement' => '>= 8',
           'type' => 'theme',
         ],
         [
@@ -377,7 +377,7 @@ public function testMissingExtension($extension_type) {
     $extension_info = [
       'name' => $extension_name,
       'type' => $extension_type,
-      'core_version_requirement' => '^8 || ^9',
+      'core_version_requirement' => '^8 || ^9 || ^10',
     ];
     if ($extension_type === 'theme') {
       $extension_info['base theme'] = FALSE;

core/modules/system/tests/themes/test_core_semver/test_core_semver.info.yml

@@ -3,4 +3,4 @@ type: theme
 base theme: stable
 description: 'Test theme which has semver core version.'
 version: VERSION
-core_version_requirement: ^8 || ^9
+core_version_requirement: ^8 || ^9 || ^10

core/modules/user/src/Form/UserLoginForm.php

@@ -5,13 +5,13 @@
 use Drupal\Core\Form\FormBase;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Render\RendererInterface;
+use Drupal\Core\Render\BareHtmlPageRendererInterface;
 use Drupal\Core\Url;
 use Drupal\user\UserAuthInterface;
 use Drupal\user\UserInterface;
 use Drupal\user\UserStorageInterface;
 use Drupal\user\UserFloodControlInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\HttpFoundation\Response;
 
 /**
  * Provides a user login form.
@@ -48,6 +48,13 @@ class UserLoginForm extends FormBase {
    */
   protected $renderer;
 
+  /**
+   * The bare HTML renderer.
+   *
+   * @var \Drupal\Core\Render\BareHtmlPageRendererInterface
+   */
+  protected $bareHtmlPageRenderer;
+
   /**
    * Constructs a new UserLoginForm.
    *
@@ -59,16 +66,23 @@ class UserLoginForm extends FormBase {
    *   The user authentication object.
    * @param \Drupal\Core\Render\RendererInterface $renderer
    *   The renderer.
+   * @param \Drupal\Core\Render\BareHtmlPageRendererInterface $bare_html_renderer
+   *   The renderer.
    */
-  public function __construct($user_flood_control, UserStorageInterface $user_storage, UserAuthInterface $user_auth, RendererInterface $renderer) {
+  public function __construct($user_flood_control, UserStorageInterface $user_storage, UserAuthInterface $user_auth, RendererInterface $renderer, BareHtmlPageRendererInterface $bare_html_renderer = NULL) {
     if (!$user_flood_control instanceof UserFloodControlInterface) {
       @trigger_error('Passing the flood service to ' . __METHOD__ . ' is deprecated in drupal:9.1.0 and is replaced by user.flood_control in drupal:10.0.0. See https://www.drupal.org/node/3067148', E_USER_DEPRECATED);
       $user_flood_control = \Drupal::service('user.flood_control');
     }
+    if (!$bare_html_renderer instanceof BareHtmlPageRendererInterface) {
+      @trigger_error('Calling UserLoginForm::__construct() without the $bare_html_renderer argument is deprecated in drupal:9.4.0 and will be required before drupal:10.0.0. See https://www.drupal.org/node/3251987.', E_USER_DEPRECATED);
+      $bare_html_renderer = \Drupal::service('bare_html_page_renderer');
+    }
     $this->userFloodControl = $user_flood_control;
     $this->userStorage = $user_storage;
     $this->userAuth = $user_auth;
     $this->renderer = $renderer;
+    $this->bareHtmlPageRenderer = $bare_html_renderer;
   }
 
   /**
@@ -79,7 +93,8 @@ public static function create(ContainerInterface $container) {
       $container->get('user.flood_control'),
       $container->get('entity_type.manager')->getStorage('user'),
       $container->get('user.auth'),
-      $container->get('renderer')
+      $container->get('renderer'),
+      $container->get('bare_html_page_renderer')
     );
   }
 
@@ -237,7 +252,9 @@ public function validateFinal(array &$form, FormStateInterface $form_state) {
           // We did not find a uid, so the limit is IP-based.
           $message = $this->t('Too many failed login attempts from your IP address. This IP address is temporarily blocked. Try again later or <a href=":url">request a new password</a>.', [':url' => Url::fromRoute('user.pass')->toString()]);
         }
-        $form_state->setResponse(new Response($message, 403));
+        $response = $this->bareHtmlPageRenderer->renderBarePage(['#markup' => $message], $this->t('Login failed'), 'maintenance_page');
+        $response->setStatusCode(403);
+        $form_state->setResponse($response);
       }
       else {
         // Use $form_state->getUserInput() in the error message to guarantee

core/modules/user/tests/src/Functional/UserLoginTest.php

@@ -217,6 +217,7 @@ public function assertFailedLogin(User $account, string $flood_trigger = NULL):
         ->fetchField();
       if ($flood_trigger == 'user') {
         $this->assertSession()->pageTextMatches("/There (has|have) been more than \w+ failed login attempt.* for this account. It is temporarily blocked. Try again later or request a new password./");
+        $this->assertSession()->elementExists('css', 'body.maintenance-page');
         $this->assertSession()->linkExists("request a new password");
         $this->assertSession()->linkByHrefExists(Url::fromRoute('user.pass')->toString());
         $this->assertEquals('Flood control blocked login attempt for uid %uid from %ip', $last_log, 'A watchdog message was logged for the login attempt blocked by flood control per user.');
@@ -224,6 +225,7 @@ public function assertFailedLogin(User $account, string $flood_trigger = NULL):
       else {
         // No uid, so the limit is IP-based.
         $this->assertSession()->pageTextContains("Too many failed login attempts from your IP address. This IP address is temporarily blocked. Try again later or request a new password.");
+        $this->assertSession()->elementExists('css', 'body.maintenance-page');
         $this->assertSession()->linkExists("request a new password");
         $this->assertSession()->linkByHrefExists(Url::fromRoute('user.pass')->toString());
         $this->assertEquals('Flood control blocked login attempt from %ip', $last_log, 'A watchdog message was logged for the login attempt blocked by flood control per IP.');

core/modules/user/tests/src/Kernel/Form/UserLoginFormTest.php

@@ -4,6 +4,7 @@
 
 use Drupal\Core\Flood\FloodInterface;
 use Drupal\Core\Render\RendererInterface;
+use Drupal\Core\Render\BareHtmlPageRendererInterface;
 use Drupal\KernelTests\KernelTestBase;
 use Drupal\user\Form\UserLoginForm;
 use Drupal\user\UserAuthInterface;
@@ -29,11 +30,13 @@ public function testConstructorDeprecations() {
     $user_storage = $this->prophesize(UserStorageInterface::class);
     $user_auth = $this->prophesize(UserAuthInterface::class);
     $renderer = $this->prophesize(RendererInterface::class);
+    $bare_html_renderer = $this->prophesize(BareHtmlPageRendererInterface::class);
     $form = new UserLoginForm(
       $flood->reveal(),
       $user_storage->reveal(),
       $user_auth->reveal(),
-      $renderer->reveal()
+      $renderer->reveal(),
+      $bare_html_renderer->reveal()
     );
     $this->assertNotNull($form);
   }

core/profiles/testing_multilingual/config/install/locale.settings.yml

+cache_strings: true
+translate_english: false
+javascript:
+  directory: languages
+translation:
+  use_source: local
+  default_filename: '%project-%version.%language.po'
+  default_server_pattern: 'https://ftp.drupal.org/files/translations/%core/%project/%project-%version.%language.po'
+  overwrite_customized: false
+  overwrite_not_customized: true
+  update_interval_days: 0
+  path: ''
+  import_enabled: true

core/profiles/testing_multilingual/testing_multilingual.info.yml

@@ -5,4 +5,5 @@ version: VERSION
 hidden: true
 install:
   - locale
+  - locale_test_translate
   - tour

core/tests/Drupal/FunctionalTests/Installer/InstallerTranslationMultipleLanguageNonInteractiveTest.php

+<?php
+
+namespace Drupal\FunctionalTests\Installer;
+
+use Drupal\Tests\BrowserTestBase;
+
+/**
+ * Tests translation files for multiple languages get imported during install.
+ *
+ * @group Installer
+ */
+class InstallerTranslationMultipleLanguageNonInteractiveTest extends BrowserTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $defaultTheme = 'stark';
+
+  /**
+   * Switch to the multilingual testing profile.
+   *
+   * @var string
+   */
+  protected $profile = 'testing_multilingual';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function prepareEnvironment() {
+    parent::prepareEnvironment();
+    // Place custom local translations in the translations directory.
+    mkdir(DRUPAL_ROOT . '/' . $this->siteDirectory . '/files/translations', 0777, TRUE);
+    file_put_contents(DRUPAL_ROOT . '/' . $this->siteDirectory . '/files/translations/drupal-8.0.0.de.po', $this->getPo('de'));
+    file_put_contents(DRUPAL_ROOT . '/' . $this->siteDirectory . '/files/translations/drupal-8.0.0.es.po', $this->getPo('es'));
+  }
+
+  /**
+   * Returns the string for the test .po file.
+   *
+   * @param string $langcode
+   *   The language code.
+   *
+   * @return string
+   *   Contents for the test .po file.
+   */
+  protected function getPo($langcode) {
+    return <<<ENDPO
+msgid ""
+msgstr ""
+
+msgid "Save and continue"
+msgstr "Save and continue $langcode"
+
+msgid "Anonymous"
+msgstr "Anonymous $langcode"
+
+msgid "Language"
+msgstr "Language $langcode"
+
+#: Testing site name configuration during the installer.
+msgid "Drupal"
+msgstr "Drupal"
+ENDPO;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function installParameters() {
+    $params = parent::installParameters();
+    $params['forms']['install_configure_form']['site_name'] = 'SITE_NAME_en';
+    return $params;
+  }
+
+  /**
+   * Tests that translations ended up at the expected places.
+   */
+  public function testTranslationsLoaded() {
+    $this->drupalLogin($this->createUser([], NULL, TRUE));
+    // Ensure the title is correct.
+    $this->assertEquals('SITE_NAME_en', \Drupal::config('system.site')->get('name'));
+
+    // Verify German and Spanish were configured.
+    $this->drupalGet('admin/config/regional/language');
+    $this->assertSession()->pageTextContains('German');
+    $this->assertSession()->pageTextContains('Spanish');
+    // If the installer was English or we used a profile that keeps English, we
+    // expect that configured also. Otherwise English should not be configured
+    // on the site.
+    $this->assertSession()->pageTextContains('English');
+
+    // Verify the strings from the translation files were imported.
+    $this->verifyImportedStringsTranslated();
+
+    /** @var \Drupal\language\ConfigurableLanguageManager $language_manager */
+    $language_manager = \Drupal::languageManager();
+
+    // If the site was installed in a foreign language (only tested with German
+    // in subclasses), then the active configuration should be updated and no
+    // override should exist in German. Otherwise the German translation should
+    // end up in overrides the same way as Spanish (which is not used as a site
+    // installation language). English should be available based on profile
+    // information and should be possible to add if not yet added, making
+    // English overrides available.
+
+    $config = \Drupal::config('user.settings');
+    $override_de = $language_manager->getLanguageConfigOverride('de', 'user.settings');
+    $override_en = $language_manager->getLanguageConfigOverride('en', 'user.settings');
+    $override_es = $language_manager->getLanguageConfigOverride('es', 'user.settings');
+
+    // Active configuration should be English.
+    $this->assertEquals('Anonymous', $config->get('anonymous'));
+    $this->assertEquals('en', $config->get('langcode'));
+    // There should not be an English override.
+    $this->assertTrue($override_en->isNew());
+    // German should be an override.
+    $this->assertEquals('Anonymous de', $override_de->get('anonymous'));
+
+    // Spanish is always an override (never used as installation language).
+    $this->assertEquals('Anonymous es', $override_es->get('anonymous'));
+
+    // Test translation from locale_test module.
+    $this->assertEquals('Montag', t('Monday', [], ['langcode' => 'de']));
+  }
+
+  /**
+   * Helper function to verify that the expected strings are translated.
+   */
+  protected function verifyImportedStringsTranslated() {
+    $test_samples = ['Save and continue', 'Anonymous', 'Language'];
+    $langcodes = ['de', 'es'];
+
+    foreach ($test_samples as $sample) {
+      foreach ($langcodes as $langcode) {
+        $edit = [];
+        $edit['langcode'] = $langcode;
+        $edit['translation'] = 'translated';
+        $edit['string'] = $sample;
+        $this->drupalGet('admin/config/regional/translate');
+        $this->submitForm($edit, 'Filter');
+        $this->assertSession()->pageTextContains($sample . ' ' . $langcode);
+      }
+    }
+  }
+
+}