diff --git a/core/includes/batch.inc b/core/includes/batch.inc
index 2dc34b33d4fe927aeb0956016ffb58d0aea07555..dd5da074c4f669c2837a57e1fb5e20634cd2d402 100644
--- a/core/includes/batch.inc
+++ b/core/includes/batch.inc
@@ -183,7 +183,7 @@ function _batch_progress_page() {
print $fallback;
// Perform actual processing.
- [$percentage, $message, $label] = _batch_process($batch);
+ [$percentage, $message, $label] = _batch_process();
if ($percentage == 100) {
$new_op = 'finished';
}
diff --git a/core/includes/install.inc b/core/includes/install.inc
index 63b5ee558999a35e302eaab5fc9ebee8fd8798a3..c43a7e159dc4dcdf22d10e057f84244f36d11672 100644
--- a/core/includes/install.inc
+++ b/core/includes/install.inc
@@ -314,7 +314,7 @@ function drupal_rewrite_settings($settings = [], $settings_file = NULL) {
break;
case 'array_index':
- if (_drupal_rewrite_settings_is_array_index($type, $value)) {
+ if (_drupal_rewrite_settings_is_array_index($type)) {
$index = trim($value, '\'"');
$state = 'right_bracket';
}
@@ -633,7 +633,7 @@ function drupal_install_system($install_state) {
// its dependencies, and here the dependencies will be installed as well.
if ($provider !== 'core') {
$autoload = $connection->getConnectionOptions()['autoload'] ?? '';
- if (($pos = strpos($autoload, 'src/Driver/Database/')) !== FALSE) {
+ if (strpos($autoload, 'src/Driver/Database/') !== FALSE) {
$kernel->getContainer()->get('module_installer')->install([$provider], TRUE);
}
}
diff --git a/core/lib/Drupal/Component/Gettext/PoStreamReader.php b/core/lib/Drupal/Component/Gettext/PoStreamReader.php
index 87f50601e629128848b1d6c012ec310751b7cecc..e14ed213ab82cfb945c7b9dbf8f8d780dafcf46a 100644
--- a/core/lib/Drupal/Component/Gettext/PoStreamReader.php
+++ b/core/lib/Drupal/Component/Gettext/PoStreamReader.php
@@ -349,7 +349,7 @@ private function readLine() {
$quoted = $this->parseQuoted($line);
if ($quoted === FALSE) {
// The message id must be wrapped in quotes.
- $this->errors[] = new FormattableMarkup('The translation stream %uri contains an error: invalid format for "msgid" on line %line.', $log_vars, $log_vars);
+ $this->errors[] = new FormattableMarkup('The translation stream %uri contains an error: invalid format for "msgid" on line %line.', $log_vars);
return FALSE;
}
diff --git a/core/lib/Drupal/Component/Utility/Variable.php b/core/lib/Drupal/Component/Utility/Variable.php
index 8fe25c6da93a796e84e101d18306a3fe0d09e3ee..b4cfe04eff38f1a5fbc82f8db335f3eb01dcd9f3 100644
--- a/core/lib/Drupal/Component/Utility/Variable.php
+++ b/core/lib/Drupal/Component/Utility/Variable.php
@@ -57,7 +57,7 @@ public static function export($var, $prefix = '') {
// Don't export keys if the array is non associative.
$export_keys = array_values($var) != $var;
foreach ($var as $key => $value) {
- $output .= ' ' . ($export_keys ? static::export($key) . ' => ' : '') . static::export($value, ' ', FALSE) . ",\n";
+ $output .= ' ' . ($export_keys ? static::export($key) . ' => ' : '') . static::export($value, ' ') . ",\n";
}
$output .= ')';
}
diff --git a/core/lib/Drupal/Core/Config/ConfigInstaller.php b/core/lib/Drupal/Core/Config/ConfigInstaller.php
index 33e1524d71fea12b6b5b15ef2108614575ce6c47..5118607a1046f7ad9a6f48e2288c35a31f9a2430 100644
--- a/core/lib/Drupal/Core/Config/ConfigInstaller.php
+++ b/core/lib/Drupal/Core/Config/ConfigInstaller.php
@@ -256,7 +256,7 @@ public function installOptionalConfig(StorageInterface $storage = NULL, $depende
// Create the optional configuration if there is any left after filtering.
if (!empty($config_to_create)) {
- $this->createConfiguration(StorageInterface::DEFAULT_COLLECTION, $config_to_create, TRUE);
+ $this->createConfiguration(StorageInterface::DEFAULT_COLLECTION, $config_to_create);
}
}
diff --git a/core/lib/Drupal/Core/DependencyInjection/YamlFileLoader.php b/core/lib/Drupal/Core/DependencyInjection/YamlFileLoader.php
index 0c35209135bc4d0d110f9243c900c9356da8c046..f1fcfabd0f54412ca4c2c57c7abb8b7f3b2ce37d 100644
--- a/core/lib/Drupal/Core/DependencyInjection/YamlFileLoader.php
+++ b/core/lib/Drupal/Core/DependencyInjection/YamlFileLoader.php
@@ -474,13 +474,10 @@ private function resolveServices($value)
if ('=' === substr($value, -1)) {
$value = substr($value, 0, -1);
- $strict = false;
- } else {
- $strict = true;
}
if (null !== $invalidBehavior) {
- $value = new Reference($value, $invalidBehavior, $strict);
+ $value = new Reference($value, $invalidBehavior);
}
}
diff --git a/core/lib/Drupal/Core/Update/UpdateCacheBackendFactory.php b/core/lib/Drupal/Core/Update/UpdateCacheBackendFactory.php
index 1a459f3a0bd1d2224dc6135bac772b30d6b438ee..9ae04cc41b429e8212863e9edad14c83d3936fab 100644
--- a/core/lib/Drupal/Core/Update/UpdateCacheBackendFactory.php
+++ b/core/lib/Drupal/Core/Update/UpdateCacheBackendFactory.php
@@ -43,7 +43,7 @@ public function __construct(CacheFactoryInterface $cache_factory) {
*/
public function get($bin) {
if (!isset($this->bins[$bin])) {
- $this->bins[$bin] = new UpdateBackend($this->cacheFactory->get($bin), $bin);
+ $this->bins[$bin] = new UpdateBackend($this->cacheFactory->get($bin));
}
return $this->bins[$bin];
}
diff --git a/core/lib/Drupal/Core/Update/UpdateKernel.php b/core/lib/Drupal/Core/Update/UpdateKernel.php
index 8e7f44b1351cc7b8416f29258b28c9041e6033e0..7f203653425326c5558c574fe12a6e0a3f1887a8 100644
--- a/core/lib/Drupal/Core/Update/UpdateKernel.php
+++ b/core/lib/Drupal/Core/Update/UpdateKernel.php
@@ -72,7 +72,7 @@ public function handle(Request $request, $type = self::MAIN_REQUEST, $catch = TR
// Handle the actual request. We need the session both for authentication
// as well as the DB update, like
// \Drupal\system\Controller\DbUpdateController::batchFinished.
- $this->bootSession($request, $type);
+ $this->bootSession($request);
$result = $this->handleRaw($request);
$this->shutdownSession($request);
@@ -99,7 +99,7 @@ public function handle(Request $request, $type = self::MAIN_REQUEST, $catch = TR
protected function handleRaw(Request $request) {
$container = $this->getContainer();
- $this->handleAccess($request, $container);
+ $this->handleAccess($request);
/** @var \Drupal\Core\Controller\ControllerResolverInterface $controller_resolver */
$controller_resolver = $container->get('controller_resolver');
diff --git a/core/modules/block/tests/src/Unit/Plugin/migrate/process/BlockSettingsTest.php b/core/modules/block/tests/src/Unit/Plugin/migrate/process/BlockSettingsTest.php
index 827f3fbe6a9f33ecbf6ea97df60df9cc8ee991cf..47e3128eb98a63bf79e0cddda9af405610c696ff 100644
--- a/core/modules/block/tests/src/Unit/Plugin/migrate/process/BlockSettingsTest.php
+++ b/core/modules/block/tests/src/Unit/Plugin/migrate/process/BlockSettingsTest.php
@@ -32,7 +32,7 @@ public function testTransform($value, $expected) {
$row = $this->prophesize(Row::class)->reveal();
}
- $plugin = new BlockSettings([], 'block_settings', [], 'foo');
+ $plugin = new BlockSettings([], 'block_settings', []);
$actual = $plugin->transform($value, $executable, $row, 'foo');
$this->assertSame($expected, $actual);
}
diff --git a/core/modules/comment/src/CommentForm.php b/core/modules/comment/src/CommentForm.php
index 45fd79229d48cb29cd1b9ba62549b54d1ff24086..ba4047d45fb741107c926c718a9769f2a9c6228e 100644
--- a/core/modules/comment/src/CommentForm.php
+++ b/core/modules/comment/src/CommentForm.php
@@ -242,7 +242,7 @@ public function form(array $form, FormStateInterface $form_state) {
'#access' => $is_admin,
];
- return parent::form($form, $form_state, $comment);
+ return parent::form($form, $form_state);
}
/**
diff --git a/core/modules/comment/tests/src/Functional/CommentPagerTest.php b/core/modules/comment/tests/src/Functional/CommentPagerTest.php
index 62d2b3c761d84e0f4d6695399740c7f04520e327..4039e2b36d55f2b44a43de61dc3376db8745aeaa 100644
--- a/core/modules/comment/tests/src/Functional/CommentPagerTest.php
+++ b/core/modules/comment/tests/src/Functional/CommentPagerTest.php
@@ -432,7 +432,7 @@ protected function clickLinkWithXPath($xpath, $arguments = [], $index = 0) {
$url_target = $this->getAbsoluteUrl($urls[$index]->getAttribute('href'));
return $this->drupalGet($url_target);
}
- $this->fail(new FormattableMarkup('Link %label does not exist on @url_before', ['%label' => $xpath, '@url_before' => $url_before]), 'Browser');
+ $this->fail(new FormattableMarkup('Link %label does not exist on @url_before', ['%label' => $xpath, '@url_before' => $url_before]));
return FALSE;
}
diff --git a/core/modules/contact/src/MessageForm.php b/core/modules/contact/src/MessageForm.php
index 4b64d2cc50e6ba3131a77e1b43b4f716da980fa6..91facbd57508e60a039705b8df9085e1b1fbf575 100644
--- a/core/modules/contact/src/MessageForm.php
+++ b/core/modules/contact/src/MessageForm.php
@@ -101,7 +101,7 @@ public static function create(ContainerInterface $container) {
public function form(array $form, FormStateInterface $form_state) {
$user = $this->currentUser();
$message = $this->entity;
- $form = parent::form($form, $form_state, $message);
+ $form = parent::form($form, $form_state);
$form['#attributes']['class'][] = 'contact-form';
if (!empty($message->preview)) {
diff --git a/core/modules/content_translation/src/ContentTranslationHandler.php b/core/modules/content_translation/src/ContentTranslationHandler.php
index 7e782db495846b5c92293b690eaff90dd8d91d33..24caa245c7c4874f449a8cbb86f6307ec7c8f2c1 100644
--- a/core/modules/content_translation/src/ContentTranslationHandler.php
+++ b/core/modules/content_translation/src/ContentTranslationHandler.php
@@ -653,7 +653,7 @@ protected function addTranslatabilityClue(&$element) {
// If the current element does not have a (valid) title, try child elements.
elseif ($children = Element::children($element)) {
foreach ($children as $delta) {
- $this->addTranslatabilityClue($element[$delta], $suffix);
+ $this->addTranslatabilityClue($element[$delta]);
}
}
// If there are no children, fall back to the current #title attribute if it
diff --git a/core/modules/editor/tests/src/Functional/EditorLoadingTest.php b/core/modules/editor/tests/src/Functional/EditorLoadingTest.php
index efdccccc84fd06bf4799e53e06d1f62b014f5a70..c8d062976760218faaa8737022dbc1569fa3176f 100644
--- a/core/modules/editor/tests/src/Functional/EditorLoadingTest.php
+++ b/core/modules/editor/tests/src/Functional/EditorLoadingTest.php
@@ -155,7 +155,7 @@ public function testLoading() {
$this->assertFalse($editor_js_present, 'No Text Editor JavaScript.');
$this->assertSession()->elementsCount('xpath', $body, 1);
$this->assertSession()->elementNotExists('css', 'select.js-filter-list');
- $this->drupalLogout($this->normalUser);
+ $this->drupalLogout();
// The privileged user:
// - has access to 2 text formats (and the fallback format);
@@ -186,7 +186,7 @@ public function testLoading() {
$this->drupalGet('editor/dialog/image/full_html');
$this->assertSession()->statusCodeEquals(200);
- $this->drupalLogout($this->privilegedUser);
+ $this->drupalLogout();
// Also associate a text editor with the "Plain Text" text format.
$editor = Editor::create([
diff --git a/core/modules/field/tests/src/Unit/Plugin/migrate/process/d6/FieldInstanceSettingsTest.php b/core/modules/field/tests/src/Unit/Plugin/migrate/process/d6/FieldInstanceSettingsTest.php
index 27f830a611e5c4ee81f4472bf93e2bc1934a79f3..cb69ff29c9a6533f07e79dcf8f6b8212c04ea40b 100644
--- a/core/modules/field/tests/src/Unit/Plugin/migrate/process/d6/FieldInstanceSettingsTest.php
+++ b/core/modules/field/tests/src/Unit/Plugin/migrate/process/d6/FieldInstanceSettingsTest.php
@@ -24,7 +24,7 @@ class FieldInstanceSettingsTest extends UnitTestCase {
public function testGetSettings($field_type, $instance_settings, $expected) {
$instance_settings = unserialize($instance_settings);
$migration = $this->createMock(MigrationInterface::class);
- $plugin = new FieldInstanceSettings([], 'd6_field_field_settings', [], $migration);
+ $plugin = new FieldInstanceSettings([], 'd6_field_field_settings', []);
$executable = $this->createMock(MigrateExecutableInterface::class);
$row = $this->getMockBuilder(Row::class)
diff --git a/core/modules/field/tests/src/Unit/Plugin/migrate/process/d6/FieldSettingsTest.php b/core/modules/field/tests/src/Unit/Plugin/migrate/process/d6/FieldSettingsTest.php
index f6823d13b779076aff93e899a48c679c5c6529bc..1664d97aab1a3bd24d688925311cb4fe91919a10 100644
--- a/core/modules/field/tests/src/Unit/Plugin/migrate/process/d6/FieldSettingsTest.php
+++ b/core/modules/field/tests/src/Unit/Plugin/migrate/process/d6/FieldSettingsTest.php
@@ -21,7 +21,7 @@ class FieldSettingsTest extends UnitTestCase {
*/
public function testGetSettings($field_type, $field_settings, $allowed_values) {
$migration = $this->createMock(MigrationInterface::class);
- $plugin = new FieldSettings([], 'd6_field_settings', [], $migration);
+ $plugin = new FieldSettings([], 'd6_field_settings', []);
$executable = $this->createMock(MigrateExecutableInterface::class);
$row = $this->getMockBuilder(Row::class)
diff --git a/core/modules/field/tests/src/Unit/Plugin/migrate/process/d7/FieldInstanceSettingsTest.php b/core/modules/field/tests/src/Unit/Plugin/migrate/process/d7/FieldInstanceSettingsTest.php
index bda611c6a2212c9709a2b13a8c049c5c4240bf54..d6860a78800e73d8091feb16dc583ae6fea79c06 100644
--- a/core/modules/field/tests/src/Unit/Plugin/migrate/process/d7/FieldInstanceSettingsTest.php
+++ b/core/modules/field/tests/src/Unit/Plugin/migrate/process/d7/FieldInstanceSettingsTest.php
@@ -21,7 +21,7 @@ class FieldInstanceSettingsTest extends MigrateTestCase {
*/
public function testTransformImageSettings() {
$migration = $this->createMock(MigrationInterface::class);
- $plugin = new FieldInstanceSettings([], 'd7_field_instance_settings', [], $migration);
+ $plugin = new FieldInstanceSettings([], 'd7_field_instance_settings', []);
$executable = $this->createMock(MigrateExecutableInterface::class);
$row = $this->getMockBuilder(Row::class)
diff --git a/core/modules/field/tests/src/Unit/Plugin/migrate/process/d7/FieldSettingsTest.php b/core/modules/field/tests/src/Unit/Plugin/migrate/process/d7/FieldSettingsTest.php
index cb12d960d0a49cd0b9627fa0ebb4864b4f73fea9..5a55adec32a06c8d9ab9dc1db86f6d2a52f9dea4 100644
--- a/core/modules/field/tests/src/Unit/Plugin/migrate/process/d7/FieldSettingsTest.php
+++ b/core/modules/field/tests/src/Unit/Plugin/migrate/process/d7/FieldSettingsTest.php
@@ -21,7 +21,7 @@ class FieldSettingsTest extends MigrateTestCase {
*/
public function testTransformImageSettings() {
$migration = $this->createMock(MigrationInterface::class);
- $plugin = new FieldSettings([], 'd7_field_settings', [], $migration);
+ $plugin = new FieldSettings([], 'd7_field_settings', []);
$executable = $this->createMock(MigrateExecutableInterface::class);
$row = $this->getMockBuilder(Row::class)
diff --git a/core/modules/field_ui/src/Form/FieldStorageAddForm.php b/core/modules/field_ui/src/Form/FieldStorageAddForm.php
index 7c54ca94cc719fabbf5bebe095e18555b1c75d78..9e4f3ddd4f7967cef8d48bc8bcb1fc29721c0991 100644
--- a/core/modules/field_ui/src/Form/FieldStorageAddForm.php
+++ b/core/modules/field_ui/src/Form/FieldStorageAddForm.php
@@ -430,7 +430,7 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
if ($destinations) {
$destination = $this->getDestinationArray();
$destinations[] = $destination['destination'];
- $form_state->setRedirectUrl(FieldUI::getNextDestination($destinations, $form_state));
+ $form_state->setRedirectUrl(FieldUI::getNextDestination($destinations));
}
elseif (!$error) {
$this->messenger()->addStatus($this->t('Your settings have been saved.'));
diff --git a/core/modules/file/tests/src/Functional/FileFieldWidgetTest.php b/core/modules/file/tests/src/Functional/FileFieldWidgetTest.php
index e096d19f69e2598b10db767ed94f27d4d3567c75..4f9051979a4dcbfa3526079211d3057eeef1a614 100644
--- a/core/modules/file/tests/src/Functional/FileFieldWidgetTest.php
+++ b/core/modules/file/tests/src/Functional/FileFieldWidgetTest.php
@@ -230,7 +230,7 @@ public function testMultiValuedWidget() {
$this->assertSameSize($upload_files_node_creation, $node->{$field_name}, 'Node was successfully saved with multiple files.');
// Try to upload exactly the allowed number of files on revision.
- $this->uploadNodeFile($test_file, $field_name, $node->id(), 1, [], TRUE);
+ $this->uploadNodeFile($test_file, $field_name, $node->id(), 1);
$node = $node_storage->loadUnchanged($nid);
$this->assertCount($cardinality, $node->{$field_name}, 'Node was successfully revised to maximum number of files.');
diff --git a/core/modules/file/tests/src/Kernel/SaveTest.php b/core/modules/file/tests/src/Kernel/SaveTest.php
index 6e7524bdd5b1d42b0e8e001062a3c186bf60a641..67ba4329b3c96947ebd26be61141e4748aebab4c 100644
--- a/core/modules/file/tests/src/Kernel/SaveTest.php
+++ b/core/modules/file/tests/src/Kernel/SaveTest.php
@@ -50,7 +50,7 @@ public function testFileSave() {
$loaded_file = File::load($file->id());
// Verify that the timestamp didn't go backwards.
$this->assertGreaterThanOrEqual($file->getChangedTime(), $loaded_file->getChangedTime());
- $this->assertNotNull($loaded_file, 'Record still exists in the database.', 'File');
+ $this->assertNotNull($loaded_file, 'Record still exists in the database.');
$this->assertEquals($file->isPermanent(), $loaded_file->isPermanent(), 'Status was saved correctly.');
$this->assertEquals('en', $loaded_file->langcode->value, 'Langcode was saved correctly.');
diff --git a/core/modules/filter/tests/src/Kernel/Plugin/migrate/process/FilterSettingsTest.php b/core/modules/filter/tests/src/Kernel/Plugin/migrate/process/FilterSettingsTest.php
index 636850c815bbeba5539206607e6e6bf274ddd995..51592ee8b986c8ad81ad3bc72378351992f64bf7 100644
--- a/core/modules/filter/tests/src/Kernel/Plugin/migrate/process/FilterSettingsTest.php
+++ b/core/modules/filter/tests/src/Kernel/Plugin/migrate/process/FilterSettingsTest.php
@@ -24,7 +24,7 @@ class FilterSettingsTest extends MigrateTestCase {
*/
public function testTransform($value, $destination_id, $expected_value) {
$migration = $this->createMock(MigrationInterface::class);
- $plugin = new FilterSettings([], 'filter_settings', [], $migration);
+ $plugin = new FilterSettings([], 'filter_settings', []);
$executable = $this->createMock(MigrateExecutableInterface::class);
$row = $this->getMockBuilder(Row::class)
diff --git a/core/modules/jsonapi/tests/src/Functional/ResourceTestBase.php b/core/modules/jsonapi/tests/src/Functional/ResourceTestBase.php
index 0092a95e97910be4ba9e2a8e9b1d5e6c9af0ba4b..a08b0163833941aa38a2af0cb7cdbb09c2cb884e 100644
--- a/core/modules/jsonapi/tests/src/Functional/ResourceTestBase.php
+++ b/core/modules/jsonapi/tests/src/Functional/ResourceTestBase.php
@@ -2377,7 +2377,7 @@ public function testPatchIndividual() {
$doc_multi_value_tests['data']['attributes']['field_rest_test_multivalue'] = $this->entity->get('field_rest_test_multivalue')->getValue();
$doc_remove_item = $doc_multi_value_tests;
unset($doc_remove_item['data']['attributes']['field_rest_test_multivalue'][0]);
- $request_options[RequestOptions::BODY] = Json::encode($doc_remove_item, 'api_json');
+ $request_options[RequestOptions::BODY] = Json::encode($doc_remove_item);
$response = $this->request('PATCH', $url, $request_options);
$this->assertResourceResponse(200, FALSE, $response);
$updated_entity = $this->entityLoadUnchanged($this->entity->id());
diff --git a/core/modules/jsonapi/tests/src/Unit/Normalizer/JsonApiDocumentTopLevelNormalizerTest.php b/core/modules/jsonapi/tests/src/Unit/Normalizer/JsonApiDocumentTopLevelNormalizerTest.php
index 589a0d48914a8aac0ef6a11a5d24e9bf2ae13649..9254a3829aa8b1cb6e00db2f6d1952a6ad499ccb 100644
--- a/core/modules/jsonapi/tests/src/Unit/Normalizer/JsonApiDocumentTopLevelNormalizerTest.php
+++ b/core/modules/jsonapi/tests/src/Unit/Normalizer/JsonApiDocumentTopLevelNormalizerTest.php
@@ -7,7 +7,6 @@
use Drupal\Core\Entity\EntityTypeInterface;
use Drupal\Core\Entity\EntityTypeManagerInterface;
use Drupal\Core\Entity\FieldableEntityInterface;
-use Drupal\jsonapi\Context\FieldResolver;
use Drupal\jsonapi\ResourceType\ResourceType;
use Drupal\jsonapi\Normalizer\JsonApiDocumentTopLevelNormalizer;
use Drupal\Tests\UnitTestCase;
@@ -37,7 +36,6 @@ class JsonApiDocumentTopLevelNormalizerTest extends UnitTestCase {
*/
protected function setUp(): void {
$resource_type_repository = $this->prophesize(ResourceTypeRepository::class);
- $field_resolver = $this->prophesize(FieldResolver::class);
$resource_type_repository
->getByTypeName(Argument::any())
@@ -68,8 +66,7 @@ protected function setUp(): void {
$this->normalizer = new JsonApiDocumentTopLevelNormalizer(
$entity_type_manager->reveal(),
- $resource_type_repository->reveal(),
- $field_resolver->reveal()
+ $resource_type_repository->reveal()
);
$serializer = $this->prophesize(DenormalizerInterface::class);
diff --git a/core/modules/locale/tests/src/Kernel/LocaleConfigSubscriberTest.php b/core/modules/locale/tests/src/Kernel/LocaleConfigSubscriberTest.php
index f059508eed3aa2a1e7f3d6c141f5771dc08499e0..b7bfe21112592500f9cf7a78db039c713e97bdd6 100644
--- a/core/modules/locale/tests/src/Kernel/LocaleConfigSubscriberTest.php
+++ b/core/modules/locale/tests/src/Kernel/LocaleConfigSubscriberTest.php
@@ -201,7 +201,7 @@ public function testLocaleDeleteTranslation() {
*/
protected function setUpNoTranslation($config_name, $key, $source, $langcode) {
$this->localeConfigManager->updateConfigTranslations([$config_name], [$langcode]);
- $this->assertNoConfigOverride($config_name, $key, $source, $langcode);
+ $this->assertNoConfigOverride($config_name, $key);
$this->assertNoTranslation($config_name, $langcode);
}
@@ -346,7 +346,7 @@ protected function deleteLanguageOverride($config_name, $key, $source_value, $la
->save();
$this->configFactory->reset($config_name);
- $this->assertNoConfigOverride($config_name, $key, $source_value, $langcode);
+ $this->assertNoConfigOverride($config_name, $key);
}
/**
@@ -376,7 +376,7 @@ protected function deleteLocaleTranslationData($config_name, $key, $source_value
$this->localeConfigManager->updateConfigTranslations([$config_name], [$langcode]);
$this->configFactory->reset($config_name);
- $this->assertNoConfigOverride($config_name, $key, $source_value, $langcode);
+ $this->assertNoConfigOverride($config_name, $key);
}
/**
diff --git a/core/modules/media_library/tests/src/FunctionalJavascript/WidgetUploadTest.php b/core/modules/media_library/tests/src/FunctionalJavascript/WidgetUploadTest.php
index 6bd9829ec20f5cc1610db311fab12f58f2b637d2..37be455fc3d840987f0af03cc30871ee25da3457 100644
--- a/core/modules/media_library/tests/src/FunctionalJavascript/WidgetUploadTest.php
+++ b/core/modules/media_library/tests/src/FunctionalJavascript/WidgetUploadTest.php
@@ -210,7 +210,7 @@ public function testWidgetUpload() {
// Assert media type four should only allow jpg files by trying a png file
// first.
$png_uri_4 = $file_system->copy($png_image->uri, 'public://');
- $this->addMediaFileToField('Add file', $file_system->realpath($png_uri_4), FALSE);
+ $this->addMediaFileToField('Add file', $file_system->realpath($png_uri_4));
$this->waitForText('Only files with the following extensions are allowed');
// Assert that jpg files are accepted by type four.
$jpg_uri_2 = $file_system->copy($jpg_image->uri, 'public://');
@@ -553,7 +553,7 @@ public function testWidgetUploadAdvancedUi() {
// Assert media type four should only allow jpg files by trying a png file
// first.
$png_uri_4 = $file_system->copy($png_image->uri, 'public://');
- $this->addMediaFileToField('Add file', $file_system->realpath($png_uri_4), FALSE);
+ $this->addMediaFileToField('Add file', $file_system->realpath($png_uri_4));
$this->waitForText('Only files with the following extensions are allowed');
// Assert that jpg files are accepted by type four.
$jpg_uri_2 = $file_system->copy($jpg_image->uri, 'public://');
diff --git a/core/modules/menu_link_content/tests/src/Kernel/Migrate/d6/MigrateMenuLinkLocalizedTest.php b/core/modules/menu_link_content/tests/src/Kernel/Migrate/d6/MigrateMenuLinkLocalizedTest.php
index 9ad274dca569ceab642cb2c882303550879ff052..3839df7d17e4683703b1ce313291dc1d75e5fb77 100644
--- a/core/modules/menu_link_content/tests/src/Kernel/Migrate/d6/MigrateMenuLinkLocalizedTest.php
+++ b/core/modules/menu_link_content/tests/src/Kernel/Migrate/d6/MigrateMenuLinkLocalizedTest.php
@@ -53,7 +53,7 @@ public function testMenuLinkLocalized() {
'attributes' => ['title' => 'fr - Test menu link 1'],
'langcode' => 'fr',
'alter' => TRUE,
- ], 'internal:/user/login', -49, 0);
+ ], 'internal:/user/login', -49);
}
}
diff --git a/core/modules/menu_link_content/tests/src/Kernel/Plugin/migrate/process/LinkUriTest.php b/core/modules/menu_link_content/tests/src/Kernel/Plugin/migrate/process/LinkUriTest.php
index f52bd0f99061d4386d28bee53a101546e7137062..01ac9ffd84902206040b27947bb49e9e6f2c6e68 100644
--- a/core/modules/menu_link_content/tests/src/Kernel/Plugin/migrate/process/LinkUriTest.php
+++ b/core/modules/menu_link_content/tests/src/Kernel/Plugin/migrate/process/LinkUriTest.php
@@ -182,11 +182,10 @@ public function providerTestDisablingRouteValidation() {
*/
public function doTransform($value, $configuration = []) {
$entityTypeManager = $this->container->get('entity_type.manager');
- $routeBuilder = $this->container->get('router.builder');
$row = new Row();
$executable = $this->prophesize(MigrateExecutableInterface::class)->reveal();
- $plugin = new LinkUri($configuration, 'link_uri', [], $entityTypeManager, $routeBuilder);
+ $plugin = new LinkUri($configuration, 'link_uri', [], $entityTypeManager);
$actual = $plugin->transform($value, $executable, $row, 'destination_property');
return $actual;
diff --git a/core/modules/migrate/tests/src/Unit/Event/EventBaseTest.php b/core/modules/migrate/tests/src/Unit/Event/EventBaseTest.php
index fc1b4bb942f386f9d7d1be7e505af81707f1f99c..fee181f582b1e96513c0aee7e603c67b3a101461 100644
--- a/core/modules/migrate/tests/src/Unit/Event/EventBaseTest.php
+++ b/core/modules/migrate/tests/src/Unit/Event/EventBaseTest.php
@@ -20,8 +20,7 @@ class EventBaseTest extends UnitTestCase {
public function testGetMigration() {
$migration = $this->prophesize('\Drupal\migrate\Plugin\MigrationInterface')->reveal();
$message_service = $this->prophesize('\Drupal\migrate\MigrateMessageInterface')->reveal();
- $row = $this->prophesize('\Drupal\migrate\Row')->reveal();
- $event = new EventBase($migration, $message_service, $row, [1, 2, 3]);
+ $event = new EventBase($migration, $message_service);
$this->assertSame($migration, $event->getMigration());
}
diff --git a/core/modules/responsive_image/src/ResponsiveImageStyleForm.php b/core/modules/responsive_image/src/ResponsiveImageStyleForm.php
index 27e9b9e2709d1e923978b55da7a06f051f29c541..dbecba4c70804b74b6d6b305f91ed630fb519a1a 100644
--- a/core/modules/responsive_image/src/ResponsiveImageStyleForm.php
+++ b/core/modules/responsive_image/src/ResponsiveImageStyleForm.php
@@ -204,7 +204,7 @@ public function form(array $form, FormStateInterface $form_state) {
$form['#tree'] = TRUE;
- return parent::form($form, $form_state, $responsive_image_style);
+ return parent::form($form, $form_state);
}
/**
diff --git a/core/modules/shortcut/src/ShortcutAccessControlHandler.php b/core/modules/shortcut/src/ShortcutAccessControlHandler.php
index dbfd3a6880059a500d37bba91b33a309f8ddc43c..6b39bd126de032a38fb7e49df0a76a00a2310b15 100644
--- a/core/modules/shortcut/src/ShortcutAccessControlHandler.php
+++ b/core/modules/shortcut/src/ShortcutAccessControlHandler.php
@@ -52,7 +52,7 @@ public static function createInstance(ContainerInterface $container, EntityTypeI
*/
protected function checkAccess(EntityInterface $entity, $operation, AccountInterface $account) {
if ($shortcut_set = $this->shortcutSetStorage->load($entity->bundle())) {
- return shortcut_set_edit_access($shortcut_set, $account);
+ return shortcut_set_edit_access($shortcut_set);
}
// @todo Fix this bizarre code: how can a shortcut exist without a shortcut
// set? The above if-test is unnecessary. See https://www.drupal.org/node/2339903.
@@ -64,7 +64,7 @@ protected function checkAccess(EntityInterface $entity, $operation, AccountInter
*/
protected function checkCreateAccess(AccountInterface $account, array $context, $entity_bundle = NULL) {
if ($shortcut_set = $this->shortcutSetStorage->load($entity_bundle)) {
- return shortcut_set_edit_access($shortcut_set, $account);
+ return shortcut_set_edit_access($shortcut_set);
}
// @todo Fix this bizarre code: how can a shortcut exist without a shortcut
// set? The above if-test is unnecessary. See https://www.drupal.org/node/2339903.
diff --git a/core/modules/shortcut/tests/src/Functional/ShortcutLinksTest.php b/core/modules/shortcut/tests/src/Functional/ShortcutLinksTest.php
index be4d92180ce6fcb9396783424552774844b3c422..5db6cba6d4171709d2596de376b8f15bc5973c71 100644
--- a/core/modules/shortcut/tests/src/Functional/ShortcutLinksTest.php
+++ b/core/modules/shortcut/tests/src/Functional/ShortcutLinksTest.php
@@ -372,7 +372,7 @@ public function testAccessShortcutsPermission() {
$this->drupalLogin($this->drupalCreateUser([
'access toolbar', 'access shortcuts', 'administer site configuration',
]));
- $this->clickLink('Shortcuts', 0, 'Shortcut link found on page.');
+ $this->clickLink('Shortcuts');
$this->assertSession()->linkExists('Cron', 0, 'Cron shortcut link found on page.');
$this->verifyAccessShortcutsPermissionForEditPages();
diff --git a/core/modules/system/tests/modules/form_test/src/FormTestServiceObject.php b/core/modules/system/tests/modules/form_test/src/FormTestServiceObject.php
index f4a89bf9fd4eb8dbe22ea83ed12089744f8da617..65ae8c19a748839a444ede97a26e939cf6e10a93 100644
--- a/core/modules/system/tests/modules/form_test/src/FormTestServiceObject.php
+++ b/core/modules/system/tests/modules/form_test/src/FormTestServiceObject.php
@@ -58,7 +58,7 @@ public function validateForm(array &$form, FormStateInterface $form_state) {
*/
public function submitForm(array &$form, FormStateInterface $form_state) {
$this->messenger()->addStatus($this->t('The FormTestServiceObject::submitForm() method was used for this form.'));
- $this->config('form_test.object', FALSE)
+ $this->config('form_test.object')
->set('bananas', $form_state->getValue('bananas'))
->save();
}
diff --git a/core/modules/system/tests/src/Functional/Ajax/FrameworkTest.php b/core/modules/system/tests/src/Functional/Ajax/FrameworkTest.php
index 5f44d545a514c969652ce51c477b2d44dcaa0aa7..ccd21ca523c7e834fd550425266113b2b4f70c01 100644
--- a/core/modules/system/tests/src/Functional/Ajax/FrameworkTest.php
+++ b/core/modules/system/tests/src/Functional/Ajax/FrameworkTest.php
@@ -36,7 +36,7 @@ public function testAJAXRender() {
// Verify that settings command is generated if JavaScript settings exist.
$commands = $this->drupalGetAjax('ajax-test/render');
$expected = new SettingsCommand(['ajax' => 'test'], TRUE);
- $this->assertCommand($commands, $expected->render(), 'JavaScript settings command is present.');
+ $this->assertCommand($commands, $expected->render());
}
/**
@@ -86,7 +86,7 @@ public function testAJAXRenderError() {
];
$commands = $this->drupalGetAjax('ajax-test/render-error', ['query' => $edit]);
$expected = new AlertCommand($edit['message']);
- $this->assertCommand($commands, $expected->render(), 'Custom error message is output.');
+ $this->assertCommand($commands, $expected->render());
}
/**
diff --git a/core/modules/system/tests/src/Functional/Batch/ProcessingTest.php b/core/modules/system/tests/src/Functional/Batch/ProcessingTest.php
index c30fd51ee28e3f204121663f27be125f751cc5d7..a341cf121f1f9bb23a77f21124d0257f67d1e1b0 100644
--- a/core/modules/system/tests/src/Functional/Batch/ProcessingTest.php
+++ b/core/modules/system/tests/src/Functional/Batch/ProcessingTest.php
@@ -30,7 +30,7 @@ class ProcessingTest extends BrowserTestBase {
public function testBatchNoForm() {
// Displaying the page triggers batch 1.
$this->drupalGet('batch-test/no-form');
- $this->assertBatchMessages($this->_resultMessages('batch_1'), 'Batch for step 2 performed successfully.');
+ $this->assertBatchMessages($this->_resultMessages('batch_1'));
$this->assertEquals($this->_resultStack('batch_1'), batch_test_stack(), 'Execution order was correct.');
$this->assertSession()->pageTextContains('Redirection successful.');
}
@@ -41,7 +41,7 @@ public function testBatchNoForm() {
public function testBatchRedirectFinishedCallback() {
// Displaying the page triggers batch 1.
$this->drupalGet('batch-test/finish-redirect');
- $this->assertBatchMessages($this->_resultMessages('batch_1'), 'Batch for step 2 performed successfully.');
+ $this->assertBatchMessages($this->_resultMessages('batch_1'));
$this->assertEquals($this->_resultStack('batch_1'), batch_test_stack(), 'Execution order was correct.');
// Verify that the custom redirection after batch execution displays the
// correct page.
@@ -61,7 +61,7 @@ public function testBatchForm() {
// character, so assert on each page that there is no escaped '<' as a way
// of verifying that no markup is incorrectly escaped.
$this->assertSession()->assertNoEscaped('<');
- $this->assertBatchMessages($this->_resultMessages('batch_0'), 'Batch with no operation performed successfully.');
+ $this->assertBatchMessages($this->_resultMessages('batch_0'));
$this->assertSession()->pageTextContains('Redirection successful.');
// Batch 1: several simple operations.
@@ -69,7 +69,7 @@ public function testBatchForm() {
$this->drupalGet('batch-test');
$this->submitForm($edit, 'Submit');
$this->assertSession()->assertNoEscaped('<');
- $this->assertBatchMessages($this->_resultMessages('batch_1'), 'Batch with simple operations performed successfully.');
+ $this->assertBatchMessages($this->_resultMessages('batch_1'));
$this->assertEquals($this->_resultStack('batch_1'), batch_test_stack(), 'Execution order was correct.');
$this->assertSession()->pageTextContains('Redirection successful.');
@@ -78,7 +78,7 @@ public function testBatchForm() {
$this->drupalGet('batch-test');
$this->submitForm($edit, 'Submit');
$this->assertSession()->assertNoEscaped('<');
- $this->assertBatchMessages($this->_resultMessages('batch_2'), 'Batch with multistep operation performed successfully.');
+ $this->assertBatchMessages($this->_resultMessages('batch_2'));
$this->assertEquals($this->_resultStack('batch_2'), batch_test_stack(), 'Execution order was correct.');
$this->assertSession()->pageTextContains('Redirection successful.');
@@ -87,7 +87,7 @@ public function testBatchForm() {
$this->drupalGet('batch-test');
$this->submitForm($edit, 'Submit');
$this->assertSession()->assertNoEscaped('<');
- $this->assertBatchMessages($this->_resultMessages('batch_3'), 'Batch with simple and multistep operations performed successfully.');
+ $this->assertBatchMessages($this->_resultMessages('batch_3'));
$this->assertEquals($this->_resultStack('batch_3'), batch_test_stack(), 'Execution order was correct.');
$this->assertSession()->pageTextContains('Redirection successful.');
@@ -96,7 +96,7 @@ public function testBatchForm() {
$this->drupalGet('batch-test');
$this->submitForm($edit, 'Submit');
$this->assertSession()->assertNoEscaped('<');
- $this->assertBatchMessages($this->_resultMessages('batch_4'), 'Nested batch performed successfully.');
+ $this->assertBatchMessages($this->_resultMessages('batch_4'));
$this->assertEquals($this->_resultStack('batch_4'), batch_test_stack(), 'Execution order was correct.');
$this->assertSession()->pageTextContains('Redirection successful.');
@@ -107,8 +107,8 @@ public function testBatchForm() {
$this->submitForm($edit, 'Submit');
$this->assertSession()->assertNoEscaped('<');
$this->assertSession()->responseContains('Redirection successful.');
- $this->assertBatchMessages($this->_resultMessages('batch_4'), 'Nested batch performed successfully.');
- $this->assertBatchMessages($this->_resultMessages('batch_7'), 'Nested batch performed successfully.');
+ $this->assertBatchMessages($this->_resultMessages('batch_4'));
+ $this->assertBatchMessages($this->_resultMessages('batch_7'));
$expected_stack = array_merge($this->_resultStack('batch_4'), $this->_resultStack('batch_7'));
$this->assertEquals($expected_stack, batch_test_stack(), 'Execution order was correct.');
$batch = \Drupal::state()->get('batch_test_nested_order_multiple_batches');
@@ -137,14 +137,14 @@ public function testBatchFormMultistep() {
// First step triggers batch 1.
$this->submitForm([], 'Submit');
- $this->assertBatchMessages($this->_resultMessages('batch_1'), 'Batch for step 1 performed successfully.');
+ $this->assertBatchMessages($this->_resultMessages('batch_1'));
$this->assertEquals($this->_resultStack('batch_1'), batch_test_stack(), 'Execution order was correct.');
$this->assertSession()->pageTextContains('step 2');
$this->assertSession()->assertNoEscaped('<');
// Second step triggers batch 2.
$this->submitForm([], 'Submit');
- $this->assertBatchMessages($this->_resultMessages('batch_2'), 'Batch for step 2 performed successfully.');
+ $this->assertBatchMessages($this->_resultMessages('batch_2'));
$this->assertEquals($this->_resultStack('batch_2'), batch_test_stack(), 'Execution order was correct.');
$this->assertSession()->pageTextContains('Redirection successful.');
$this->assertSession()->assertNoEscaped('<');
@@ -168,7 +168,7 @@ public function testBatchFormMultipleBatches() {
$this->drupalGet('batch-test/chained');
$this->submitForm($edit, 'Submit');
// Check that result messages are present and in the correct order.
- $this->assertBatchMessages($this->_resultMessages('chained'), 'Batches defined in separate submit handlers performed successfully.');
+ $this->assertBatchMessages($this->_resultMessages('chained'));
// The stack contains execution order of batch callbacks and submit
// handlers and logging of corresponding $form_state->getValues().
$this->assertEquals($this->_resultStack('chained', $value), batch_test_stack(), 'Execution order was correct, and $form_state is correctly persisted.');
@@ -186,7 +186,7 @@ public function testBatchFormProgrammatic() {
$value = rand(0, 255);
$this->drupalGet('batch-test/programmatic/' . $value);
// Check that result messages are present and in the correct order.
- $this->assertBatchMessages($this->_resultMessages('chained'), 'Batches defined in separate submit handlers performed successfully.');
+ $this->assertBatchMessages($this->_resultMessages('chained'));
// The stack contains execution order of batch callbacks and submit
// handlers and logging of corresponding $form_state->getValues().
$this->assertEquals($this->_resultStack('chained', $value), batch_test_stack(), 'Execution order was correct, and $form_state is correctly persisted.');
@@ -212,7 +212,7 @@ public function testDrupalFormSubmitInBatch() {
public function testBatchLargePercentage() {
// Displaying the page triggers batch 5.
$this->drupalGet('batch-test/large-percentage');
- $this->assertBatchMessages($this->_resultMessages('batch_5'), 'Batch for step 2 performed successfully.');
+ $this->assertBatchMessages($this->_resultMessages('batch_5'));
$this->assertEquals($this->_resultStack('batch_5'), batch_test_stack(), 'Execution order was correct.');
$this->assertSession()->pageTextContains('Redirection successful.');
}
diff --git a/core/modules/system/tests/src/Functional/Entity/EntityCacheTagsTestBase.php b/core/modules/system/tests/src/Functional/Entity/EntityCacheTagsTestBase.php
index 1f2dd2bd977f755a4e4289375109a43cfa91990b..73fd3daf07787903bee2ecedc44923b78ec96dd2 100644
--- a/core/modules/system/tests/src/Functional/Entity/EntityCacheTagsTestBase.php
+++ b/core/modules/system/tests/src/Functional/Entity/EntityCacheTagsTestBase.php
@@ -360,7 +360,7 @@ public function testReferencedEntity() {
$empty_entity_listing_cache_tags = Cache::mergeTags($this->entity->getEntityType()->getListCacheTags(), $page_cache_tags);
$nonempty_entity_listing_cache_tags = Cache::mergeTags($this->entity->getEntityType()->getListCacheTags(), $this->entity->getCacheTags());
- $nonempty_entity_listing_cache_tags = Cache::mergeTags($nonempty_entity_listing_cache_tags, $this->getAdditionalCacheTagsForEntityListing($this->entity));
+ $nonempty_entity_listing_cache_tags = Cache::mergeTags($nonempty_entity_listing_cache_tags, $this->getAdditionalCacheTagsForEntityListing());
$nonempty_entity_listing_cache_tags = Cache::mergeTags($nonempty_entity_listing_cache_tags, $page_cache_tags);
$this->verifyPageCache($referencing_entity_url, 'MISS');
diff --git a/core/modules/system/tests/src/Functional/FileTransfer/FileTransferTest.php b/core/modules/system/tests/src/Functional/FileTransfer/FileTransferTest.php
index b96caa610d70d72364e93fb929f3762a012a2a2d..6d5d6f41129f75a1b1bef5070273a82415f5e446 100644
--- a/core/modules/system/tests/src/Functional/FileTransfer/FileTransferTest.php
+++ b/core/modules/system/tests/src/Functional/FileTransfer/FileTransferTest.php
@@ -13,10 +13,6 @@
* @group FileTransfer
*/
class FileTransferTest extends BrowserTestBase {
- protected $hostname = 'localhost';
- protected $username = 'drupal';
- protected $password = 'password';
- protected $port = '42';
/**
* {@inheritdoc}
@@ -33,7 +29,7 @@ class FileTransferTest extends BrowserTestBase {
*/
protected function setUp(): void {
parent::setUp();
- $this->testConnection = TestFileTransfer::factory($this->root, ['hostname' => $this->hostname, 'username' => $this->username, 'password' => $this->password, 'port' => $this->port]);
+ $this->testConnection = TestFileTransfer::factory($this->root, []);
}
public function _getFakeModuleFiles() {
diff --git a/core/modules/system/tests/src/Functional/FileTransfer/TestFileTransfer.php b/core/modules/system/tests/src/Functional/FileTransfer/TestFileTransfer.php
index 2794ea98b25ad0d4eaeeaa687c66da1b32824dac..33bf01c253d912185c0b28296036c6911bcdf6d1 100644
--- a/core/modules/system/tests/src/Functional/FileTransfer/TestFileTransfer.php
+++ b/core/modules/system/tests/src/Functional/FileTransfer/TestFileTransfer.php
@@ -36,12 +36,9 @@ class TestFileTransfer extends FileTransfer {
*/
public $shouldIsDirectoryReturnTrue = FALSE;
- public function __construct($jail, $username, $password, $hostname = 'localhost', $port = 9999) {
- parent::__construct($jail, $username, $password, $hostname, $port);
- }
-
public static function factory($jail, $settings) {
- return new TestFileTransfer($jail, $settings['username'], $settings['password'], $settings['hostname'], $settings['port']);
+ assert(is_array($settings));
+ return new TestFileTransfer($jail);
}
public function connect() {
diff --git a/core/modules/system/tests/src/Functional/Lock/LockFunctionalTest.php b/core/modules/system/tests/src/Functional/Lock/LockFunctionalTest.php
index 4d89c41b003c977b5ebc584f54963dabfaa62e16..6e067bf8c7b43b52e3aecc2d4573c4acc2312a97 100644
--- a/core/modules/system/tests/src/Functional/Lock/LockFunctionalTest.php
+++ b/core/modules/system/tests/src/Functional/Lock/LockFunctionalTest.php
@@ -30,34 +30,34 @@ public function testLockAcquire() {
$lock = $this->container->get('lock');
$lock_acquired = 'TRUE: Lock successfully acquired in \Drupal\system_test\Controller\SystemTestController::lockAcquire()';
$lock_not_acquired = 'FALSE: Lock not acquired in \Drupal\system_test\Controller\SystemTestController::lockAcquire()';
- $this->assertTrue($lock->acquire('system_test_lock_acquire'), 'Lock acquired by this request.', 'Lock');
- $this->assertTrue($lock->acquire('system_test_lock_acquire'), 'Lock extended by this request.', 'Lock');
+ $this->assertTrue($lock->acquire('system_test_lock_acquire'), 'Lock acquired by this request.');
+ $this->assertTrue($lock->acquire('system_test_lock_acquire'), 'Lock extended by this request.');
$lock->release('system_test_lock_acquire');
// Cause another request to acquire the lock.
$this->drupalGet('system-test/lock-acquire');
$this->assertSession()->pageTextContains($lock_acquired);
// The other request has finished, thus it should have released its lock.
- $this->assertTrue($lock->acquire('system_test_lock_acquire'), 'Lock acquired by this request.', 'Lock');
+ $this->assertTrue($lock->acquire('system_test_lock_acquire'), 'Lock acquired by this request.');
// This request holds the lock, so the other request cannot acquire it.
$this->drupalGet('system-test/lock-acquire');
$this->assertSession()->pageTextContains($lock_not_acquired);
$lock->release('system_test_lock_acquire');
// Try a very short timeout and lock breaking.
- $this->assertTrue($lock->acquire('system_test_lock_acquire', 0.5), 'Lock acquired by this request.', 'Lock');
+ $this->assertTrue($lock->acquire('system_test_lock_acquire', 0.5), 'Lock acquired by this request.');
sleep(1);
// The other request should break our lock.
$this->drupalGet('system-test/lock-acquire');
$this->assertSession()->pageTextContains($lock_acquired);
// We cannot renew it, since the other thread took it.
- $this->assertFalse($lock->acquire('system_test_lock_acquire'), 'Lock cannot be extended by this request.', 'Lock');
+ $this->assertFalse($lock->acquire('system_test_lock_acquire'), 'Lock cannot be extended by this request.');
// Check the shut-down function.
$lock_acquired_exit = 'TRUE: Lock successfully acquired in \Drupal\system_test\Controller\SystemTestController::lockExit()';
$this->drupalGet('system-test/lock-exit');
$this->assertSession()->pageTextContains($lock_acquired_exit);
- $this->assertTrue($lock->acquire('system_test_lock_exit'), 'Lock acquired by this request after the other request exits.', 'Lock');
+ $this->assertTrue($lock->acquire('system_test_lock_exit'), 'Lock acquired by this request after the other request exits.');
}
/**
diff --git a/core/modules/system/tests/src/Functional/Session/SessionTest.php b/core/modules/system/tests/src/Functional/Session/SessionTest.php
index 2781e5b86d988be2b66661a36c64a8b4f0c0424c..243b04332a559bd3f342ae1ea2522412d4022e94 100644
--- a/core/modules/system/tests/src/Functional/Session/SessionTest.php
+++ b/core/modules/system/tests/src/Functional/Session/SessionTest.php
@@ -85,7 +85,7 @@ public function testSessionSaveRegenerate() {
public function testDataPersistence() {
$user = $this->drupalCreateUser([]);
// Enable sessions.
- $this->sessionReset($user->id());
+ $this->sessionReset();
$this->drupalLogin($user);
@@ -151,7 +151,7 @@ public function testDataPersistence() {
// Login, the data should persist.
$this->drupalLogin($user);
- $this->sessionReset($user->id());
+ $this->sessionReset();
// Verify that the session persists for an authenticated user after
// logging out and then back in.
$this->drupalGet('session-test/get');
@@ -159,7 +159,7 @@ public function testDataPersistence() {
// Change session and create another user.
$user2 = $this->drupalCreateUser([]);
- $this->sessionReset($user2->id());
+ $this->sessionReset();
$this->drupalLogin($user2);
}
diff --git a/core/modules/system/tests/src/Kernel/TimezoneResolverTest.php b/core/modules/system/tests/src/Kernel/TimezoneResolverTest.php
index ae7701f4702e1de75e059aeda17ca0352d96289d..1b7bfc0205645ef16314a1d8932576b12be6690c 100644
--- a/core/modules/system/tests/src/Kernel/TimezoneResolverTest.php
+++ b/core/modules/system/tests/src/Kernel/TimezoneResolverTest.php
@@ -7,7 +7,6 @@
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpKernel\Event\RequestEvent;
use Symfony\Component\HttpKernel\HttpKernelInterface;
-use Symfony\Component\HttpKernel\KernelEvents;
/**
* @coversDefaultClass \Drupal\system\TimeZoneResolver
@@ -45,7 +44,7 @@ public function testGetTimeZone() {
$eventDispatcher = $this->container->get('event_dispatcher');
$kernel = $this->container->get('kernel');
- $eventDispatcher->dispatch(new RequestEvent($kernel, Request::create('http://www.example.com'), HttpKernelInterface::MAIN_REQUEST, KernelEvents::REQUEST));
+ $eventDispatcher->dispatch(new RequestEvent($kernel, Request::create('http://www.example.com'), HttpKernelInterface::MAIN_REQUEST));
$this->assertEquals('Australia/Adelaide', date_default_timezone_get());
diff --git a/core/modules/toolbar/src/Menu/ToolbarMenuLinkTree.php b/core/modules/toolbar/src/Menu/ToolbarMenuLinkTree.php
index 24ef4e7720fd8dc7356cc6fd649a90a7b8fbfae9..e40e646918df9f80e005d99917afacafd4a21e13 100644
--- a/core/modules/toolbar/src/Menu/ToolbarMenuLinkTree.php
+++ b/core/modules/toolbar/src/Menu/ToolbarMenuLinkTree.php
@@ -17,7 +17,7 @@ public function build(array $tree, $level = 0) {
if (!$tree) {
return [];
}
- $build = parent::build($tree, $level);
+ $build = parent::build($tree);
/** @var \Drupal\Core\Menu\MenuLinkInterface $link */
$first_link = reset($tree)->link;
@@ -30,7 +30,7 @@ public function build(array $tree, $level = 0) {
return $build;
}
else {
- return parent::build($tree, $level);
+ return parent::build($tree);
}
}
diff --git a/core/modules/user/src/AccountForm.php b/core/modules/user/src/AccountForm.php
index c74619fddc7ca0c732306e7dd25dfd386052a01a..1f6d36bc2a543555c15d483cb255c398bbbe74ef 100644
--- a/core/modules/user/src/AccountForm.php
+++ b/core/modules/user/src/AccountForm.php
@@ -306,7 +306,7 @@ public function form(array $form, FormStateInterface $form_state) {
$form['timezone']['timezone']['#attributes'] = ['class' => ['timezone-detect']];
}
- return parent::form($form, $form_state, $account);
+ return parent::form($form, $form_state);
}
/**
@@ -430,7 +430,7 @@ protected function flagViolations(EntityConstraintViolationListInterface $violat
public function submitForm(array &$form, FormStateInterface $form_state) {
parent::submitForm($form, $form_state);
- $user = $this->getEntity($form_state);
+ $user = $this->getEntity();
// If there's a session set to the users id, remove the password reset tag
// since a new password was saved.
$this->getRequest()->getSession()->remove('pass_reset_' . $user->id());
diff --git a/core/modules/user/src/RegisterForm.php b/core/modules/user/src/RegisterForm.php
index 0a4da2dcf1eee34692a12a3cdfa4d0f2d5aff335..6ebb4edcdcea1bfa85310424fbf9712ab87c4ae4 100644
--- a/core/modules/user/src/RegisterForm.php
+++ b/core/modules/user/src/RegisterForm.php
@@ -50,7 +50,7 @@ public function form(array $form, FormStateInterface $form_state) {
}
// Start with the default user account fields.
- $form = parent::form($form, $form_state, $account);
+ $form = parent::form($form, $form_state);
return $form;
}
diff --git a/core/modules/user/src/RoleForm.php b/core/modules/user/src/RoleForm.php
index 34aa98e8fc199369d9fc7b2c999f5eb0a7fc57f1..92a48c90da572895fb41639daf9449bb17598baa 100644
--- a/core/modules/user/src/RoleForm.php
+++ b/core/modules/user/src/RoleForm.php
@@ -42,7 +42,7 @@ public function form(array $form, FormStateInterface $form_state) {
'#value' => $entity->getWeight(),
];
- return parent::form($form, $form_state, $entity);
+ return parent::form($form, $form_state);
}
/**
diff --git a/core/modules/user/tests/src/Functional/UserBlocksTest.php b/core/modules/user/tests/src/Functional/UserBlocksTest.php
index 59f96ffa6a03aab6b091226b9cc84abc50d87815..dfc14fb0b196f72a73b61c935ac3452e5142f54a 100644
--- a/core/modules/user/tests/src/Functional/UserBlocksTest.php
+++ b/core/modules/user/tests/src/Functional/UserBlocksTest.php
@@ -41,7 +41,7 @@ protected function setUp(): void {
$this->adminUser = $this->drupalCreateUser(['administer blocks']);
$this->drupalLogin($this->adminUser);
$this->drupalPlaceBlock('user_login_block', ['id' => 'user_blocks_test_user_login_block']);
- $this->drupalLogout($this->adminUser);
+ $this->drupalLogout();
}
/**
diff --git a/core/modules/views/src/Entity/Render/EntityTranslationRenderTrait.php b/core/modules/views/src/Entity/Render/EntityTranslationRenderTrait.php
index 788174a1c3c04cfa9ca7e54f909c0eeadb7450a2..178c1b1aa5fb6964656f4797afd6b1cb85642ff9 100644
--- a/core/modules/views/src/Entity/Render/EntityTranslationRenderTrait.php
+++ b/core/modules/views/src/Entity/Render/EntityTranslationRenderTrait.php
@@ -34,9 +34,11 @@ protected function getEntityTranslationRenderer() {
'***LANGUAGE_entity_translation***' => 'TranslationLanguageRenderer',
'***LANGUAGE_entity_default***' => 'DefaultLanguageRenderer',
];
+ $entity_type = $this->getEntityTypeManager()->getDefinition($this->getEntityTypeId());
if (isset($dynamic_renderers[$rendering_language])) {
// Dynamic language set based on result rows or instance defaults.
- $renderer = $dynamic_renderers[$rendering_language];
+ $class = '\Drupal\views\Entity\Render\\' . $dynamic_renderers[$rendering_language];
+ $this->entityTranslationRenderer = new $class($view, $this->getLanguageManager(), $entity_type);
}
else {
if (strpos($rendering_language, '***LANGUAGE_') !== FALSE) {
@@ -46,11 +48,8 @@ protected function getEntityTranslationRenderer() {
// Specific langcode set.
$langcode = $rendering_language;
}
- $renderer = 'ConfigurableLanguageRenderer';
+ $this->entityTranslationRenderer = new ConfigurableLanguageRenderer($view, $this->getLanguageManager(), $entity_type, $langcode);
}
- $class = '\Drupal\views\Entity\Render\\' . $renderer;
- $entity_type = $this->getEntityTypeManager()->getDefinition($this->getEntityTypeId());
- $this->entityTranslationRenderer = new $class($view, $this->getLanguageManager(), $entity_type, $langcode);
}
return $this->entityTranslationRenderer;
}
diff --git a/core/modules/views/src/Plugin/views/argument/Date.php b/core/modules/views/src/Plugin/views/argument/Date.php
index 97918df9a9e0c362d76af41feb8f7e0027091d27..502e264679729e7978c2e65ae7817674d7631f08 100644
--- a/core/modules/views/src/Plugin/views/argument/Date.php
+++ b/core/modules/views/src/Plugin/views/argument/Date.php
@@ -123,7 +123,7 @@ public function getDefaultArgument($raw = FALSE) {
}
}
- return parent::getDefaultArgument($raw);
+ return parent::getDefaultArgument();
}
/**
diff --git a/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php b/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php
index 1eed2d4c2be70a1b0564e5497701c85aae61cb71..11cbaf44901be7c0e09ba1206fa5def80a92956a 100644
--- a/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php
+++ b/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php
@@ -1687,7 +1687,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
if (empty($style)) {
$form['#title'] .= $this->t('Row style options');
}
- $plugin = $this->getPlugin(empty($style) ? 'row' : 'style', $name);
+ $plugin = $this->getPlugin(empty($style) ? 'row' : 'style');
if ($plugin) {
$form[$section] = [
'#tree' => TRUE,
diff --git a/core/modules/views/src/Plugin/views/field/FieldPluginBase.php b/core/modules/views/src/Plugin/views/field/FieldPluginBase.php
index 3a30b1ee779fc1cf13da35acc200f0caf6a26d4f..8428f1308c244347c5f7d6933f6435cc8b07f353 100644
--- a/core/modules/views/src/Plugin/views/field/FieldPluginBase.php
+++ b/core/modules/views/src/Plugin/views/field/FieldPluginBase.php
@@ -636,7 +636,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
];
$form['element_label_type'] = [
'#title' => $this->t('Label HTML element'),
- '#options' => $this->getElements(FALSE),
+ '#options' => $this->getElements(),
'#type' => 'select',
'#default_value' => $this->options['element_label_type'],
'#description' => $this->t('Choose the HTML element to wrap around this label, e.g. H1, H2, etc.'),
@@ -680,7 +680,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
];
$form['element_wrapper_type'] = [
'#title' => $this->t('Wrapper HTML element'),
- '#options' => $this->getElements(FALSE),
+ '#options' => $this->getElements(),
'#type' => 'select',
'#default_value' => $this->options['element_wrapper_type'],
'#description' => $this->t('Choose the HTML element to wrap around this field and label, e.g. H1, H2, etc. This may not be used if the field and label are not rendered together, such as with a table.'),
diff --git a/core/modules/views/src/Tests/TestHelperPlugin.php b/core/modules/views/src/Tests/TestHelperPlugin.php
index 51d20bd68c503ba096bd84690fcfdd2f9852c652..511fa036db820b654416428098e6326f35d3c243 100644
--- a/core/modules/views/src/Tests/TestHelperPlugin.php
+++ b/core/modules/views/src/Tests/TestHelperPlugin.php
@@ -24,7 +24,7 @@ class TestHelperPlugin extends PluginBase {
* @see \Drupal\views\Plugin\views\PluginBase::setOptionDefaults()
*/
public function testSetOptionDefaults(&$storage, $options, $level = 0) {
- $this->setOptionDefaults($storage, $options, $level);
+ $this->setOptionDefaults($storage, $options);
}
/**
diff --git a/core/modules/views/tests/src/Unit/EventSubscriber/RouteSubscriberTest.php b/core/modules/views/tests/src/Unit/EventSubscriber/RouteSubscriberTest.php
index 55d9fcf5c0cda9fc151e5b2310674718c405b26d..16167cf27d2ffd4ebeddf068af28104e14842055 100644
--- a/core/modules/views/tests/src/Unit/EventSubscriber/RouteSubscriberTest.php
+++ b/core/modules/views/tests/src/Unit/EventSubscriber/RouteSubscriberTest.php
@@ -97,7 +97,7 @@ public function testOnAlterRoutes() {
$route_2 = new Route('test_route/example', ['_controller' => 'Drupal\Tests\Core\Controller\TestController']);
$collection->add('test_route_2', $route_2);
- $route_event = new RouteBuildEvent($collection, 'views');
+ $route_event = new RouteBuildEvent($collection);
[$display_1, $display_2] = $this->setupMocks();
diff --git a/core/phpstan-baseline.neon b/core/phpstan-baseline.neon
index a0c2ab911987e6c16162fbdbba2143de1dfed394..c6272077f13bbabbbe1996792a1550532abc8a65 100644
--- a/core/phpstan-baseline.neon
+++ b/core/phpstan-baseline.neon
@@ -15,11 +15,6 @@ parameters:
count: 1
path: assets/scaffold/files/default.settings.php
- -
- message: "#^Function _batch_process invoked with 1 parameter, 0 required\\.$#"
- count: 1
- path: includes/batch.inc
-
-
message: "#^Variable \\$finished might not be defined\\.$#"
count: 1
@@ -50,11 +45,6 @@ parameters:
count: 1
path: includes/install.core.inc
- -
- message: "#^Function _drupal_rewrite_settings_is_array_index invoked with 2 parameters, 1 required\\.$#"
- count: 1
- path: includes/install.inc
-
-
message: "#^Variable \\$current might not be defined\\.$#"
count: 1
@@ -200,11 +190,6 @@ parameters:
count: 1
path: lib/Drupal/Component/Gettext/PoMemoryWriter.php
- -
- message: "#^Class Drupal\\\\Component\\\\Render\\\\FormattableMarkup constructor invoked with 3 parameters, 2 required\\.$#"
- count: 1
- path: lib/Drupal/Component/Gettext/PoStreamReader.php
-
-
message: "#^Variable \\$log_vars might not be defined\\.$#"
count: 1
@@ -215,11 +200,6 @@ parameters:
count: 1
path: lib/Drupal/Component/Utility/Color.php
- -
- message: "#^Static method Drupal\\\\Component\\\\Utility\\\\Variable\\:\\:export\\(\\) invoked with 3 parameters, 1\\-2 required\\.$#"
- count: 1
- path: lib/Drupal/Component/Utility/Variable.php
-
-
message: "#^Variable \\$permission might not be defined\\.$#"
count: 1
@@ -315,11 +295,6 @@ parameters:
count: 1
path: lib/Drupal/Core/Condition/ConditionManager.php
- -
- message: "#^Method Drupal\\\\Core\\\\Config\\\\ConfigInstaller\\:\\:createConfiguration\\(\\) invoked with 3 parameters, 2 required\\.$#"
- count: 1
- path: lib/Drupal/Core/Config/ConfigInstaller.php
-
-
message: "#^Variable \\$value in isset\\(\\) always exists and is not nullable\\.$#"
count: 2
@@ -370,11 +345,6 @@ parameters:
count: 2
path: lib/Drupal/Core/Datetime/DateHelper.php
- -
- message: "#^Class Symfony\\\\Component\\\\DependencyInjection\\\\Reference constructor invoked with 3 parameters, 1\\-2 required\\.$#"
- count: 1
- path: lib/Drupal/Core/DependencyInjection/YamlFileLoader.php
-
-
message: "#^Method Drupal\\\\Core\\\\DrupalKernel\\:\\:discoverServiceProviders\\(\\) should return array but return statement is missing\\.$#"
count: 1
@@ -820,26 +790,11 @@ parameters:
count: 1
path: lib/Drupal/Core/TypedData/Validation/RecursiveContextualValidator.php
- -
- message: "#^Class Drupal\\\\Core\\\\Update\\\\UpdateBackend constructor invoked with 2 parameters, 1 required\\.$#"
- count: 1
- path: lib/Drupal/Core/Update/UpdateCacheBackendFactory.php
-
- -
- message: "#^Method Drupal\\\\Core\\\\Update\\\\UpdateKernel\\:\\:bootSession\\(\\) invoked with 2 parameters, 1 required\\.$#"
- count: 1
- path: lib/Drupal/Core/Update/UpdateKernel.php
-
-
message: "#^Method Drupal\\\\Core\\\\Update\\\\UpdateKernel\\:\\:discoverServiceProviders\\(\\) should return array but return statement is missing\\.$#"
count: 1
path: lib/Drupal/Core/Update/UpdateKernel.php
- -
- message: "#^Method Drupal\\\\Core\\\\Update\\\\UpdateKernel\\:\\:handleAccess\\(\\) invoked with 2 parameters, 1 required\\.$#"
- count: 1
- path: lib/Drupal/Core/Update/UpdateKernel.php
-
-
message: "#^Method Drupal\\\\Core\\\\Updater\\\\Module\\:\\:postUpdateTasks\\(\\) should return array but return statement is missing\\.$#"
count: 1
@@ -890,11 +845,6 @@ parameters:
count: 1
path: modules/block/tests/src/Functional/BlockUiTest.php
- -
- message: "#^Class Drupal\\\\block\\\\Plugin\\\\migrate\\\\process\\\\BlockSettings constructor invoked with 4 parameters, 3 required\\.$#"
- count: 1
- path: modules/block/tests/src/Unit/Plugin/migrate/process/BlockSettingsTest.php
-
-
message: "#^Variable \\$row in empty\\(\\) is never defined\\.$#"
count: 1
@@ -995,11 +945,6 @@ parameters:
count: 1
path: modules/comment/src/CommentForm.php
- -
- message: "#^Method Drupal\\\\Core\\\\Entity\\\\ContentEntityForm\\:\\:form\\(\\) invoked with 3 parameters, 2 required\\.$#"
- count: 1
- path: modules/comment/src/CommentForm.php
-
-
message: "#^Method Drupal\\\\comment\\\\CommentForm\\:\\:save\\(\\) should return int but return statement is missing\\.$#"
count: 1
@@ -1055,11 +1000,6 @@ parameters:
count: 1
path: modules/comment/tests/src/Functional/CommentLanguageTest.php
- -
- message: "#^Method PHPUnit\\\\Framework\\\\Assert\\:\\:fail\\(\\) invoked with 2 parameters, 0\\-1 required\\.$#"
- count: 1
- path: modules/comment/tests/src/Functional/CommentPagerTest.php
-
-
message: "#^Variable \\$mode_text might not be defined\\.$#"
count: 1
@@ -1110,11 +1050,6 @@ parameters:
count: 1
path: modules/contact/src/Entity/Message.php
- -
- message: "#^Method Drupal\\\\Core\\\\Entity\\\\ContentEntityForm\\:\\:form\\(\\) invoked with 3 parameters, 2 required\\.$#"
- count: 1
- path: modules/contact/src/MessageForm.php
-
-
message: "#^Method Drupal\\\\contact\\\\MessageForm\\:\\:save\\(\\) should return int but return statement is missing\\.$#"
count: 1
@@ -1155,11 +1090,6 @@ parameters:
count: 5
path: modules/content_translation/src/ContentTranslationHandler.php
- -
- message: "#^Method Drupal\\\\content_translation\\\\ContentTranslationHandler\\:\\:addTranslatabilityClue\\(\\) invoked with 2 parameters, 1 required\\.$#"
- count: 1
- path: modules/content_translation/src/ContentTranslationHandler.php
-
-
message: "#^Call to deprecated constant REQUEST_TIME\\: Deprecated in drupal\\:8\\.3\\.0 and is removed from drupal\\:10\\.0\\.0\\. Use \\\\Drupal\\:\\:time\\(\\)\\-\\>getRequestTime\\(\\); $#"
count: 1
@@ -1260,11 +1190,6 @@ parameters:
count: 1
path: modules/dblog/tests/src/Kernel/DbLogTest.php
- -
- message: "#^Method Drupal\\\\Tests\\\\BrowserTestBase\\:\\:drupalLogout\\(\\) invoked with 1 parameter, 0 required\\.$#"
- count: 2
- path: modules/editor/tests/src/Functional/EditorLoadingTest.php
-
-
message: "#^Variable \\$items in empty\\(\\) always exists and is not falsy\\.$#"
count: 1
@@ -1290,26 +1215,6 @@ parameters:
count: 1
path: modules/field/tests/src/Kernel/Timestamp/TimestampFormatterTest.php
- -
- message: "#^Class Drupal\\\\field\\\\Plugin\\\\migrate\\\\process\\\\d6\\\\FieldInstanceSettings constructor invoked with 4 parameters, 3 required\\.$#"
- count: 1
- path: modules/field/tests/src/Unit/Plugin/migrate/process/d6/FieldInstanceSettingsTest.php
-
- -
- message: "#^Class Drupal\\\\field\\\\Plugin\\\\migrate\\\\process\\\\d6\\\\FieldSettings constructor invoked with 4 parameters, 3 required\\.$#"
- count: 1
- path: modules/field/tests/src/Unit/Plugin/migrate/process/d6/FieldSettingsTest.php
-
- -
- message: "#^Class Drupal\\\\field\\\\Plugin\\\\migrate\\\\process\\\\d7\\\\FieldInstanceSettings constructor invoked with 4 parameters, 3 required\\.$#"
- count: 1
- path: modules/field/tests/src/Unit/Plugin/migrate/process/d7/FieldInstanceSettingsTest.php
-
- -
- message: "#^Class Drupal\\\\field\\\\Plugin\\\\migrate\\\\process\\\\d7\\\\FieldSettings constructor invoked with 4 parameters, 3 required\\.$#"
- count: 1
- path: modules/field/tests/src/Unit/Plugin/migrate/process/d7/FieldSettingsTest.php
-
-
message: "#^Variable \\$entity_display might not be defined\\.$#"
count: 1
@@ -1345,11 +1250,6 @@ parameters:
count: 1
path: modules/field_ui/src/Form/FieldConfigEditForm.php
- -
- message: "#^Static method Drupal\\\\field_ui\\\\FieldUI\\:\\:getNextDestination\\(\\) invoked with 2 parameters, 1 required\\.$#"
- count: 1
- path: modules/field_ui/src/Form/FieldStorageAddForm.php
-
-
message: "#^Method Drupal\\\\field_ui\\\\Form\\\\FieldStorageConfigEditForm\\:\\:save\\(\\) should return int but return statement is missing\\.$#"
count: 1
@@ -1395,11 +1295,6 @@ parameters:
count: 2
path: modules/file/tests/src/Functional/FileFieldRevisionTest.php
- -
- message: "#^Method Drupal\\\\Tests\\\\file\\\\Functional\\\\FileFieldTestBase\\:\\:uploadNodeFile\\(\\) invoked with 6 parameters, 3\\-5 required\\.$#"
- count: 1
- path: modules/file/tests/src/Functional/FileFieldWidgetTest.php
-
-
message: "#^Variable \\$unexpected in empty\\(\\) always exists and is not falsy\\.$#"
count: 1
@@ -1425,11 +1320,6 @@ parameters:
count: 1
path: modules/file/tests/src/Kernel/FileManagedUnitTestBase.php
- -
- message: "#^Method PHPUnit\\\\Framework\\\\Assert\\:\\:assertNotNull\\(\\) invoked with 3 parameters, 1\\-2 required\\.$#"
- count: 1
- path: modules/file/tests/src/Kernel/SaveTest.php
-
-
message: "#^Call to deprecated constant REQUEST_TIME\\: Deprecated in drupal\\:8\\.3\\.0 and is removed from drupal\\:10\\.0\\.0\\. Use \\\\Drupal\\:\\:time\\(\\)\\-\\>getRequestTime\\(\\); $#"
count: 2
@@ -1440,11 +1330,6 @@ parameters:
count: 1
path: modules/filter/src/Plugin/Filter/FilterHtml.php
- -
- message: "#^Class Drupal\\\\filter\\\\Plugin\\\\migrate\\\\process\\\\FilterSettings constructor invoked with 4 parameters, 3 required\\.$#"
- count: 1
- path: modules/filter/tests/src/Kernel/Plugin/migrate/process/FilterSettingsTest.php
-
-
message: "#^Method Drupal\\\\forum\\\\ForumManager\\:\\:getTopicOrder\\(\\) should return array but return statement is missing\\.$#"
count: 1
@@ -1540,11 +1425,6 @@ parameters:
count: 1
path: modules/jsonapi/src/Revisions/VersionNegotiator.php
- -
- message: "#^Static method Drupal\\\\Component\\\\Serialization\\\\Json\\:\\:encode\\(\\) invoked with 2 parameters, 1 required\\.$#"
- count: 1
- path: modules/jsonapi/tests/src/Functional/ResourceTestBase.php
-
-
message: "#^Variable \\$created_entity might not be defined\\.$#"
count: 1
@@ -1565,11 +1445,6 @@ parameters:
count: 2
path: modules/jsonapi/tests/src/Functional/ResourceTestBase.php
- -
- message: "#^Class Drupal\\\\jsonapi\\\\Normalizer\\\\JsonApiDocumentTopLevelNormalizer constructor invoked with 3 parameters, 2 required\\.$#"
- count: 1
- path: modules/jsonapi/tests/src/Unit/Normalizer/JsonApiDocumentTopLevelNormalizerTest.php
-
-
message: "#^Variable \\$id in isset\\(\\) always exists and is not nullable\\.$#"
count: 2
@@ -1690,11 +1565,6 @@ parameters:
count: 2
path: modules/locale/tests/src/Functional/LocaleUpdateInterfaceTest.php
- -
- message: "#^Method Drupal\\\\Tests\\\\locale\\\\Kernel\\\\LocaleConfigSubscriberTest\\:\\:assertNoConfigOverride\\(\\) invoked with 4 parameters, 2 required\\.$#"
- count: 3
- path: modules/locale/tests/src/Kernel/LocaleConfigSubscriberTest.php
-
-
message: "#^Variable \\$error in empty\\(\\) always exists and is not falsy\\.$#"
count: 1
@@ -1720,11 +1590,6 @@ parameters:
count: 1
path: modules/media_library/tests/src/FunctionalJavascript/EmbeddedFormWidgetTest.php
- -
- message: "#^Method Drupal\\\\Tests\\\\media_library\\\\FunctionalJavascript\\\\MediaLibraryTestBase\\:\\:addMediaFileToField\\(\\) invoked with 3 parameters, 2 required\\.$#"
- count: 2
- path: modules/media_library/tests/src/FunctionalJavascript/WidgetUploadTest.php
-
-
message: "#^Constructor of class Drupal\\\\menu_link_content\\\\Form\\\\MenuLinkContentForm has an unused parameter \\$language_manager\\.$#"
count: 1
@@ -1745,16 +1610,6 @@ parameters:
count: 2
path: modules/menu_link_content/tests/src/Kernel/MenuLinksTest.php
- -
- message: "#^Method Drupal\\\\Tests\\\\menu_link_content\\\\Kernel\\\\Migrate\\\\d6\\\\MigrateMenuLinkLocalizedTest\\:\\:assertEntity\\(\\) invoked with 11 parameters, 10 required\\.$#"
- count: 1
- path: modules/menu_link_content/tests/src/Kernel/Migrate/d6/MigrateMenuLinkLocalizedTest.php
-
- -
- message: "#^Class Drupal\\\\menu_link_content\\\\Plugin\\\\migrate\\\\process\\\\LinkUri constructor invoked with 5 parameters, 4 required\\.$#"
- count: 1
- path: modules/menu_link_content/tests/src/Kernel/Plugin/migrate/process/LinkUriTest.php
-
-
message: "#^Method Drupal\\\\menu_ui\\\\MenuForm\\:\\:save\\(\\) should return int but return statement is missing\\.$#"
count: 1
@@ -1820,11 +1675,6 @@ parameters:
count: 1
path: modules/migrate/tests/src/Kernel/MigrateTestBase.php
- -
- message: "#^Class Drupal\\\\migrate\\\\Event\\\\EventBase constructor invoked with 4 parameters, 2 required\\.$#"
- count: 1
- path: modules/migrate/tests/src/Unit/Event/EventBaseTest.php
-
-
message: "#^Variable \\$sub_process_plugins might not be defined\\.$#"
count: 2
@@ -2105,26 +1955,11 @@ parameters:
count: 1
path: modules/responsive_image/src/Plugin/Field/FieldFormatter/ResponsiveImageFormatter.php
- -
- message: "#^Method Drupal\\\\Core\\\\Entity\\\\EntityForm\\:\\:form\\(\\) invoked with 3 parameters, 2 required\\.$#"
- count: 1
- path: modules/responsive_image/src/ResponsiveImageStyleForm.php
-
-
message: "#^Method Drupal\\\\responsive_image\\\\ResponsiveImageStyleForm\\:\\:save\\(\\) should return int but return statement is missing\\.$#"
count: 1
path: modules/responsive_image/src/ResponsiveImageStyleForm.php
- -
- message: "#^Class Drupal\\\\views\\\\Entity\\\\Render\\\\DefaultLanguageRenderer constructor invoked with 4 parameters, 3 required\\.$#"
- count: 1
- path: modules/rest/src/Plugin/views/row/DataEntityRow.php
-
- -
- message: "#^Class Drupal\\\\views\\\\Entity\\\\Render\\\\TranslationLanguageRenderer constructor invoked with 4 parameters, 3 required\\.$#"
- count: 1
- path: modules/rest/src/Plugin/views/row/DataEntityRow.php
-
-
message: "#^Method Drupal\\\\rest\\\\Routing\\\\ResourceRoutes\\:\\:onDynamicRouteEvent\\(\\) should return array but return statement is missing\\.$#"
count: 1
@@ -2200,11 +2035,6 @@ parameters:
count: 1
path: modules/shortcut/src/Form/SetCustomize.php
- -
- message: "#^Function shortcut_set_edit_access invoked with 2 parameters, 0\\-1 required\\.$#"
- count: 2
- path: modules/shortcut/src/ShortcutAccessControlHandler.php
-
-
message: "#^Method Drupal\\\\shortcut\\\\ShortcutForm\\:\\:save\\(\\) should return int but return statement is missing\\.$#"
count: 1
@@ -2215,11 +2045,6 @@ parameters:
count: 1
path: modules/shortcut/src/ShortcutSetForm.php
- -
- message: "#^Method Drupal\\\\Tests\\\\BrowserTestBase\\:\\:clickLink\\(\\) invoked with 3 parameters, 1\\-2 required\\.$#"
- count: 1
- path: modules/shortcut/tests/src/Functional/ShortcutLinksTest.php
-
-
message: "#^Variable \\$args might not be defined\\.$#"
count: 1
@@ -2325,11 +2150,6 @@ parameters:
count: 1
path: modules/system/tests/modules/form_test/src/Form/FormTestTableSelectJsSelectForm.php
- -
- message: "#^Method Drupal\\\\Core\\\\Form\\\\ConfigFormBase\\:\\:config\\(\\) invoked with 2 parameters, 1 required\\.$#"
- count: 1
- path: modules/system/tests/modules/form_test/src/FormTestServiceObject.php
-
-
message: "#^Constructor of class Drupal\\\\lazy_route_provider_install_test\\\\PluginManager has an unused parameter \\$cache_backend\\.$#"
count: 1
@@ -2345,21 +2165,6 @@ parameters:
count: 1
path: modules/system/tests/modules/module_installer_config_test/src/Entity/TestConfigType.php
- -
- message: "#^Method Drupal\\\\Tests\\\\system\\\\Functional\\\\Ajax\\\\FrameworkTest\\:\\:assertCommand\\(\\) invoked with 3 parameters, 2 required\\.$#"
- count: 2
- path: modules/system/tests/src/Functional/Ajax/FrameworkTest.php
-
- -
- message: "#^Method Drupal\\\\Tests\\\\system\\\\Functional\\\\Batch\\\\ProcessingTest\\:\\:assertBatchMessages\\(\\) invoked with 2 parameters, 1 required\\.$#"
- count: 14
- path: modules/system/tests/src/Functional/Batch/ProcessingTest.php
-
- -
- message: "#^Method Drupal\\\\Tests\\\\system\\\\Functional\\\\Entity\\\\EntityCacheTagsTestBase\\:\\:getAdditionalCacheTagsForEntityListing\\(\\) invoked with 1 parameter, 0 required\\.$#"
- count: 1
- path: modules/system/tests/src/Functional/Entity/EntityCacheTagsTestBase.php
-
-
message: "#^Instantiated class Drupal\\\\Tests\\\\system\\\\Functional\\\\FileTransfer\\\\Exception not found\\.$#"
count: 1
@@ -2370,11 +2175,6 @@ parameters:
count: 5
path: modules/system/tests/src/Functional/FileTransfer/TestFileTransfer.php
- -
- message: "#^Method Drupal\\\\Core\\\\FileTransfer\\\\FileTransfer\\:\\:__construct\\(\\) invoked with 5 parameters, 1 required\\.$#"
- count: 1
- path: modules/system/tests/src/Functional/FileTransfer/TestFileTransfer.php
-
-
message: "#^Variable \\$checked might not be defined\\.$#"
count: 1
@@ -2385,16 +2185,6 @@ parameters:
count: 2
path: modules/system/tests/src/Functional/Form/FormTest.php
- -
- message: "#^Method PHPUnit\\\\Framework\\\\Assert\\:\\:assertFalse\\(\\) invoked with 3 parameters, 1\\-2 required\\.$#"
- count: 1
- path: modules/system/tests/src/Functional/Lock/LockFunctionalTest.php
-
- -
- message: "#^Method PHPUnit\\\\Framework\\\\Assert\\:\\:assertTrue\\(\\) invoked with 3 parameters, 1\\-2 required\\.$#"
- count: 5
- path: modules/system/tests/src/Functional/Lock/LockFunctionalTest.php
-
-
message: "#^Variable \\$goto in isset\\(\\) always exists and is not nullable\\.$#"
count: 1
@@ -2410,11 +2200,6 @@ parameters:
count: 7
path: modules/system/tests/src/Functional/Menu/BreadcrumbTest.php
- -
- message: "#^Method Drupal\\\\Tests\\\\system\\\\Functional\\\\Session\\\\SessionTest\\:\\:sessionReset\\(\\) invoked with 1 parameter, 0 required\\.$#"
- count: 3
- path: modules/system/tests/src/Functional/Session/SessionTest.php
-
-
message: "#^Variable \\$expected_required_list_items might not be defined\\.$#"
count: 2
@@ -2425,11 +2210,6 @@ parameters:
count: 1
path: modules/system/tests/src/Kernel/Common/UrlTest.php
- -
- message: "#^Class Symfony\\\\Component\\\\HttpKernel\\\\Event\\\\RequestEvent constructor invoked with 4 parameters, 3 required\\.$#"
- count: 1
- path: modules/system/tests/src/Kernel/TimezoneResolverTest.php
-
-
message: "#^Call to deprecated constant REQUEST_TIME\\: Deprecated in drupal\\:8\\.3\\.0 and is removed from drupal\\:10\\.0\\.0\\. Use \\\\Drupal\\:\\:time\\(\\)\\-\\>getRequestTime\\(\\); $#"
count: 1
@@ -2525,11 +2305,6 @@ parameters:
count: 1
path: modules/toolbar/src/Controller/ToolbarController.php
- -
- message: "#^Method Drupal\\\\Core\\\\Menu\\\\MenuLinkTree\\:\\:build\\(\\) invoked with 2 parameters, 1 required\\.$#"
- count: 2
- path: modules/toolbar/src/Menu/ToolbarMenuLinkTree.php
-
-
message: "#^Method Drupal\\\\tour\\\\TipPluginBase\\:\\:get\\(\\) should return string but return statement is missing\\.$#"
count: 1
@@ -2550,16 +2325,6 @@ parameters:
count: 4
path: modules/update/src/UpdateProcessor.php
- -
- message: "#^Method Drupal\\\\Core\\\\Entity\\\\ContentEntityForm\\:\\:form\\(\\) invoked with 3 parameters, 2 required\\.$#"
- count: 1
- path: modules/user/src/AccountForm.php
-
- -
- message: "#^Method Drupal\\\\Core\\\\Entity\\\\EntityForm\\:\\:getEntity\\(\\) invoked with 1 parameter, 0 required\\.$#"
- count: 1
- path: modules/user/src/AccountForm.php
-
-
message: "#^Variable \\$users might not be defined\\.$#"
count: 1
@@ -2605,31 +2370,16 @@ parameters:
count: 1
path: modules/user/src/ProfileForm.php
- -
- message: "#^Method Drupal\\\\user\\\\AccountForm\\:\\:form\\(\\) invoked with 3 parameters, 2 required\\.$#"
- count: 1
- path: modules/user/src/RegisterForm.php
-
-
message: "#^Method Drupal\\\\user\\\\RegisterForm\\:\\:save\\(\\) should return int but return statement is missing\\.$#"
count: 1
path: modules/user/src/RegisterForm.php
- -
- message: "#^Method Drupal\\\\Core\\\\Entity\\\\EntityForm\\:\\:form\\(\\) invoked with 3 parameters, 2 required\\.$#"
- count: 1
- path: modules/user/src/RoleForm.php
-
-
message: "#^Method Drupal\\\\user\\\\RoleForm\\:\\:save\\(\\) should return int but return statement is missing\\.$#"
count: 1
path: modules/user/src/RoleForm.php
- -
- message: "#^Method Drupal\\\\Tests\\\\BrowserTestBase\\:\\:drupalLogout\\(\\) invoked with 1 parameter, 0 required\\.$#"
- count: 1
- path: modules/user/tests/src/Functional/UserBlocksTest.php
-
-
message: "#^Call to deprecated constant REQUEST_TIME\\: Deprecated in drupal\\:8\\.3\\.0 and is removed from drupal\\:10\\.0\\.0\\. Use \\\\Drupal\\:\\:time\\(\\)\\-\\>getRequestTime\\(\\); $#"
count: 2
@@ -2685,16 +2435,6 @@ parameters:
count: 1
path: modules/user/tests/src/Unit/UserAccessControlHandlerTest.php
- -
- message: "#^Class Drupal\\\\views\\\\Entity\\\\Render\\\\DefaultLanguageRenderer constructor invoked with 4 parameters, 3 required\\.$#"
- count: 1
- path: modules/views/src/Entity/Render/EntityFieldRenderer.php
-
- -
- message: "#^Class Drupal\\\\views\\\\Entity\\\\Render\\\\TranslationLanguageRenderer constructor invoked with 4 parameters, 3 required\\.$#"
- count: 1
- path: modules/views/src/Entity/Render/EntityFieldRenderer.php
-
-
message: "#^Variable \\$batch in isset\\(\\) is never defined\\.$#"
count: 1
@@ -2765,11 +2505,6 @@ parameters:
count: 1
path: modules/views/src/Plugin/views/argument/Date.php
- -
- message: "#^Method Drupal\\\\views\\\\Plugin\\\\views\\\\argument\\\\ArgumentPluginBase\\:\\:getDefaultArgument\\(\\) invoked with 1 parameter, 0 required\\.$#"
- count: 1
- path: modules/views/src/Plugin/views/argument/Date.php
-
-
message: "#^Method Drupal\\\\views\\\\Plugin\\\\views\\\\cache\\\\CachePluginBase\\:\\:cacheGet\\(\\) should return bool but return statement is missing\\.$#"
count: 1
@@ -2785,11 +2520,6 @@ parameters:
count: 1
path: modules/views/src/Plugin/views/display/DisplayPluginBase.php
- -
- message: "#^Method Drupal\\\\views\\\\Plugin\\\\views\\\\display\\\\DisplayPluginBase\\:\\:getPlugin\\(\\) invoked with 2 parameters, 1 required\\.$#"
- count: 1
- path: modules/views/src/Plugin/views/display/DisplayPluginBase.php
-
-
message: "#^Variable \\$pager in isset\\(\\) always exists and is not nullable\\.$#"
count: 1
@@ -2815,16 +2545,6 @@ parameters:
count: 1
path: modules/views/src/Plugin/views/field/Broken.php
- -
- message: "#^Class Drupal\\\\views\\\\Entity\\\\Render\\\\DefaultLanguageRenderer constructor invoked with 4 parameters, 3 required\\.$#"
- count: 1
- path: modules/views/src/Plugin/views/field/BulkForm.php
-
- -
- message: "#^Class Drupal\\\\views\\\\Entity\\\\Render\\\\TranslationLanguageRenderer constructor invoked with 4 parameters, 3 required\\.$#"
- count: 1
- path: modules/views/src/Plugin/views/field/BulkForm.php
-
-
message: "#^Variable \\$entity in empty\\(\\) always exists and is not falsy\\.$#"
count: 1
@@ -2860,21 +2580,6 @@ parameters:
count: 1
path: modules/views/src/Plugin/views/field/EntityField.php
- -
- message: "#^Class Drupal\\\\views\\\\Entity\\\\Render\\\\DefaultLanguageRenderer constructor invoked with 4 parameters, 3 required\\.$#"
- count: 1
- path: modules/views/src/Plugin/views/field/EntityOperations.php
-
- -
- message: "#^Class Drupal\\\\views\\\\Entity\\\\Render\\\\TranslationLanguageRenderer constructor invoked with 4 parameters, 3 required\\.$#"
- count: 1
- path: modules/views/src/Plugin/views/field/EntityOperations.php
-
- -
- message: "#^Method Drupal\\\\views\\\\Plugin\\\\views\\\\field\\\\FieldPluginBase\\:\\:getElements\\(\\) invoked with 1 parameter, 0 required\\.$#"
- count: 2
- path: modules/views/src/Plugin/views/field/FieldPluginBase.php
-
-
message: "#^Variable \\$options in empty\\(\\) always exists and is not falsy\\.$#"
count: 1
@@ -2890,16 +2595,6 @@ parameters:
count: 1
path: modules/views/src/Plugin/views/field/FieldPluginBase.php
- -
- message: "#^Class Drupal\\\\views\\\\Entity\\\\Render\\\\DefaultLanguageRenderer constructor invoked with 4 parameters, 3 required\\.$#"
- count: 1
- path: modules/views/src/Plugin/views/field/LinkBase.php
-
- -
- message: "#^Class Drupal\\\\views\\\\Entity\\\\Render\\\\TranslationLanguageRenderer constructor invoked with 4 parameters, 3 required\\.$#"
- count: 1
- path: modules/views/src/Plugin/views/field/LinkBase.php
-
-
message: "#^Method Drupal\\\\views\\\\Plugin\\\\views\\\\field\\\\Markup\\:\\:render\\(\\) should return Drupal\\\\Component\\\\Render\\\\MarkupInterface\\|string but return statement is missing\\.$#"
count: 1
@@ -2910,16 +2605,6 @@ parameters:
count: 1
path: modules/views/src/Plugin/views/field/PrerenderList.php
- -
- message: "#^Class Drupal\\\\views\\\\Entity\\\\Render\\\\DefaultLanguageRenderer constructor invoked with 4 parameters, 3 required\\.$#"
- count: 1
- path: modules/views/src/Plugin/views/field/RenderedEntity.php
-
- -
- message: "#^Class Drupal\\\\views\\\\Entity\\\\Render\\\\TranslationLanguageRenderer constructor invoked with 4 parameters, 3 required\\.$#"
- count: 1
- path: modules/views/src/Plugin/views/field/RenderedEntity.php
-
-
message: "#^Variable \\$entity in isset\\(\\) always exists and is not nullable\\.$#"
count: 1
@@ -2990,16 +2675,6 @@ parameters:
count: 1
path: modules/views/src/Plugin/views/relationship/GroupwiseMax.php
- -
- message: "#^Class Drupal\\\\views\\\\Entity\\\\Render\\\\DefaultLanguageRenderer constructor invoked with 4 parameters, 3 required\\.$#"
- count: 1
- path: modules/views/src/Plugin/views/row/EntityRow.php
-
- -
- message: "#^Class Drupal\\\\views\\\\Entity\\\\Render\\\\TranslationLanguageRenderer constructor invoked with 4 parameters, 3 required\\.$#"
- count: 1
- path: modules/views/src/Plugin/views/row/EntityRow.php
-
-
message: "#^Variable \\$items might not be defined\\.$#"
count: 1
@@ -3040,11 +2715,6 @@ parameters:
count: 1
path: modules/views/src/Routing/ViewPageController.php
- -
- message: "#^Method Drupal\\\\views\\\\Plugin\\\\views\\\\PluginBase\\:\\:setOptionDefaults\\(\\) invoked with 3 parameters, 2 required\\.$#"
- count: 1
- path: modules/views/src/Tests/TestHelperPlugin.php
-
-
message: "#^Call to deprecated constant REQUEST_TIME\\: Deprecated in drupal\\:8\\.3\\.0 and is removed from drupal\\:10\\.0\\.0\\. Use \\\\Drupal\\:\\:time\\(\\)\\-\\>getRequestTime\\(\\); $#"
count: 1
@@ -3125,11 +2795,6 @@ parameters:
count: 2
path: modules/views/tests/src/Kernel/RenderCacheIntegrationTest.php
- -
- message: "#^Class Drupal\\\\Core\\\\Routing\\\\RouteBuildEvent constructor invoked with 2 parameters, 1 required\\.$#"
- count: 1
- path: modules/views/tests/src/Unit/EventSubscriber/RouteSubscriberTest.php
-
-
message: "#^Variable \\$entity_revision_data_table might not be defined\\.$#"
count: 1
@@ -3330,16 +2995,6 @@ parameters:
count: 1
path: tests/Drupal/KernelTests/Core/Entity/EntityTypeConstraintsTest.php
- -
- message: "#^Method PHPUnit\\\\Framework\\\\Assert\\:\\:assertFalse\\(\\) invoked with 3 parameters, 1\\-2 required\\.$#"
- count: 1
- path: tests/Drupal/KernelTests/Core/Entity/FieldSqlStorageTest.php
-
- -
- message: "#^Method PHPUnit\\\\Framework\\\\Assert\\:\\:assertTrue\\(\\) invoked with 3 parameters, 1\\-2 required\\.$#"
- count: 2
- path: tests/Drupal/KernelTests/Core/Entity/FieldSqlStorageTest.php
-
-
message: "#^Variable \\$e might not be defined\\.$#"
count: 1
@@ -3355,16 +3010,6 @@ parameters:
count: 1
path: tests/Drupal/KernelTests/Core/Entity/FieldableEntityDefinitionUpdateTest.php
- -
- message: "#^Method PHPUnit\\\\Framework\\\\Assert\\:\\:assertFalse\\(\\) invoked with 3 parameters, 1\\-2 required\\.$#"
- count: 2
- path: tests/Drupal/KernelTests/Core/File/DirectoryTest.php
-
- -
- message: "#^Method PHPUnit\\\\Framework\\\\Assert\\:\\:assertTrue\\(\\) invoked with 3 parameters, 1\\-2 required\\.$#"
- count: 3
- path: tests/Drupal/KernelTests/Core/File/DirectoryTest.php
-
-
message: "#^Variable \\$x might not be defined\\.$#"
count: 1
@@ -3380,11 +3025,6 @@ parameters:
count: 1
path: tests/Drupal/KernelTests/Core/KeyValueStore/GarbageCollectionTest.php
- -
- message: "#^Class Drupal\\\\Core\\\\Extension\\\\ModuleHandler constructor invoked with 4 parameters, 3 required\\.$#"
- count: 1
- path: tests/Drupal/KernelTests/Core/Plugin/PluginTestBase.php
-
-
message: "#^\\#pre_render callback 'element_info_test…' at key '1' is not trusted\\.$#"
count: 1
@@ -3460,11 +3100,6 @@ parameters:
count: 1
path: tests/Drupal/Tests/Component/DependencyInjection/Dumper/OptimizedPhpArrayDumperTest.php
- -
- message: "#^Method PHPUnit\\\\Framework\\\\TestCase\\:\\:expectException\\(\\) invoked with 2 parameters, 1 required\\.$#"
- count: 3
- path: tests/Drupal/Tests/Component/Gettext/PoStreamWriterTest.php
-
-
message: "#^Constructor of class Drupal\\\\Tests\\\\Component\\\\Plugin\\\\Factory\\\\ArgumentsAllNull has an unused parameter \\$charismatic\\.$#"
count: 1
@@ -3525,21 +3160,6 @@ parameters:
count: 1
path: tests/Drupal/Tests/Composer/ComposerTest.php
- -
- message: "#^Class Drupal\\\\Core\\\\Asset\\\\LibraryDiscovery constructor invoked with 2 parameters, 1 required\\.$#"
- count: 1
- path: tests/Drupal/Tests/Core/Asset/LibraryDiscoveryTest.php
-
- -
- message: "#^Method PHPUnit\\\\Framework\\\\Assert\\:\\:assertTrue\\(\\) invoked with 3 parameters, 1\\-2 required\\.$#"
- count: 1
- path: tests/Drupal/Tests/Core/Common/TagsTest.php
-
- -
- message: "#^Class Drupal\\\\Core\\\\Database\\\\Query\\\\Condition constructor invoked with 2 parameters, 1 required\\.$#"
- count: 3
- path: tests/Drupal/Tests/Core/Database/ConditionTest.php
-
-
message: "#^Class Drupal\\\\Driver\\\\Database\\\\corefake\\\\Install\\\\Tasks not found\\.$#"
count: 1
@@ -3560,46 +3180,6 @@ parameters:
count: 1
path: tests/Drupal/Tests/Core/Entity/EntityTypeBundleInfoTest.php
- -
- message: "#^Method PHPUnit\\\\Framework\\\\Assert\\:\\:stringStartsWith\\(\\) invoked with 2 parameters, 1 required\\.$#"
- count: 1
- path: tests/Drupal/Tests/Core/EventSubscriber/FinalExceptionSubscriberTest.php
-
- -
- message: "#^Class Drupal\\\\Core\\\\Routing\\\\RouteBuildEvent constructor invoked with 2 parameters, 1 required\\.$#"
- count: 1
- path: tests/Drupal/Tests/Core/EventSubscriber/ModuleRouteSubscriberTest.php
-
- -
- message: "#^Class Drupal\\\\Core\\\\Routing\\\\RouteBuildEvent constructor invoked with 2 parameters, 1 required\\.$#"
- count: 2
- path: tests/Drupal/Tests/Core/EventSubscriber/PathRootsSubscriberTest.php
-
- -
- message: "#^Class Drupal\\\\Core\\\\Routing\\\\RouteBuildEvent constructor invoked with 2 parameters, 1 required\\.$#"
- count: 2
- path: tests/Drupal/Tests/Core/EventSubscriber/SpecialAttributesRouteSubscriberTest.php
-
- -
- message: "#^Class Drupal\\\\Core\\\\State\\\\State constructor invoked with 3 parameters, 1 required\\.$#"
- count: 2
- path: tests/Drupal/Tests/Core/Extension/ThemeExtensionListTest.php
-
- -
- message: "#^Class Drupal\\\\Tests\\\\Core\\\\Extension\\\\TestThemeEngineExtensionList constructor invoked with 8 parameters, 7 required\\.$#"
- count: 1
- path: tests/Drupal/Tests/Core/Extension/ThemeExtensionListTest.php
-
- -
- message: "#^Class Drupal\\\\Core\\\\Layout\\\\LayoutPluginManager constructor invoked with 5 parameters, 4 required\\.$#"
- count: 1
- path: tests/Drupal/Tests/Core/Layout/LayoutPluginManagerTest.php
-
- -
- message: "#^Method Drupal\\\\Tests\\\\Core\\\\Menu\\\\LocalTaskManagerTest\\:\\:getLocalTasksCache\\(\\) invoked with 1 parameter, 0 required\\.$#"
- count: 1
- path: tests/Drupal/Tests/Core/Menu/LocalTaskManagerTest.php
-
-
message: "#^Call to method getDefinitions\\(\\) on an unknown class Drupal\\\\Core\\\\Plugin\\\\CategorizingPluginManagerTrait\\.$#"
count: 3
@@ -3660,11 +3240,6 @@ parameters:
count: 1
path: tests/Drupal/Tests/Core/Render/RendererRecursionTest.php
- -
- message: "#^Class Drupal\\\\Core\\\\Cache\\\\Context\\\\ContextCacheKeys constructor invoked with 2 parameters, 1 required\\.$#"
- count: 1
- path: tests/Drupal/Tests/Core/Render/RendererTestBase.php
-
-
message: "#^Variable \\$value in isset\\(\\) always exists and is not nullable\\.$#"
count: 1
diff --git a/core/tests/Drupal/KernelTests/Core/Entity/FieldSqlStorageTest.php b/core/tests/Drupal/KernelTests/Core/Entity/FieldSqlStorageTest.php
index 99057a2fdc25fec19c8cb88883b63ae18b97ca24..6d3ac67e9178493188502b1729ad6a47d4209c08 100644
--- a/core/tests/Drupal/KernelTests/Core/Entity/FieldSqlStorageTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Entity/FieldSqlStorageTest.php
@@ -427,15 +427,15 @@ public function testFieldUpdateIndexesWithData() {
$field_storage->setIndexes(['value' => [['value', 255]]]);
$field_storage->save();
foreach ($tables as $table) {
- $this->assertTrue(Database::getConnection()->schema()->indexExists($table, "{$field_name}_value"), "Index on value created in @table", ['@table' => $table]);
+ $this->assertTrue(Database::getConnection()->schema()->indexExists($table, "{$field_name}_value"), "Index on value created in $table");
}
// Add a different index, removing the existing custom one.
$field_storage->setIndexes(['value_format' => [['value', 127], ['format', 127]]]);
$field_storage->save();
foreach ($tables as $table) {
- $this->assertTrue(Database::getConnection()->schema()->indexExists($table, "{$field_name}_value_format"), "Index on value_format created in @table", ['@table' => $table]);
- $this->assertFalse(Database::getConnection()->schema()->indexExists($table, "{$field_name}_value"), "Index on value removed in @table", ['@table' => $table]);
+ $this->assertTrue(Database::getConnection()->schema()->indexExists($table, "{$field_name}_value_format"), "Index on value_format created in $table");
+ $this->assertFalse(Database::getConnection()->schema()->indexExists($table, "{$field_name}_value"), "Index on value removed in $table");
}
// Verify that the tables were not dropped in the process.
diff --git a/core/tests/Drupal/KernelTests/Core/File/DirectoryTest.php b/core/tests/Drupal/KernelTests/Core/File/DirectoryTest.php
index adca42d6681071acee76e310fd9c93a3324e4399..633a12afc5a016716561369df5b8619818544b04 100644
--- a/core/tests/Drupal/KernelTests/Core/File/DirectoryTest.php
+++ b/core/tests/Drupal/KernelTests/Core/File/DirectoryTest.php
@@ -53,7 +53,7 @@ public function testFileCheckLocalDirectoryHandling() {
// Check creating a directory using an absolute path.
$absolute_path = $file_system->realpath($directory) . DIRECTORY_SEPARATOR . $this->randomMachineName() . DIRECTORY_SEPARATOR . $this->randomMachineName();
- $this->assertTrue($file_system->mkdir($absolute_path, 0775, TRUE), 'No error reported when creating new absolute directories.', 'File');
+ $this->assertTrue($file_system->mkdir($absolute_path, 0775, TRUE), 'No error reported when creating new absolute directories.');
$this->assertDirectoryPermissions($absolute_path, 0775);
}
@@ -69,10 +69,10 @@ public function testFileCheckDirectoryHandling() {
// Non-existent directory.
/** @var \Drupal\Core\File\FileSystemInterface $file_system */
$file_system = \Drupal::service('file_system');
- $this->assertFalse($file_system->prepareDirectory($directory, 0), 'Error reported for non-existing directory.', 'File');
+ $this->assertFalse($file_system->prepareDirectory($directory, 0), 'Error reported for non-existing directory.');
// Make a directory.
- $this->assertTrue($file_system->prepareDirectory($directory, FileSystemInterface::CREATE_DIRECTORY), 'No error reported when creating a new directory.', 'File');
+ $this->assertTrue($file_system->prepareDirectory($directory, FileSystemInterface::CREATE_DIRECTORY), 'No error reported when creating a new directory.');
// Make sure directory actually exists.
$this->assertDirectoryExists($directory);
@@ -85,11 +85,11 @@ public function testFileCheckDirectoryHandling() {
// Make directory read only.
@$file_system->chmod($directory, 0444);
- $this->assertFalse($file_system->prepareDirectory($directory, 0), 'Error reported for a non-writable directory.', 'File');
+ $this->assertFalse($file_system->prepareDirectory($directory, 0), 'Error reported for a non-writable directory.');
// Test directory permission modification.
$this->setSetting('file_chmod_directory', 0777);
- $this->assertTrue($file_system->prepareDirectory($directory, FileSystemInterface::MODIFY_PERMISSIONS), 'No error reported when making directory writable.', 'File');
+ $this->assertTrue($file_system->prepareDirectory($directory, FileSystemInterface::MODIFY_PERMISSIONS), 'No error reported when making directory writable.');
}
// Test that the directory has the correct permissions.
diff --git a/core/tests/Drupal/KernelTests/Core/Plugin/PluginTestBase.php b/core/tests/Drupal/KernelTests/Core/Plugin/PluginTestBase.php
index 16c87953ad8682ad28f1443cfb5cc4c0189f2ee4..b1b48d0db8836aacea19116ae5950d7bb2837b2d 100644
--- a/core/tests/Drupal/KernelTests/Core/Plugin/PluginTestBase.php
+++ b/core/tests/Drupal/KernelTests/Core/Plugin/PluginTestBase.php
@@ -45,7 +45,7 @@ protected function setUp(): void {
// as derivatives and ReflectionFactory.
$this->testPluginManager = new TestPluginManager();
$this->mockBlockManager = new MockBlockManager();
- $module_handler = new ModuleHandler($this->root, [], new MemoryBackend(), $this->container->get('event_dispatcher'));
+ $module_handler = new ModuleHandler($this->root, [], new MemoryBackend());
$this->defaultsTestPluginManager = new DefaultsTestPluginManager($module_handler);
// The expected plugin definitions within each manager. Several tests assert
diff --git a/core/tests/Drupal/Tests/Component/Gettext/PoStreamWriterTest.php b/core/tests/Drupal/Tests/Component/Gettext/PoStreamWriterTest.php
index c3994a67cbc4bce3a37ba891673284f34b9019f8..cd04a4f3b5aaff08ccc52929132d3a35374e988e 100644
--- a/core/tests/Drupal/Tests/Component/Gettext/PoStreamWriterTest.php
+++ b/core/tests/Drupal/Tests/Component/Gettext/PoStreamWriterTest.php
@@ -52,7 +52,8 @@ protected function setUp(): void {
* @covers ::getURI
*/
public function testGetUriException() {
- $this->expectException(\Exception::class, 'No URI set.');
+ $this->expectException(\Exception::class);
+ $this->expectExceptionMessage('No URI set.');
$this->poWriter->getURI();
}
@@ -63,7 +64,8 @@ public function testGetUriException() {
*/
public function testWriteItem($poContent, $expected, $long) {
if ($long) {
- $this->expectException(\Exception::class, 'Unable to write data:');
+ $this->expectException(\Exception::class);
+ $this->expectExceptionMessage('Unable to write data:');
}
// Limit the file system quota to make the write fail on long strings.
@@ -104,7 +106,8 @@ public function providerWriteData() {
* @covers ::close
*/
public function testCloseException() {
- $this->expectException(\Exception::class, 'Cannot close stream that is not open.');
+ $this->expectException(\Exception::class);
+ $this->expectExceptionMessage('Cannot close stream that is not open.');
$this->poWriter->close();
}
diff --git a/core/tests/Drupal/Tests/Core/Asset/LibraryDiscoveryTest.php b/core/tests/Drupal/Tests/Core/Asset/LibraryDiscoveryTest.php
index fd2f4189fe2ced411182adc44c36c1c7d85a1f12..b53d6a72b9285bb5db39c6cb435e92073dd5f8ec 100644
--- a/core/tests/Drupal/Tests/Core/Asset/LibraryDiscoveryTest.php
+++ b/core/tests/Drupal/Tests/Core/Asset/LibraryDiscoveryTest.php
@@ -69,7 +69,7 @@ protected function setUp(): void {
$this->libraryDiscoveryCollector = $this->getMockBuilder('Drupal\Core\Asset\LibraryDiscoveryCollector')
->disableOriginalConstructor()
->getMock();
- $this->libraryDiscovery = new LibraryDiscovery($this->libraryDiscoveryCollector, $this->cacheTagsInvalidator);
+ $this->libraryDiscovery = new LibraryDiscovery($this->libraryDiscoveryCollector);
$this->libraryDiscoveryCollector->expects($this->once())
->method('get')
->with('test')
diff --git a/core/tests/Drupal/Tests/Core/Common/TagsTest.php b/core/tests/Drupal/Tests/Core/Common/TagsTest.php
index ad2fba9322f30325d41e93c296b5b08e442fea1b..a0ca0ac7c6769e8167812d583d1bac1dfb075527 100644
--- a/core/tests/Drupal/Tests/Core/Common/TagsTest.php
+++ b/core/tests/Drupal/Tests/Core/Common/TagsTest.php
@@ -22,10 +22,10 @@ class TagsTest extends UnitTestCase {
/**
* Explodes a series of tags.
*/
- public function explodeTags() {
+ public function testExplodeTags() {
$string = implode(', ', array_keys($this->validTags));
$tags = Tags::explode($string);
- $this->assertTags($tags);
+ $this->assertEquals(array_values($this->validTags), $tags);
}
/**
@@ -38,24 +38,7 @@ public function testImplodeTags() {
$string = Tags::implode($tags);
$tags = Tags::explode($string);
}
- $this->assertTags($tags);
- }
-
- /**
- * Helper function: asserts that the ending array of tags is what we wanted.
- *
- * @internal
- */
- protected function assertTags(array $tags): void {
- $original = $this->validTags;
- foreach ($tags as $tag) {
- $key = array_search($tag, $original);
- $this->assertTrue((bool) $key, $tag, sprintf('Make sure tag %s shows up in the final tags array (originally %s)', $tag, $key));
- unset($original[$key]);
- }
- foreach ($original as $leftover) {
- $this->fail(sprintf('Leftover tag %s was left over.', $leftover));
- }
+ $this->assertEquals(array_values($this->validTags), $tags);
}
}
diff --git a/core/tests/Drupal/Tests/Core/Database/ConditionTest.php b/core/tests/Drupal/Tests/Core/Database/ConditionTest.php
index 6ef0cc7adb5877d3c17f670b1348b9e3031c25cc..8f19768a7e0fc306a7590bb724131b20dd72dfb0 100644
--- a/core/tests/Drupal/Tests/Core/Database/ConditionTest.php
+++ b/core/tests/Drupal/Tests/Core/Database/ConditionTest.php
@@ -41,7 +41,7 @@ public function testSimpleCondition($expected, $field_name) {
return preg_replace('/[^A-Za-z0-9_.]+/', '', $args[0]);
});
$connection->mapConditionOperator('=')->willReturn(['operator' => '=']);
- $connection->condition('AND')->willReturn(new Condition('AND', FALSE));
+ $connection->condition('AND')->willReturn(new Condition('AND'));
$connection = $connection->reveal();
$query_placeholder = $this->prophesize(PlaceholderInterface::class);
@@ -83,7 +83,7 @@ public function testCompileWithKnownOperators($expected, $field, $value, $operat
return preg_replace('/[^A-Za-z0-9_.]+/', '', $args[0]);
});
$connection->mapConditionOperator(Argument::any())->willReturn(NULL);
- $connection->condition('AND')->willReturn(new Condition('AND', FALSE));
+ $connection->condition('AND')->willReturn(new Condition('AND'));
$connection = $connection->reveal();
$query_placeholder = $this->prophesize(PlaceholderInterface::class);
@@ -152,7 +152,7 @@ public function testCompileWithSqlInjectionForOperator($operator) {
return preg_replace('/[^A-Za-z0-9_.]+/', '', $args[0]);
});
$connection->mapConditionOperator(Argument::any())->willReturn(NULL);
- $connection->condition('AND')->willReturn(new Condition('AND', FALSE));
+ $connection->condition('AND')->willReturn(new Condition('AND'));
$connection = $connection->reveal();
$query_placeholder = $this->prophesize(PlaceholderInterface::class);
diff --git a/core/tests/Drupal/Tests/Core/EventSubscriber/FinalExceptionSubscriberTest.php b/core/tests/Drupal/Tests/Core/EventSubscriber/FinalExceptionSubscriberTest.php
index 4b6bc941e69b0a5f08b3753900176263f71a9e78..4827771d8ab1f8db89b827277f1ea3cf7d071eef 100644
--- a/core/tests/Drupal/Tests/Core/EventSubscriber/FinalExceptionSubscriberTest.php
+++ b/core/tests/Drupal/Tests/Core/EventSubscriber/FinalExceptionSubscriberTest.php
@@ -35,7 +35,7 @@ public function testOnExceptionWithUnknownFormat() {
$response = $event->getResponse();
$this->assertInstanceOf(Response::class, $response);
- $this->stringStartsWith('The website encountered an unexpected error. Please try again later.<br><br><em class="placeholder">Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException</em>: test message in ', $response->getContent());
+ $this->assertStringStartsWith('The website encountered an unexpected error. Please try again later.<br><br><em class="placeholder">Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException</em>: test message in ', $response->getContent());
$this->assertEquals(405, $response->getStatusCode());
$this->assertEquals('POST, PUT', $response->headers->get('Allow'));
// Also check that the text/plain content type was added.
diff --git a/core/tests/Drupal/Tests/Core/EventSubscriber/ModuleRouteSubscriberTest.php b/core/tests/Drupal/Tests/Core/EventSubscriber/ModuleRouteSubscriberTest.php
index d58560e12e5be7f43664fe5f88453f082a7e5fa9..ce791139044aaec6c051deffb3ee9da0ed820170 100644
--- a/core/tests/Drupal/Tests/Core/EventSubscriber/ModuleRouteSubscriberTest.php
+++ b/core/tests/Drupal/Tests/Core/EventSubscriber/ModuleRouteSubscriberTest.php
@@ -55,7 +55,7 @@ public function testRemoveRoute($route_name, array $requirements, $removed) {
$route = new Route('', [], $requirements);
$collection->add($route_name, $route);
- $event = new RouteBuildEvent($collection, 'test');
+ $event = new RouteBuildEvent($collection);
$route_subscriber = new ModuleRouteSubscriber($this->moduleHandler);
$route_subscriber->onAlterRoutes($event);
diff --git a/core/tests/Drupal/Tests/Core/EventSubscriber/PathRootsSubscriberTest.php b/core/tests/Drupal/Tests/Core/EventSubscriber/PathRootsSubscriberTest.php
index 7ba79ed582928407758e6cc770c994a5a436a2ad..4a5ff02d624d024d4c9811b28323e8f72fd18980 100644
--- a/core/tests/Drupal/Tests/Core/EventSubscriber/PathRootsSubscriberTest.php
+++ b/core/tests/Drupal/Tests/Core/EventSubscriber/PathRootsSubscriberTest.php
@@ -53,7 +53,7 @@ public function testSubscribing() {
$route_collection->add('test_route2', new Route('/test/baz'));
$route_collection->add('test_route3', new Route('/test2/bar/baz'));
- $event = new RouteBuildEvent($route_collection, 'provider');
+ $event = new RouteBuildEvent($route_collection);
$this->pathRootsSubscriber->onRouteAlter($event);
$route_collection = new RouteCollection();
@@ -61,7 +61,7 @@ public function testSubscribing() {
$route_collection->add('test_route5', new Route('/test2/baz'));
$route_collection->add('test_route6', new Route('/test2/bar/baz'));
- $event = new RouteBuildEvent($route_collection, 'provider');
+ $event = new RouteBuildEvent($route_collection);
$this->pathRootsSubscriber->onRouteAlter($event);
$this->state->expects($this->once())
diff --git a/core/tests/Drupal/Tests/Core/EventSubscriber/SpecialAttributesRouteSubscriberTest.php b/core/tests/Drupal/Tests/Core/EventSubscriber/SpecialAttributesRouteSubscriberTest.php
index 3adcef36e3bf1533dc8a3152fb451a8444c32cb5..440b1e48c90b6559fd892d0672b37a38606a1dc3 100644
--- a/core/tests/Drupal/Tests/Core/EventSubscriber/SpecialAttributesRouteSubscriberTest.php
+++ b/core/tests/Drupal/Tests/Core/EventSubscriber/SpecialAttributesRouteSubscriberTest.php
@@ -78,7 +78,7 @@ public function testOnRouteBuildingValidVariables(Route $route) {
$route_collection = new RouteCollection();
$route_collection->add('test', $route);
- $event = new RouteBuildEvent($route_collection, 'test');
+ $event = new RouteBuildEvent($route_collection);
$subscriber = new SpecialAttributesRouteSubscriber();
$this->assertNull($subscriber->onAlterRoutes($event));
}
@@ -96,7 +96,7 @@ public function testOnRouteBuildingInvalidVariables(Route $route) {
$route_collection = new RouteCollection();
$route_collection->add('test', $route);
- $event = new RouteBuildEvent($route_collection, 'test');
+ $event = new RouteBuildEvent($route_collection);
$subscriber = new SpecialAttributesRouteSubscriber();
$this->expectWarning();
$this->expectWarningMessage('uses reserved variable names');
diff --git a/core/tests/Drupal/Tests/Core/Extension/ThemeExtensionListTest.php b/core/tests/Drupal/Tests/Core/Extension/ThemeExtensionListTest.php
index 835dc94b5960f2c0ee20fea5ad81f277c7182d06..51057ea77c33bec032ca9fe6fc7a87e85ec901b2 100644
--- a/core/tests/Drupal/Tests/Core/Extension/ThemeExtensionListTest.php
+++ b/core/tests/Drupal/Tests/Core/Extension/ThemeExtensionListTest.php
@@ -2,7 +2,6 @@
namespace Drupal\Tests\Core\Extension;
-use Drupal\Core\Cache\MemoryBackend;
use Drupal\Core\Cache\NullBackend;
use Drupal\Core\Extension\Extension;
use Drupal\Core\Extension\ExtensionDiscovery;
@@ -12,7 +11,6 @@
use Drupal\Core\Extension\ThemeEngineExtensionList;
use Drupal\Core\Extension\ThemeExtensionList;
use Drupal\Core\KeyValueStore\KeyValueMemoryFactory;
-use Drupal\Core\Lock\NullLockBackend;
use Drupal\Core\State\State;
use Drupal\Tests\UnitTestCase;
use Prophecy\Argument;
@@ -65,7 +63,7 @@ public function testRebuildThemeDataWithThemeParents() {
->alter('system_info', Argument::type('array'), Argument::type(Extension::class), Argument::any())
->shouldBeCalled();
- $state = new State(new KeyValueMemoryFactory(), new MemoryBackend(), new NullLockBackend());
+ $state = new State(new KeyValueMemoryFactory());
$config_factory = $this->getConfigFactoryStub([
'core.extension' => [
@@ -78,7 +76,7 @@ public function testRebuildThemeDataWithThemeParents() {
],
]);
- $theme_engine_list = new TestThemeEngineExtensionList($this->root, 'theme_engine', new NullBackend('test'), $info_parser->reveal(), $module_handler->reveal(), $state, $config_factory, 'testing');
+ $theme_engine_list = new TestThemeEngineExtensionList($this->root, 'theme_engine', new NullBackend('test'), $info_parser->reveal(), $module_handler->reveal(), $state, $config_factory);
$theme_engine_list->setExtensionDiscovery($extension_discovery->reveal());
$theme_list = new TestThemeExtensionList($this->root, 'theme', new NullBackend('test'), $info_parser->reveal(), $module_handler->reveal(), $state, $config_factory, $theme_engine_list, 'testing');
@@ -121,7 +119,7 @@ public function testRebuildThemeDataWithThemeParents() {
public function testGetBaseThemes(array $themes, $theme, array $expected) {
// Mocks and stubs.
$module_handler = $this->prophesize(ModuleHandlerInterface::class);
- $state = new State(new KeyValueMemoryFactory(), new MemoryBackend(), new NullLockBackend());
+ $state = new State(new KeyValueMemoryFactory());
$config_factory = $this->getConfigFactoryStub([]);
$theme_engine_list = $this->prophesize(ThemeEngineExtensionList::class);
$theme_listing = new ThemeExtensionList($this->root, 'theme', new NullBackend('test'), new InfoParser($this->root), $module_handler->reveal(), $state, $config_factory, $theme_engine_list->reveal(), 'test');
diff --git a/core/tests/Drupal/Tests/Core/Layout/LayoutPluginManagerTest.php b/core/tests/Drupal/Tests/Core/Layout/LayoutPluginManagerTest.php
index 35b7b32b6e4052ba6c336c44ee8b837ff4181a0e..a87329268c47203a8b29aa63db12d061febbe616 100644
--- a/core/tests/Drupal/Tests/Core/Layout/LayoutPluginManagerTest.php
+++ b/core/tests/Drupal/Tests/Core/Layout/LayoutPluginManagerTest.php
@@ -89,7 +89,7 @@ protected function setUp(): void {
$this->cacheBackend = $this->prophesize(CacheBackendInterface::class);
$namespaces = new \ArrayObject(['Drupal\Core' => vfsStream::url('root/core/lib/Drupal/Core')]);
- $this->layoutPluginManager = new LayoutPluginManager($namespaces, $this->cacheBackend->reveal(), $this->moduleHandler->reveal(), $this->themeHandler->reveal(), $this->getStringTranslationStub());
+ $this->layoutPluginManager = new LayoutPluginManager($namespaces, $this->cacheBackend->reveal(), $this->moduleHandler->reveal(), $this->themeHandler->reveal());
}
/**
diff --git a/core/tests/Drupal/Tests/Core/Menu/LocalTaskManagerTest.php b/core/tests/Drupal/Tests/Core/Menu/LocalTaskManagerTest.php
index 41cce150c7741007e52b459297e0f659d0f66207..faf6850cbebfd01edc54c06fe0872db917da690c 100644
--- a/core/tests/Drupal/Tests/Core/Menu/LocalTaskManagerTest.php
+++ b/core/tests/Drupal/Tests/Core/Menu/LocalTaskManagerTest.php
@@ -207,7 +207,7 @@ public function testGetLocalTaskForRouteWithFilledCache() {
$this->setupLocalTaskManager();
- $result = $this->getLocalTasksCache($mock_plugin);
+ $result = $this->getLocalTasksCache();
$this->cacheBackend->expects($this->once())
->method('get')
diff --git a/core/tests/Drupal/Tests/Core/Render/RendererTestBase.php b/core/tests/Drupal/Tests/Core/Render/RendererTestBase.php
index 70346b79259c1d516f3fd7f40e25f8e9c882879a..4419f04ceb4036a302f4660abb2b684c212b276f 100644
--- a/core/tests/Drupal/Tests/Core/Render/RendererTestBase.php
+++ b/core/tests/Drupal/Tests/Core/Render/RendererTestBase.php
@@ -8,7 +8,6 @@
namespace Drupal\Tests\Core\Render;
use Drupal\Core\Cache\Cache;
-use Drupal\Core\Cache\CacheableMetadata;
use Drupal\Core\Cache\Context\ContextCacheKeys;
use Drupal\Core\Cache\MemoryBackend;
use Drupal\Core\Security\TrustedCallbackInterface;
@@ -171,7 +170,7 @@ protected function setUp(): void {
$keys[] = $context_id;
}
}
- return new ContextCacheKeys($keys, new CacheableMetadata());
+ return new ContextCacheKeys($keys);
});
$this->placeholderGenerator = new PlaceholderGenerator($this->rendererConfig);
$this->renderCache = new PlaceholderingRenderCache($this->requestStack, $this->cacheFactory, $this->cacheContextsManager, $this->placeholderGenerator);