From 803da73c0b662a1ef876832827f4da8bd1085458 Mon Sep 17 00:00:00 2001 From: Alex Pott <alex.a.pott@googlemail.com> Date: Tue, 27 Sep 2022 11:11:12 +0100 Subject: [PATCH] Issue #2937515 by Spokje, quietone, idebr, longwave, SherFengChong, anweshasinha, borisson_, mfernea, xjm, bbrala, daffie, Berdir: Fix Drupal.Array.Array.[ArrayClosingIndentation, ArrayIndentation] coding standard --- core/includes/install.core.inc | 44 ++-- .../Drupal/Core/Config/DatabaseStorage.php | 5 +- core/lib/Drupal/Core/Datetime/DateHelper.php | 6 +- .../Exception/AlreadyInstalledException.php | 9 +- core/lib/Drupal/Core/Mail/MailManager.php | 8 +- core/lib/Drupal/Core/Menu/menu.api.php | 18 +- .../tests/src/Functional/BigPipeTest.php | 6 +- .../src/Functional/BlockHiddenRegionTest.php | 3 +- core/modules/book/book.install | 2 +- core/modules/book/src/BookOutlineStorage.php | 3 +- .../src/Plugin/Block/BookNavigationBlock.php | 2 +- core/modules/comment/comment.install | 12 +- core/modules/comment/src/CommentForm.php | 6 +- core/modules/comment/src/CommentStorage.php | 23 +- .../src/Plugin/migrate/source/d6/Comment.php | 8 +- .../Plugin/views/field/NodeNewComments.php | 12 +- .../tests/src/Functional/CommentBlockTest.php | 2 +- .../tests/src/Functional/CommentTestBase.php | 2 +- .../src/Kernel/CommentFieldAccessTest.php | 10 +- .../tests/drupal-7.contact.database.php | 12 +- ...slationOutdatedRevisionTranslationTest.php | 6 +- ...slationRevisionTranslationDeletionTest.php | 6 +- .../src/Functional/DateRangeFieldTest.php | 6 +- ...erenceFieldTranslatedReferenceViewTest.php | 12 +- .../EntityReferenceFileUploadTest.php | 2 +- .../Views/EntityReferenceRelationshipTest.php | 2 +- ...rateFieldInstanceOptionTranslationTest.php | 10 +- .../Plugin/migrate/source/d7/FieldTest.php | 16 +- core/modules/file/file.module | 10 +- core/modules/file/src/FileViewsData.php | 8 +- .../tests/src/Functional/SaveUploadTest.php | 12 +- .../filter/src/FilterFormatFormBase.php | 6 +- .../tests/src/Kernel/FilterKernelTest.php | 235 ++++++++---------- core/modules/forum/forum.install | 10 +- core/modules/forum/forum.module | 2 +- .../Migrate/d6/MigrateImageCacheTest.php | 54 ++-- .../src/FormErrorHandler.php | 2 +- .../src/Form/NegotiationConfigureForm.php | 4 +- .../language/src/LanguageListBuilder.php | 6 +- .../Functional/LanguageConfigurationTest.php | 2 +- .../src/Functional/LanguageSwitchingTest.php | 4 +- .../Unit/BlockComponentRenderArrayTest.php | 12 +- .../tests/src/Kernel/LocaleStringTest.php | 2 +- .../MediaEmbedFilterTranslationTest.php | 8 +- .../WidgetWithoutTypesTest.php | 4 +- .../Unit/MigrateSqlIdMapEnsureTablesTest.php | 22 +- .../migrate/tests/src/Unit/RowTest.php | 32 +-- .../tests/src/Unit/FieldDiscoveryTest.php | 2 +- .../src/Batch/MigrateUpgradeImportBatch.php | 8 +- .../src/Form/OverviewForm.php | 6 +- .../node/src/Controller/NodeController.php | 4 +- .../node/src/NodeGrantDatabaseStorage.php | 14 +- core/modules/node/src/NodeTypeListBuilder.php | 4 +- .../src/Plugin/migrate/source/d6/Node.php | 26 +- .../src/Functional/Views/FrontPageTest.php | 11 +- ...NodeAccessLanguageAwareCombinationTest.php | 2 +- .../tests/src/Kernel/NodeFieldAccessTest.php | 2 +- .../src/Functional/OptionsFieldUITest.php | 4 +- .../Plugin/Field/FieldWidget/PathWidget.php | 2 +- .../src/Driver/Database/pgsql/Schema.php | 2 +- .../ResponsiveImageFormatter.php | 2 +- .../ResponsiveImageFieldDisplayTest.php | 6 +- ...sponsiveImageStyleConfigEntityUnitTest.php | 42 ++-- .../src/Kernel/EntitySerializationTest.php | 2 +- .../Plugin/Block/StatisticsPopularBlock.php | 10 +- core/modules/statistics/statistics.views.inc | 4 +- core/modules/syslog/syslog.module | 2 +- .../Form/ModulesListNonStableConfirmForm.php | 4 +- core/modules/system/system.install | 2 +- .../database_test/database_test.install | 4 +- .../src/EarlyRenderingTestController.php | 9 +- .../Rest/EntityTestResourceTestBase.php | 18 +- .../MenuLinkTestWithUnsafeTitle.php | 6 +- .../mock_block/MockMenuBlockDeriver.php | 2 +- .../tests/src/Functional/Form/FormTest.php | 30 +-- .../Form/LanguageSelectElementTest.php | 8 +- .../src/Functional/Mail/HtmlToTextTest.php | 4 +- .../src/Functional/System/DateTimeTest.php | 2 +- .../UpdateSystem/UpdateScriptTest.php | 6 +- .../src/Kernel/Block/SystemMenuBlockTest.php | 2 +- .../tests/src/Functional/TermIndexTest.php | 2 +- .../d7/TermLocalizedTranslationTest.php | 6 +- .../src/Unit/Migrate/d6/TextFieldTest.php | 24 +- .../Plugin/migrate/field/d6/TextFieldTest.php | 24 +- core/modules/tour/src/TourViewBuilder.php | 4 +- .../src/Functional/UpdateSemverTestBase.php | 2 +- .../Functional/Rest/UserResourceTestBase.php | 12 +- .../tests/src/Functional/UserAdminTest.php | 16 +- .../migrate/source/ProfileFieldTest.php | 2 +- .../src/Controller/ViewAjaxController.php | 22 +- .../views/display/DisplayPluginBase.php | 26 +- .../exposed_form/ExposedFormPluginBase.php | 2 +- .../views/src/Plugin/views/style/Table.php | 2 +- .../Plugin/views/wizard/WizardPluginBase.php | 2 +- .../Functional/Plugin/ArgumentDefaultTest.php | 4 +- .../src/Kernel/Entity/EntityViewsDataTest.php | 12 +- .../src/Kernel/Handler/FilterCombineTest.php | 28 +-- .../src/Kernel/Handler/FilterNumericTest.php | 4 +- .../tests/src/Kernel/Handler/SortDateTest.php | 2 +- .../tests/src/Unit/Plugin/area/ViewTest.php | 2 +- .../Unit/Routing/ViewPageControllerTest.php | 4 +- core/modules/views/views.views.inc | 12 +- .../views_ui/src/Form/Ajax/EditDetails.php | 8 +- core/modules/views_ui/src/ViewUI.php | 6 +- .../tests/src/Functional/ViewsUITourTest.php | 8 +- core/phpcs.xml.dist | 4 +- .../EntityReferenceAutocompleteWidgetTest.php | 13 +- .../Menu/MenuActiveTrail403Test.php | 2 +- .../Core/Database/DatabaseTestBase.php | 18 +- .../EntityAutocompleteElementFormTest.php | 10 +- .../Entity/EntityAccessControlHandlerTest.php | 14 +- .../Entity/EntityQueryRelationshipTest.php | 2 +- .../Core/Entity/EntityQueryTest.php | 18 +- .../Core/Entity/EntityTranslationTest.php | 9 +- .../KernelTests/Core/File/MimeTypeTest.php | 4 +- .../KeyValueStore/GarbageCollectionTest.php | 10 +- .../Drupal/KernelTests/KernelTestBaseTest.php | 9 +- .../Dumper/OptimizedPhpArrayDumperTest.php | 14 +- .../FileCache/FileCacheFactoryTest.php | 2 +- .../Component/Utility/NestedArrayTest.php | 2 +- .../Core/Cache/CacheableMetadataTest.php | 2 +- .../Compiler/TaggedHandlersPassTest.php | 6 +- .../Core/Entity/ContentEntityBaseUnitTest.php | 2 +- .../Tests/Core/Entity/EntityFormTest.php | 20 +- .../Core/Entity/EntityTypeBundleInfoTest.php | 8 +- .../Sql/SqlContentEntityStorageSchemaTest.php | 4 +- .../TypedData/EntityAdapterUnitTest.php | 2 +- .../FormAjaxSubscriberTest.php | 4 +- .../CategorizingPluginManagerTraitTest.php | 6 +- .../Core/Render/PlaceholderGeneratorTest.php | 11 +- .../Core/Render/RendererBubblingTest.php | 4 +- .../Drupal/Tests/Core/Render/RendererTest.php | 27 +- .../Tests/Core/Template/TwigExtensionTest.php | 11 +- .../RecursiveContextualValidatorTest.php | 2 +- core/tests/Drupal/Tests/Core/UrlTest.php | 18 +- .../Tests/Core/Utility/LinkGeneratorTest.php | 2 +- 136 files changed, 709 insertions(+), 727 deletions(-) diff --git a/core/includes/install.core.inc b/core/includes/install.core.inc index c9b49f5d9bd9..b18c9e57a38f 100644 --- a/core/includes/install.core.inc +++ b/core/includes/install.core.inc @@ -2107,9 +2107,9 @@ function install_check_requirements($install_state) { 'value' => $default_file_info['description_default'], 'severity' => REQUIREMENT_ERROR, 'description' => t('The @drupal installer requires that the %default-file file must not be deleted or modified from the original download.', [ - '@drupal' => drupal_install_profile_distribution_name(), - '%default-file' => $default_file, - ]), + '@drupal' => drupal_install_profile_distribution_name(), + '%default-file' => $default_file, + ]), ]; } // Otherwise, if $file does not exist yet, we can try to copy @@ -2166,11 +2166,11 @@ function install_check_requirements($install_state) { 'value' => t('The %file does not exist.', ['%file' => $default_file_info['title']]), 'severity' => REQUIREMENT_ERROR, 'description' => t('The @drupal installer requires that you create a %file as part of the installation process. Copy the %default_file file to %file. More details about installing Drupal are available in <a href=":install_txt">INSTALL.txt</a>.', [ - '@drupal' => drupal_install_profile_distribution_name(), - '%file' => $file, - '%default_file' => $default_file, - ':install_txt' => base_path() . 'core/INSTALL.txt', - ]), + '@drupal' => drupal_install_profile_distribution_name(), + '%file' => $file, + '%default_file' => $default_file, + ':install_txt' => base_path() . 'core/INSTALL.txt', + ]), ]; } else { @@ -2185,10 +2185,10 @@ function install_check_requirements($install_state) { 'value' => t('The %file is not readable.', ['%file' => $default_file_info['title']]), 'severity' => REQUIREMENT_ERROR, 'description' => t('@drupal requires read permissions to %file at all times. The <a href=":handbook_url">webhosting issues</a> documentation section offers help on this and other topics.', [ - '@drupal' => drupal_install_profile_distribution_name(), - '%file' => $file, - ':handbook_url' => 'https://www.drupal.org/server-permissions', - ]), + '@drupal' => drupal_install_profile_distribution_name(), + '%file' => $file, + ':handbook_url' => 'https://www.drupal.org/server-permissions', + ]), ]; } // If the $file is not writable, throw an error. @@ -2198,10 +2198,10 @@ function install_check_requirements($install_state) { 'value' => t('The %file is not writable.', ['%file' => $default_file_info['title']]), 'severity' => REQUIREMENT_ERROR, 'description' => t('The @drupal installer requires write permissions to %file during the installation process. The <a href=":handbook_url">webhosting issues</a> documentation section offers help on this and other topics.', [ - '@drupal' => drupal_install_profile_distribution_name(), - '%file' => $file, - ':handbook_url' => 'https://www.drupal.org/server-permissions', - ]), + '@drupal' => drupal_install_profile_distribution_name(), + '%file' => $file, + ':handbook_url' => 'https://www.drupal.org/server-permissions', + ]), ]; } else { @@ -2216,12 +2216,12 @@ function install_check_requirements($install_state) { 'value' => t('The @file is owned by the web server.', ['@file' => $default_file_info['title']]), 'severity' => REQUIREMENT_ERROR, 'description' => t('The @drupal installer failed to create a %file file with proper file ownership. Log on to your web server, remove the existing %file file, and create a new one by copying the %default_file file to %file. More details about installing Drupal are available in <a href=":install_txt">INSTALL.txt</a>. The <a href=":handbook_url">webhosting issues</a> documentation section offers help on this and other topics.', [ - '@drupal' => drupal_install_profile_distribution_name(), - '%file' => $file, - '%default_file' => $default_file, - ':install_txt' => base_path() . 'core/INSTALL.txt', - ':handbook_url' => 'https://www.drupal.org/server-permissions', - ]), + '@drupal' => drupal_install_profile_distribution_name(), + '%file' => $file, + '%default_file' => $default_file, + ':install_txt' => base_path() . 'core/INSTALL.txt', + ':handbook_url' => 'https://www.drupal.org/server-permissions', + ]), ]; } } diff --git a/core/lib/Drupal/Core/Config/DatabaseStorage.php b/core/lib/Drupal/Core/Config/DatabaseStorage.php index 14290691e1bc..7626bf50802c 100644 --- a/core/lib/Drupal/Core/Config/DatabaseStorage.php +++ b/core/lib/Drupal/Core/Config/DatabaseStorage.php @@ -324,9 +324,8 @@ public function getCollectionName() { public function getAllCollectionNames() { try { return $this->connection->query('SELECT DISTINCT [collection] FROM {' . $this->connection->escapeTable($this->table) . '} WHERE [collection] <> :collection ORDER by [collection]', [ - ':collection' => StorageInterface::DEFAULT_COLLECTION, - ] - )->fetchCol(); + ':collection' => StorageInterface::DEFAULT_COLLECTION, + ])->fetchCol(); } catch (\Exception $e) { return []; diff --git a/core/lib/Drupal/Core/Datetime/DateHelper.php b/core/lib/Drupal/Core/Datetime/DateHelper.php index bbe76d1e2c78..63d1188f50ac 100644 --- a/core/lib/Drupal/Core/Datetime/DateHelper.php +++ b/core/lib/Drupal/Core/Datetime/DateHelper.php @@ -436,9 +436,9 @@ public static function seconds($format = 's', $required = FALSE, $increment = 1) public static function ampm($required = FALSE) { $none = ['' => '']; $ampm = [ - 'am' => t('am', [], ['context' => 'ampm']), - 'pm' => t('pm', [], ['context' => 'ampm']), - ]; + 'am' => t('am', [], ['context' => 'ampm']), + 'pm' => t('pm', [], ['context' => 'ampm']), + ]; return !$required ? $none + $ampm : $ampm; } diff --git a/core/lib/Drupal/Core/Installer/Exception/AlreadyInstalledException.php b/core/lib/Drupal/Core/Installer/Exception/AlreadyInstalledException.php index ca00d0be81f7..465059561680 100644 --- a/core/lib/Drupal/Core/Installer/Exception/AlreadyInstalledException.php +++ b/core/lib/Drupal/Core/Installer/Exception/AlreadyInstalledException.php @@ -19,14 +19,15 @@ public function __construct(TranslationInterface $string_translation) { $this->stringTranslation = $string_translation; $title = $this->t('Drupal already installed'); + $replacements = [ + ':base-url' => $GLOBALS['base_url'], + ':update-url' => $GLOBALS['base_path'] . 'update.php', + ]; $message = $this->t('<ul> <li>To start over, you must empty your existing database and copy <em>default.settings.php</em> over <em>settings.php</em>.</li> <li>To upgrade an existing installation, proceed to the <a href=":update-url">update script</a>.</li> <li>View your <a href=":base-url">existing site</a>.</li> -</ul>', [ - ':base-url' => $GLOBALS['base_url'], - ':update-url' => $GLOBALS['base_path'] . 'update.php', - ]); +</ul>', $replacements); parent::__construct($message, $title); } diff --git a/core/lib/Drupal/Core/Mail/MailManager.php b/core/lib/Drupal/Core/Mail/MailManager.php index ea819c0c11db..df6eb226d072 100644 --- a/core/lib/Drupal/Core/Mail/MailManager.php +++ b/core/lib/Drupal/Core/Mail/MailManager.php @@ -309,10 +309,10 @@ public function doMail($module, $key, $to, $langcode, $params = [], $reply = NUL if (!$message['result']) { $this->loggerFactory->get('mail') ->error('Error sending email (from %from to %to with reply-to %reply).', [ - '%from' => $message['from'], - '%to' => $message['to'], - '%reply' => $message['reply-to'] ? $message['reply-to'] : $this->t('not set'), - ]); + '%from' => $message['from'], + '%to' => $message['to'], + '%reply' => $message['reply-to'] ? $message['reply-to'] : $this->t('not set'), + ]); $error_message = $params['_error_message'] ?? $this->t('Unable to send email. Contact the site administrator if the problem persists.'); if ($error_message) { $this->messenger()->addError($error_message); diff --git a/core/lib/Drupal/Core/Menu/menu.api.php b/core/lib/Drupal/Core/Menu/menu.api.php index ce136e22364c..0d4b5a53c8da 100644 --- a/core/lib/Drupal/Core/Menu/menu.api.php +++ b/core/lib/Drupal/Core/Menu/menu.api.php @@ -317,16 +317,16 @@ function hook_menu_local_tasks_alter(&$data, $route_name, \Drupal\Core\Cache\Ref // Add a tab linking to node/add to all pages. $data['tabs'][0]['node.add_page'] = [ - '#theme' => 'menu_local_task', - '#link' => [ - 'title' => t('Example tab'), - 'url' => Url::fromRoute('node.add_page'), - 'localized_options' => [ - 'attributes' => [ - 'title' => t('Add content'), - ], - ], + '#theme' => 'menu_local_task', + '#link' => [ + 'title' => t('Example tab'), + 'url' => Url::fromRoute('node.add_page'), + 'localized_options' => [ + 'attributes' => [ + 'title' => t('Add content'), + ], ], + ], ]; // The tab we're adding is dependent on a user's access to add content. $cacheability->addCacheContexts(['user.permissions']); diff --git a/core/modules/big_pipe/tests/src/Functional/BigPipeTest.php b/core/modules/big_pipe/tests/src/Functional/BigPipeTest.php index e7e1dbc86c31..c3731b85ae5a 100644 --- a/core/modules/big_pipe/tests/src/Functional/BigPipeTest.php +++ b/core/modules/big_pipe/tests/src/Functional/BigPipeTest.php @@ -414,9 +414,9 @@ protected function assertBigPipePlaceholders(array $expected_big_pipe_placeholde array_unshift($expected_stream_order, BigPipe::START_SIGNAL); array_push($expected_stream_order, BigPipe::STOP_SIGNAL); $actual_stream_order = $placeholder_replacement_positions + [ - $start_signal_position => BigPipe::START_SIGNAL, - $stop_signal_position => BigPipe::STOP_SIGNAL, - ]; + $start_signal_position => BigPipe::START_SIGNAL, + $stop_signal_position => BigPipe::STOP_SIGNAL, + ]; ksort($actual_stream_order, SORT_NUMERIC); $this->assertEquals($expected_stream_order, array_values($actual_stream_order)); } diff --git a/core/modules/block/tests/src/Functional/BlockHiddenRegionTest.php b/core/modules/block/tests/src/Functional/BlockHiddenRegionTest.php index 8a506ce74b5e..2e749b085c42 100644 --- a/core/modules/block/tests/src/Functional/BlockHiddenRegionTest.php +++ b/core/modules/block/tests/src/Functional/BlockHiddenRegionTest.php @@ -37,8 +37,7 @@ protected function setUp(): void { 'administer blocks', 'administer themes', 'search content', - ] - ); + ]); $this->drupalLogin($this->adminUser); $this->drupalPlaceBlock('search_form_block'); diff --git a/core/modules/book/book.install b/core/modules/book/book.install index 77044833651f..90c6f87ffcc8 100644 --- a/core/modules/book/book.install +++ b/core/modules/book/book.install @@ -18,7 +18,7 @@ function book_uninstall() { */ function book_schema() { $schema['book'] = [ - 'description' => 'Stores book outline information. Uniquely defines the location of each node in the book outline', + 'description' => 'Stores book outline information. Uniquely defines the location of each node in the book outline', 'fields' => [ 'nid' => [ 'type' => 'int', diff --git a/core/modules/book/src/BookOutlineStorage.php b/core/modules/book/src/BookOutlineStorage.php index 9953a1410829..e986c1f77ebb 100644 --- a/core/modules/book/src/BookOutlineStorage.php +++ b/core/modules/book/src/BookOutlineStorage.php @@ -133,8 +133,7 @@ public function insert($link, $parents) { 'bid' => $link['bid'], 'pid' => $link['pid'], 'weight' => $link['weight'], - ] + $parents - ) + ] + $parents) ->execute(); } diff --git a/core/modules/book/src/Plugin/Block/BookNavigationBlock.php b/core/modules/book/src/Plugin/Block/BookNavigationBlock.php index c1e2ca849c4e..86d957739f03 100644 --- a/core/modules/book/src/Plugin/Block/BookNavigationBlock.php +++ b/core/modules/book/src/Plugin/Block/BookNavigationBlock.php @@ -105,7 +105,7 @@ public function blockForm($form, FormStateInterface $form_state) { '#options' => $options, '#default_value' => $this->configuration['block_mode'], '#description' => $this->t("If <em>Show block on all pages</em> is selected, the block will contain the automatically generated menus for all of the site's books. If <em>Show block only on book pages</em> is selected, the block will contain only the one menu corresponding to the current page's book. In this case, if the current page is not in a book, no block will be displayed. The <em>Page specific visibility settings</em> or other visibility settings can be used in addition to selectively display this block."), - ]; + ]; return $form; } diff --git a/core/modules/comment/comment.install b/core/modules/comment/comment.install index d60f06442ed9..2a0808b5c022 100644 --- a/core/modules/comment/comment.install +++ b/core/modules/comment/comment.install @@ -125,12 +125,12 @@ function comment_update_10100(&$sandbox = NULL) { $connection = \Drupal::database(); if ($connection->schema()->tableExists('comment_entity_statistics') && $connection->databaseType() != 'sqlite') { $new = [ - 'type' => 'int', - 'not null' => TRUE, - 'default' => 0, - 'description' => 'The Unix timestamp of the last comment that was posted within this node, from {comment}.changed.', - 'size' => 'big', - ]; + 'type' => 'int', + 'not null' => TRUE, + 'default' => 0, + 'description' => 'The Unix timestamp of the last comment that was posted within this node, from {comment}.changed.', + 'size' => 'big', + ]; $connection->schema()->changeField('comment_entity_statistics', 'last_comment_timestamp', 'last_comment_timestamp', $new); } } diff --git a/core/modules/comment/src/CommentForm.php b/core/modules/comment/src/CommentForm.php index e2b88f71e533..45fd79229d48 100644 --- a/core/modules/comment/src/CommentForm.php +++ b/core/modules/comment/src/CommentForm.php @@ -382,9 +382,9 @@ public function save(array $form, FormStateInterface $form_state) { // Add a log entry. $logger->notice('Comment posted: %subject.', [ - '%subject' => $comment->getSubject(), - 'link' => Link::fromTextAndUrl(t('View'), $comment->toUrl()->setOption('fragment', 'comment-' . $comment->id()))->toString(), - ]); + '%subject' => $comment->getSubject(), + 'link' => Link::fromTextAndUrl(t('View'), $comment->toUrl()->setOption('fragment', 'comment-' . $comment->id()))->toString(), + ]); // Explain the approval queue if necessary. if (!$comment->isPublished()) { diff --git a/core/modules/comment/src/CommentStorage.php b/core/modules/comment/src/CommentStorage.php index 6bf70252189c..4f668eac1199 100644 --- a/core/modules/comment/src/CommentStorage.php +++ b/core/modules/comment/src/CommentStorage.php @@ -187,17 +187,18 @@ public function getNewCommentPageNumber($total_comments, $new_comments, Fieldabl // Find the number of the first comment of the first unread thread. $count = $this->database->query('SELECT COUNT(*) FROM {' . $data_table . '} WHERE [entity_id] = :entity_id - AND [entity_type] = :entity_type - AND [field_name] = :field_name - AND [status] = :status - AND SUBSTRING([thread], 1, (LENGTH([thread]) - 1)) < :thread - AND [default_langcode] = 1', [ - ':status' => CommentInterface::PUBLISHED, - ':entity_id' => $entity->id(), - ':field_name' => $field_name, - ':entity_type' => $entity->getEntityTypeId(), - ':thread' => $first_thread, - ])->fetchField(); + AND [entity_type] = :entity_type + AND [field_name] = :field_name + AND [status] = :status + AND SUBSTRING([thread], 1, (LENGTH([thread]) - 1)) < :thread + AND [default_langcode] = 1', [ + ':status' => CommentInterface::PUBLISHED, + ':entity_id' => $entity->id(), + ':field_name' => $field_name, + ':entity_type' => $entity->getEntityTypeId(), + ':thread' => $first_thread, + ] + )->fetchField(); } return $comments_per_page > 0 ? (int) ($count / $comments_per_page) : 0; diff --git a/core/modules/comment/src/Plugin/migrate/source/d6/Comment.php b/core/modules/comment/src/Plugin/migrate/source/d6/Comment.php index 4f68018c8d36..6b1f4651cc4b 100644 --- a/core/modules/comment/src/Plugin/migrate/source/d6/Comment.php +++ b/core/modules/comment/src/Plugin/migrate/source/d6/Comment.php @@ -27,10 +27,10 @@ class Comment extends DrupalSqlBase { */ public function query() { $query = $this->select('comments', 'c') - ->fields('c', ['cid', 'pid', 'nid', 'uid', 'subject', - 'comment', 'hostname', 'timestamp', 'status', 'thread', 'name', - 'mail', 'homepage', 'format', - ]); + ->fields('c', ['cid', 'pid', 'nid', 'uid', 'subject', 'comment', + 'hostname', 'timestamp', 'status', 'thread', 'name', 'mail', 'homepage', + 'format', + ]); $query->innerJoin('node', 'n', '[c].[nid] = [n].[nid]'); $query->fields('n', ['type', 'language']); $query->orderBy('c.timestamp'); diff --git a/core/modules/comment/src/Plugin/views/field/NodeNewComments.php b/core/modules/comment/src/Plugin/views/field/NodeNewComments.php index 433d3c68fba2..bb4dca48d97e 100644 --- a/core/modules/comment/src/Plugin/views/field/NodeNewComments.php +++ b/core/modules/comment/src/Plugin/views/field/NodeNewComments.php @@ -158,12 +158,12 @@ public function preRender(&$values) { $result = $this->database->query("SELECT [n].[nid], COUNT([c].[cid]) AS [num_comments] FROM {node} [n] INNER JOIN {comment_field_data} [c] ON [n].[nid] = [c].[entity_id] AND [c].[entity_type] = 'node' AND [c].[default_langcode] = 1 LEFT JOIN {history} [h] ON [h].[nid] = [n].[nid] AND [h].[uid] = :h_uid WHERE [n].[nid] IN ( :nids[] ) AND [c].[changed] > GREATEST(COALESCE([h].[timestamp], :timestamp1), :timestamp2) AND [c].[status] = :status GROUP BY [n].[nid]", [ - ':status' => CommentInterface::PUBLISHED, - ':h_uid' => $user->id(), - ':nids[]' => $nids, - ':timestamp1' => HISTORY_READ_LIMIT, - ':timestamp2' => HISTORY_READ_LIMIT, - ]); + ':status' => CommentInterface::PUBLISHED, + ':h_uid' => $user->id(), + ':nids[]' => $nids, + ':timestamp1' => HISTORY_READ_LIMIT, + ':timestamp2' => HISTORY_READ_LIMIT, + ]); foreach ($result as $node) { foreach ($ids[$node->nid] as $id) { $values[$id]->{$this->field_alias} = $node->num_comments; diff --git a/core/modules/comment/tests/src/Functional/CommentBlockTest.php b/core/modules/comment/tests/src/Functional/CommentBlockTest.php index ac72aeae0f8b..b709bf5ddd54 100644 --- a/core/modules/comment/tests/src/Functional/CommentBlockTest.php +++ b/core/modules/comment/tests/src/Functional/CommentBlockTest.php @@ -34,7 +34,7 @@ protected function setUp(): void { 'access comments', 'access content', 'administer blocks', - ]); + ]); } /** diff --git a/core/modules/comment/tests/src/Functional/CommentTestBase.php b/core/modules/comment/tests/src/Functional/CommentTestBase.php index 8097bae40cf0..b74371e7da0a 100644 --- a/core/modules/comment/tests/src/Functional/CommentTestBase.php +++ b/core/modules/comment/tests/src/Functional/CommentTestBase.php @@ -78,7 +78,7 @@ protected function setUp(): void { // permission is granted. 'access user profiles', 'access content', - ]); + ]); $this->webUser = $this->drupalCreateUser([ 'access comments', 'post comments', diff --git a/core/modules/comment/tests/src/Kernel/CommentFieldAccessTest.php b/core/modules/comment/tests/src/Kernel/CommentFieldAccessTest.php index 0d96303232b6..414eb9a79cee 100644 --- a/core/modules/comment/tests/src/Kernel/CommentFieldAccessTest.php +++ b/core/modules/comment/tests/src/Kernel/CommentFieldAccessTest.php @@ -300,11 +300,11 @@ public function testAccessToAdministrativeFields() { $set['user']->hasPermission('post comments') && $set['comment']->getFieldName() == 'comment_other' ), new FormattableMarkup('User @user @state update field @field on comment @comment', [ - '@user' => $set['user']->getAccountName(), - '@state' => $may_update ? 'can' : 'cannot', - '@comment' => $set['comment']->getSubject(), - '@field' => $field, - ])); + '@user' => $set['user']->getAccountName(), + '@state' => $may_update ? 'can' : 'cannot', + '@comment' => $set['comment']->getSubject(), + '@field' => $field, + ])); } } foreach ($permutations as $set) { diff --git a/core/modules/contact/tests/drupal-7.contact.database.php b/core/modules/contact/tests/drupal-7.contact.database.php index 8ace9362c82b..66119d351851 100644 --- a/core/modules/contact/tests/drupal-7.contact.database.php +++ b/core/modules/contact/tests/drupal-7.contact.database.php @@ -25,10 +25,10 @@ 'selected', ]) ->values([ - 'category' => 'Upgrade test', - 'recipients' => 'test1@example.com,test2@example.com', - 'reply' => 'Test reply', - 'weight' => 1, - 'selected' => 1, -]) + 'category' => 'Upgrade test', + 'recipients' => 'test1@example.com,test2@example.com', + 'reply' => 'Test reply', + 'weight' => 1, + 'selected' => 1, + ]) ->execute(); diff --git a/core/modules/content_translation/tests/src/Functional/ContentTranslationOutdatedRevisionTranslationTest.php b/core/modules/content_translation/tests/src/Functional/ContentTranslationOutdatedRevisionTranslationTest.php index 07dacff667ba..b01f5b5c70c3 100644 --- a/core/modules/content_translation/tests/src/Functional/ContentTranslationOutdatedRevisionTranslationTest.php +++ b/core/modules/content_translation/tests/src/Functional/ContentTranslationOutdatedRevisionTranslationTest.php @@ -39,7 +39,8 @@ public function testFlagAsOutdatedHidden() { $entity = $this->storage->load($id); // Add a published Italian translation. - $add_translation_url = Url::fromRoute("entity.{$this->entityTypeId}.content_translation_add", [ + $add_translation_url = Url::fromRoute("entity.{$this->entityTypeId}.content_translation_add", + [ $entity->getEntityTypeId() => $id, 'source' => 'en', 'target' => 'it', @@ -58,7 +59,8 @@ public function testFlagAsOutdatedHidden() { $this->submitForm($edit, 'Save (this translation)'); // Add a published French translation. - $add_translation_url = Url::fromRoute("entity.{$this->entityTypeId}.content_translation_add", [ + $add_translation_url = Url::fromRoute("entity.{$this->entityTypeId}.content_translation_add", + [ $entity->getEntityTypeId() => $id, 'source' => 'en', 'target' => 'fr', diff --git a/core/modules/content_translation/tests/src/Functional/ContentTranslationRevisionTranslationDeletionTest.php b/core/modules/content_translation/tests/src/Functional/ContentTranslationRevisionTranslationDeletionTest.php index cd89e4d4c10e..25b60c757387 100644 --- a/core/modules/content_translation/tests/src/Functional/ContentTranslationRevisionTranslationDeletionTest.php +++ b/core/modules/content_translation/tests/src/Functional/ContentTranslationRevisionTranslationDeletionTest.php @@ -61,7 +61,8 @@ public function doTestOverview($index) { // Add a draft translation and check that it is available only in the latest // revision. - $add_translation_url = Url::fromRoute("entity.{$this->entityTypeId}.content_translation_add", [ + $add_translation_url = Url::fromRoute("entity.{$this->entityTypeId}.content_translation_add", + [ $entity->getEntityTypeId() => $id, 'source' => 'en', 'target' => 'it', @@ -186,7 +187,8 @@ public function doTestOverview($index) { // again, since the active revision is now a default revision. $this->drupalLogin($this->editor); $this->drupalGet($it_revision->toUrl('version-history')); - $revision_deletion_url = Url::fromRoute('node.revision_delete_confirm', [ + $revision_deletion_url = Url::fromRoute('node.revision_delete_confirm', + [ 'node' => $id, 'node_revision' => $it_revision->getRevisionId(), ], diff --git a/core/modules/datetime_range/tests/src/Functional/DateRangeFieldTest.php b/core/modules/datetime_range/tests/src/Functional/DateRangeFieldTest.php index 629e0b197c5b..d621de54ae45 100644 --- a/core/modules/datetime_range/tests/src/Functional/DateRangeFieldTest.php +++ b/core/modules/datetime_range/tests/src/Functional/DateRangeFieldTest.php @@ -226,9 +226,9 @@ public function testDateRangeField() { 'type' => 'daterange_default', 'label' => 'hidden', 'settings' => [ - 'format_type' => 'long', - 'separator' => 'THESEPARATOR', - ] + $this->defaultSettings, + 'format_type' => 'long', + 'separator' => 'THESEPARATOR', + ] + $this->defaultSettings, ]; $display_repository->getViewDisplay($this->field->getTargetEntityTypeId(), $this->field->getTargetBundle(), 'full') diff --git a/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceFieldTranslatedReferenceViewTest.php b/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceFieldTranslatedReferenceViewTest.php index e69abc86d91c..a231b402ccbe 100644 --- a/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceFieldTranslatedReferenceViewTest.php +++ b/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceFieldTranslatedReferenceViewTest.php @@ -282,13 +282,13 @@ protected function setUpEntityReferenceField() { */ protected function setUpContentTypes() { $this->referrerType = $this->drupalCreateContentType([ - 'type' => 'referrer', - 'name' => 'Referrer', - ]); + 'type' => 'referrer', + 'name' => 'Referrer', + ]); $this->referencedType = $this->drupalCreateContentType([ - 'type' => 'referenced_page', - 'name' => 'Referenced Page', - ]); + 'type' => 'referenced_page', + 'name' => 'Referenced Page', + ]); } /** diff --git a/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceFileUploadTest.php b/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceFileUploadTest.php index 96905cbd79c5..18a469a32334 100644 --- a/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceFileUploadTest.php +++ b/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceFileUploadTest.php @@ -112,7 +112,7 @@ protected function setUp(): void { 'type' => 'entity_reference_autocomplete', ]) ->setComponent($file_field_name, [ - 'type' => 'file_generic', + 'type' => 'file_generic', ]) ->save(); } diff --git a/core/modules/field/tests/src/Kernel/EntityReference/Views/EntityReferenceRelationshipTest.php b/core/modules/field/tests/src/Kernel/EntityReference/Views/EntityReferenceRelationshipTest.php index 17766c0483d3..f1be011b886d 100644 --- a/core/modules/field/tests/src/Kernel/EntityReference/Views/EntityReferenceRelationshipTest.php +++ b/core/modules/field/tests/src/Kernel/EntityReference/Views/EntityReferenceRelationshipTest.php @@ -34,7 +34,7 @@ class EntityReferenceRelationshipTest extends ViewsKernelTestBase { 'test_entity_reference_entity_test_mul_view', 'test_entity_reference_reverse_entity_test_mul_view', 'test_entity_reference_group_by_empty_relationships', - ]; + ]; /** * Modules to install. diff --git a/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldInstanceOptionTranslationTest.php b/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldInstanceOptionTranslationTest.php index 6981a4a54f15..1540609d64d1 100644 --- a/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldInstanceOptionTranslationTest.php +++ b/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldInstanceOptionTranslationTest.php @@ -15,11 +15,11 @@ class MigrateFieldInstanceOptionTranslationTest extends MigrateDrupal6TestBase { * {@inheritdoc} */ protected static $modules = [ - 'config_translation', - 'language', - 'locale', - 'menu_ui', - ]; + 'config_translation', + 'language', + 'locale', + 'menu_ui', + ]; /** * {@inheritdoc} diff --git a/core/modules/field/tests/src/Kernel/Plugin/migrate/source/d7/FieldTest.php b/core/modules/field/tests/src/Kernel/Plugin/migrate/source/d7/FieldTest.php index 6be4de53d250..ee3478f3caf0 100644 --- a/core/modules/field/tests/src/Kernel/Plugin/migrate/source/d7/FieldTest.php +++ b/core/modules/field/tests/src/Kernel/Plugin/migrate/source/d7/FieldTest.php @@ -173,14 +173,14 @@ public function providerSource() { 'entity_type' => 'user', 'instances' => [ [ - 'id' => '33', - 'field_id' => '11', - 'field_name' => 'field_file', - 'entity_type' => 'user', - 'bundle' => 'user', - 'data' => 'a:6:{s:5:"label";s:4:"File";s:6:"widget";a:5:{s:6:"weight";s:1:"8";s:4:"type";s:12:"file_generic";s:6:"module";s:4:"file";s:6:"active";i:1;s:8:"settings";a:1:{s:18:"progress_indicator";s:8:"throbber";}}s:8:"settings";a:5:{s:14:"file_directory";s:0:"";s:15:"file_extensions";s:3:"txt";s:12:"max_filesize";s:0:"";s:17:"description_field";i:0;s:18:"user_register_form";i:0;}s:7:"display";a:1:{s:7:"default";a:5:{s:5:"label";s:5:"above";s:4:"type";s:12:"file_default";s:8:"settings";a:0:{}s:6:"module";s:4:"file";s:6:"weight";i:0;}}s:8:"required";i:0;s:11:"description";s:0:"";}', - 'deleted' => '0', - ], + 'id' => '33', + 'field_id' => '11', + 'field_name' => 'field_file', + 'entity_type' => 'user', + 'bundle' => 'user', + 'data' => 'a:6:{s:5:"label";s:4:"File";s:6:"widget";a:5:{s:6:"weight";s:1:"8";s:4:"type";s:12:"file_generic";s:6:"module";s:4:"file";s:6:"active";i:1;s:8:"settings";a:1:{s:18:"progress_indicator";s:8:"throbber";}}s:8:"settings";a:5:{s:14:"file_directory";s:0:"";s:15:"file_extensions";s:3:"txt";s:12:"max_filesize";s:0:"";s:17:"description_field";i:0;s:18:"user_register_form";i:0;}s:7:"display";a:1:{s:7:"default";a:5:{s:5:"label";s:5:"above";s:4:"type";s:12:"file_default";s:8:"settings";a:0:{}s:6:"module";s:4:"file";s:6:"weight";i:0;}}s:8:"required";i:0;s:11:"description";s:0:"";}', + 'deleted' => '0', + ], ], ], ]; diff --git a/core/modules/file/file.module b/core/modules/file/file.module index edd6947bbe3f..d8c9ab3a02d8 100644 --- a/core/modules/file/file.module +++ b/core/modules/file/file.module @@ -665,15 +665,15 @@ function file_save_upload($form_field_name, $validators = [], $destination = FAL } catch (IniSizeFileException | FormSizeFileException $e) { \Drupal::messenger()->addError(t('The file %file could not be saved because it exceeds %maxsize, the maximum allowed size for uploads.', [ - '%file' => $uploaded_file->getFilename(), - '%maxsize' => format_size(Environment::getUploadMaxSize()), - ])); + '%file' => $uploaded_file->getFilename(), + '%maxsize' => format_size(Environment::getUploadMaxSize()), + ])); $files[$i] = FALSE; } catch (PartialFileException | NoFileException $e) { \Drupal::messenger()->addError(t('The file %file could not be saved because the upload did not complete.', [ - '%file' => $uploaded_file->getFilename(), - ])); + '%file' => $uploaded_file->getFilename(), + ])); $files[$i] = FALSE; } catch (SymfonyFileException $e) { diff --git a/core/modules/file/src/FileViewsData.php b/core/modules/file/src/FileViewsData.php index aad5ac23a441..cc69d7e05399 100644 --- a/core/modules/file/src/FileViewsData.php +++ b/core/modules/file/src/FileViewsData.php @@ -50,7 +50,7 @@ public function getViewsData() { 'default_formatter' => 'file_extension', 'id' => 'field', 'click sortable' => FALSE, - ], + ], ]; $data['file_managed']['filesize']['field']['default_formatter'] = 'file_size'; @@ -252,7 +252,7 @@ public function getViewsData() { 'help' => $this->t('The module managing this file relationship.'), 'field' => [ 'id' => 'standard', - ], + ], 'filter' => [ 'id' => 'string', ], @@ -268,7 +268,7 @@ public function getViewsData() { 'help' => $this->t('The type of entity that is related to the file.'), 'field' => [ 'id' => 'standard', - ], + ], 'filter' => [ 'id' => 'string', ], @@ -300,7 +300,7 @@ public function getViewsData() { 'help' => $this->t('The number of times the file is used by this entity.'), 'field' => [ 'id' => 'numeric', - ], + ], 'filter' => [ 'id' => 'numeric', ], diff --git a/core/modules/file/tests/src/Functional/SaveUploadTest.php b/core/modules/file/tests/src/Functional/SaveUploadTest.php index 5fb1f1a8117d..aa36c38755f3 100644 --- a/core/modules/file/tests/src/Functional/SaveUploadTest.php +++ b/core/modules/file/tests/src/Functional/SaveUploadTest.php @@ -463,9 +463,9 @@ public function testHandleFileMunge() { // extensions. $extensions = 'foo ' . $this->imageExtension; $edit = [ - 'files[file_test_upload]' => \Drupal::service('file_system')->realpath($this->image->getFileUri()), - 'extensions' => $extensions, - ]; + 'files[file_test_upload]' => \Drupal::service('file_system')->realpath($this->image->getFileUri()), + 'extensions' => $extensions, + ]; $this->drupalGet('file-test/upload'); $this->submitForm($edit, 'Submit'); @@ -505,9 +505,9 @@ public function testHandleFileMunge() { $extensions = 'php ' . $this->imageExtension; $edit = [ - 'files[file_test_upload]' => \Drupal::service('file_system')->realpath($this->image->getFileUri()), - 'extensions' => $extensions, - ]; + 'files[file_test_upload]' => \Drupal::service('file_system')->realpath($this->image->getFileUri()), + 'extensions' => $extensions, + ]; $this->drupalGet('file-test/upload'); $this->submitForm($edit, 'Submit'); diff --git a/core/modules/filter/src/FilterFormatFormBase.php b/core/modules/filter/src/FilterFormatFormBase.php index 19f9eb93d8ba..5a89904c68cd 100644 --- a/core/modules/filter/src/FilterFormatFormBase.php +++ b/core/modules/filter/src/FilterFormatFormBase.php @@ -88,9 +88,9 @@ public function form(array $form, FormStateInterface $form_state) { '#title' => $this->t('Filter processing order'), '#tabledrag' => [ [ - 'action' => 'order', - 'relationship' => 'sibling', - 'group' => 'filter-order-weight', + 'action' => 'order', + 'relationship' => 'sibling', + 'group' => 'filter-order-weight', ], ], '#tree' => FALSE, diff --git a/core/modules/filter/tests/src/Kernel/FilterKernelTest.php b/core/modules/filter/tests/src/Kernel/FilterKernelTest.php index 9b452eee4713..234ad1d09f46 100644 --- a/core/modules/filter/tests/src/Kernel/FilterKernelTest.php +++ b/core/modules/filter/tests/src/Kernel/FilterKernelTest.php @@ -333,12 +333,11 @@ public function testLineBreakFilter() { ], // Skip contents of certain block tags entirely. "<script>aaa\nbbb\n\nccc</script> -<style>aaa\nbbb\n\nccc</style> -<pre>aaa\nbbb\n\nccc</pre> -<object>aaa\nbbb\n\nccc</object> -<iframe>aaa\nbbb\n\nccc</iframe> -<svg>aaa\nbbb\n\nccc</svg> -" => [ + <style>aaa\nbbb\n\nccc</style> + <pre>aaa\nbbb\n\nccc</pre> + <object>aaa\nbbb\n\nccc</object> + <iframe>aaa\nbbb\n\nccc</iframe> + <svg>aaa\nbbb\n\nccc</svg>" => [ "<script>aaa\nbbb\n\nccc</script>" => TRUE, "<style>aaa\nbbb\n\nccc</style>" => TRUE, "<pre>aaa\nbbb\n\nccc</pre>" => TRUE, @@ -570,16 +569,12 @@ public function testUrlFilter() { // Filter selection/pattern matching. $tests = [ // HTTP URLs. - ' -http://example.com or www.example.com -' => [ + 'http://example.com or www.example.com' => [ '<a href="http://example.com">http://example.com</a>' => TRUE, '<a href="http://www.example.com">www.example.com</a>' => TRUE, ], // MAILTO URLs. - ' -person@example.com or mailto:person2@example.com or ' . $email_with_plus_sign . ' or ' . $long_email . ' but not ' . $too_long_email . ' -' => [ + 'person@example.com or mailto:person2@example.com or ' . $email_with_plus_sign . ' or ' . $long_email . ' but not ' . $too_long_email => [ '<a href="mailto:person@example.com">person@example.com</a>' => TRUE, '<a href="mailto:person2@example.com">mailto:person2@example.com</a>' => TRUE, '<a href="mailto:' . $long_email . '">' . $long_email . '</a>' => TRUE, @@ -587,15 +582,13 @@ public function testUrlFilter() { '<a href="mailto:' . $email_with_plus_sign . '">' . $email_with_plus_sign . '</a>' => TRUE, ], // URI parts and special characters. - ' -http://trailingslash.com/ or www.trailingslash.com/ -http://host.com/some/path?query=foo&bar[baz]=beer#fragment or www.host.com/some/path?query=foo&bar[baz]=beer#fragment -http://twitter.com/#!/example/status/22376963142324226 -http://example.com/@user/ -ftp://user:pass@ftp.example.com/~home/dir1 -sftp://user@nonstandardport:222/dir -ssh://192.168.0.100/srv/git/drupal.git -' => [ + 'http://trailingslash.com/ or www.trailingslash.com/ + http://host.com/some/path?query=foo&bar[baz]=beer#fragment or www.host.com/some/path?query=foo&bar[baz]=beer#fragment + http://twitter.com/#!/example/status/22376963142324226 + http://example.com/@user/ + ftp://user:pass@ftp.example.com/~home/dir1 + sftp://user@nonstandardport:222/dir + ssh://192.168.0.100/srv/git/drupal.git' => [ '<a href="http://trailingslash.com/">http://trailingslash.com/</a>' => TRUE, '<a href="http://www.trailingslash.com/">www.trailingslash.com/</a>' => TRUE, '<a href="http://host.com/some/path?query=foo&bar[baz]=beer#fragment">http://host.com/some/path?query=foo&bar[baz]=beer#fragment</a>' => TRUE, @@ -607,15 +600,13 @@ public function testUrlFilter() { '<a href="ssh://192.168.0.100/srv/git/drupal.git">ssh://192.168.0.100/srv/git/drupal.git</a>' => TRUE, ], // International Unicode characters. - ' -http://пример.иÑпытание/ -http://مثال.إختبار/ -http://例å.測試/ -http://12345.ä¸å›½/ -http://例ãˆ.テスト/ -http://dréißig-bücher.de/ -http://méxico-mañana.es/ -' => [ + 'http://пример.иÑпытание/ + http://مثال.إختبار/ + http://例å.測試/ + http://12345.ä¸å›½/ + http://例ãˆ.テスト/ + http://dréißig-bücher.de/ + http://méxico-mañana.es/' => [ '<a href="http://пример.иÑпытание/">http://пример.иÑпытание/</a>' => TRUE, '<a href="http://مثال.إختبار/">http://مثال.إختبار/</a>' => TRUE, '<a href="http://例å.測試/">http://例å.測試/</a>' => TRUE, @@ -625,18 +616,14 @@ public function testUrlFilter() { '<a href="http://méxico-mañana.es/">http://méxico-mañana.es/</a>' => TRUE, ], // Encoding. - ' -http://ampersand.com/?a=1&b=2 -http://encoded.com/?a=1&b=2 -' => [ + 'http://ampersand.com/?a=1&b=2 + http://encoded.com/?a=1&b=2' => [ '<a href="http://ampersand.com/?a=1&b=2">http://ampersand.com/?a=1&b=2</a>' => TRUE, '<a href="http://encoded.com/?a=1&b=2">http://encoded.com/?a=1&b=2</a>' => TRUE, ], // Domain name length. - ' -www.ex.ex or www.example.example or www.toolongdomainexampledomainexampledomainexampledomainexampledomain or -me@me.tv -' => [ + 'www.ex.ex or www.example.example or www.toolongdomainexampledomainexampledomainexampledomainexampledomain or + me@me.tv' => [ '<a href="http://www.ex.ex">www.ex.ex</a>' => TRUE, '<a href="http://www.example.example">www.example.example</a>' => TRUE, 'http://www.toolong' => FALSE, @@ -645,18 +632,17 @@ public function testUrlFilter() { // Absolute URL protocols. // The list to test is found in the beginning of _filter_url() at // $protocols = \Drupal::getContainer()->getParameter('filter_protocols'). - ' -https://example.com, -ftp://ftp.example.com, -news://example.net, -telnet://example, -irc://example.host, -ssh://odd.geek, -sftp://secure.host?, -webcal://calendar, -rtsp://127.0.0.1, -not foo://disallowed.com. -' => [ + 'https://example.com, + ftp://ftp.example.com, + news://example.net, + telnet://example, + irc://example.host, + ssh://odd.geek, + sftp://secure.host?, + webcal://calendar, + rtsp://127.0.0.1, + not foo://disallowed.com. + ' => [ 'href="https://example.com"' => TRUE, 'href="ftp://ftp.example.com"' => TRUE, 'href="news://example.net"' => TRUE, @@ -674,19 +660,16 @@ public function testUrlFilter() { // Surrounding text/punctuation. $tests = [ - ' -Partial URL with trailing period www.partial.com. -Email with trailing comma person@example.com, -Absolute URL with trailing question http://www.absolute.com? -Query string with trailing exclamation www.query.com/index.php?a=! -Partial URL with 3 trailing www.partial.periods... -Email with 3 trailing exclamations@example.com!!! -Absolute URL and query string with 2 different punctuation characters (http://www.example.com/q=abc). -Partial URL with brackets in the URL as well as surrounded brackets (www.foo.com/more_(than)_one_(parens)). -Absolute URL with square brackets in the URL as well as surrounded brackets [https://www.drupal.org/?class[]=1] -Absolute URL with quotes "https://www.drupal.org/sample" - -' => [ + 'Partial URL with trailing period www.partial.com. + Email with trailing comma person@example.com, + Absolute URL with trailing question http://www.absolute.com? + Query string with trailing exclamation www.query.com/index.php?a=! + Partial URL with 3 trailing www.partial.periods... + Email with 3 trailing exclamations@example.com!!! + Absolute URL and query string with 2 different punctuation characters (http://www.example.com/q=abc). + Partial URL with brackets in the URL as well as surrounded brackets (www.foo.com/more_(than)_one_(parens)). + Absolute URL with square brackets in the URL as well as surrounded brackets [https://www.drupal.org/?class[]=1] + Absolute URL with quotes "https://www.drupal.org/sample"' => [ 'period <a href="http://www.partial.com">www.partial.com</a>.' => TRUE, 'comma <a href="mailto:person@example.com">person@example.com</a>,' => TRUE, 'question <a href="http://www.absolute.com">http://www.absolute.com</a>?' => TRUE, @@ -698,9 +681,7 @@ public function testUrlFilter() { 'brackets [<a href="https://www.drupal.org/?class[]=1">https://www.drupal.org/?class[]=1</a>]' => TRUE, 'quotes "<a href="https://www.drupal.org/sample">https://www.drupal.org/sample</a>"' => TRUE, ], - ' -(www.parenthesis.com/dir?a=1&b=2#a) -' => [ + '(www.parenthesis.com/dir?a=1&b=2#a)' => [ '(<a href="http://www.parenthesis.com/dir?a=1&b=2#a">www.parenthesis.com/dir?a=1&b=2#a</a>)' => TRUE, ], ]; @@ -708,42 +689,36 @@ public function testUrlFilter() { // Surrounding markup. $tests = [ - ' -<p xmlns="www.namespace.com" /> -<p xmlns="http://namespace.com"> -An <a href="http://example.com" title="Read more at www.example.info...">anchor</a>. -</p> -' => [ + '<p xmlns="www.namespace.com" /> + <p xmlns="http://namespace.com"> + An <a href="http://example.com" title="Read more at www.example.info...">anchor</a>. + </p>' => [ '<p xmlns="www.namespace.com" />' => TRUE, '<p xmlns="http://namespace.com">' => TRUE, 'href="http://www.namespace.com"' => FALSE, 'href="http://namespace.com"' => FALSE, 'An <a href="http://example.com" title="Read more at www.example.info...">anchor</a>.' => TRUE, ], - ' -Not <a href="foo">www.relative.com</a> or <a href="http://absolute.com">www.absolute.com</a> -but <strong>http://www.strong.net</strong> or <em>www.emphasis.info</em> -' => [ + 'Not <a href="foo">www.relative.com</a> or <a href="http://absolute.com">www.absolute.com</a> + but <strong>http://www.strong.net</strong> or <em>www.emphasis.info</em>' => [ '<a href="foo">www.relative.com</a>' => TRUE, 'href="http://www.relative.com"' => FALSE, '<a href="http://absolute.com">www.absolute.com</a>' => TRUE, '<strong><a href="http://www.strong.net">http://www.strong.net</a></strong>' => TRUE, '<em><a href="http://www.emphasis.info">www.emphasis.info</a></em>' => TRUE, ], - ' -Test <code>using www.example.com the code tag</code>. -' => [ + 'Test <code>using www.example.com the code tag</code>. + ' => [ 'href' => FALSE, 'http' => FALSE, ], - ' -Intro. -<blockquote> -Quoted text linking to www.example.com, written by person@example.com, originating from http://origin.example.com. <code>@see www.usage.example.com or <em>www.example.info</em> bla bla</code>. -</blockquote> - -Outro. -' => [ + 'Intro. + <blockquote> + Quoted text linking to www.example.com, written by person@example.com, originating from http://origin.example.com. <code>@see www.usage.example.com or <em>www.example.info</em> bla bla</code>. + </blockquote> + + Outro. + ' => [ 'href="http://www.example.com"' => TRUE, 'href="mailto:person@example.com"' => TRUE, 'href="http://origin.example.com"' => TRUE, @@ -752,17 +727,15 @@ public function testUrlFilter() { 'Intro.' => TRUE, 'Outro.' => TRUE, ], - ' -Unknown tag <x>containing x and www.example.com</x>? And a tag <pooh>beginning with p and containing www.example.pooh with p?</pooh> -' => [ + 'Unknown tag <x>containing x and www.example.com</x>? And a tag <pooh>beginning with p and containing www.example.pooh with p?</pooh> + ' => [ 'href="http://www.example.com"' => TRUE, 'href="http://www.example.pooh"' => TRUE, ], - ' -<p>Test <br/>: This is a www.example17.com example <strong>with</strong> various http://www.example18.com tags. *<br/> - It is important www.example19.com to *<br/>test different URLs and http://www.example20.com in the same paragraph. *<br> -HTML www.example21.com soup by person@example22.com can litererally http://www.example23.com contain *img*<img> anything. Just a www.example24.com with http://www.example25.com thrown in. www.example26.com from person@example27.com with extra http://www.example28.com. -' => [ + '<p>Test <br/>: This is a www.example17.com example <strong>with</strong> various http://www.example18.com tags. *<br/> + It is important www.example19.com to *<br/>test different URLs and http://www.example20.com in the same paragraph. *<br> + HTML www.example21.com soup by person@example22.com can litererally http://www.example23.com contain *img*<img> anything. Just a www.example24.com with http://www.example25.com thrown in. www.example26.com from person@example27.com with extra http://www.example28.com. + ' => [ 'href="http://www.example17.com"' => TRUE, 'href="http://www.example18.com"' => TRUE, 'href="http://www.example19.com"' => TRUE, @@ -776,53 +749,41 @@ public function testUrlFilter() { 'href="mailto:person@example27.com"' => TRUE, 'href="http://www.example28.com"' => TRUE, ], - ' -<script> -<!-- - // @see www.example.com - var exampleurl = "http://example.net"; ---> -<!--//--><![CDATA[//><!-- - // @see www.example.com - var exampleurl = "http://example.net"; -//--><!]]> -</script> -' => [ + '<script> + <!-- + // @see www.example.com + var exampleurl = "http://example.net"; + --> + <!--//--><![CDATA[//><!-- + // @see www.example.com + var exampleurl = "http://example.net"; + //--><!]]> + </script>' => [ 'href="http://www.example.com"' => FALSE, 'href="http://example.net"' => FALSE, ], - ' -<style>body { - background: url(http://example.com/pixel.gif); -}</style> -' => [ + '<style>body { + background: url(http://example.com/pixel.gif); + }</style>' => [ 'href' => FALSE, ], - ' -<!-- Skip any URLs like www.example.com in comments --> -' => [ + '<!-- Skip any URLs like www.example.com in comments -->' => [ 'href' => FALSE, ], - ' -<!-- Skip any URLs like -www.example.com with a newline in comments --> -' => [ + '<!-- Skip any URLs like + www.example.com with a newline in comments -->' => [ 'href' => FALSE, ], - ' -<!-- Skip any URLs like www.comment.com in comments. <p>Also ignore http://commented.out/markup.</p> --> -' => [ + '<!-- Skip any URLs like www.comment.com in comments. <p>Also ignore http://commented.out/markup.</p> -->' => [ 'href' => FALSE, ], - ' -<dl> -<dt>www.example.com</dt> -<dd>http://example.com</dd> -<dd>person@example.com</dd> -<dt>Check www.example.net</dt> -<dd>Some text around http://www.example.info by person@example.info?</dd> -</dl> -' => [ + '<dl> + <dt>www.example.com</dt> + <dd>http://example.com</dd> + <dd>person@example.com</dd> + <dt>Check www.example.net</dt> + <dd>Some text around http://www.example.info by person@example.info?</dd> + </dl>' => [ 'href="http://www.example.com"' => TRUE, 'href="http://example.com"' => TRUE, 'href="mailto:person@example.com"' => TRUE, @@ -830,13 +791,11 @@ public function testUrlFilter() { 'href="http://www.example.info"' => TRUE, 'href="mailto:person@example.info"' => TRUE, ], - ' -<div>www.div.com</div> -<ul> -<li>http://listitem.com</li> -<li class="odd">www.class.listitem.com</li> -</ul> -' => [ + '<div>www.div.com</div> + <ul> + <li>http://listitem.com</li> + <li class="odd">www.class.listitem.com</li> + </ul>' => [ '<div><a href="http://www.div.com">www.div.com</a></div>' => TRUE, '<li><a href="http://listitem.com">http://listitem.com</a></li>' => TRUE, '<li class="odd"><a href="http://www.class.listitem.com">www.class.listitem.com</a></li>' => TRUE, diff --git a/core/modules/forum/forum.install b/core/modules/forum/forum.install index 8f1ff13fd071..7b6f40f9bac2 100644 --- a/core/modules/forum/forum.install +++ b/core/modules/forum/forum.install @@ -120,11 +120,11 @@ function forum_schema() { 'default' => '', ], 'tid' => [ - 'description' => 'The term ID.', - 'type' => 'int', - 'unsigned' => TRUE, - 'not null' => TRUE, - 'default' => 0, + 'description' => 'The term ID.', + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + 'default' => 0, ], 'sticky' => [ 'description' => 'Boolean indicating whether the node is sticky.', diff --git a/core/modules/forum/forum.module b/core/modules/forum/forum.module index c11ec858f803..10f0b37ba5ed 100644 --- a/core/modules/forum/forum.module +++ b/core/modules/forum/forum.module @@ -576,7 +576,7 @@ function template_preprocess_forum_list(&$variables) { } $variables['pager'] = [ - '#type' => 'pager', + '#type' => 'pager', ]; // Give meaning to $tid for themers. $tid actually stands for term ID. diff --git a/core/modules/image/tests/src/Kernel/Migrate/d6/MigrateImageCacheTest.php b/core/modules/image/tests/src/Kernel/Migrate/d6/MigrateImageCacheTest.php index 89009fd05886..7cb8ad8d9cac 100644 --- a/core/modules/image/tests/src/Kernel/Migrate/d6/MigrateImageCacheTest.php +++ b/core/modules/image/tests/src/Kernel/Migrate/d6/MigrateImageCacheTest.php @@ -85,19 +85,19 @@ public function testPassingMigration() { public function testMissingEffectPlugin() { Database::getConnection('default', 'migrate')->insert("imagecache_action") ->fields([ - 'presetid', - 'weight', - 'module', - 'action', - 'data', - ]) + 'presetid', + 'weight', + 'module', + 'action', + 'data', + ]) ->values([ - 'presetid' => '1', - 'weight' => '0', - 'module' => 'imagecache', - 'action' => 'imagecache_deprecated_scale', - 'data' => 'a:3:{s:3:"fit";s:7:"outside";s:5:"width";s:3:"200";s:6:"height";s:3:"200";}', - ])->execute(); + 'presetid' => '1', + 'weight' => '0', + 'module' => 'imagecache', + 'action' => 'imagecache_deprecated_scale', + 'data' => 'a:3:{s:3:"fit";s:7:"outside";s:5:"width";s:3:"200";s:6:"height";s:3:"200";}', + ])->execute(); $this->startCollectingMessages(); $this->executeMigration('d6_imagecache_presets'); @@ -113,22 +113,22 @@ public function testMissingEffectPlugin() { public function testInvalidCropValues() { Database::getConnection('default', 'migrate')->insert("imagecache_action") ->fields([ - 'presetid', - 'weight', - 'module', - 'action', - 'data', - ]) + 'presetid', + 'weight', + 'module', + 'action', + 'data', + ]) ->values([ - 'presetid' => '1', - 'weight' => '0', - 'module' => 'imagecache', - 'action' => 'imagecache_crop', - 'data' => serialize([ - 'xoffset' => '10', - 'yoffset' => '10', - ]), - ])->execute(); + 'presetid' => '1', + 'weight' => '0', + 'module' => 'imagecache', + 'action' => 'imagecache_crop', + 'data' => serialize([ + 'xoffset' => '10', + 'yoffset' => '10', + ]), + ])->execute(); $this->startCollectingMessages(); $this->executeMigration('d6_imagecache_presets'); diff --git a/core/modules/inline_form_errors/src/FormErrorHandler.php b/core/modules/inline_form_errors/src/FormErrorHandler.php index 23cef62c48de..da286108b98f 100644 --- a/core/modules/inline_form_errors/src/FormErrorHandler.php +++ b/core/modules/inline_form_errors/src/FormErrorHandler.php @@ -108,7 +108,7 @@ protected function displayErrorMessages(array $form, FormStateInterface $form_st if (!empty($error_links)) { $render_array = [ [ - '#markup' => $this->formatPlural(count($error_links), '1 error has been found: ', '@count errors have been found: '), + '#markup' => $this->formatPlural(count($error_links), '1 error has been found: ', '@count errors have been found: '), ], [ '#theme' => 'item_list', diff --git a/core/modules/language/src/Form/NegotiationConfigureForm.php b/core/modules/language/src/Form/NegotiationConfigureForm.php index 6af8c1458569..2b808d54d408 100644 --- a/core/modules/language/src/Form/NegotiationConfigureForm.php +++ b/core/modules/language/src/Form/NegotiationConfigureForm.php @@ -308,8 +308,8 @@ protected function configureFormTable(array &$form, $type) { $table_form['#show_operations'] = TRUE; } $table_form['operation'][$method_id] = [ - '#type' => 'operations', - '#links' => $config_op, + '#type' => 'operations', + '#links' => $config_op, ]; } } diff --git a/core/modules/language/src/LanguageListBuilder.php b/core/modules/language/src/LanguageListBuilder.php index f736738669bd..290e699c232d 100644 --- a/core/modules/language/src/LanguageListBuilder.php +++ b/core/modules/language/src/LanguageListBuilder.php @@ -103,9 +103,9 @@ public function getFormId() { */ public function buildHeader() { $header = [ - 'label' => t('Name'), - 'default' => t('Default'), - ] + parent::buildHeader(); + 'label' => t('Name'), + 'default' => t('Default'), + ] + parent::buildHeader(); return $header; } diff --git a/core/modules/language/tests/src/Functional/LanguageConfigurationTest.php b/core/modules/language/tests/src/Functional/LanguageConfigurationTest.php index 39ff21219a07..8ea06a2eb9fe 100644 --- a/core/modules/language/tests/src/Functional/LanguageConfigurationTest.php +++ b/core/modules/language/tests/src/Functional/LanguageConfigurationTest.php @@ -165,7 +165,7 @@ public function testLanguageConfigurationWeight() { $admin_user = $this->drupalCreateUser([ 'administer languages', 'access administration pages', - ]); + ]); $this->drupalLogin($admin_user); $this->checkConfigurableLanguageWeight(); diff --git a/core/modules/language/tests/src/Functional/LanguageSwitchingTest.php b/core/modules/language/tests/src/Functional/LanguageSwitchingTest.php index 014667ffa4ab..64bb010780dc 100644 --- a/core/modules/language/tests/src/Functional/LanguageSwitchingTest.php +++ b/core/modules/language/tests/src/Functional/LanguageSwitchingTest.php @@ -105,8 +105,8 @@ protected function doTestLanguageBlockAuthenticated($block_label) { $link = $list_item->find('xpath', 'a'); $anchors[] = [ - 'hreflang' => $link->getAttribute('hreflang'), - 'data-drupal-link-system-path' => $link->getAttribute('data-drupal-link-system-path'), + 'hreflang' => $link->getAttribute('hreflang'), + 'data-drupal-link-system-path' => $link->getAttribute('data-drupal-link-system-path'), ]; $labels[] = $link->getText(); } diff --git a/core/modules/layout_builder/tests/src/Unit/BlockComponentRenderArrayTest.php b/core/modules/layout_builder/tests/src/Unit/BlockComponentRenderArrayTest.php index 76281f873161..883d3c7d2060 100644 --- a/core/modules/layout_builder/tests/src/Unit/BlockComponentRenderArrayTest.php +++ b/core/modules/layout_builder/tests/src/Unit/BlockComponentRenderArrayTest.php @@ -477,12 +477,12 @@ public function testOnBuildRenderEmptyBuildWithCacheTags() { $expected_build = []; $expected_cache = $expected_build + [ - '#cache' => [ - 'contexts' => [], - 'tags' => ['empty_build_cache_test', 'test'], - 'max-age' => -1, - ], - ]; + '#cache' => [ + 'contexts' => [], + 'tags' => ['empty_build_cache_test', 'test'], + 'max-age' => -1, + ], + ]; $subscriber->onBuildRender($event); $result = $event->getBuild(); diff --git a/core/modules/locale/tests/src/Kernel/LocaleStringTest.php b/core/modules/locale/tests/src/Kernel/LocaleStringTest.php index 85cfd2bfde4b..391ad49cf87b 100644 --- a/core/modules/locale/tests/src/Kernel/LocaleStringTest.php +++ b/core/modules/locale/tests/src/Kernel/LocaleStringTest.php @@ -19,7 +19,7 @@ class LocaleStringTest extends KernelTestBase { protected static $modules = [ 'language', 'locale', - ]; + ]; /** * The locale storage. diff --git a/core/modules/media/tests/src/Kernel/MediaEmbedFilterTranslationTest.php b/core/modules/media/tests/src/Kernel/MediaEmbedFilterTranslationTest.php index 2031eefa946b..ead63b80b8c4 100644 --- a/core/modules/media/tests/src/Kernel/MediaEmbedFilterTranslationTest.php +++ b/core/modules/media/tests/src/Kernel/MediaEmbedFilterTranslationTest.php @@ -33,10 +33,10 @@ protected function setUp(): void { $this->embeddedEntity->addTranslation('pt-br') ->set('field_media_image', [ - 'target_id' => $this->image->id(), - 'alt' => 'pt-br alt', - 'title' => 'pt-br title', - ])->save(); + 'target_id' => $this->image->id(), + 'alt' => 'pt-br alt', + 'title' => 'pt-br title', + ])->save(); } /** diff --git a/core/modules/media_library/tests/src/FunctionalJavascript/WidgetWithoutTypesTest.php b/core/modules/media_library/tests/src/FunctionalJavascript/WidgetWithoutTypesTest.php index 616455db03ed..dc301d5f49e7 100644 --- a/core/modules/media_library/tests/src/FunctionalJavascript/WidgetWithoutTypesTest.php +++ b/core/modules/media_library/tests/src/FunctionalJavascript/WidgetWithoutTypesTest.php @@ -100,8 +100,8 @@ public function testWidgetWithoutMediaTypes() { $field_empty_types_message = 'There are no allowed media types configured for this field. <a href="' . $field_empty_types_url->toString() . '">Edit the field settings</a> to select the allowed media types.'; $field_null_types_url = new Url('entity.field_config.node_field_edit_form', [ - 'field_config' => 'node.basic_page.field_null_types_media', - ] + $route_bundle_params); + 'field_config' => 'node.basic_page.field_null_types_media', + ] + $route_bundle_params); $field_null_types_message = 'There are no allowed media types configured for this field. <a href="' . $field_null_types_url->toString() . '">Edit the field settings</a> to select the allowed media types.'; // Visit a node create page. diff --git a/core/modules/migrate/tests/src/Unit/MigrateSqlIdMapEnsureTablesTest.php b/core/modules/migrate/tests/src/Unit/MigrateSqlIdMapEnsureTablesTest.php index cee2cd55700f..d5a185fa78da 100644 --- a/core/modules/migrate/tests/src/Unit/MigrateSqlIdMapEnsureTablesTest.php +++ b/core/modules/migrate/tests/src/Unit/MigrateSqlIdMapEnsureTablesTest.php @@ -209,13 +209,13 @@ protected function runEnsureTablesTest($schema) { $plugin->expects($this->any()) ->method('getIds') ->willReturn([ - 'source_id_property' => [ - 'type' => 'integer', - ], - 'source_id_property_2' => [ - 'type' => 'integer', - ], - ]); + 'source_id_property' => [ + 'type' => 'integer', + ], + 'source_id_property_2' => [ + 'type' => 'integer', + ], + ]); $migration->expects($this->any()) ->method('getSourcePlugin') ->willReturn($plugin); @@ -223,10 +223,10 @@ protected function runEnsureTablesTest($schema) { $plugin->expects($this->any()) ->method('getIds') ->willReturn([ - 'destination_id_property' => [ - 'type' => 'string', - ], - ]); + 'destination_id_property' => [ + 'type' => 'string', + ], + ]); $migration->expects($this->any()) ->method('getDestinationPlugin') ->willReturn($plugin); diff --git a/core/modules/migrate/tests/src/Unit/RowTest.php b/core/modules/migrate/tests/src/Unit/RowTest.php index 1770ccd9bd9c..6bf26e94e95f 100644 --- a/core/modules/migrate/tests/src/Unit/RowTest.php +++ b/core/modules/migrate/tests/src/Unit/RowTest.php @@ -236,29 +236,29 @@ public function testSourceIdValues() { public function testMultipleSourceIdValues() { // Set values in same order as ids. $multi_source_ids = $this->testSourceIds + [ - 'vid' => 'Node revision', - 'type' => 'Node type', - 'langcode' => 'Node language', - ]; + 'vid' => 'Node revision', + 'type' => 'Node type', + 'langcode' => 'Node language', + ]; $multi_source_ids_values = $this->testValues + [ - 'vid' => 1, - 'type' => 'page', - 'langcode' => 'en', - ]; + 'vid' => 1, + 'type' => 'page', + 'langcode' => 'en', + ]; $row = new Row($multi_source_ids_values, $multi_source_ids); $this->assertSame(array_keys($multi_source_ids), array_keys($row->getSourceIdValues())); // Set values in different order. $multi_source_ids = $this->testSourceIds + [ - 'vid' => 'Node revision', - 'type' => 'Node type', - 'langcode' => 'Node language', - ]; + 'vid' => 'Node revision', + 'type' => 'Node type', + 'langcode' => 'Node language', + ]; $multi_source_ids_values = $this->testValues + [ - 'langcode' => 'en', - 'type' => 'page', - 'vid' => 1, - ]; + 'langcode' => 'en', + 'type' => 'page', + 'vid' => 1, + ]; $row = new Row($multi_source_ids_values, $multi_source_ids); $this->assertSame(array_keys($multi_source_ids), array_keys($row->getSourceIdValues())); } diff --git a/core/modules/migrate_drupal/tests/src/Unit/FieldDiscoveryTest.php b/core/modules/migrate_drupal/tests/src/Unit/FieldDiscoveryTest.php index 1c60da83fee0..809ace52296c 100644 --- a/core/modules/migrate_drupal/tests/src/Unit/FieldDiscoveryTest.php +++ b/core/modules/migrate_drupal/tests/src/Unit/FieldDiscoveryTest.php @@ -178,7 +178,7 @@ public function getBundleFieldsData() { 'entity_type_id' => 'user', 'bundle' => 'user', 'expected_fields' => [ - 'user_field_1' => ['field_info_key' => 'user_field_1_data'], + 'user_field_1' => ['field_info_key' => 'user_field_1_data'], ], ], 'Comment - Content Type 1' => [ diff --git a/core/modules/migrate_drupal_ui/src/Batch/MigrateUpgradeImportBatch.php b/core/modules/migrate_drupal_ui/src/Batch/MigrateUpgradeImportBatch.php index 5345db3e8ffe..93d285c2f6e8 100644 --- a/core/modules/migrate_drupal_ui/src/Batch/MigrateUpgradeImportBatch.php +++ b/core/modules/migrate_drupal_ui/src/Batch/MigrateUpgradeImportBatch.php @@ -232,10 +232,10 @@ public static function run($initial_ids, $config, &$context) { $migration = \Drupal::service('plugin.manager.migration')->createInstance($migration_id); $migration_name = $migration->label() ? $migration->label() : $migration_id; $context['message'] = (string) new TranslatableMarkup('Currently upgrading @migration (@current of @max total tasks)', [ - '@migration' => $migration_name, - '@current' => $context['sandbox']['current'], - '@max' => $context['sandbox']['max'], - ]) . "<br />\n" . $context['message']; + '@migration' => $migration_name, + '@current' => $context['sandbox']['current'], + '@max' => $context['sandbox']['max'], + ]) . "<br />\n" . $context['message']; } } else { diff --git a/core/modules/migrate_drupal_ui/src/Form/OverviewForm.php b/core/modules/migrate_drupal_ui/src/Form/OverviewForm.php index 162c7686ce5d..e9c29e30692c 100644 --- a/core/modules/migrate_drupal_ui/src/Form/OverviewForm.php +++ b/core/modules/migrate_drupal_ui/src/Form/OverviewForm.php @@ -35,9 +35,9 @@ public function buildForm(array $form, FormStateInterface $form_state) { $form['info_header'] = [ '#markup' => '<p>' . $this->t('Upgrade a site by importing its files and the data from its database into a clean and empty new install of Drupal @version. See the <a href=":url">Drupal site upgrades handbook</a> for more information.', [ - '@version' => $this->destinationSiteVersion, - ':url' => 'https://www.drupal.org/upgrade/migrate', - ]), + '@version' => $this->destinationSiteVersion, + ':url' => 'https://www.drupal.org/upgrade/migrate', + ]), ]; $form['legend']['#markup'] = ''; diff --git a/core/modules/node/src/Controller/NodeController.php b/core/modules/node/src/Controller/NodeController.php index ed80d7ced7aa..f5449802da45 100644 --- a/core/modules/node/src/Controller/NodeController.php +++ b/core/modules/node/src/Controller/NodeController.php @@ -230,8 +230,8 @@ public function revisionOverview(NodeInterface $node) { $links['revert'] = [ 'title' => $vid < $node->getRevisionId() ? $this->t('Revert') : $this->t('Set as current revision'), 'url' => $has_translations ? - Url::fromRoute('node.revision_revert_translation_confirm', ['node' => $node->id(), 'node_revision' => $vid, 'langcode' => $langcode]) : - Url::fromRoute('node.revision_revert_confirm', ['node' => $node->id(), 'node_revision' => $vid]), + Url::fromRoute('node.revision_revert_translation_confirm', ['node' => $node->id(), 'node_revision' => $vid, 'langcode' => $langcode]) : + Url::fromRoute('node.revision_revert_confirm', ['node' => $node->id(), 'node_revision' => $vid]), ]; } diff --git a/core/modules/node/src/NodeGrantDatabaseStorage.php b/core/modules/node/src/NodeGrantDatabaseStorage.php index 4718a7c8765a..66ab73f696f5 100644 --- a/core/modules/node/src/NodeGrantDatabaseStorage.php +++ b/core/modules/node/src/NodeGrantDatabaseStorage.php @@ -256,13 +256,13 @@ public function delete() { public function writeDefault() { $this->database->insert('node_access') ->fields([ - 'nid' => 0, - 'realm' => 'all', - 'gid' => 0, - 'grant_view' => 1, - 'grant_update' => 0, - 'grant_delete' => 0, - ]) + 'nid' => 0, + 'realm' => 'all', + 'gid' => 0, + 'grant_view' => 1, + 'grant_update' => 0, + 'grant_delete' => 0, + ]) ->execute(); } diff --git a/core/modules/node/src/NodeTypeListBuilder.php b/core/modules/node/src/NodeTypeListBuilder.php index 870729891a3e..c99f3a545c91 100644 --- a/core/modules/node/src/NodeTypeListBuilder.php +++ b/core/modules/node/src/NodeTypeListBuilder.php @@ -56,8 +56,8 @@ public function getDefaultOperations(EntityInterface $entity) { public function render() { $build = parent::render(); $build['table']['#empty'] = $this->t('No content types available. <a href=":link">Add content type</a>.', [ - ':link' => Url::fromRoute('node.type_add')->toString(), - ]); + ':link' => Url::fromRoute('node.type_add')->toString(), + ]); return $build; } diff --git a/core/modules/node/src/Plugin/migrate/source/d6/Node.php b/core/modules/node/src/Plugin/migrate/source/d6/Node.php index a1a3166420e6..e3f5a9b0ebc2 100644 --- a/core/modules/node/src/Plugin/migrate/source/d6/Node.php +++ b/core/modules/node/src/Plugin/migrate/source/d6/Node.php @@ -107,19 +107,19 @@ public function query() { $this->handleTranslations($query); $query->fields('n', [ - 'nid', - 'type', - 'language', - 'status', - 'created', - 'changed', - 'comment', - 'promote', - 'moderate', - 'sticky', - 'tnid', - 'translate', - ]) + 'nid', + 'type', + 'language', + 'status', + 'created', + 'changed', + 'comment', + 'promote', + 'moderate', + 'sticky', + 'tnid', + 'translate', + ]) ->fields('nr', [ 'title', 'body', diff --git a/core/modules/node/tests/src/Functional/Views/FrontPageTest.php b/core/modules/node/tests/src/Functional/Views/FrontPageTest.php index 9b3e1ce2ad3b..ac17825ab281 100644 --- a/core/modules/node/tests/src/Functional/Views/FrontPageTest.php +++ b/core/modules/node/tests/src/Functional/Views/FrontPageTest.php @@ -301,12 +301,11 @@ protected function doTestFrontPageViewCacheTags($do_assert_views_caches) { $cache_context_tags = \Drupal::service('cache_contexts_manager')->convertTokensToKeys($cache_contexts)->getCacheTags(); $first_page_output_cache_tags = Cache::mergeTags($first_page_result_cache_tags, $cache_context_tags); $first_page_output_cache_tags = Cache::mergeTags($first_page_output_cache_tags, [ - 'config:filter.format.plain_text', - 'node_view', - 'user_view', - 'user:0', - ] - ); + 'config:filter.format.plain_text', + 'node_view', + 'user_view', + 'user:0', + ]); $view->setDisplay('page_1'); $view->setCurrentPage(0); $this->assertViewsCacheTags( diff --git a/core/modules/node/tests/src/Kernel/NodeAccessLanguageAwareCombinationTest.php b/core/modules/node/tests/src/Kernel/NodeAccessLanguageAwareCombinationTest.php index dc1966815f5f..1307d5677761 100644 --- a/core/modules/node/tests/src/Kernel/NodeAccessLanguageAwareCombinationTest.php +++ b/core/modules/node/tests/src/Kernel/NodeAccessLanguageAwareCombinationTest.php @@ -175,7 +175,7 @@ protected function setUp(): void { $this->nodes['public_no_language_private'] = $this->drupalCreateNode([ 'field_private' => [['value' => 1]], 'private' => FALSE, - 'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED, + 'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED, ]); $this->nodes['public_no_language_public'] = $this->drupalCreateNode([ 'field_private' => [['value' => 0]], diff --git a/core/modules/node/tests/src/Kernel/NodeFieldAccessTest.php b/core/modules/node/tests/src/Kernel/NodeFieldAccessTest.php index 0f54c38ec028..b19c6bea2f88 100644 --- a/core/modules/node/tests/src/Kernel/NodeFieldAccessTest.php +++ b/core/modules/node/tests/src/Kernel/NodeFieldAccessTest.php @@ -49,7 +49,7 @@ public function testAccessToAdministrativeFields() { // Create the page node type with revisions disabled. $page = NodeType::create([ 'type' => 'page', - 'new_revision' => FALSE, + 'new_revision' => FALSE, ]); $page->save(); diff --git a/core/modules/options/tests/src/Functional/OptionsFieldUITest.php b/core/modules/options/tests/src/Functional/OptionsFieldUITest.php index 23e965bd4174..9ec72586ef3b 100644 --- a/core/modules/options/tests/src/Functional/OptionsFieldUITest.php +++ b/core/modules/options/tests/src/Functional/OptionsFieldUITest.php @@ -344,9 +344,7 @@ public function testNodeDisplay() { $on = $this->randomMachineName(); $off = $this->randomMachineName(); $edit = [ - 'settings[allowed_values]' => - "1|$on - 0|$off", + 'settings[allowed_values]' => "1|$on" . PHP_EOL . "0|$off", ]; $this->drupalGet($this->adminPath); diff --git a/core/modules/path/src/Plugin/Field/FieldWidget/PathWidget.php b/core/modules/path/src/Plugin/Field/FieldWidget/PathWidget.php index 441c65c94fce..20d3aa8f5183 100644 --- a/core/modules/path/src/Plugin/Field/FieldWidget/PathWidget.php +++ b/core/modules/path/src/Plugin/Field/FieldWidget/PathWidget.php @@ -44,7 +44,7 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen $element['source'] = [ '#type' => 'value', '#value' => !$entity->isNew() ? '/' . $entity->toUrl()->getInternalPath() : NULL, - ]; + ]; $element['langcode'] = [ '#type' => 'value', '#value' => $items[$delta]->langcode, diff --git a/core/modules/pgsql/src/Driver/Database/pgsql/Schema.php b/core/modules/pgsql/src/Driver/Database/pgsql/Schema.php index 986005d6828f..5cb6c569e1e5 100644 --- a/core/modules/pgsql/src/Driver/Database/pgsql/Schema.php +++ b/core/modules/pgsql/src/Driver/Database/pgsql/Schema.php @@ -461,7 +461,7 @@ public function getFieldTypeMap() { 'serial:medium' => 'serial', 'serial:big' => 'bigserial', 'serial:normal' => 'serial', - ]; + ]; return $map; } diff --git a/core/modules/responsive_image/src/Plugin/Field/FieldFormatter/ResponsiveImageFormatter.php b/core/modules/responsive_image/src/Plugin/Field/FieldFormatter/ResponsiveImageFormatter.php index ca3bb3940890..da0f53f3b947 100644 --- a/core/modules/responsive_image/src/Plugin/Field/FieldFormatter/ResponsiveImageFormatter.php +++ b/core/modules/responsive_image/src/Plugin/Field/FieldFormatter/ResponsiveImageFormatter.php @@ -142,7 +142,7 @@ public function settingsForm(array $form, FormStateInterface $form_state) { '#description' => [ '#markup' => $this->linkGenerator->generate($this->t('Configure Responsive Image Styles'), new Url('entity.responsive_image_style.collection')), '#access' => $this->currentUser->hasPermission('administer responsive image styles'), - ], + ], ]; $link_types = [ diff --git a/core/modules/responsive_image/tests/src/Functional/ResponsiveImageFieldDisplayTest.php b/core/modules/responsive_image/tests/src/Functional/ResponsiveImageFieldDisplayTest.php index e865b0ee2949..8abca68b22ad 100644 --- a/core/modules/responsive_image/tests/src/Functional/ResponsiveImageFieldDisplayTest.php +++ b/core/modules/responsive_image/tests/src/Functional/ResponsiveImageFieldDisplayTest.php @@ -426,9 +426,9 @@ public function testResponsiveImageFieldFormattersOneSource() { 'image_mapping' => 'medium', ]) ->addImageStyleMapping('responsive_image_test_module.empty', '2x', [ - 'image_mapping_type' => 'image_style', - 'image_mapping' => 'large', - ]) + 'image_mapping_type' => 'image_style', + 'image_mapping' => 'large', + ]) ->save(); $node_storage = $this->container->get('entity_type.manager')->getStorage('node'); $field_name = mb_strtolower($this->randomMachineName()); diff --git a/core/modules/responsive_image/tests/src/Unit/ResponsiveImageStyleConfigEntityUnitTest.php b/core/modules/responsive_image/tests/src/Unit/ResponsiveImageStyleConfigEntityUnitTest.php index d6045e2420de..36ffee744805 100644 --- a/core/modules/responsive_image/tests/src/Unit/ResponsiveImageStyleConfigEntityUnitTest.php +++ b/core/modules/responsive_image/tests/src/Unit/ResponsiveImageStyleConfigEntityUnitTest.php @@ -124,45 +124,45 @@ public function testHasImageStyleMappings() { $entity = new ResponsiveImageStyle([]); $this->assertFalse($entity->hasImageStyleMappings()); $entity->addImageStyleMapping('test_breakpoint', '1x', [ - 'image_mapping_type' => 'image_style', - 'image_mapping' => '', + 'image_mapping_type' => 'image_style', + 'image_mapping' => '', ]); $this->assertFalse($entity->hasImageStyleMappings()); $entity->removeImageStyleMappings(); $entity->addImageStyleMapping('test_breakpoint', '1x', [ - 'image_mapping_type' => 'sizes', - 'image_mapping' => [ - 'sizes' => '(min-width:700px) 700px, 100vw', - 'sizes_image_styles' => [], - ], + 'image_mapping_type' => 'sizes', + 'image_mapping' => [ + 'sizes' => '(min-width:700px) 700px, 100vw', + 'sizes_image_styles' => [], + ], ]); $this->assertFalse($entity->hasImageStyleMappings()); $entity->removeImageStyleMappings(); $entity->addImageStyleMapping('test_breakpoint', '1x', [ - 'image_mapping_type' => 'sizes', - 'image_mapping' => [ - 'sizes' => '', - 'sizes_image_styles' => [ - 'large' => 'large', - ], + 'image_mapping_type' => 'sizes', + 'image_mapping' => [ + 'sizes' => '', + 'sizes_image_styles' => [ + 'large' => 'large', ], + ], ]); $this->assertFalse($entity->hasImageStyleMappings()); $entity->removeImageStyleMappings(); $entity->addImageStyleMapping('test_breakpoint', '1x', [ - 'image_mapping_type' => 'image_style', - 'image_mapping' => 'large', + 'image_mapping_type' => 'image_style', + 'image_mapping' => 'large', ]); $this->assertTrue($entity->hasImageStyleMappings()); $entity->removeImageStyleMappings(); $entity->addImageStyleMapping('test_breakpoint', '1x', [ - 'image_mapping_type' => 'sizes', - 'image_mapping' => [ - 'sizes' => '(min-width:700px) 700px, 100vw', - 'sizes_image_styles' => [ - 'large' => 'large', - ], + 'image_mapping_type' => 'sizes', + 'image_mapping' => [ + 'sizes' => '(min-width:700px) 700px, 100vw', + 'sizes_image_styles' => [ + 'large' => 'large', ], + ], ]); $this->assertTrue($entity->hasImageStyleMappings()); } diff --git a/core/modules/serialization/tests/src/Kernel/EntitySerializationTest.php b/core/modules/serialization/tests/src/Kernel/EntitySerializationTest.php index 6e997dd016eb..0290ba17e09a 100644 --- a/core/modules/serialization/tests/src/Kernel/EntitySerializationTest.php +++ b/core/modules/serialization/tests/src/Kernel/EntitySerializationTest.php @@ -324,7 +324,7 @@ public function testDenormalizeInvalidCustomSerializedField() { $this->serializer->denormalize([ 'serialized_long' => [ [ - 'value' => 'boo', + 'value' => 'boo', ], ], 'type' => 'entity_test_serialized_field', diff --git a/core/modules/statistics/src/Plugin/Block/StatisticsPopularBlock.php b/core/modules/statistics/src/Plugin/Block/StatisticsPopularBlock.php index 53e39c3333a4..072c72736f40 100644 --- a/core/modules/statistics/src/Plugin/Block/StatisticsPopularBlock.php +++ b/core/modules/statistics/src/Plugin/Block/StatisticsPopularBlock.php @@ -116,11 +116,11 @@ public function blockForm($form, FormStateInterface $form_state) { $numbers = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 15, 20, 25, 30, 40]; $numbers = ['0' => $this->t('Disabled')] + array_combine($numbers, $numbers); $form['statistics_block_top_day_num'] = [ - '#type' => 'select', - '#title' => $this->t("Number of day's top views to display"), - '#default_value' => $this->configuration['top_day_num'], - '#options' => $numbers, - '#description' => $this->t('How many content items to display in "day" list.'), + '#type' => 'select', + '#title' => $this->t("Number of day's top views to display"), + '#default_value' => $this->configuration['top_day_num'], + '#options' => $numbers, + '#description' => $this->t('How many content items to display in "day" list.'), ]; $form['statistics_block_top_all_num'] = [ '#type' => 'select', diff --git a/core/modules/statistics/statistics.views.inc b/core/modules/statistics/statistics.views.inc index e9ce1644274d..01e6d1efd8b4 100644 --- a/core/modules/statistics/statistics.views.inc +++ b/core/modules/statistics/statistics.views.inc @@ -24,7 +24,7 @@ function statistics_views_data() { 'field' => [ 'id' => 'statistics_numeric', 'click sortable' => TRUE, - ], + ], 'filter' => [ 'id' => 'numeric', ], @@ -42,7 +42,7 @@ function statistics_views_data() { 'field' => [ 'id' => 'statistics_numeric', 'click sortable' => TRUE, - ], + ], 'filter' => [ 'id' => 'numeric', ], diff --git a/core/modules/syslog/syslog.module b/core/modules/syslog/syslog.module index 28d57f7b0565..b13af5090367 100644 --- a/core/modules/syslog/syslog.module +++ b/core/modules/syslog/syslog.module @@ -49,7 +49,7 @@ function syslog_form_system_logging_settings_alter(&$form, FormStateInterface $f '#default_value' => $config->get('facility'), '#options' => syslog_facility_list(), '#description' => t('Depending on the system configuration, Syslog and other logging tools use this code to identify or filter messages from within the entire system log.') . $help, - ]; + ]; } $form['syslog_format'] = [ '#type' => 'textarea', diff --git a/core/modules/system/src/Form/ModulesListNonStableConfirmForm.php b/core/modules/system/src/Form/ModulesListNonStableConfirmForm.php index 3788d3084795..93bc6b5406ea 100644 --- a/core/modules/system/src/Form/ModulesListNonStableConfirmForm.php +++ b/core/modules/system/src/Form/ModulesListNonStableConfirmForm.php @@ -184,9 +184,7 @@ protected function buildNonStableInfo(): void { Url::fromUri($data[$machine_name]->info[ExtensionLifecycle::LIFECYCLE_LINK_IDENTIFIER], [ 'attributes' => [ - 'aria-label' => ' ' . $this->t('about the status of the @name module', [ - '@name' => $name, - ]), + 'aria-label' => ' ' . $this->t('about the status of the @name module', ['@name' => $name]), ], ]) )->toString(); diff --git a/core/modules/system/system.install b/core/modules/system/system.install index 15b4f4858774..3f252f765369 100644 --- a/core/modules/system/system.install +++ b/core/modules/system/system.install @@ -1476,7 +1476,7 @@ function system_schema() { 'unsigned' => TRUE, 'not null' => TRUE, ], - ], + ], 'primary key' => ['value'], ]; diff --git a/core/modules/system/tests/modules/database_test/database_test.install b/core/modules/system/tests/modules/database_test/database_test.install index 855a518031a8..a388f3fe6896 100644 --- a/core/modules/system/tests/modules/database_test/database_test.install +++ b/core/modules/system/tests/modules/database_test/database_test.install @@ -170,7 +170,7 @@ function database_test_schema() { ], ], 'primary key' => ['id'], - ]; + ]; $schema['test_two_blobs'] = [ 'description' => 'A simple test table with two BLOB fields.', @@ -190,7 +190,7 @@ function database_test_schema() { ], ], 'primary key' => ['id'], - ]; + ]; $schema['test_task'] = [ 'description' => 'A task list for people in the test table.', diff --git a/core/modules/system/tests/modules/early_rendering_controller_test/src/EarlyRenderingTestController.php b/core/modules/system/tests/modules/early_rendering_controller_test/src/EarlyRenderingTestController.php index 00f3ef9848ec..40b9bc8233db 100644 --- a/core/modules/system/tests/modules/early_rendering_controller_test/src/EarlyRenderingTestController.php +++ b/core/modules/system/tests/modules/early_rendering_controller_test/src/EarlyRenderingTestController.php @@ -60,10 +60,11 @@ protected function earlyRenderContent() { public function renderArray() { return [ - '#pre_render' => [function () { - $elements = $this->earlyRenderContent(); - return $elements; - }, + '#pre_render' => [ + function () { + $elements = $this->earlyRenderContent(); + return $elements; + }, ], ]; } diff --git a/core/modules/system/tests/modules/entity_test/tests/src/Functional/Rest/EntityTestResourceTestBase.php b/core/modules/system/tests/modules/entity_test/tests/src/Functional/Rest/EntityTestResourceTestBase.php index fc30b8f36639..7985a3244c91 100644 --- a/core/modules/system/tests/modules/entity_test/tests/src/Functional/Rest/EntityTestResourceTestBase.php +++ b/core/modules/system/tests/modules/entity_test/tests/src/Functional/Rest/EntityTestResourceTestBase.php @@ -78,15 +78,15 @@ protected function createEntity() { $entity_test = \Drupal::entityTypeManager() ->getStorage(static::$entityTypeId) ->create([ - 'name' => 'Llama', - 'type' => static::$entityTypeId, - // Set a value for the internal field to confirm that it will not be - // returned in normalization. - // @see entity_test_entity_base_field_info(). - 'internal_string_field' => [ - 'value' => 'This value shall not be internal!', - ], - ]); + 'name' => 'Llama', + 'type' => static::$entityTypeId, + // Set a value for the internal field to confirm that it will not be + // returned in normalization. + // @see entity_test_entity_base_field_info(). + 'internal_string_field' => [ + 'value' => 'This value shall not be internal!', + ], + ]); $entity_test->setOwnerId(0); $entity_test->save(); diff --git a/core/modules/system/tests/modules/menu_test/src/Plugin/Derivative/MenuLinkTestWithUnsafeTitle.php b/core/modules/system/tests/modules/menu_test/src/Plugin/Derivative/MenuLinkTestWithUnsafeTitle.php index 822224c1a0a6..60d9923117c5 100644 --- a/core/modules/system/tests/modules/menu_test/src/Plugin/Derivative/MenuLinkTestWithUnsafeTitle.php +++ b/core/modules/system/tests/modules/menu_test/src/Plugin/Derivative/MenuLinkTestWithUnsafeTitle.php @@ -14,9 +14,9 @@ class MenuLinkTestWithUnsafeTitle extends DeriverBase { */ public function getDerivativeDefinitions($base_plugin_definition) { $this->derivatives['unsafe'] = [ - 'title' => '<script>alert("Even more wild animals")</script>', - 'menu_name' => 'tools', - ] + $base_plugin_definition; + 'title' => '<script>alert("Even more wild animals")</script>', + 'menu_name' => 'tools', + ] + $base_plugin_definition; return $this->derivatives; } diff --git a/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/MockMenuBlockDeriver.php b/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/MockMenuBlockDeriver.php index b8aedac36a50..22ef9809a667 100644 --- a/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/MockMenuBlockDeriver.php +++ b/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/MockMenuBlockDeriver.php @@ -45,7 +45,7 @@ public function getDerivativeDefinitions($base_plugin_definition) { // Instead of the derivative label, the specific label will be used. 'label' => t('Derivative label'), // This setting will be merged in. - 'setting' => 'default', + 'setting' => 'default', ] + $base_plugin_definition, ]; diff --git a/core/modules/system/tests/src/Functional/Form/FormTest.php b/core/modules/system/tests/src/Functional/Form/FormTest.php index e9a53849044b..72c2e57fcb5d 100644 --- a/core/modules/system/tests/src/Functional/Form/FormTest.php +++ b/core/modules/system/tests/src/Functional/Form/FormTest.php @@ -416,27 +416,27 @@ public function testSelect() { // Posting without any values should throw validation errors. $this->submitForm([], 'Submit'); $no_errors = [ - 'select', - 'select_required', - 'select_optional', - 'empty_value', - 'empty_value_one', - 'no_default_optional', - 'no_default_empty_option_optional', - 'no_default_empty_value_optional', - 'multiple', - 'multiple_no_default', + 'select', + 'select_required', + 'select_optional', + 'empty_value', + 'empty_value_one', + 'no_default_optional', + 'no_default_empty_option_optional', + 'no_default_empty_value_optional', + 'multiple', + 'multiple_no_default', ]; foreach ($no_errors as $key) { $this->assertSession()->pageTextNotContains($form[$key]['#title'] . ' field is required.'); } $expected_errors = [ - 'no_default', - 'no_default_empty_option', - 'no_default_empty_value', - 'no_default_empty_value_one', - 'multiple_no_default_required', + 'no_default', + 'no_default_empty_option', + 'no_default_empty_value', + 'no_default_empty_value_one', + 'multiple_no_default_required', ]; foreach ($expected_errors as $key) { $this->assertSession()->pageTextContains($form[$key]['#title'] . ' field is required.'); diff --git a/core/modules/system/tests/src/Functional/Form/LanguageSelectElementTest.php b/core/modules/system/tests/src/Functional/Form/LanguageSelectElementTest.php index fa623992416d..6622ce607c6c 100644 --- a/core/modules/system/tests/src/Functional/Form/LanguageSelectElementTest.php +++ b/core/modules/system/tests/src/Functional/Form/LanguageSelectElementTest.php @@ -47,10 +47,10 @@ public function testLanguageSelectElementOptions() { $this->drupalGet('form-test/language_select'); // Check that the language fields were rendered on the page. $ids = [ - 'edit-languages-all' => LanguageInterface::STATE_ALL, - 'edit-languages-configurable' => LanguageInterface::STATE_CONFIGURABLE, - 'edit-languages-locked' => LanguageInterface::STATE_LOCKED, - 'edit-languages-config-and-locked' => LanguageInterface::STATE_CONFIGURABLE | LanguageInterface::STATE_LOCKED, + 'edit-languages-all' => LanguageInterface::STATE_ALL, + 'edit-languages-configurable' => LanguageInterface::STATE_CONFIGURABLE, + 'edit-languages-locked' => LanguageInterface::STATE_LOCKED, + 'edit-languages-config-and-locked' => LanguageInterface::STATE_CONFIGURABLE | LanguageInterface::STATE_LOCKED, ]; foreach ($ids as $id => $flags) { $this->assertSession()->fieldExists($id); diff --git a/core/modules/system/tests/src/Functional/Mail/HtmlToTextTest.php b/core/modules/system/tests/src/Functional/Mail/HtmlToTextTest.php index b9d00c44b94d..920feaeb083f 100644 --- a/core/modules/system/tests/src/Functional/Mail/HtmlToTextTest.php +++ b/core/modules/system/tests/src/Functional/Mail/HtmlToTextTest.php @@ -304,9 +304,9 @@ public function testFootnoteReferences() { public function testDrupalHtmlToTextParagraphs() { $tests = []; $tests[] = [ - 'html' => "<p>line 1<br />\nline 2<br />line 3\n<br />line 4</p><p>paragraph</p>", + 'html' => "<p>line 1<br />\nline 2<br />line 3\n<br />line 4</p><p>paragraph</p>", // @todo Trailing line breaks should be trimmed. - 'text' => "line 1\nline 2\nline 3\nline 4\n\nparagraph\n\n", + 'text' => "line 1\nline 2\nline 3\nline 4\n\nparagraph\n\n", ]; $tests[] = [ 'html' => "<p>line 1<br /> line 2</p> <p>line 4<br /> line 5</p> <p>0</p>", diff --git a/core/modules/system/tests/src/Functional/System/DateTimeTest.php b/core/modules/system/tests/src/Functional/System/DateTimeTest.php index 44aebf2b0935..091395dbdad3 100644 --- a/core/modules/system/tests/src/Functional/System/DateTimeTest.php +++ b/core/modules/system/tests/src/Functional/System/DateTimeTest.php @@ -173,7 +173,7 @@ public function testDateFormatConfiguration() { 'id' => 'xss_short', 'label' => 'XSS format', 'pattern' => '\<\s\c\r\i\p\t\>\a\l\e\r\t\(\'\X\S\S\'\)\;\<\/\s\c\r\i\p\t\>', - ]); + ]); $date_format->save(); $this->drupalGet(Url::fromRoute('entity.date_format.collection')); diff --git a/core/modules/system/tests/src/Functional/UpdateSystem/UpdateScriptTest.php b/core/modules/system/tests/src/Functional/UpdateSystem/UpdateScriptTest.php index 819fd6e4e775..32ad7657f1d3 100644 --- a/core/modules/system/tests/src/Functional/UpdateSystem/UpdateScriptTest.php +++ b/core/modules/system/tests/src/Functional/UpdateSystem/UpdateScriptTest.php @@ -568,9 +568,9 @@ public function testSuccessfulMultilingualUpdateFunctionality() { // Add some custom languages. foreach (['aa', 'bb'] as $language_code) { ConfigurableLanguage::create([ - 'id' => $language_code, - 'label' => $this->randomMachineName(), - ])->save(); + 'id' => $language_code, + 'label' => $this->randomMachineName(), + ])->save(); } $config = \Drupal::service('config.factory')->getEditable('language.negotiation'); diff --git a/core/modules/system/tests/src/Kernel/Block/SystemMenuBlockTest.php b/core/modules/system/tests/src/Kernel/Block/SystemMenuBlockTest.php index 30575f2abe62..8872978fee6e 100644 --- a/core/modules/system/tests/src/Kernel/Block/SystemMenuBlockTest.php +++ b/core/modules/system/tests/src/Kernel/Block/SystemMenuBlockTest.php @@ -208,7 +208,7 @@ public function testConfigLevelDepth() { 'test.example2' => [], 'test.example5' => [ 'test.example7' => [], - ], + ], 'test.example6' => [], 'test.example8' => [], ]; diff --git a/core/modules/taxonomy/tests/src/Functional/TermIndexTest.php b/core/modules/taxonomy/tests/src/Functional/TermIndexTest.php index cf011b157ef2..7f1fabc725d0 100644 --- a/core/modules/taxonomy/tests/src/Functional/TermIndexTest.php +++ b/core/modules/taxonomy/tests/src/Functional/TermIndexTest.php @@ -62,7 +62,7 @@ protected function setUp(): void { $handler_settings = [ 'target_bundles' => [ $this->vocabulary->id() => $this->vocabulary->id(), - ], + ], 'auto_create' => TRUE, ]; $this->createEntityReferenceField('node', 'article', $this->fieldName1, NULL, 'taxonomy_term', 'default', $handler_settings, FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED); diff --git a/core/modules/taxonomy/tests/src/Kernel/Plugin/migrate/source/d7/TermLocalizedTranslationTest.php b/core/modules/taxonomy/tests/src/Kernel/Plugin/migrate/source/d7/TermLocalizedTranslationTest.php index f04788b9daa8..cf8c969da9aa 100644 --- a/core/modules/taxonomy/tests/src/Kernel/Plugin/migrate/source/d7/TermLocalizedTranslationTest.php +++ b/core/modules/taxonomy/tests/src/Kernel/Plugin/migrate/source/d7/TermLocalizedTranslationTest.php @@ -153,7 +153,7 @@ public function providerSource() { 'property' => 'description', 'objectindex' => '5', 'format' => 0, - ]); + ]); array_push($tests[1]['source_data']['locales_target'], [ 'lid' => 10, @@ -170,7 +170,7 @@ public function providerSource() { 'plid' => 0, 'plural' => 0, 'i18n_status' => 0, - ]); + ]); // The expected results. array_push($tests[1]['expected_data'], @@ -225,7 +225,7 @@ public function providerSource() { 'translation' => 'fr - description value 5', 'name_translated' => 'fr - name value 5', 'description_translated' => 'fr - description value 5', - ]); + ]); $tests[1]['expected_count'] = NULL; // Empty configuration will return terms for all vocabularies. diff --git a/core/modules/text/tests/src/Unit/Migrate/d6/TextFieldTest.php b/core/modules/text/tests/src/Unit/Migrate/d6/TextFieldTest.php index af2ce704cacb..b3d0afb15b8d 100644 --- a/core/modules/text/tests/src/Unit/Migrate/d6/TextFieldTest.php +++ b/core/modules/text/tests/src/Unit/Migrate/d6/TextFieldTest.php @@ -126,25 +126,25 @@ public function getFieldTypeProvider() { return [ ['string_long', 'text_textfield', ['text_processing' => FALSE]], ['string', 'text_textfield', [ - 'text_processing' => FALSE, - 'max_length' => 128, - ], + 'text_processing' => FALSE, + 'max_length' => 128, + ], ], ['string_long', 'text_textfield', [ - 'text_processing' => FALSE, - 'max_length' => 4096, - ], + 'text_processing' => FALSE, + 'max_length' => 4096, + ], ], ['text_long', 'text_textfield', ['text_processing' => TRUE]], ['text', 'text_textfield', [ - 'text_processing' => TRUE, - 'max_length' => 128, - ], + 'text_processing' => TRUE, + 'max_length' => 128, + ], ], ['text_long', 'text_textfield', [ - 'text_processing' => TRUE, - 'max_length' => 4096, - ], + 'text_processing' => TRUE, + 'max_length' => 4096, + ], ], ['list_string', 'optionwidgets_buttons'], ['list_string', 'optionwidgets_select'], diff --git a/core/modules/text/tests/src/Unit/Plugin/migrate/field/d6/TextFieldTest.php b/core/modules/text/tests/src/Unit/Plugin/migrate/field/d6/TextFieldTest.php index ccc677b225e2..616a16e078bf 100644 --- a/core/modules/text/tests/src/Unit/Plugin/migrate/field/d6/TextFieldTest.php +++ b/core/modules/text/tests/src/Unit/Plugin/migrate/field/d6/TextFieldTest.php @@ -126,25 +126,25 @@ public function getFieldTypeProvider() { return [ ['string_long', 'text_textfield', ['text_processing' => FALSE]], ['string', 'text_textfield', [ - 'text_processing' => FALSE, - 'max_length' => 128, - ], + 'text_processing' => FALSE, + 'max_length' => 128, + ], ], ['string_long', 'text_textfield', [ - 'text_processing' => FALSE, - 'max_length' => 4096, - ], + 'text_processing' => FALSE, + 'max_length' => 4096, + ], ], ['text_long', 'text_textfield', ['text_processing' => TRUE]], ['text', 'text_textfield', [ - 'text_processing' => TRUE, - 'max_length' => 128, - ], + 'text_processing' => TRUE, + 'max_length' => 128, + ], ], ['text_long', 'text_textfield', [ - 'text_processing' => TRUE, - 'max_length' => 4096, - ], + 'text_processing' => TRUE, + 'max_length' => 4096, + ], ], ['list_string', 'optionwidgets_buttons'], ['list_string', 'optionwidgets_select'], diff --git a/core/modules/tour/src/TourViewBuilder.php b/core/modules/tour/src/TourViewBuilder.php index cafd4dd0c8cc..83535172dcec 100644 --- a/core/modules/tour/src/TourViewBuilder.php +++ b/core/modules/tour/src/TourViewBuilder.php @@ -59,8 +59,8 @@ public function viewMultiple(array $entities = [], $view_mode = 'full', $langcod '@total' => $total_tips, ]), 'attachTo' => [ - 'element' => $selector, - 'on' => $location ?? 'bottom-start', + 'element' => $selector, + 'on' => $location ?? 'bottom-start', ], // Shepherd expects classes to be provided as a string. 'classes' => implode(' ', $classes), diff --git a/core/modules/update/tests/src/Functional/UpdateSemverTestBase.php b/core/modules/update/tests/src/Functional/UpdateSemverTestBase.php index 5f9a969126d8..a1dbeee5ee6f 100644 --- a/core/modules/update/tests/src/Functional/UpdateSemverTestBase.php +++ b/core/modules/update/tests/src/Functional/UpdateSemverTestBase.php @@ -42,7 +42,7 @@ protected function setUp(): void { $admin_user = $this->drupalCreateUser([ 'administer site configuration', 'view update notifications', - ]); + ]); $this->drupalLogin($admin_user); $this->drupalPlaceBlock('local_actions_block'); } diff --git a/core/modules/user/tests/src/Functional/Rest/UserResourceTestBase.php b/core/modules/user/tests/src/Functional/Rest/UserResourceTestBase.php index 3b01a626a902..88d6d7532db1 100644 --- a/core/modules/user/tests/src/Functional/Rest/UserResourceTestBase.php +++ b/core/modules/user/tests/src/Functional/Rest/UserResourceTestBase.php @@ -288,12 +288,12 @@ public function testPatchSecurityOtherUser() { // Try changing user 1's email. $user1 = [ - 'mail' => [['value' => 'another_email_address@example.com']], - 'uid' => [['value' => 1]], - 'name' => [['value' => 'another_user_name']], - 'pass' => [['existing' => $this->account->passRaw]], - 'uuid' => [['value' => '2e9403a4-d8af-4096-a116-624710140be0']], - ] + $original_normalization; + 'mail' => [['value' => 'another_email_address@example.com']], + 'uid' => [['value' => 1]], + 'name' => [['value' => 'another_user_name']], + 'pass' => [['existing' => $this->account->passRaw]], + 'uuid' => [['value' => '2e9403a4-d8af-4096-a116-624710140be0']], + ] + $original_normalization; $request_options[RequestOptions::BODY] = $this->serializer->encode($user1, static::$format); $response = $this->request('PATCH', $url, $request_options); // Ensure the email address has not changed. diff --git a/core/modules/user/tests/src/Functional/UserAdminTest.php b/core/modules/user/tests/src/Functional/UserAdminTest.php index 8fedf64f7c07..32f9673b7247 100644 --- a/core/modules/user/tests/src/Functional/UserAdminTest.php +++ b/core/modules/user/tests/src/Functional/UserAdminTest.php @@ -125,10 +125,10 @@ public function testUserAdmin() { ->set('notify.status_blocked', TRUE) ->save(); $this->drupalGet('admin/people', [ - // Sort the table by username so that we know reliably which user will be - // targeted with the blocking action. - 'query' => ['order' => 'name', 'sort' => 'asc'], -]); + // Sort the table by username so that we know reliably which user will be + // targeted with the blocking action. + 'query' => ['order' => 'name', 'sort' => 'asc'], + ]); $this->submitForm($edit, 'Apply to selected items'); $site_name = $this->config('system.site')->get('name'); $this->assertMailString('body', 'Your account on ' . $site_name . ' has been blocked.', 1, 'Blocked message found in the mail sent to user C.'); @@ -147,10 +147,10 @@ public function testUserAdmin() { $editunblock['action'] = 'user_unblock_user_action'; $editunblock['user_bulk_form[4]'] = TRUE; $this->drupalGet('admin/people', [ - // Sort the table by username so that we know reliably which user will be - // targeted with the blocking action. - 'query' => ['order' => 'name', 'sort' => 'asc'], -]); + // Sort the table by username so that we know reliably which user will be + // targeted with the blocking action. + 'query' => ['order' => 'name', 'sort' => 'asc'], + ]); $this->submitForm($editunblock, 'Apply to selected items'); $user_storage->resetCache([$user_c->id()]); $account = $user_storage->load($user_c->id()); diff --git a/core/modules/user/tests/src/Kernel/Plugin/migrate/source/ProfileFieldTest.php b/core/modules/user/tests/src/Kernel/Plugin/migrate/source/ProfileFieldTest.php index 1f29505a5a8e..9dc0c72ea300 100644 --- a/core/modules/user/tests/src/Kernel/Plugin/migrate/source/ProfileFieldTest.php +++ b/core/modules/user/tests/src/Kernel/Plugin/migrate/source/ProfileFieldTest.php @@ -25,7 +25,7 @@ public function providerSource() { [ 'source_data' => [], 'expected_data' => [], - ], + ], ]; $profile_fields = [ diff --git a/core/modules/views/src/Controller/ViewAjaxController.php b/core/modules/views/src/Controller/ViewAjaxController.php index d765629d86ee..bff0acb81b36 100644 --- a/core/modules/views/src/Controller/ViewAjaxController.php +++ b/core/modules/views/src/Controller/ViewAjaxController.php @@ -136,17 +136,17 @@ public function ajaxView(Request $request) { // @todo Remove this parsing once these are removed from the request in // https://www.drupal.org/node/2504709. foreach ([ - 'view_name', - 'view_display_id', - 'view_args', - 'view_path', - 'view_dom_id', - 'pager_element', - 'view_base_path', - AjaxResponseSubscriber::AJAX_REQUEST_PARAMETER, - FormBuilderInterface::AJAX_FORM_REQUEST, - MainContentViewSubscriber::WRAPPER_FORMAT, - ] as $key) { + 'view_name', + 'view_display_id', + 'view_args', + 'view_path', + 'view_dom_id', + 'pager_element', + 'view_base_path', + AjaxResponseSubscriber::AJAX_REQUEST_PARAMETER, + FormBuilderInterface::AJAX_FORM_REQUEST, + MainContentViewSubscriber::WRAPPER_FORMAT, + ] as $key) { $request->query->remove($key); $request->request->remove($key); } diff --git a/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php b/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php index ec4121672d67..ea557f386d2e 100644 --- a/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php +++ b/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php @@ -572,21 +572,21 @@ protected function defineOptions() { 'contains' => [ 'type' => ['default' => 'views_query'], 'options' => ['default' => []], - ], + ], 'merge_defaults' => [$this, 'mergePlugin'], ], 'exposed_form' => [ 'contains' => [ 'type' => ['default' => 'basic'], 'options' => ['default' => []], - ], + ], 'merge_defaults' => [$this, 'mergePlugin'], ], 'pager' => [ 'contains' => [ 'type' => ['default' => 'mini'], 'options' => ['default' => []], - ], + ], 'merge_defaults' => [$this, 'mergePlugin'], ], 'style' => [ @@ -1039,16 +1039,16 @@ public function optionLink($text, $section, $class = '', $title = '') { } return Link::fromTextAndUrl($text, Url::fromRoute('views_ui.form_display', [ - 'js' => 'nojs', - 'view' => $this->view->storage->id(), - 'display_id' => $this->display['id'], - 'type' => $section, - ], [ - 'attributes' => [ - 'class' => ['views-ajax-link', $class], - 'title' => $title, - 'id' => Html::getUniqueId('views-' . $this->display['id'] . '-' . $section), - ], + 'js' => 'nojs', + 'view' => $this->view->storage->id(), + 'display_id' => $this->display['id'], + 'type' => $section, + ], [ + 'attributes' => [ + 'class' => ['views-ajax-link', $class], + 'title' => $title, + 'id' => Html::getUniqueId('views-' . $this->display['id'] . '-' . $section), + ], ]))->toString(); } diff --git a/core/modules/views/src/Plugin/views/exposed_form/ExposedFormPluginBase.php b/core/modules/views/src/Plugin/views/exposed_form/ExposedFormPluginBase.php index f700380fadc4..87e5ef38ebe9 100644 --- a/core/modules/views/src/Plugin/views/exposed_form/ExposedFormPluginBase.php +++ b/core/modules/views/src/Plugin/views/exposed_form/ExposedFormPluginBase.php @@ -54,7 +54,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) { ]; $form['reset_button_label'] = [ - '#type' => 'textfield', + '#type' => 'textfield', '#title' => $this->t('Reset button label'), '#description' => $this->t('Text to display in the reset button of the exposed form.'), '#default_value' => $this->options['reset_button_label'], diff --git a/core/modules/views/src/Plugin/views/style/Table.php b/core/modules/views/src/Plugin/views/style/Table.php index fb75b0dedd79..a933104bc256 100644 --- a/core/modules/views/src/Plugin/views/style/Table.php +++ b/core/modules/views/src/Plugin/views/style/Table.php @@ -336,7 +336,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) { 'views-align-left' => $this->t('Left', [], ['context' => 'Text alignment']), 'views-align-center' => $this->t('Center', [], ['context' => 'Text alignment']), 'views-align-right' => $this->t('Right', [], ['context' => 'Text alignment']), - ], + ], '#states' => [ 'visible' => [ $column_selector => ['value' => $field], diff --git a/core/modules/views/src/Plugin/views/wizard/WizardPluginBase.php b/core/modules/views/src/Plugin/views/wizard/WizardPluginBase.php index f575a18ca919..6205b97efda7 100644 --- a/core/modules/views/src/Plugin/views/wizard/WizardPluginBase.php +++ b/core/modules/views/src/Plugin/views/wizard/WizardPluginBase.php @@ -1044,7 +1044,7 @@ protected function defaultDisplaySortsUser($form, FormStateInterface $form_state 'entity_type' => $data['table']['entity type'] ?? NULL, 'entity_field' => $data[$column]['entity field'] ?? NULL, 'plugin_id' => $data[$column]['sort']['id'], - ]; + ]; } } diff --git a/core/modules/views/tests/src/Functional/Plugin/ArgumentDefaultTest.php b/core/modules/views/tests/src/Functional/Plugin/ArgumentDefaultTest.php index e87372c7ba0c..998c2af57046 100644 --- a/core/modules/views/tests/src/Functional/Plugin/ArgumentDefaultTest.php +++ b/core/modules/views/tests/src/Functional/Plugin/ArgumentDefaultTest.php @@ -28,7 +28,7 @@ class ArgumentDefaultTest extends ViewTestBase { 'test_argument_default_current_user', 'test_argument_default_node', 'test_argument_default_query_param', - ]; + ]; /** * {@inheritdoc} @@ -145,7 +145,7 @@ public function testArgumentDefaultNode() { 'bypass node access', 'access user profiles', 'view all revisions', - ]; + ]; $views_admin = $this->drupalCreateUser($permissions); $this->drupalLogin($views_admin); diff --git a/core/modules/views/tests/src/Kernel/Entity/EntityViewsDataTest.php b/core/modules/views/tests/src/Kernel/Entity/EntityViewsDataTest.php index c96792e93b08..6fc3c673d130 100644 --- a/core/modules/views/tests/src/Kernel/Entity/EntityViewsDataTest.php +++ b/core/modules/views/tests/src/Kernel/Entity/EntityViewsDataTest.php @@ -418,7 +418,8 @@ public function testBaseTableFields() { $this->assertEquals([ 'left_field' => 'id', 'field' => 'entity_id', - 'extra' => [[ + 'extra' => [ + [ 'field' => 'deleted', 'value' => 0, 'numeric' => TRUE, @@ -506,7 +507,8 @@ public function testDataTableFields() { $this->assertEquals([ 'left_field' => 'id', 'field' => 'entity_id', - 'extra' => [[ + 'extra' => [ + [ 'field' => 'deleted', 'value' => 0, 'numeric' => TRUE, @@ -636,7 +638,8 @@ public function testRevisionTableFields() { $this->assertEquals([ 'left_field' => 'id', 'field' => 'entity_id', - 'extra' => [[ + 'extra' => [ + [ 'field' => 'deleted', 'value' => 0, 'numeric' => TRUE, @@ -649,7 +652,8 @@ public function testRevisionTableFields() { $this->assertEquals([ 'left_field' => 'revision_id', 'field' => 'entity_id', - 'extra' => [[ + 'extra' => [ + [ 'field' => 'deleted', 'value' => 0, 'numeric' => TRUE, diff --git a/core/modules/views/tests/src/Kernel/Handler/FilterCombineTest.php b/core/modules/views/tests/src/Kernel/Handler/FilterCombineTest.php index 7a748f485e4c..6d5b71742d92 100644 --- a/core/modules/views/tests/src/Kernel/Handler/FilterCombineTest.php +++ b/core/modules/views/tests/src/Kernel/Handler/FilterCombineTest.php @@ -104,13 +104,13 @@ public function testFilterCombineWord() { $fields = $view->displayHandlers->get('default')->getOption('fields'); $view->displayHandlers->get('default')->overrideOption('fields', $fields + [ - 'job' => [ - 'id' => 'job', - 'table' => 'views_test_data', - 'field' => 'job', - 'relationship' => 'none', - ], - ]); + 'job' => [ + 'id' => 'job', + 'table' => 'views_test_data', + 'field' => 'job', + 'relationship' => 'none', + ], + ]); // Change the filtering. $view->displayHandlers->get('default')->overrideOption('filters', [ @@ -155,13 +155,13 @@ public function testFilterCombineAllWords() { $fields = $view->displayHandlers->get('default')->getOption('fields'); $view->displayHandlers->get('default')->overrideOption('fields', $fields + [ - 'job' => [ - 'id' => 'job', - 'table' => 'views_test_data', - 'field' => 'job', - 'relationship' => 'none', - ], - ]); + 'job' => [ + 'id' => 'job', + 'table' => 'views_test_data', + 'field' => 'job', + 'relationship' => 'none', + ], + ]); // Set the filtering to allwords and simulate searching for a phrase. $view->displayHandlers->get('default')->overrideOption('filters', [ diff --git a/core/modules/views/tests/src/Kernel/Handler/FilterNumericTest.php b/core/modules/views/tests/src/Kernel/Handler/FilterNumericTest.php index a2c2fe6f51e8..36f71a5bf28f 100644 --- a/core/modules/views/tests/src/Kernel/Handler/FilterNumericTest.php +++ b/core/modules/views/tests/src/Kernel/Handler/FilterNumericTest.php @@ -338,7 +338,7 @@ public function testFilterNumericEmpty() { $this->executeView($view); $resultset = [ - [ + [ 'name' => 'John', 'age' => 25, ], @@ -391,7 +391,7 @@ public function testFilterNumericExposedGroupedNotEmpty() { $this->executeView($view); $resultset = [ - [ + [ 'name' => 'John', 'age' => 25, ], diff --git a/core/modules/views/tests/src/Kernel/Handler/SortDateTest.php b/core/modules/views/tests/src/Kernel/Handler/SortDateTest.php index a27e1b5c508c..ef33882f0520 100644 --- a/core/modules/views/tests/src/Kernel/Handler/SortDateTest.php +++ b/core/modules/views/tests/src/Kernel/Handler/SortDateTest.php @@ -104,7 +104,7 @@ protected function expectedResultSet($granularity, $reverse = TRUE) { ['name' => 'Meredith'], ['name' => 'Paul'], ['name' => 'John'], - ]; + ]; break; case 'hour': diff --git a/core/modules/views/tests/src/Unit/Plugin/area/ViewTest.php b/core/modules/views/tests/src/Unit/Plugin/area/ViewTest.php index 1d0ff220737e..4f095fb4476f 100644 --- a/core/modules/views/tests/src/Unit/Plugin/area/ViewTest.php +++ b/core/modules/views/tests/src/Unit/Plugin/area/ViewTest.php @@ -55,7 +55,7 @@ public function testCalculateDependencies() { ->willReturnMap([ ['this', $view_this], ['other', $view_other], - ]); + ]); $this->viewHandler->view->storage = $view_this; $this->viewHandler->options['view_to_insert'] = 'other:default'; diff --git a/core/modules/views/tests/src/Unit/Routing/ViewPageControllerTest.php b/core/modules/views/tests/src/Unit/Routing/ViewPageControllerTest.php index c898806fbc86..15b5f4eecd23 100644 --- a/core/modules/views/tests/src/Unit/Routing/ViewPageControllerTest.php +++ b/core/modules/views/tests/src/Unit/Routing/ViewPageControllerTest.php @@ -131,7 +131,7 @@ public function testHandleWithArgumentsOnOverriddenRoute() { '#cache' => [ 'keys' => ['view', 'test_page_view', 'display', 'page_1', 'args', 'test-argument'], ], - ] + $this->defaultRenderArray; + ] + $this->defaultRenderArray; $this->assertEquals($build, $result); } @@ -170,7 +170,7 @@ public function testHandleWithArgumentsOnOverriddenRouteWithUpcasting() { '#cache' => [ 'keys' => ['view', 'test_page_view', 'display', 'page_1', 'args', 'example_id'], ], - ] + $this->defaultRenderArray; + ] + $this->defaultRenderArray; $this->assertEquals($build, $result); } diff --git a/core/modules/views/views.views.inc b/core/modules/views/views.views.inc index de7977332108..2f88006d1a0d 100644 --- a/core/modules/views/views.views.inc +++ b/core/modules/views/views.views.inc @@ -22,14 +22,14 @@ function views_views_data() { $data['views']['table']['group'] = t('Global'); $data['views']['table']['join'] = [ // #global is a special flag which allows a table to appear all the time. - '#global' => [], + '#global' => [], ]; $data['views']['random'] = [ - 'title' => t('Random'), - 'help' => t('Randomize the display order.'), - 'sort' => [ - 'id' => 'random', + 'title' => t('Random'), + 'help' => t('Randomize the display order.'), + 'sort' => [ + 'id' => 'random', ], ]; @@ -116,7 +116,7 @@ function views_views_data() { ]; $data['views']['combine'] = [ - 'title' => t('Combine fields filter'), + 'title' => t('Combine fields filter'), 'help' => t('Combine multiple fields together and search by them.'), 'filter' => [ 'id' => 'combine', diff --git a/core/modules/views_ui/src/Form/Ajax/EditDetails.php b/core/modules/views_ui/src/Form/Ajax/EditDetails.php index bbb7266d8ca9..b3f8b517ca32 100644 --- a/core/modules/views_ui/src/Form/Ajax/EditDetails.php +++ b/core/modules/views_ui/src/Form/Ajax/EditDetails.php @@ -51,10 +51,10 @@ public function buildForm(array $form, FormStateInterface $form_state) { '#default_value' => $view->get('langcode'), ]; $form['details']['description'] = [ - '#type' => 'textfield', - '#title' => $this->t('Administrative description'), - '#default_value' => $view->get('description'), - ]; + '#type' => 'textfield', + '#title' => $this->t('Administrative description'), + '#default_value' => $view->get('description'), + ]; $form['details']['tag'] = [ '#type' => 'textfield', '#title' => $this->t('Administrative tags'), diff --git a/core/modules/views_ui/src/ViewUI.php b/core/modules/views_ui/src/ViewUI.php index 1af5cabb25bc..6501fe385ba5 100644 --- a/core/modules/views_ui/src/ViewUI.php +++ b/core/modules/views_ui/src/ViewUI.php @@ -678,9 +678,9 @@ public function renderPreview($display_id, $args = []) { [ 'data' => [ '#prefix' => '<pre>', - 'queries' => $queries, - '#suffix' => '</pre>', - ], + 'queries' => $queries, + '#suffix' => '</pre>', + ], ], ]; } diff --git a/core/modules/views_ui/tests/src/Functional/ViewsUITourTest.php b/core/modules/views_ui/tests/src/Functional/ViewsUITourTest.php index 72817fb071f0..767833c94977 100644 --- a/core/modules/views_ui/tests/src/Functional/ViewsUITourTest.php +++ b/core/modules/views_ui/tests/src/Functional/ViewsUITourTest.php @@ -108,10 +108,10 @@ public function testViewsUiTourTipsTranslated() { */ public function createTranslation($source, $langcode) { return $this->localeStorage->createTranslation([ - 'lid' => $source->lid, - 'language' => $langcode, - 'translation' => $this->randomMachineName(100), - ])->save(); + 'lid' => $source->lid, + 'language' => $langcode, + 'translation' => $this->randomMachineName(100), + ])->save(); } } diff --git a/core/phpcs.xml.dist b/core/phpcs.xml.dist index a1e107442575..3960b29673d8 100644 --- a/core/phpcs.xml.dist +++ b/core/phpcs.xml.dist @@ -28,9 +28,7 @@ <!-- Drupal sniffs --> <rule ref="Drupal.Arrays.Array"> - <!-- Sniff for these errors: CommaLastItem --> - <exclude name="Drupal.Arrays.Array.ArrayClosingIndentation"/> - <exclude name="Drupal.Arrays.Array.ArrayIndentation"/> + <!-- Sniff for these errors: ArrayClosingIndentation, ArrayIndentation, CommaLastItem --> <exclude name="Drupal.Arrays.Array.LongLineDeclaration"/> </rule> <rule ref="Drupal.CSS.ClassDefinitionNameSpacing"/> diff --git a/core/tests/Drupal/FunctionalJavascriptTests/EntityReference/EntityReferenceAutocompleteWidgetTest.php b/core/tests/Drupal/FunctionalJavascriptTests/EntityReference/EntityReferenceAutocompleteWidgetTest.php index 54db002351ee..bcae27f02045 100644 --- a/core/tests/Drupal/FunctionalJavascriptTests/EntityReference/EntityReferenceAutocompleteWidgetTest.php +++ b/core/tests/Drupal/FunctionalJavascriptTests/EntityReference/EntityReferenceAutocompleteWidgetTest.php @@ -127,13 +127,12 @@ public function testEntityReferenceAutocompleteWidget() { // Change the size of the result set via the UI. $this->drupalLogin($this->createUser([ - 'access content', - 'administer content types', - 'administer node fields', - 'administer node form display', - 'create page content', - ] - )); + 'access content', + 'administer content types', + 'administer node fields', + 'administer node form display', + 'create page content', + ])); $this->drupalGet('/admin/structure/types/manage/page/form-display'); $assert_session->pageTextContains('Autocomplete suggestion list size: 1'); // Click on the widget settings button to open the widget settings form. diff --git a/core/tests/Drupal/FunctionalTests/Menu/MenuActiveTrail403Test.php b/core/tests/Drupal/FunctionalTests/Menu/MenuActiveTrail403Test.php index f9fe087ac89e..ccbd44277f6d 100644 --- a/core/tests/Drupal/FunctionalTests/Menu/MenuActiveTrail403Test.php +++ b/core/tests/Drupal/FunctionalTests/Menu/MenuActiveTrail403Test.php @@ -49,7 +49,7 @@ protected function setUp(): void { $this->drupalPlaceBlock( 'system_menu_block:' . $this->menu, [ - 'level' => 2, + 'level' => 2, ] ); diff --git a/core/tests/Drupal/KernelTests/Core/Database/DatabaseTestBase.php b/core/tests/Drupal/KernelTests/Core/Database/DatabaseTestBase.php index 774575688ae5..e62185848a98 100644 --- a/core/tests/Drupal/KernelTests/Core/Database/DatabaseTestBase.php +++ b/core/tests/Drupal/KernelTests/Core/Database/DatabaseTestBase.php @@ -49,17 +49,17 @@ public function ensureSampleDataNull() { $this->connection->insert('test_null') ->fields(['name', 'age']) ->values([ - 'name' => 'Kermit', - 'age' => 25, - ]) + 'name' => 'Kermit', + 'age' => 25, + ]) ->values([ - 'name' => 'Fozzie', - 'age' => NULL, - ]) + 'name' => 'Fozzie', + 'age' => NULL, + ]) ->values([ - 'name' => 'Gonzo', - 'age' => 27, - ]) + 'name' => 'Gonzo', + 'age' => 27, + ]) ->execute(); } diff --git a/core/tests/Drupal/KernelTests/Core/Entity/Element/EntityAutocompleteElementFormTest.php b/core/tests/Drupal/KernelTests/Core/Entity/Element/EntityAutocompleteElementFormTest.php index abe9dd70e223..70ff047b621b 100644 --- a/core/tests/Drupal/KernelTests/Core/Entity/Element/EntityAutocompleteElementFormTest.php +++ b/core/tests/Drupal/KernelTests/Core/Entity/Element/EntityAutocompleteElementFormTest.php @@ -207,14 +207,8 @@ public function testValidEntityAutocompleteElement() { 'single_autocreate' => 'single - autocreated entity label', 'single_autocreate_specific_uid' => 'single - autocreated entity label with specific uid', 'tags' => $this->getAutocompleteInput($this->referencedEntities[0]) . ', ' . $this->getAutocompleteInput($this->referencedEntities[1]), - 'tags_autocreate' => - $this->getAutocompleteInput($this->referencedEntities[0]) - . ', tags - autocreated entity label, ' - . $this->getAutocompleteInput($this->referencedEntities[1]), - 'tags_autocreate_specific_uid' => - $this->getAutocompleteInput($this->referencedEntities[0]) - . ', tags - autocreated entity label with specific uid, ' - . $this->getAutocompleteInput($this->referencedEntities[1]), + 'tags_autocreate' => $this->getAutocompleteInput($this->referencedEntities[0]) . ', tags - autocreated entity label, ' . $this->getAutocompleteInput($this->referencedEntities[1]), + 'tags_autocreate_specific_uid' => $this->getAutocompleteInput($this->referencedEntities[0]) . ', tags - autocreated entity label with specific uid, ' . $this->getAutocompleteInput($this->referencedEntities[1]), 'single_string_id' => $this->getAutocompleteInput($this->referencedEntities[2]), 'tags_string_id' => $this->getAutocompleteInput($this->referencedEntities[2]) . ', ' . $this->getAutocompleteInput($this->referencedEntities[3]), ]); diff --git a/core/tests/Drupal/KernelTests/Core/Entity/EntityAccessControlHandlerTest.php b/core/tests/Drupal/KernelTests/Core/Entity/EntityAccessControlHandlerTest.php index a66fca14a820..3f303dc90fc8 100644 --- a/core/tests/Drupal/KernelTests/Core/Entity/EntityAccessControlHandlerTest.php +++ b/core/tests/Drupal/KernelTests/Core/Entity/EntityAccessControlHandlerTest.php @@ -156,16 +156,16 @@ public function testDefaultEntityAccess() { // Set up a non-admin user that is allowed to view test entities. \Drupal::currentUser()->setAccount($this->createUser(['uid' => 2], ['view test entity'])); $entity = EntityTest::create([ - 'name' => 'forbid_access', - ]); + 'name' => 'forbid_access', + ]); // The user is denied access to the entity. $this->assertEntityAccess([ - 'create' => FALSE, - 'update' => FALSE, - 'delete' => FALSE, - 'view' => FALSE, - ], $entity); + 'create' => FALSE, + 'update' => FALSE, + 'delete' => FALSE, + 'view' => FALSE, + ], $entity); } /** diff --git a/core/tests/Drupal/KernelTests/Core/Entity/EntityQueryRelationshipTest.php b/core/tests/Drupal/KernelTests/Core/Entity/EntityQueryRelationshipTest.php index b0983c757764..4f43ae678cab 100644 --- a/core/tests/Drupal/KernelTests/Core/Entity/EntityQueryRelationshipTest.php +++ b/core/tests/Drupal/KernelTests/Core/Entity/EntityQueryRelationshipTest.php @@ -77,7 +77,7 @@ protected function setUp(): void { $handler_settings = [ 'target_bundles' => [ $vocabulary->id() => $vocabulary->id(), - ], + ], 'auto_create' => TRUE, ]; $this->createEntityReferenceField('entity_test', 'test_bundle', $this->fieldName, NULL, 'taxonomy_term', 'default', $handler_settings); diff --git a/core/tests/Drupal/KernelTests/Core/Entity/EntityQueryTest.php b/core/tests/Drupal/KernelTests/Core/Entity/EntityQueryTest.php index 40dd4b65d8e1..019107ee4658 100644 --- a/core/tests/Drupal/KernelTests/Core/Entity/EntityQueryTest.php +++ b/core/tests/Drupal/KernelTests/Core/Entity/EntityQueryTest.php @@ -99,24 +99,34 @@ protected function setUp(): void { $bundles[] = $bundle; } // Each unit is a list of field name, langcode and a column-value array. - $units[] = [$figures, 'en', [ + $units[] = [$figures, 'en', + [ 'color' => 'red', 'shape' => 'triangle', ], ]; - $units[] = [$figures, 'en', [ + $units[] = [ + $figures, + 'en', + [ 'color' => 'blue', 'shape' => 'circle', ], ]; // To make it easier to test sorting, the greetings get formats according // to their langcode. - $units[] = [$greetings, 'tr', [ + $units[] = [ + $greetings, + 'tr', + [ 'value' => 'merhaba', 'format' => 'format-tr', ], ]; - $units[] = [$greetings, 'pl', [ + $units[] = [ + $greetings, + 'pl', + [ 'value' => 'siema', 'format' => 'format-pl', ], diff --git a/core/tests/Drupal/KernelTests/Core/Entity/EntityTranslationTest.php b/core/tests/Drupal/KernelTests/Core/Entity/EntityTranslationTest.php index 080840f56654..117f1dc26ed1 100644 --- a/core/tests/Drupal/KernelTests/Core/Entity/EntityTranslationTest.php +++ b/core/tests/Drupal/KernelTests/Core/Entity/EntityTranslationTest.php @@ -245,11 +245,10 @@ protected function doTestMultilingualProperties($entity_type) { $storage = $this->container->get('entity_type.manager') ->getStorage($entity_type); $storage->create([ - 'user_id' => $properties[$langcode]['user_id'], - 'name' => 'some name', - $langcode_key => LanguageInterface::LANGCODE_NOT_SPECIFIED, - ]) - ->save(); + 'user_id' => $properties[$langcode]['user_id'], + 'name' => 'some name', + $langcode_key => LanguageInterface::LANGCODE_NOT_SPECIFIED, + ])->save(); $entities = $storage->loadMultiple(); $this->assertCount(3, $entities, new FormattableMarkup('%entity_type: Three entities were created.', ['%entity_type' => $entity_type])); diff --git a/core/tests/Drupal/KernelTests/Core/File/MimeTypeTest.php b/core/tests/Drupal/KernelTests/Core/File/MimeTypeTest.php index 50ae3914aacf..f59293260a00 100644 --- a/core/tests/Drupal/KernelTests/Core/File/MimeTypeTest.php +++ b/core/tests/Drupal/KernelTests/Core/File/MimeTypeTest.php @@ -60,8 +60,8 @@ public function testFileMimeTypeDetection() { 1 => 'image/jpeg', ], 'extensions' => [ - 'jar' => 0, - 'jpg' => 1, + 'jar' => 0, + 'jpg' => 1, ], ]; diff --git a/core/tests/Drupal/KernelTests/Core/KeyValueStore/GarbageCollectionTest.php b/core/tests/Drupal/KernelTests/Core/KeyValueStore/GarbageCollectionTest.php index a8a0239110e7..669a835b086b 100644 --- a/core/tests/Drupal/KernelTests/Core/KeyValueStore/GarbageCollectionTest.php +++ b/core/tests/Drupal/KernelTests/Core/KeyValueStore/GarbageCollectionTest.php @@ -39,12 +39,12 @@ public function testGarbageCollection() { for ($i = 0; $i <= 3; $i++) { $connection->merge('key_value_expire') ->keys([ - 'name' => 'key_' . $i, - 'collection' => $collection, - ]) + 'name' => 'key_' . $i, + 'collection' => $collection, + ]) ->fields([ - 'expire' => REQUEST_TIME - 1, - ]) + 'expire' => REQUEST_TIME - 1, + ]) ->execute(); } diff --git a/core/tests/Drupal/KernelTests/KernelTestBaseTest.php b/core/tests/Drupal/KernelTests/KernelTestBaseTest.php index fc96fbae3ead..d67f58fad931 100644 --- a/core/tests/Drupal/KernelTests/KernelTestBaseTest.php +++ b/core/tests/Drupal/KernelTests/KernelTestBaseTest.php @@ -316,10 +316,11 @@ protected function tearDown(): void { if ($connection->databaseType() === 'sqlite') { $result = $connection->query("SELECT name FROM " . $this->databasePrefix . ".sqlite_master WHERE type = :type AND name LIKE :table_name AND name NOT LIKE :pattern", [ - ':type' => 'table', - ':table_name' => '%', - ':pattern' => 'sqlite_%', - ])->fetchAllKeyed(0, 0); + ':type' => 'table', + ':table_name' => '%', + ':pattern' => 'sqlite_%', + ] + )->fetchAllKeyed(0, 0); $this->assertEmpty($result, 'All test tables have been removed.'); } else { diff --git a/core/tests/Drupal/Tests/Component/DependencyInjection/Dumper/OptimizedPhpArrayDumperTest.php b/core/tests/Drupal/Tests/Component/DependencyInjection/Dumper/OptimizedPhpArrayDumperTest.php index 6771cee67841..e53b27b6cb83 100644 --- a/core/tests/Drupal/Tests/Component/DependencyInjection/Dumper/OptimizedPhpArrayDumperTest.php +++ b/core/tests/Drupal/Tests/Component/DependencyInjection/Dumper/OptimizedPhpArrayDumperTest.php @@ -347,8 +347,8 @@ public function getDefinitionsDataProvider() { ] + $base_service_definition; $service_definitions[] = [ - 'shared' => FALSE, - ] + $base_service_definition; + 'shared' => FALSE, + ] + $base_service_definition; // Test factory. $service_definitions[] = [ @@ -499,11 +499,11 @@ public function testGetServiceDefinitionWithReferenceToAlias($public) { $service_definition = $this->getPrivateServiceCall('bar', $bar_definition_php_array, TRUE); } $data = [ - 'class' => '\stdClass', - 'arguments' => $this->getCollection([ - $service_definition, - ]), - 'arguments_count' => 1, + 'class' => '\stdClass', + 'arguments' => $this->getCollection([ + $service_definition, + ]), + 'arguments_count' => 1, ]; $this->assertEquals($this->serializeDefinition($data), $dump['services']['foo'], 'Expected definition matches dump.'); } diff --git a/core/tests/Drupal/Tests/Component/FileCache/FileCacheFactoryTest.php b/core/tests/Drupal/Tests/Component/FileCache/FileCacheFactoryTest.php index b57f059183da..c21bc5bf3812 100644 --- a/core/tests/Drupal/Tests/Component/FileCache/FileCacheFactoryTest.php +++ b/core/tests/Drupal/Tests/Component/FileCache/FileCacheFactoryTest.php @@ -152,7 +152,7 @@ public function configurationDataProvider() { ], ['class' => '\stdClass'], $class, - ]; + ]; return $data; } diff --git a/core/tests/Drupal/Tests/Component/Utility/NestedArrayTest.php b/core/tests/Drupal/Tests/Component/Utility/NestedArrayTest.php index 6e52b8d5d488..35c0be969088 100644 --- a/core/tests/Drupal/Tests/Component/Utility/NestedArrayTest.php +++ b/core/tests/Drupal/Tests/Component/Utility/NestedArrayTest.php @@ -33,7 +33,7 @@ protected function setUp(): void { // Create a form structure with a nested element. $this->form['details']['element'] = [ - '#value' => 'Nested element', + '#value' => 'Nested element', ]; // Set up parent array. diff --git a/core/tests/Drupal/Tests/Core/Cache/CacheableMetadataTest.php b/core/tests/Drupal/Tests/Core/Cache/CacheableMetadataTest.php index 2d939a75ab85..ff12edabe678 100644 --- a/core/tests/Drupal/Tests/Core/Cache/CacheableMetadataTest.php +++ b/core/tests/Drupal/Tests/Core/Cache/CacheableMetadataTest.php @@ -129,7 +129,7 @@ public function providerSetCacheMaxAge() { [300, FALSE], [[], TRUE], [8.0, TRUE], - ]; + ]; } /** diff --git a/core/tests/Drupal/Tests/Core/DependencyInjection/Compiler/TaggedHandlersPassTest.php b/core/tests/Drupal/Tests/Core/DependencyInjection/Compiler/TaggedHandlersPassTest.php index 680d124e9b85..aec35dd8d44d 100644 --- a/core/tests/Drupal/Tests/Core/DependencyInjection/Compiler/TaggedHandlersPassTest.php +++ b/core/tests/Drupal/Tests/Core/DependencyInjection/Compiler/TaggedHandlersPassTest.php @@ -324,9 +324,9 @@ public function testProcessWithExtraArguments() { $container ->register('handler1', __NAMESPACE__ . '\ValidHandler') ->addTag('consumer_id', [ - 'extra1' => 'extra1', - 'extra2' => 'extra2', - ]); + 'extra1' => 'extra1', + 'extra2' => 'extra2', + ]); $handler_pass = new TaggedHandlersPass(); $handler_pass->process($container); diff --git a/core/tests/Drupal/Tests/Core/Entity/ContentEntityBaseUnitTest.php b/core/tests/Drupal/Tests/Core/Entity/ContentEntityBaseUnitTest.php index a5b2af859551..6d078c8c3c87 100644 --- a/core/tests/Drupal/Tests/Core/Entity/ContentEntityBaseUnitTest.php +++ b/core/tests/Drupal/Tests/Core/Entity/ContentEntityBaseUnitTest.php @@ -142,7 +142,7 @@ protected function setUp(): void { ->will($this->returnValue([ 'id' => 'id', 'uuid' => 'uuid', - ])); + ])); $this->entityTypeManager = $this->createMock(EntityTypeManagerInterface::class); $this->entityTypeManager->expects($this->any()) diff --git a/core/tests/Drupal/Tests/Core/Entity/EntityFormTest.php b/core/tests/Drupal/Tests/Core/Entity/EntityFormTest.php index efa591ad3704..844fa01e2513 100644 --- a/core/tests/Drupal/Tests/Core/Entity/EntityFormTest.php +++ b/core/tests/Drupal/Tests/Core/Entity/EntityFormTest.php @@ -72,31 +72,41 @@ public function testFormId($expected, $definition) { */ public function providerTestFormIds() { return [ - ['node_article_form', [ + [ + 'node_article_form', + [ 'entity_type' => 'node', 'bundle' => 'article', 'operation' => 'default', ], ], - ['node_article_delete_form', [ + [ + 'node_article_delete_form', + [ 'entity_type' => 'node', 'bundle' => 'article', 'operation' => 'delete', ], ], - ['user_user_form', [ + [ + 'user_user_form', + [ 'entity_type' => 'user', 'bundle' => 'user', 'operation' => 'default', ], ], - ['user_form', [ + [ + 'user_form', + [ 'entity_type' => 'user', 'bundle' => '', 'operation' => 'default', ], ], - ['user_delete_form', [ + [ + 'user_delete_form', + [ 'entity_type' => 'user', 'bundle' => '', 'operation' => 'delete', diff --git a/core/tests/Drupal/Tests/Core/Entity/EntityTypeBundleInfoTest.php b/core/tests/Drupal/Tests/Core/Entity/EntityTypeBundleInfoTest.php index 591f6ded76b1..628303412a55 100644 --- a/core/tests/Drupal/Tests/Core/Entity/EntityTypeBundleInfoTest.php +++ b/core/tests/Drupal/Tests/Core/Entity/EntityTypeBundleInfoTest.php @@ -194,11 +194,15 @@ public function testGetBundleInfo($entity_type_id, $expected) { */ public function providerTestGetBundleInfo() { return [ - ['apple', [ + [ + 'apple', + [ 'apple' => ['label' => 'Apple'], ], ], - ['banana', [ + [ + 'banana', + [ 'banana' => ['label' => 'Banana'], ], ], diff --git a/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageSchemaTest.php b/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageSchemaTest.php index 7ae6eeba5718..9cbb634b25a2 100644 --- a/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageSchemaTest.php +++ b/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageSchemaTest.php @@ -975,8 +975,8 @@ public function testDedicatedTableSchema() { $field_name . '_color' => [[$field_name . '_color', 3]], ], 'unique keys' => [ - $field_name . '_area' => [$field_name . '_area'], - $field_name . '_shape' => [[$field_name . '_shape', 10]], + $field_name . '_area' => [$field_name . '_area'], + $field_name . '_shape' => [[$field_name . '_shape', 10]], ], 'foreign keys' => [ $field_name . '_color' => [ diff --git a/core/tests/Drupal/Tests/Core/Entity/TypedData/EntityAdapterUnitTest.php b/core/tests/Drupal/Tests/Core/Entity/TypedData/EntityAdapterUnitTest.php index 67baf44dc21e..7c8aa9bc7ff4 100644 --- a/core/tests/Drupal/Tests/Core/Entity/TypedData/EntityAdapterUnitTest.php +++ b/core/tests/Drupal/Tests/Core/Entity/TypedData/EntityAdapterUnitTest.php @@ -136,7 +136,7 @@ protected function setUp(): void { ->will($this->returnValue([ 'id' => 'id', 'uuid' => 'uuid', - ])); + ])); $this->entityTypeManager = $this->createMock(EntityTypeManagerInterface::class); $this->entityTypeManager->expects($this->any()) diff --git a/core/tests/Drupal/Tests/Core/Form/EventSubscriber/FormAjaxSubscriberTest.php b/core/tests/Drupal/Tests/Core/Form/EventSubscriber/FormAjaxSubscriberTest.php index 90581d843596..d1495335f354 100644 --- a/core/tests/Drupal/Tests/Core/Form/EventSubscriber/FormAjaxSubscriberTest.php +++ b/core/tests/Drupal/Tests/Core/Form/EventSubscriber/FormAjaxSubscriberTest.php @@ -221,8 +221,8 @@ public function testOnExceptionBrokenPostRequest() { public function testOnExceptionNestedException() { $form = ['#type' => 'form', '#build_id' => 'the_build_id']; $expected_form = $form + [ - '#build_id_old' => 'the_build_id', - ]; + '#build_id_old' => 'the_build_id', + ]; $form_state = new FormState(); $form_exception = new FormAjaxException($form, $form_state); $exception = new \Exception('', 0, $form_exception); diff --git a/core/tests/Drupal/Tests/Core/Plugin/CategorizingPluginManagerTraitTest.php b/core/tests/Drupal/Tests/Core/Plugin/CategorizingPluginManagerTraitTest.php index d189383746be..b7ad7110e425 100644 --- a/core/tests/Drupal/Tests/Core/Plugin/CategorizingPluginManagerTraitTest.php +++ b/core/tests/Drupal/Tests/Core/Plugin/CategorizingPluginManagerTraitTest.php @@ -48,9 +48,9 @@ protected function setUp(): void { */ public function testGetCategories() { $this->assertSame([ - 'fruits', - 'vegetables', - ], array_values($this->pluginManager->getCategories())); + 'fruits', + 'vegetables', + ], array_values($this->pluginManager->getCategories())); } /** diff --git a/core/tests/Drupal/Tests/Core/Render/PlaceholderGeneratorTest.php b/core/tests/Drupal/Tests/Core/Render/PlaceholderGeneratorTest.php index 1c492dc4345e..cdde813b5f9c 100644 --- a/core/tests/Drupal/Tests/Core/Render/PlaceholderGeneratorTest.php +++ b/core/tests/Drupal/Tests/Core/Render/PlaceholderGeneratorTest.php @@ -50,10 +50,13 @@ public function testRenderPlaceholdersDifferentSortedContextsTags() { $tags_1 = ['current-temperature', 'foo']; $tags_2 = ['foo', 'current-temperature']; $test_element = [ - '#cache' => [ - 'max-age' => Cache::PERMANENT, - ], - '#lazy_builder' => ['Drupal\Tests\Core\Render\PlaceholdersTest::callback', ['foo' => TRUE]], + '#cache' => [ + 'max-age' => Cache::PERMANENT, + ], + '#lazy_builder' => [ + 'Drupal\Tests\Core\Render\PlaceholdersTest::callback', + ['foo' => TRUE], + ], ]; $test_element['#cache']['contexts'] = $contexts_1; diff --git a/core/tests/Drupal/Tests/Core/Render/RendererBubblingTest.php b/core/tests/Drupal/Tests/Core/Render/RendererBubblingTest.php index 31d32bdbaadc..e9041d9deaa4 100644 --- a/core/tests/Drupal/Tests/Core/Render/RendererBubblingTest.php +++ b/core/tests/Drupal/Tests/Core/Render/RendererBubblingTest.php @@ -185,7 +185,7 @@ public function providerTestContextBubblingEdgeCases() { // set of contexts are present point to the same cache item. Regardless of // the contexts' order. A sad necessity because PHP doesn't have sets.) $test_element = [ - '#cache' => [ + '#cache' => [ 'keys' => ['set_test'], 'contexts' => [], ], @@ -622,7 +622,7 @@ public function testOverWriteCacheKeys() { $data = [ '#cache' => [ 'keys' => ['llama', 'bar'], - ], + ], '#pre_render' => [__NAMESPACE__ . '\\BubblingTest::bubblingCacheOverwritePrerender'], ]; $this->expectException(\LogicException::class); diff --git a/core/tests/Drupal/Tests/Core/Render/RendererTest.php b/core/tests/Drupal/Tests/Core/Render/RendererTest.php index ac69590e8bac..7a2a7eedfbb5 100644 --- a/core/tests/Drupal/Tests/Core/Render/RendererTest.php +++ b/core/tests/Drupal/Tests/Core/Render/RendererTest.php @@ -218,10 +218,11 @@ public function providerTestRenderBasic() { $data[] = [ [ '#markup' => 'foo', - '#pre_render' => [function ($elements) { - $elements['#markup'] .= '<script>alert("bar");</script>'; - return $elements; - }, + '#pre_render' => [ + function ($elements) { + $elements['#markup'] .= '<script>alert("bar");</script>'; + return $elements; + }, ], ], 'fooalert("bar");', @@ -231,10 +232,11 @@ public function providerTestRenderBasic() { [ '#markup' => 'foo', '#allowed_tags' => ['script'], - '#pre_render' => [function ($elements) { - $elements['#markup'] .= '<script>alert("bar");</script>'; - return $elements; - }, + '#pre_render' => [ + function ($elements) { + $elements['#markup'] .= '<script>alert("bar");</script>'; + return $elements; + }, ], ], 'foo<script>alert("bar");</script>', @@ -244,10 +246,11 @@ public function providerTestRenderBasic() { $data[] = [ [ '#plain_text' => 'foo', - '#pre_render' => [function ($elements) { - $elements['#plain_text'] .= '<script>alert("bar");</script>'; - return $elements; - }, + '#pre_render' => [ + function ($elements) { + $elements['#plain_text'] .= '<script>alert("bar");</script>'; + return $elements; + }, ], ], 'foo<script>alert("bar");</script>', diff --git a/core/tests/Drupal/Tests/Core/Template/TwigExtensionTest.php b/core/tests/Drupal/Tests/Core/Template/TwigExtensionTest.php index 764b47227eb1..6e3e22518f5e 100644 --- a/core/tests/Drupal/Tests/Core/Template/TwigExtensionTest.php +++ b/core/tests/Drupal/Tests/Core/Template/TwigExtensionTest.php @@ -307,12 +307,11 @@ public function providerTestRenderVar() { public function testEscapeWithGeneratedLink() { $loader = new FilesystemLoader(); $twig = new Environment($loader, [ - 'debug' => TRUE, - 'cache' => FALSE, - 'autoescape' => 'html', - 'optimizations' => 0, - ] - ); + 'debug' => TRUE, + 'cache' => FALSE, + 'autoescape' => 'html', + 'optimizations' => 0, + ]); $twig->addExtension($this->systemUnderTest); $link = new GeneratedLink(); diff --git a/core/tests/Drupal/Tests/Core/TypedData/RecursiveContextualValidatorTest.php b/core/tests/Drupal/Tests/Core/TypedData/RecursiveContextualValidatorTest.php index 694922a8df08..5300667181c9 100644 --- a/core/tests/Drupal/Tests/Core/TypedData/RecursiveContextualValidatorTest.php +++ b/core/tests/Drupal/Tests/Core/TypedData/RecursiveContextualValidatorTest.php @@ -329,7 +329,7 @@ protected function buildExampleTypedDataWithProperties($subkey_value = NULL) { ], 'key_with_properties' => [ 'value' => $subkey_value ?: ['subkey1' => 'subvalue1', 'subkey2' => 'subvalue2'], - ], + ], ]; $tree['properties']['key_with_properties']['properties']['subkey1'] = ['value' => $tree['properties']['key_with_properties']['value']['subkey1']]; $tree['properties']['key_with_properties']['properties']['subkey2'] = ['value' => $tree['properties']['key_with_properties']['value']['subkey2']]; diff --git a/core/tests/Drupal/Tests/Core/UrlTest.php b/core/tests/Drupal/Tests/Core/UrlTest.php index d3084108b86f..2e4dea754f21 100644 --- a/core/tests/Drupal/Tests/Core/UrlTest.php +++ b/core/tests/Drupal/Tests/Core/UrlTest.php @@ -129,15 +129,15 @@ public function testUrlFromRequest() { [$this->getRequestConstraint('/node/2/edit')], ) ->willReturnOnConsecutiveCalls([ - RouteObjectInterface::ROUTE_NAME => 'view.frontpage.page_1', - '_raw_variables' => new InputBag(), - ], [ - RouteObjectInterface::ROUTE_NAME => 'node_view', - '_raw_variables' => new InputBag(['node' => '1']), - ], [ - RouteObjectInterface::ROUTE_NAME => 'node_edit', - '_raw_variables' => new InputBag(['node' => '2']), - ]); + RouteObjectInterface::ROUTE_NAME => 'view.frontpage.page_1', + '_raw_variables' => new InputBag(), + ], [ + RouteObjectInterface::ROUTE_NAME => 'node_view', + '_raw_variables' => new InputBag(['node' => '1']), + ], [ + RouteObjectInterface::ROUTE_NAME => 'node_edit', + '_raw_variables' => new InputBag(['node' => '2']), + ]); $urls = []; foreach ($this->map as $index => $values) { diff --git a/core/tests/Drupal/Tests/Core/Utility/LinkGeneratorTest.php b/core/tests/Drupal/Tests/Core/Utility/LinkGeneratorTest.php index 540442693af8..d45d2b0f7130 100644 --- a/core/tests/Drupal/Tests/Core/Utility/LinkGeneratorTest.php +++ b/core/tests/Drupal/Tests/Core/Utility/LinkGeneratorTest.php @@ -120,7 +120,7 @@ public function testGenerateHrefs($route_name, array $parameters, $absolute, $ex $result = $this->linkGenerator->generate('Test', $url); $this->assertLink([ 'attributes' => ['href' => $expected_url], - ], $result); + ], $result); } /** -- GitLab