diff --git a/core/includes/install.inc b/core/includes/install.inc index 083776a5377030be7ea87ae8f0b5400b4aefeb5d..6d2c29126048d71cf58363f2b873b4b9db51b158 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 586e545a1888dd4f231c61e38023a09c3fb0e18a..5a6621b4e3b8278037062045225f73c5378f3678 100644 --- a/core/modules/menu_ui/tests/src/Functional/MenuUiTest.php +++ b/core/modules/menu_ui/tests/src/Functional/MenuUiTest.php @@ -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'); } } diff --git a/core/modules/search/tests/src/Functional/SearchMultilingualEntityTest.php b/core/modules/search/tests/src/Functional/SearchMultilingualEntityTest.php index b6a939b0b831fc7d9e014bc07e7cd5137f375a39..55855f00c775c54826f7ab7ea985e3c84568d5f6 100644 --- a/core/modules/search/tests/src/Functional/SearchMultilingualEntityTest.php +++ b/core/modules/search/tests/src/Functional/SearchMultilingualEntityTest.php @@ -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'); diff --git a/core/modules/system/tests/src/Functional/Menu/MenuRouterTest.php b/core/modules/system/tests/src/Functional/Menu/MenuRouterTest.php index 06980db0efd1cc9e20900a06639e63dbeb39d7ba..6724fc7cd5259097aed902e28d183bc916fc547f 100644 --- a/core/modules/system/tests/src/Functional/Menu/MenuRouterTest.php +++ b/core/modules/system/tests/src/Functional/Menu/MenuRouterTest.php @@ -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'); } /** diff --git a/core/modules/system/tests/src/FunctionalJavascript/System/DateFormatTest.php b/core/modules/system/tests/src/FunctionalJavascript/System/DateFormatTest.php index f7113a619da67ef6688aefa3b6eb76eb4c5049dd..0bc84181d1059fa2766600b16149609af1e3fde7 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 @@ 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'); diff --git a/core/modules/views/src/Plugin/views/cache/CachePluginBase.php b/core/modules/views/src/Plugin/views/cache/CachePluginBase.php index d372baedc2050d7c670c97a2925b3b17e84de228..6cd39aa1a31cdf959ee77e1ab7960a677af17200 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 @@ public function cacheGet($type) { // 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 ef24bb6eee649d0994c9e751152bffcb7ac4369e..dd2014e86a986ab12b1e79f3e4ff380b2930f3b2 100644 --- a/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php +++ b/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php @@ -2171,7 +2171,7 @@ protected function getMoreUrl() { * {@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 6ef1a332fef51881f405fe3a00bff6d4a2652511..aff3dc6696daa9ee5d82dded1023d2fa8518ed5b 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 @@ public function testAjaxViewWithPager() { ->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 95630123c3483bc0dc91faf357f40f94d6adc963..1e2c1e7c60e319351d62c1781b528ba7f8d364d2 100644 --- a/core/tests/Drupal/Tests/Core/DrupalKernel/DrupalKernelTest.php +++ b/core/tests/Drupal/Tests/Core/DrupalKernel/DrupalKernelTest.php @@ -135,8 +135,8 @@ public function testFindSitePath() { $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 7583848a1ecf68977abc5d2a73df09eb6e0ca0c6..1cafe065f7b0eb57a54ee7644588bbbd108a5af3 100644 --- a/core/tests/Drupal/Tests/Core/Entity/BaseFieldDefinitionTest.php +++ b/core/tests/Drupal/Tests/Core/Entity/BaseFieldDefinitionTest.php @@ -220,7 +220,7 @@ public function testFieldInitialValue() { // 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 @@ public function testFieldInitialValue() { // 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 80cb15d75162bd21181f79c09c79d92670647f43..53788d4b84b8e10da9f1a90b289d50b0afb31f8e 100644 --- a/core/tests/Drupal/Tests/Core/Image/ImageTest.php +++ b/core/tests/Drupal/Tests/Core/Image/ImageTest.php @@ -339,7 +339,7 @@ public function testScaleAndCropWidth() { ->method('execute') ->will($this->returnArgument(0)); - $ret = $this->image->scaleAndCrop(34, 50, FALSE); + $ret = $this->image->scaleAndCrop(34, 50); $this->assertEquals(5, $ret['x']); }