Verified Commit 967264ee authored by Dave Long's avatar Dave Long
Browse files

Issue #3422546 by mstrelan: Remove extra parameters passed to functions 

(cherry picked from commit 7cb81a40)
parent f35b1b1e

core/includes/install.inc

+1 −1
Original line number Diff line number Diff line
@@ -511,7 +511,7 @@ function drupal_install_system($install_state) { 
  $kernel = \Drupal::service('kernel');

  $kernel->shutdown();

  // Have installer rebuild from the disk, rather then building from scratch.

  $kernel->rebuildContainer(FALSE);

  $kernel->rebuildContainer();

  // Reboot the kernel with new container.

  $kernel->boot();

  $kernel->preHandle($request);

core/modules/menu_ui/tests/src/Functional/MenuUiTest.php

+5 −5
Original line number Diff line number Diff line
@@ -1130,21 +1130,21 @@ private function verifyAccess($response = 200) { 
    $this->drupalGet('admin/help/menu');

    $this->assertSession()->statusCodeEquals($response);

    if ($response == 200) {

      $this->assertSession()->pageTextContains('Menu', 'Menu help was displayed');

      $this->assertSession()->pageTextContains('Menu');

    }



    // View menu build overview page.

    $this->drupalGet('admin/structure/menu');

    $this->assertSession()->statusCodeEquals($response);

    if ($response == 200) {

      $this->assertSession()->pageTextContains('Menus', 'Menu build overview page was displayed');

      $this->assertSession()->pageTextContains('Menus');

    }



    // View tools menu customization page.

    $this->drupalGet('admin/structure/menu/manage/' . $this->menu->id());

    $this->assertSession()->statusCodeEquals($response);

    if ($response == 200) {

      $this->assertSession()->pageTextContains('Tools', 'Tools menu page was displayed');

      $this->assertSession()->pageTextContains('Tools');

    }



    // View menu edit page for a static link.
@@ -1152,14 +1152,14 @@ private function verifyAccess($response = 200) { 
    $this->drupalGet('admin/structure/menu/link/' . $item->getPluginId() . '/edit');

    $this->assertSession()->statusCodeEquals($response);

    if ($response == 200) {

      $this->assertSession()->pageTextContains('Edit menu item', 'Menu edit page was displayed');

      $this->assertSession()->pageTextContains('Edit menu item');

    }



    // View add menu page.

    $this->drupalGet('admin/structure/menu/add');

    $this->assertSession()->statusCodeEquals($response);

    if ($response == 200) {

      $this->assertSession()->pageTextContains('Menus', 'Add menu page was displayed');

      $this->assertSession()->pageTextContains('Menus');

    }

  }

core/modules/search/tests/src/Functional/SearchMultilingualEntityTest.php

+1 −1
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ public function testMultilingualSearch() { 
    // Make sure index throttle is high enough, via the UI.

    $this->drupalGet('admin/config/search/pages');

    $this->submitForm(['cron_limit' => 20], 'Save configuration');

    $this->assertEquals(20, $this->config('search.settings')->get('index.cron_limit', 100), 'Config setting was saved correctly');

    $this->assertEquals(20, $this->config('search.settings')->get('index.cron_limit'), 'Config setting was saved correctly');

    // Get a new search plugin, to make sure it has this setting.

    $this->plugin = $this->container->get('plugin.manager.search')->createInstance('node_search');

core/modules/system/tests/src/Functional/Menu/MenuRouterTest.php

+2 −2
Original line number Diff line number Diff line
@@ -82,8 +82,8 @@ protected function doTestHookMenuIntegration() { 
   */

  protected function doTestTitleCallbackFalse() {

    $this->drupalGet('test-page');

    $this->assertSession()->pageTextContains('A title with @placeholder', 'Raw text found on the page');

    $this->assertSession()->pageTextNotContains('A title with some other text', 'Text with placeholder substitutions not found.');

    $this->assertSession()->pageTextContains('A title with @placeholder');

    $this->assertSession()->pageTextNotContains('A title with some other text');

  }



  /**

core/modules/system/tests/src/FunctionalJavascript/System/DateFormatTest.php

+2 −2
Original line number Diff line number Diff line
@@ -51,9 +51,9 @@ public function testDateFormatXss() { 
    ]);

    $date_format->save();

    $this->drupalGet('admin/config/regional/date-time');

    $assert->assertEscaped('<script>alert("XSS");</script>', 'The date format was properly escaped');

    $assert->assertEscaped('<script>alert("XSS");</script>');

    $this->drupalGet('admin/config/regional/date-time/formats/manage/xss_short');

    $assert->assertEscaped('<script>alert("XSS");</script>', 'The date format was properly escaped');

    $assert->assertEscaped('<script>alert("XSS");</script>');



    // Add a new date format with HTML in it.

    $this->drupalGet('admin/config/regional/date-time/formats/add');