From b50d6e0731ea22e9d543d02d26c7ba14a15a5876 Mon Sep 17 00:00:00 2001 From: Dave Long Date: Sat, 2 Mar 2024 23:22:12 +0000 Subject: [PATCH] Issue #3422546 by mstrelan: Remove extra parameters passed to functions (cherry picked from commit 7cb81a403b500050483b16d54a60d780f62c1b63) --- core/includes/install.inc | 2 +- .../menu_ui/tests/src/Functional/MenuUiTest.php | 10 +++++----- .../src/Functional/SearchMultilingualEntityTest.php | 2 +- .../tests/src/Functional/Menu/MenuRouterTest.php | 4 ++-- .../src/FunctionalJavascript/System/DateFormatTest.php | 4 ++-- .../views/src/Plugin/views/cache/CachePluginBase.php | 2 +- .../src/Plugin/views/display/DisplayPluginBase.php | 2 +- .../src/Unit/Controller/ViewAjaxControllerTest.php | 2 +- .../Tests/Core/DrupalKernel/DrupalKernelTest.php | 4 ++-- .../Tests/Core/Entity/BaseFieldDefinitionTest.php | 10 +++++----- core/tests/Drupal/Tests/Core/Image/ImageTest.php | 2 +- 11 files changed, 22 insertions(+), 22 deletions(-) diff --git a/core/includes/install.inc b/core/includes/install.inc index 083776a53770..6d2c29126048 100644 --- a/core/includes/install.inc +++ b/core/includes/install.inc @@ -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); diff --git a/core/modules/menu_ui/tests/src/Functional/MenuUiTest.php b/core/modules/menu_ui/tests/src/Functional/MenuUiTest.php index d301b3729114..488a22eaee03 100644 --- a/core/modules/menu_ui/tests/src/Functional/MenuUiTest.php +++ b/core/modules/menu_ui/tests/src/Functional/MenuUiTest.php @@ -1138,21 +1138,21 @@ class MenuUiTest extends BrowserTestBase { $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. @@ -1160,14 +1160,14 @@ class MenuUiTest extends BrowserTestBase { $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'); } } diff --git a/core/modules/search/tests/src/Functional/SearchMultilingualEntityTest.php b/core/modules/search/tests/src/Functional/SearchMultilingualEntityTest.php index f71212c1f9ae..38d1e62aa772 100644 --- a/core/modules/search/tests/src/Functional/SearchMultilingualEntityTest.php +++ b/core/modules/search/tests/src/Functional/SearchMultilingualEntityTest.php @@ -161,7 +161,7 @@ class SearchMultilingualEntityTest extends BrowserTestBase { // 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'); diff --git a/core/modules/system/tests/src/Functional/Menu/MenuRouterTest.php b/core/modules/system/tests/src/Functional/Menu/MenuRouterTest.php index cf43941e0799..fb8352c90448 100644 --- a/core/modules/system/tests/src/Functional/Menu/MenuRouterTest.php +++ b/core/modules/system/tests/src/Functional/Menu/MenuRouterTest.php @@ -84,8 +84,8 @@ class MenuRouterTest extends BrowserTestBase { */ 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'); } /** diff --git a/core/modules/system/tests/src/FunctionalJavascript/System/DateFormatTest.php b/core/modules/system/tests/src/FunctionalJavascript/System/DateFormatTest.php index f7113a619da6..0bc84181d105 100644 --- a/core/modules/system/tests/src/FunctionalJavascript/System/DateFormatTest.php +++ b/core/modules/system/tests/src/FunctionalJavascript/System/DateFormatTest.php @@ -51,9 +51,9 @@ class DateFormatTest extends WebDriverTestBase { ]); $date_format->save(); $this->drupalGet('admin/config/regional/date-time'); - $assert->assertEscaped('', 'The date format was properly escaped'); + $assert->assertEscaped(''); $this->drupalGet('admin/config/regional/date-time/formats/manage/xss_short'); - $assert->assertEscaped('', 'The date format was properly escaped'); + $assert->assertEscaped(''); // Add a new date format with HTML in it. $this->drupalGet('admin/config/regional/date-time/formats/add'); diff --git a/core/modules/views/src/Plugin/views/cache/CachePluginBase.php b/core/modules/views/src/Plugin/views/cache/CachePluginBase.php index d372baedc205..6cd39aa1a31c 100644 --- a/core/modules/views/src/Plugin/views/cache/CachePluginBase.php +++ b/core/modules/views/src/Plugin/views/cache/CachePluginBase.php @@ -146,7 +146,7 @@ abstract class CachePluginBase extends PluginBase { // Load entities for each result. $this->view->query->loadEntities($this->view->result); $this->view->total_rows = $cache->data['total_rows']; - $this->view->setCurrentPage($cache->data['current_page'], TRUE); + $this->view->setCurrentPage($cache->data['current_page']); $this->view->execute_time = 0; return TRUE; } diff --git a/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php b/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php index 81c37a2c37dc..6f6f2f3ba858 100644 --- a/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php +++ b/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php @@ -2172,7 +2172,7 @@ abstract class DisplayPluginBase extends PluginBase implements DisplayPluginInte * {@inheritdoc} */ public function render() { - $rows = (!empty($this->view->result) || $this->view->style_plugin->evenEmpty()) ? $this->view->style_plugin->render($this->view->result) : []; + $rows = (!empty($this->view->result) || $this->view->style_plugin->evenEmpty()) ? $this->view->style_plugin->render() : []; $element = [ '#theme' => $this->themeFunctions(), diff --git a/core/modules/views/tests/src/Unit/Controller/ViewAjaxControllerTest.php b/core/modules/views/tests/src/Unit/Controller/ViewAjaxControllerTest.php index 6ef1a332fef5..aff3dc6696da 100644 --- a/core/modules/views/tests/src/Unit/Controller/ViewAjaxControllerTest.php +++ b/core/modules/views/tests/src/Unit/Controller/ViewAjaxControllerTest.php @@ -336,7 +336,7 @@ class ViewAjaxControllerTest extends UnitTestCase { ->disableOriginalConstructor() ->getMock(); $display_handler->expects($this->once()) - ->method('setOption', '0') + ->method('setOption') ->with($this->equalTo('pager_element')); $display_collection = $this->getMockBuilder('Drupal\views\DisplayPluginCollection') diff --git a/core/tests/Drupal/Tests/Core/DrupalKernel/DrupalKernelTest.php b/core/tests/Drupal/Tests/Core/DrupalKernel/DrupalKernelTest.php index dee0d58572a0..c43f947b569f 100644 --- a/core/tests/Drupal/Tests/Core/DrupalKernel/DrupalKernelTest.php +++ b/core/tests/Drupal/Tests/Core/DrupalKernel/DrupalKernelTest.php @@ -137,8 +137,8 @@ EOD; $request->server->set('SERVER_NAME', 'www.example.org'); $request->server->set('SERVER_PORT', '8888'); $request->server->set('SCRIPT_NAME', '/index.php'); - $this->assertEquals('sites/example', DrupalKernel::findSitePath($request, TRUE, $vfs_root->url('drupal_root'))); - $this->assertEquals('sites/example', DrupalKernel::findSitePath($request, FALSE, $vfs_root->url('drupal_root'))); + $this->assertEquals('sites/example', DrupalKernel::findSitePath($request, TRUE, $vfs_root->url())); + $this->assertEquals('sites/example', DrupalKernel::findSitePath($request, FALSE, $vfs_root->url())); } /** diff --git a/core/tests/Drupal/Tests/Core/Entity/BaseFieldDefinitionTest.php b/core/tests/Drupal/Tests/Core/Entity/BaseFieldDefinitionTest.php index 7583848a1ecf..1cafe065f7b0 100644 --- a/core/tests/Drupal/Tests/Core/Entity/BaseFieldDefinitionTest.php +++ b/core/tests/Drupal/Tests/Core/Entity/BaseFieldDefinitionTest.php @@ -220,7 +220,7 @@ class BaseFieldDefinitionTest extends UnitTestCase { // Set the field item list class to be used to avoid requiring the typed // data manager to retrieve it. $definition->setClass('Drupal\Core\Field\FieldItemList'); - $this->assertEquals($expected_default_value, $definition->getInitialValue($entity)); + $this->assertEquals($expected_default_value, $definition->getInitialValue()); $data_definition = $this->getMockBuilder('Drupal\Core\TypedData\DataDefinition') ->disableOriginalConstructor() @@ -232,19 +232,19 @@ class BaseFieldDefinitionTest extends UnitTestCase { // Set default value only with a literal. $definition->setInitialValue($default_value['value']); - $this->assertEquals($expected_default_value, $definition->getInitialValue($entity)); + $this->assertEquals($expected_default_value, $definition->getInitialValue()); // Set default value with an indexed array. $definition->setInitialValue($expected_default_value); - $this->assertEquals($expected_default_value, $definition->getInitialValue($entity)); + $this->assertEquals($expected_default_value, $definition->getInitialValue()); // Set default value with an empty array. $definition->setInitialValue([]); - $this->assertEquals([], $definition->getInitialValue($entity)); + $this->assertEquals([], $definition->getInitialValue()); // Set default value with NULL. $definition->setInitialValue(NULL); - $this->assertEquals([], $definition->getInitialValue($entity)); + $this->assertEquals([], $definition->getInitialValue()); } /** diff --git a/core/tests/Drupal/Tests/Core/Image/ImageTest.php b/core/tests/Drupal/Tests/Core/Image/ImageTest.php index 80cb15d75162..53788d4b84b8 100644 --- a/core/tests/Drupal/Tests/Core/Image/ImageTest.php +++ b/core/tests/Drupal/Tests/Core/Image/ImageTest.php @@ -339,7 +339,7 @@ class ImageTest extends UnitTestCase { ->method('execute') ->will($this->returnArgument(0)); - $ret = $this->image->scaleAndCrop(34, 50, FALSE); + $ret = $this->image->scaleAndCrop(34, 50); $this->assertEquals(5, $ret['x']); }