Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

(cherry picked from commit 7cb81a403b)
merge-requests/6880/merge
Dave Long 2024-03-02 23:22:12 +00:00
parent 971076c14f
commit b50d6e0731
No known key found for this signature in database
GPG Key ID: ED52AE211E142771
11 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/includes/install.inc
View File

@ -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);

10
core/modules/menu_ui/tests/src/Functional/MenuUiTest.php
View File

@ -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');
}
}

2
core/modules/search/tests/src/Functional/SearchMultilingualEntityTest.php
View File

@ -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');

4
core/modules/system/tests/src/Functional/Menu/MenuRouterTest.php
View File

@ -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');
}
/**

4
core/modules/system/tests/src/FunctionalJavascript/System/DateFormatTest.php
View File

@ -51,9 +51,9 @@ class DateFormatTest extends WebDriverTestBase {
]);
$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');

2
core/modules/views/src/Plugin/views/cache/CachePluginBase.php vendored
View File

@ -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;
}

2
core/modules/views/src/Plugin/views/display/DisplayPluginBase.php
View File

@ -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(),

2
core/modules/views/tests/src/Unit/Controller/ViewAjaxControllerTest.php
View File

@ -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')

4
core/tests/Drupal/Tests/Core/DrupalKernel/DrupalKernelTest.php
View File

@ -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()));
}
/**

10
core/tests/Drupal/Tests/Core/Entity/BaseFieldDefinitionTest.php
View File

@ -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());
}
/**

2
core/tests/Drupal/Tests/Core/Image/ImageTest.php
View File

@ -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']);
}