Issue #3339374 by gapple, andypost, longwave, catch, smustgrave: [11.x]...

Issue #3339374 by gapple, andypost, longwave, catch, smustgrave: [11.x] Require array argument for AddCssCommand

core/lib/Drupal/Core/Ajax/AddCssCommand.php

@@ -17,21 +17,18 @@ class AddCssCommand implements CommandInterface {
   /**
    * Arrays containing attributes of the stylesheets to be added to the page.
    *
-   * @var string[][]|string
+   * @var string[][]
    */
   protected $styles;
 
   /**
    * Constructs an AddCssCommand.
    *
-   * @param string[][]|string $styles
+   * @param string[][] $styles
    *   Arrays containing attributes of the stylesheets to be added to the page.
    *   i.e. `['href' => 'someURL']` becomes `<link href="someURL">`.
    */
-  public function __construct($styles) {
-    if (is_string($styles)) {
-      @trigger_error('The ' . __NAMESPACE__ . '\AddCssCommand with a string argument is deprecated in drupal:10.1.0 and is removed from drupal:11.0.0. See http://www.drupal.org/node/3154948', E_USER_DEPRECATED);
-    }
+  public function __construct(array $styles) {
     $this->styles = $styles;
   }
 

core/misc/ajax.js

@@ -1699,21 +1699,12 @@
      *   {@link Drupal.Ajax} object created by {@link Drupal.ajax}.
      * @param {object} response
      *   The response from the Ajax request.
-     * @param {object[]|string} response.data
+     * @param {object[]} response.data
      *   An array of styles to be added.
      * @param {number} [status]
      *   The XMLHttpRequest status.
      */
     add_css(ajax, response, status) {
-      if (typeof response.data === 'string') {
-        Drupal.deprecationError({
-          message:
-            'Passing a string to the Drupal.ajax.add_css() method is deprecated in 10.1.0 and is removed from drupal:11.0.0. See https://www.drupal.org/node/3154948.',
-        });
-        $('head').prepend(response.data);
-        return;
-      }
-
       const allUniqueBundleIds = response.data.map(function (style) {
         const uniqueBundleId = style.href + ajax.instanceIndex;
         // Force file to load as a CSS stylesheet using 'css!' flag.

core/modules/system/tests/modules/ajax_forms_test/ajax_forms_test.module

@@ -215,17 +215,6 @@ function ajax_forms_test_advanced_commands_add_css_callback($form, FormStateInte
   return $response;
 }
 
-/**
- * Ajax callback for 'add_css' that uses legacy string parameter.
- *
- * @todo Remove in Drupal 11.0.0 https://www.drupal.org/i/3339374
- */
-function ajax_forms_test_advanced_commands_add_css_legacy_callback($form, FormStateInterface $form_state) {
-  $response = new AjaxResponse();
-  $response->addCommand(new AddCssCommand("<link rel='stylesheet' href='my/file.css' media='all' />"));
-  return $response;
-}
-
 /**
  * Ajax form callback: Selects the 'driver_text' element of the validation form.
  */

core/modules/system/tests/modules/ajax_forms_test/src/Form/AjaxFormsTestCommandsForm.php

@@ -224,16 +224,6 @@ public function buildForm(array $form, FormStateInterface $form_state) {
       ],
     ];
 
-    // Shows the Ajax 'add_css' command with legacy string parameter.
-    // @todo Remove in Drupal 11.0.0 https://www.drupal.org/i/3339374
-    $form['add_css_legacy_command_example'] = [
-      '#type' => 'submit',
-      '#value' => $this->t("AJAX 'add_css' legacy command"),
-      '#ajax' => [
-        'callback' => 'ajax_forms_test_advanced_commands_add_css_legacy_callback',
-      ],
-    ];
-
     $form['submit'] = [
       '#type' => 'submit',
       '#value' => $this->t('Submit'),

core/tests/Drupal/FunctionalJavascriptTests/Ajax/CommandsTest.php

@@ -144,25 +144,6 @@ public function testAjaxCommands() {
     $this->assertWaitPageContains('<div class="test-settings-command">42</div>');
   }
 
-  /**
-   * Tests the various Ajax Commands with legacy parameters.
-   * @group legacy
-   */
-  public function testLegacyAjaxCommands() {
-    $session = $this->getSession();
-    $page = $this->getSession()->getPage();
-
-    $form_path = 'ajax_forms_test_ajax_commands_form';
-    $web_user = $this->drupalCreateUser(['access content']);
-    $this->drupalLogin($web_user);
-    $this->drupalGet($form_path);
-
-    // Tests the 'add_css' command with legacy string value.
-    $this->expectDeprecation('Javascript Deprecation: Passing a string to the Drupal.ajax.add_css() method is deprecated in 10.1.0 and is removed from drupal:11.0.0. See https://www.drupal.org/node/3154948.');
-    $page->pressButton("AJAX 'add_css' legacy command");
-    $this->assertWaitPageContains('my/file.css');
-  }
-
   /**
    * Asserts that page contains a text after waiting.
    *

core/tests/Drupal/Tests/Core/Ajax/AjaxCommandsTest.php

@@ -126,23 +126,6 @@ public function testAddCssCommand($css, $expected) {
     $this->assertEquals($expected, $command->render());
   }
 
-  /**
-   * @covers \Drupal\Core\Ajax\AddCssCommand
-   * @group legacy
-   */
-  public function testStringAddCssCommand() {
-    $this->expectDeprecation("The Drupal\Core\Ajax\AddCssCommand with a string argument is deprecated in drupal:10.1.0 and is removed from drupal:11.0.0. See http://www.drupal.org/node/3154948");
-
-    $command = new AddCssCommand('<style>p{ text-decoration:blink; }</style>');
-
-    $expected = [
-      'command' => 'add_css',
-      'data' => '<style>p{ text-decoration:blink; }</style>',
-    ];
-
-    $this->assertEquals($expected, $command->render());
-  }
-
   /**
    * @covers \Drupal\Core\Ajax\AfterCommand
    */