diff --git a/core/includes/install.core.inc b/core/includes/install.core.inc index a869d90..80f971a 100644 --- a/core/includes/install.core.inc +++ b/core/includes/install.core.inc @@ -2015,9 +2015,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 not be modified in any way 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 @@ -2074,11 +2074,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 INSTALL.txt.', [ - '@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 { @@ -2093,10 +2093,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 webhosting issues 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. @@ -2106,10 +2106,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 webhosting issues 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 { @@ -2124,12 +2124,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 INSTALL.txt. The webhosting issues 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 0ac6134..a3fa04b 100644 --- a/core/lib/Drupal/Core/Config/DatabaseStorage.php +++ b/core/lib/Drupal/Core/Config/DatabaseStorage.php @@ -320,8 +320,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, - ] + ':collection' => StorageInterface::DEFAULT_COLLECTION, + ] )->fetchCol(); } catch (\Exception $e) { diff --git a/core/lib/Drupal/Core/Database/Driver/pgsql/Schema.php b/core/lib/Drupal/Core/Database/Driver/pgsql/Schema.php index 96dea95..b233ef1 100644 --- a/core/lib/Drupal/Core/Database/Driver/pgsql/Schema.php +++ b/core/lib/Drupal/Core/Database/Driver/pgsql/Schema.php @@ -424,7 +424,7 @@ public function getFieldTypeMap() { 'serial:medium' => 'serial', 'serial:big' => 'bigserial', 'serial:normal' => 'serial', - ]; + ]; return $map; } diff --git a/core/lib/Drupal/Core/Datetime/DateHelper.php b/core/lib/Drupal/Core/Datetime/DateHelper.php index b3a8ce7..1569774 100644 --- a/core/lib/Drupal/Core/Datetime/DateHelper.php +++ b/core/lib/Drupal/Core/Datetime/DateHelper.php @@ -437,9 +437,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/Form/form.api.php b/core/lib/Drupal/Core/Form/form.api.php index 554e271..8f0af2b 100644 --- a/core/lib/Drupal/Core/Form/form.api.php +++ b/core/lib/Drupal/Core/Form/form.api.php @@ -115,7 +115,7 @@ function callback_batch_finished($success, $results, $operations) { // Here we do something meaningful with the results. $message = t("@count items were processed.", [ '@count' => count($results), - ]); + ]); $list = [ '#theme' => 'item_list', '#items' => $results, diff --git a/core/lib/Drupal/Core/Installer/Exception/AlreadyInstalledException.php b/core/lib/Drupal/Core/Installer/Exception/AlreadyInstalledException.php index ca00d0b..533eac1 100644 --- a/core/lib/Drupal/Core/Installer/Exception/AlreadyInstalledException.php +++ b/core/lib/Drupal/Core/Installer/Exception/AlreadyInstalledException.php @@ -24,9 +24,9 @@ public function __construct(TranslationInterface $string_translation) {
  • To upgrade an existing installation, proceed to the update script.
  • View your existing site.
    • ', [ - ':base-url' => $GLOBALS['base_url'], - ':update-url' => $GLOBALS['base_path'] . 'update.php', - ]); + ':base-url' => $GLOBALS['base_url'], + ':update-url' => $GLOBALS['base_path'] . 'update.php', +]); parent::__construct($message, $title); } diff --git a/core/lib/Drupal/Core/Mail/MailManager.php b/core/lib/Drupal/Core/Mail/MailManager.php index 348dcee..f47bcdd 100644 --- a/core/lib/Drupal/Core/Mail/MailManager.php +++ b/core/lib/Drupal/Core/Mail/MailManager.php @@ -299,10 +299,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'), + ]); drupal_set_message($this->t('Unable to send email. Contact the site administrator if the problem persists.'), 'error'); } } diff --git a/core/lib/Drupal/Core/Menu/menu.api.php b/core/lib/Drupal/Core/Menu/menu.api.php index f932cf9..216302a 100644 --- a/core/lib/Drupal/Core/Menu/menu.api.php +++ b/core/lib/Drupal/Core/Menu/menu.api.php @@ -309,16 +309,16 @@ function hook_menu_local_tasks_alter(&$data, $route_name) { // 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'), + ], ], + ], ]; } diff --git a/core/modules/aggregator/src/Plugin/Field/FieldFormatter/AggregatorTitleFormatter.php b/core/modules/aggregator/src/Plugin/Field/FieldFormatter/AggregatorTitleFormatter.php index 25e33e9..febec0c 100644 --- a/core/modules/aggregator/src/Plugin/Field/FieldFormatter/AggregatorTitleFormatter.php +++ b/core/modules/aggregator/src/Plugin/Field/FieldFormatter/AggregatorTitleFormatter.php @@ -62,9 +62,9 @@ public function viewElements(FieldItemListInterface $items, $langcode) { foreach ($items as $delta => $item) { if ($this->getSetting('display_as_link') && $url_string) { $elements[$delta] = [ - '#type' => 'link', - '#title' => $item->value, - '#url' => Url::fromUri($url_string), + '#type' => 'link', + '#title' => $item->value, + '#url' => Url::fromUri($url_string), ]; } else { diff --git a/core/modules/aggregator/tests/src/Kernel/AggregatorTitleTest.php b/core/modules/aggregator/tests/src/Kernel/AggregatorTitleTest.php index 4493c5c..3fb6fae 100644 --- a/core/modules/aggregator/tests/src/Kernel/AggregatorTitleTest.php +++ b/core/modules/aggregator/tests/src/Kernel/AggregatorTitleTest.php @@ -58,7 +58,7 @@ public function testStringFormatter() { 'title' => 'test title', 'fid' => $aggregator_feed->id(), 'link' => 'http://www.example.com', - ]); + ]); $aggregator_item->save(); // Verify aggregator feed title with and without links. diff --git a/core/modules/big_pipe/tests/src/Functional/BigPipeTest.php b/core/modules/big_pipe/tests/src/Functional/BigPipeTest.php index 92d1a86..22de838 100644 --- a/core/modules/big_pipe/tests/src/Functional/BigPipeTest.php +++ b/core/modules/big_pipe/tests/src/Functional/BigPipeTest.php @@ -398,9 +398,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->assertEqual($expected_stream_order, array_values($actual_stream_order)); } diff --git a/core/modules/block/block.post_update.php b/core/modules/block/block.post_update.php index d5f0852..520575c 100644 --- a/core/modules/block/block.post_update.php +++ b/core/modules/block/block.post_update.php @@ -59,9 +59,9 @@ function block_post_update_disable_blocks_with_missing_contexts() { $message .= ''; diff --git a/core/modules/block/tests/src/Functional/BlockHiddenRegionTest.php b/core/modules/block/tests/src/Functional/BlockHiddenRegionTest.php index c515515..260673f 100644 --- a/core/modules/block/tests/src/Functional/BlockHiddenRegionTest.php +++ b/core/modules/block/tests/src/Functional/BlockHiddenRegionTest.php @@ -32,7 +32,7 @@ protected function setUp() { 'administer blocks', 'administer themes', 'search content', - ] + ] ); $this->drupalLogin($this->adminUser); diff --git a/core/modules/book/book.install b/core/modules/book/book.install index 7704483..90c6f87 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 4f61b5c..43e6eeb 100644 --- a/core/modules/book/src/BookOutlineStorage.php +++ b/core/modules/book/src/BookOutlineStorage.php @@ -133,7 +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 e55fe36..94c1cbb 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 Show block on all pages is selected, the block will contain the automatically generated menus for all of the site's books. If Show block only on book pages 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 Page specific visibility settings or other visibility settings can be used in addition to selectively display this block."), - ]; + ]; return $form; } diff --git a/core/modules/ckeditor/src/Plugin/CKEditorPlugin/Language.php b/core/modules/ckeditor/src/Plugin/CKEditorPlugin/Language.php index ffae409..6d55834 100644 --- a/core/modules/ckeditor/src/Plugin/CKEditorPlugin/Language.php +++ b/core/modules/ckeditor/src/Plugin/CKEditorPlugin/Language.php @@ -128,7 +128,7 @@ public function settingsForm(array $form, FormStateInterface $form_state, Editor */ public function getCssFiles(Editor $editor) { return [ - drupal_get_path('module', 'ckeditor') . '/css/plugins/language/ckeditor.language.css' + drupal_get_path('module', 'ckeditor') . '/css/plugins/language/ckeditor.language.css' ]; } diff --git a/core/modules/ckeditor/src/Plugin/Editor/CKEditor.php b/core/modules/ckeditor/src/Plugin/Editor/CKEditor.php index 49ab1b3..d00855d 100644 --- a/core/modules/ckeditor/src/Plugin/Editor/CKEditor.php +++ b/core/modules/ckeditor/src/Plugin/Editor/CKEditor.php @@ -205,14 +205,14 @@ public function settingsForm(array $form, FormStateInterface $form_state, Editor 'settings' => [ // Single toolbar row, single button group, all existing buttons. 'toolbar' => [ - 'rows' => [ - 0 => [ - 0 => [ - 'name' => 'All existing buttons', - 'items' => $all_buttons, - ] - ] - ], + 'rows' => [ + 0 => [ + 0 => [ + 'name' => 'All existing buttons', + 'items' => $all_buttons, + ] + ] + ] ], 'plugins' => $settings['plugins'], ], diff --git a/core/modules/comment/src/CommentForm.php b/core/modules/comment/src/CommentForm.php index 98e9dde..8829613 100644 --- a/core/modules/comment/src/CommentForm.php +++ b/core/modules/comment/src/CommentForm.php @@ -368,9 +368,9 @@ public function save(array $form, FormStateInterface $form_state) { // Add a log entry. $logger->notice('Comment posted: %subject.', [ - '%subject' => $comment->getSubject(), - 'link' => $this->l(t('View'), $comment->urlInfo()->setOption('fragment', 'comment-' . $comment->id())) - ]); + '%subject' => $comment->getSubject(), + 'link' => $this->l(t('View'), $comment->urlInfo()->setOption('fragment', 'comment-' . $comment->id())), + ]); // 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 2bcda91..a89b04c 100644 --- a/core/modules/comment/src/CommentStorage.php +++ b/core/modules/comment/src/CommentStorage.php @@ -177,12 +177,12 @@ public function getNewCommentPageNumber($total_comments, $new_comments, Fieldabl 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(); + ':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 b2511c5..bcfbef6 100644 --- a/core/modules/comment/src/Plugin/migrate/source/d6/Comment.php +++ b/core/modules/comment/src/Plugin/migrate/source/d6/Comment.php @@ -21,9 +21,9 @@ 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', - ]); + 'comment', 'hostname', 'timestamp', 'status', 'thread', 'name', + 'mail', 'homepage', 'format', + ]); $query->innerJoin('node', 'n', 'c.nid = n.nid'); $query->fields('n', ['type']); $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 c53b52e..1eaaa7f 100644 --- a/core/modules/comment/src/Plugin/views/field/NodeNewComments.php +++ b/core/modules/comment/src/Plugin/views/field/NodeNewComments.php @@ -130,12 +130,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/src/Tests/CommentTestBase.php b/core/modules/comment/src/Tests/CommentTestBase.php index 3b923ff..7c99590 100644 --- a/core/modules/comment/src/Tests/CommentTestBase.php +++ b/core/modules/comment/src/Tests/CommentTestBase.php @@ -76,7 +76,7 @@ protected function setUp() { // permission is granted. 'access user profiles', 'access content', - ]); + ]); $this->webUser = $this->drupalCreateUser([ 'access comments', 'post comments', diff --git a/core/modules/comment/tests/src/Functional/CommentTestBase.php b/core/modules/comment/tests/src/Functional/CommentTestBase.php index 7cadcbf..0ecf443 100644 --- a/core/modules/comment/tests/src/Functional/CommentTestBase.php +++ b/core/modules/comment/tests/src/Functional/CommentTestBase.php @@ -70,7 +70,7 @@ protected function setUp() { // 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 1e0fd72..783480e 100644 --- a/core/modules/comment/tests/src/Kernel/CommentFieldAccessTest.php +++ b/core/modules/comment/tests/src/Kernel/CommentFieldAccessTest.php @@ -299,11 +299,11 @@ public function testAccessToAdministrativeFields() { $set['user']->hasPermission('post comments') && $set['comment']->getFieldName() == 'comment_other' ), SafeMarkup::format('User @user @state update field @field on comment @comment', [ - '@user' => $set['user']->getUsername(), - '@state' => $may_update ? 'can' : 'cannot', - '@comment' => $set['comment']->getSubject(), - '@field' => $field, - ])); + '@user' => $set['user']->getUsername(), + '@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 bd36384..4b67589 100644 --- a/core/modules/contact/tests/drupal-7.contact.database.php +++ b/core/modules/contact/tests/drupal-7.contact.database.php @@ -24,10 +24,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/contact/tests/src/Functional/ContactSitewideTest.php b/core/modules/contact/tests/src/Functional/ContactSitewideTest.php index 178a3ad..781b9c2 100644 --- a/core/modules/contact/tests/src/Functional/ContactSitewideTest.php +++ b/core/modules/contact/tests/src/Functional/ContactSitewideTest.php @@ -283,7 +283,7 @@ public function testSiteWideContact() { $view_link = $this->xpath('//table/tbody/tr/td/a[contains(@href, :href) and text()=:text]', [ ':href' => \Drupal::url('entity.contact_form.canonical', ['contact_form' => $contact_form]), ':text' => $label, - ] + ] ); $this->assertTrue(!empty($view_link), 'Contact listing links to contact form.'); diff --git a/core/modules/datetime_range/tests/src/Functional/DateRangeFieldTest.php b/core/modules/datetime_range/tests/src/Functional/DateRangeFieldTest.php index bd83b98..dbbb485 100644 --- a/core/modules/datetime_range/tests/src/Functional/DateRangeFieldTest.php +++ b/core/modules/datetime_range/tests/src/Functional/DateRangeFieldTest.php @@ -218,9 +218,9 @@ public function testDateRangeField() { 'type' => 'daterange_default', 'label' => 'hidden', 'settings' => [ - 'format_type' => 'long', - 'separator' => 'THESEPARATOR', - ] + $this->defaultSettings, + 'format_type' => 'long', + 'separator' => 'THESEPARATOR', + ] + $this->defaultSettings, ]; entity_get_display($this->field->getTargetEntityTypeId(), $this->field->getTargetBundle(), 'full') diff --git a/core/modules/field/src/Tests/EntityReference/EntityReferenceFileUploadTest.php b/core/modules/field/src/Tests/EntityReference/EntityReferenceFileUploadTest.php index ebb0ba1..4fb230c 100644 --- a/core/modules/field/src/Tests/EntityReference/EntityReferenceFileUploadTest.php +++ b/core/modules/field/src/Tests/EntityReference/EntityReferenceFileUploadTest.php @@ -101,7 +101,7 @@ protected function setUp() { 'type' => 'entity_reference_autocomplete', ]) ->setComponent($file_field_name, [ - 'type' => 'file_generic', + 'type' => 'file_generic', ]) ->save(); } diff --git a/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceFieldTranslatedReferenceViewTest.php b/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceFieldTranslatedReferenceViewTest.php index 7ded590..f278d43 100644 --- a/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceFieldTranslatedReferenceViewTest.php +++ b/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceFieldTranslatedReferenceViewTest.php @@ -270,13 +270,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/Kernel/EntityReference/Views/EntityReferenceRelationshipTest.php b/core/modules/field/tests/src/Kernel/EntityReference/Views/EntityReferenceRelationshipTest.php index 5f4c8ee..fcd0750 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/MigrateFieldFormatterSettingsTest.php b/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldFormatterSettingsTest.php index 7bf3ad5..05410d9 100644 --- a/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldFormatterSettingsTest.php +++ b/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldFormatterSettingsTest.php @@ -93,10 +93,10 @@ public function testEntityDisplaySettings() { $expected['weight'] = 2; $expected['type'] = 'number_decimal'; $expected['settings'] = [ - 'scale' => 2, - 'decimal_separator' => '.', - 'thousand_separator' => ',', - 'prefix_suffix' => TRUE, + 'scale' => 2, + 'decimal_separator' => '.', + 'thousand_separator' => ',', + 'prefix_suffix' => TRUE, ]; $component = $display->getComponent('field_test_three'); $this->assertIdentical($expected, $component); diff --git a/core/modules/field/tests/src/Kernel/Migrate/d7/MigrateFieldFormatterSettingsTest.php b/core/modules/field/tests/src/Kernel/Migrate/d7/MigrateFieldFormatterSettingsTest.php index 576e86a..62e6709 100644 --- a/core/modules/field/tests/src/Kernel/Migrate/d7/MigrateFieldFormatterSettingsTest.php +++ b/core/modules/field/tests/src/Kernel/Migrate/d7/MigrateFieldFormatterSettingsTest.php @@ -101,42 +101,42 @@ protected function setUp() { 'label' => 'Body', 'widget' => [ - 'type' => 'text_textarea_with_summary', - 'settings' => + 'type' => 'text_textarea_with_summary', + 'settings' => [ - 'rows' => 20, - 'summary_rows' => 5, - ], - 'weight' => -4, - 'module' => 'text', - ], + 'rows' => 20, + 'summary_rows' => 5, + ], + 'weight' => -4, + 'module' => 'text', + ], 'settings' => [ - 'display_summary' => TRUE, - 'text_processing' => 1, - 'user_register_form' => FALSE, - ], + 'display_summary' => TRUE, + 'text_processing' => 1, + 'user_register_form' => FALSE, + ], 'display' => [ - 'default' => + 'default' => [ - 'label' => 'hidden', - 'type' => 'text_default', - 'settings' => [], - 'module' => 'text', - 'weight' => 0, - ], - 'teaser' => + 'label' => 'hidden', + 'type' => 'text_default', + 'settings' => [], + 'module' => 'text', + 'weight' => 0, + ], + 'teaser' => [ - 'label' => 'hidden', - 'type' => 'text_summary_or_trimmed', + 'label' => 'hidden', + 'type' => 'text_summary_or_trimmed', // settings is always expected to be an array. Making it NULL // causes a fatal. - 'settings' => NULL, - 'module' => 'text', - 'weight' => 0, - ], - ], + 'settings' => NULL, + 'module' => 'text', + 'weight' => 0, + ], + ], 'required' => FALSE, 'description' => '', ]), 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 f904429..473897b 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/field_ui/src/Tests/ManageDisplayTest.php b/core/modules/field_ui/src/Tests/ManageDisplayTest.php index 688b9e9..5821432 100644 --- a/core/modules/field_ui/src/Tests/ManageDisplayTest.php +++ b/core/modules/field_ui/src/Tests/ManageDisplayTest.php @@ -171,7 +171,7 @@ public function testFormatterUI() { $edit = [ 'fields[field_test][type]' => 'field_empty_setting', 'fields[field_test][region]' => 'content', - ]; + ]; $this->drupalPostForm(NULL, $edit, t('Save')); $this->assertNoText('Default empty setting now has a value.'); $this->assertFieldById('edit-fields-field-test-settings-edit'); diff --git a/core/modules/file/src/FileViewsData.php b/core/modules/file/src/FileViewsData.php index 459a37e..4784a72 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/filter/src/FilterFormatFormBase.php b/core/modules/filter/src/FilterFormatFormBase.php index cbcb632..f4608eb 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 7b0c029..f445ea2 100644 --- a/core/modules/filter/tests/src/Kernel/FilterKernelTest.php +++ b/core/modules/filter/tests/src/Kernel/FilterKernelTest.php @@ -340,7 +340,7 @@ public function testLineBreakFilter() { "
    aaa\nbbb\n\nccc
    " => TRUE, "aaa\nbbb\n\nccc" => TRUE, "" => TRUE, - ], +], // Skip comments entirely. "One. Two.\n\n" => [ '' => TRUE, @@ -569,7 +569,7 @@ public function testUrlFilter() { ' => [ 'http://example.com' => TRUE, 'www.example.com' => TRUE, - ], +], // MAILTO URLs. ' person@example.com or mailto:person2@example.com or ' . $email_with_plus_sign . ' or ' . $long_email . ' but not ' . $too_long_email . ' @@ -579,7 +579,7 @@ public function testUrlFilter() { '' . $long_email . '' => TRUE, '' . $too_long_email . '' => FALSE, '' . $email_with_plus_sign . '' => TRUE, - ], +], // URI parts and special characters. ' http://trailingslash.com/ or www.trailingslash.com/ @@ -599,7 +599,7 @@ public function testUrlFilter() { 'ftp://user:pass@ftp.example.com/~home/dir1' => TRUE, 'sftp://user@nonstandardport:222/dir' => TRUE, 'ssh://192.168.0.100/srv/git/drupal.git' => TRUE, - ], +], // International Unicode characters. ' http://пример.испытание/ @@ -617,7 +617,7 @@ public function testUrlFilter() { 'http://例え.テスト/' => TRUE, 'http://dréißig-bücher.de/' => TRUE, 'http://méxico-mañana.es/' => TRUE, - ], +], // Encoding. ' http://ampersand.com/?a=1&b=2 @@ -625,7 +625,7 @@ public function testUrlFilter() { ' => [ 'http://ampersand.com/?a=1&b=2' => TRUE, 'http://encoded.com/?a=1&b=2' => TRUE, - ], +], // Domain name length. ' www.ex.ex or www.example.example or www.toolongdomainexampledomainexampledomainexampledomainexampledomain or @@ -635,7 +635,7 @@ public function testUrlFilter() { 'www.example.example' => TRUE, 'http://www.toolong' => FALSE, 'me@me.tv' => TRUE, - ], +], // Absolute URL protocols. // The list to test is found in the beginning of _filter_url() at // $protocols = \Drupal::getContainer()->getParameter('filter_protocols'). @@ -662,7 +662,7 @@ public function testUrlFilter() { 'href="rtsp://127.0.0.1"' => TRUE, 'href="foo://disallowed.com"' => FALSE, 'not foo://disallowed.com.' => TRUE, - ], +], ]; $this->assertFilteredString($filter, $tests); @@ -691,12 +691,12 @@ public function testUrlFilter() { 'brackets (www.foo.com/more_(than)_one_(parens)).' => TRUE, 'brackets [https://www.drupal.org/?class[]=1]' => TRUE, 'quotes "https://www.drupal.org/sample"' => TRUE, - ], +], ' (www.parenthesis.com/dir?a=1&b=2#a) ' => [ '(www.parenthesis.com/dir?a=1&b=2#a)' => TRUE, - ], +], ]; $this->assertFilteredString($filter, $tests); @@ -713,7 +713,7 @@ public function testUrlFilter() { 'href="http://www.namespace.com"' => FALSE, 'href="http://namespace.com"' => FALSE, 'An anchor.' => TRUE, - ], +], ' Not www.relative.com or www.absolute.com but http://www.strong.net or www.emphasis.info @@ -723,13 +723,13 @@ public function testUrlFilter() { 'www.absolute.com' => TRUE, 'http://www.strong.net' => TRUE, 'www.emphasis.info' => TRUE, - ], +], ' Test using www.example.com the code tag. ' => [ 'href' => FALSE, 'http' => FALSE, - ], +], ' Intro.
    @@ -745,13 +745,13 @@ public function testUrlFilter() { 'http://www.example.info' => FALSE, 'Intro.' => TRUE, 'Outro.' => TRUE, - ], +], ' Unknown tag containing x and www.example.com? And a tag beginning with p and containing www.example.pooh with p? ' => [ 'href="http://www.example.com"' => TRUE, 'href="http://www.example.pooh"' => TRUE, - ], +], '

    Test <br/>: This is a www.example17.com example with various http://www.example18.com tags. *
    It is important www.example19.com to *
    test different URLs and http://www.example20.com in the same paragraph. *
    @@ -769,7 +769,7 @@ public function testUrlFilter() { 'href="http://www.example26.com"' => TRUE, 'href="mailto:person@example27.com"' => TRUE, 'href="http://www.example28.com"' => TRUE, - ], +], ' ', - 'menu_name' => 'tools', - ] + $base_plugin_definition; + 'title' => '', + '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 d5f6d6c..c02ea34 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 87c7632..915add9 100644 --- a/core/modules/system/tests/src/Functional/Form/FormTest.php +++ b/core/modules/system/tests/src/Functional/Form/FormTest.php @@ -391,27 +391,27 @@ public function testSelect() { // Posting without any values should throw validation errors. $this->drupalPostForm(NULL, [], '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->assertNoText(t('@name field is required.', ['@name' => $form[$key]['#title']])); } $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->assertText(t('@name field is required.', ['@name' => $form[$key]['#title']])); diff --git a/core/modules/system/tests/src/Functional/Form/LanguageSelectElementTest.php b/core/modules/system/tests/src/Functional/Form/LanguageSelectElementTest.php index 1bfa19f..ada96b6 100644 --- a/core/modules/system/tests/src/Functional/Form/LanguageSelectElementTest.php +++ b/core/modules/system/tests/src/Functional/Form/LanguageSelectElementTest.php @@ -42,10 +42,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->assertField($id, format_string('The @id field was found on the page.', ['@id' => $id])); diff --git a/core/modules/system/tests/src/Functional/Mail/HtmlToTextTest.php b/core/modules/system/tests/src/Functional/Mail/HtmlToTextTest.php index bdbfd74..6070e1e 100644 --- a/core/modules/system/tests/src/Functional/Mail/HtmlToTextTest.php +++ b/core/modules/system/tests/src/Functional/Mail/HtmlToTextTest.php @@ -314,9 +314,9 @@ public function testFootnoteReferences() { public function testDrupalHtmlToTextParagraphs() { $tests = []; $tests[] = [ - 'html' => "

    line 1
    \nline 2
    line 3\n
    line 4

    paragraph

    ", + 'html' => "

    line 1
    \nline 2
    line 3\n
    line 4

    paragraph

    ", // @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' => "

    line 1
    line 2

    line 4
    line 5

    0

    ", diff --git a/core/modules/system/tests/src/Functional/System/DateTimeTest.php b/core/modules/system/tests/src/Functional/System/DateTimeTest.php index bdecab5..55f0756 100644 --- a/core/modules/system/tests/src/Functional/System/DateTimeTest.php +++ b/core/modules/system/tests/src/Functional/System/DateTimeTest.php @@ -142,7 +142,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/Update/UpdateScriptTest.php b/core/modules/system/tests/src/Functional/Update/UpdateScriptTest.php index 29d4d08..5a75778 100644 --- a/core/modules/system/tests/src/Functional/Update/UpdateScriptTest.php +++ b/core/modules/system/tests/src/Functional/Update/UpdateScriptTest.php @@ -241,9 +241,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 663bff6..9f9905f 100644 --- a/core/modules/system/tests/src/Kernel/Block/SystemMenuBlockTest.php +++ b/core/modules/system/tests/src/Kernel/Block/SystemMenuBlockTest.php @@ -207,7 +207,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 d4fe8f2..76a1ddf 100644 --- a/core/modules/taxonomy/tests/src/Functional/TermIndexTest.php +++ b/core/modules/taxonomy/tests/src/Functional/TermIndexTest.php @@ -53,7 +53,7 @@ protected function setUp() { $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/text/tests/src/Unit/Migrate/TextCckTest.php b/core/modules/text/tests/src/Unit/Migrate/TextCckTest.php index 2273c18..ef8fe90 100644 --- a/core/modules/text/tests/src/Unit/Migrate/TextCckTest.php +++ b/core/modules/text/tests/src/Unit/Migrate/TextCckTest.php @@ -125,25 +125,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/Migrate/d6/TextFieldTest.php b/core/modules/text/tests/src/Unit/Migrate/d6/TextFieldTest.php index 8bf5d2a..8117d60 100644 --- a/core/modules/text/tests/src/Unit/Migrate/d6/TextFieldTest.php +++ b/core/modules/text/tests/src/Unit/Migrate/d6/TextFieldTest.php @@ -125,25 +125,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/cckfield/TextCckTest.php b/core/modules/text/tests/src/Unit/Plugin/migrate/cckfield/TextCckTest.php index acd7790..0a90521 100644 --- a/core/modules/text/tests/src/Unit/Plugin/migrate/cckfield/TextCckTest.php +++ b/core/modules/text/tests/src/Unit/Plugin/migrate/cckfield/TextCckTest.php @@ -125,25 +125,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 b79a0b5..a0e9099 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 @@ -124,25 +124,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/user/tests/fixtures/update/drupal-8.user-email-token-2587275.php b/core/modules/user/tests/fixtures/update/drupal-8.user-email-token-2587275.php index eaa2a9a..9c95e4e 100644 --- a/core/modules/user/tests/fixtures/update/drupal-8.user-email-token-2587275.php +++ b/core/modules/user/tests/fixtures/update/drupal-8.user-email-token-2587275.php @@ -16,7 +16,7 @@ $connection->insert('config') ->fields(['collection', 'name', 'data']) ->values([ - 'collection' => '', - 'name' => 'user.mail', - 'data' => "a:10:{s:14:\"cancel_confirm\";a:2:{s:4:\"body\";s:369:\"[user:name],\n\nA request to cancel your account has been made at [site:name].\n\nYou may now cancel your account on [site:url-brief] by clicking this link or copying and pasting it into your browser:\n\n[user:cancel-url]\n\nNOTE: The cancellation of your account is not reversible.\n\nThis link expires in one day and nothing will happen if it is not used.\n\n-- [site:name] team\";s:7:\"subject\";s:59:\"Account cancellation request for [user:name] at [site:name]\";}s:14:\"password_reset\";a:2:{s:4:\"body\";s:397:\"[user:name],\n\nA request to reset the password for your account has been made at [site:name].\n\nYou may now log in by clicking this link or copying and pasting it to your browser:\n\n[user:one-time-login-url]\n\nThis link can only be used once to log in and will lead you to a page where you can set your password. It expires after one day and nothing will happen if it's not used.\n\n-- [site:name] team\";s:7:\"subject\";s:60:\"Replacement login information for [user:name] at [site:name]\";}s:22:\"register_admin_created\";a:2:{s:4:\"body\";s:463:\"[user:name],\n\nA site administrator at [site:name] has created an account for you. You may now log in by clicking this link or copying and pasting it to your browser:\n\n[user:one-time-login-url]\n\nThis link can only be used once to log in and will lead you to a page where you can set your password.\n\nAfter setting your password, you will be able to log in at [site:login-url] in the future using:\n\nusername: [user:name]\npassword: Your password\n\n-- [site:name] team\";s:7:\"subject\";s:58:\"An administrator created an account for you at [site:name]\";}s:29:\"register_no_approval_required\";a:2:{s:4:\"body\";s:437:\"[user:name],\n\nThank you for registering at [site:name]. You may now log in by clicking this link or copying and pasting it to your browser:\n\n[user:one-time-login-url]\n\nThis link can only be used once to log in and will lead you to a page where you can set your password.\n\nAfter setting your password, you will be able to log in at [site:login-url] in the future using:\n\nusername: [user:name]\npassword: Your password\n\n-- [site:name] team\";s:7:\"subject\";s:46:\"Account details for [user:name] at [site:name]\";}s:25:\"register_pending_approval\";a:2:{s:4:\"body\";s:281:\"[user:name],\n\nThank you for registering at [site:name]. Your application for an account is currently pending approval. Once it has been approved, you will receive another email containing information about how to log in, set your password, and other details.\n\n\n-- [site:name] team\";s:7:\"subject\";s:71:\"Account details for [user:name] at [site:name] (pending admin approval)\";}s:31:\"register_pending_approval_admin\";a:2:{s:4:\"body\";s:56:\"[user:name] has applied for an account.\n\n[user:edit-url]\";s:7:\"subject\";s:71:\"Account details for [user:name] at [site:name] (pending admin approval)\";}s:16:\"status_activated\";a:2:{s:4:\"body\";s:446:\"[user:name],\n\nYour account at [site:name] has been activated.\n\nYou may now log in by clicking this link or copying and pasting it into your browser:\n\n[user:one-time-login-url]\n\nThis link can only be used once to log in and will lead you to a page where you can set your password.\n\nAfter setting your password, you will be able to log in at [site:login-url] in the future using:\n\nusername: [user:name]\npassword: Your password\n\n-- [site:name] team\";s:7:\"subject\";s:57:\"Account details for [user:name] at [site:name] (approved)\";}s:14:\"status_blocked\";a:2:{s:4:\"body\";s:89:\"[user:name],\n\nYour account on [site:account-name] has been blocked.\n\n-- [site:name] team\";s:7:\"subject\";s:56:\"Account details for [user:name] at [site:name] (blocked)\";}s:15:\"status_canceled\";a:2:{s:4:\"body\";s:82:\"[user:name],\n\nYour account on [site:name] has been canceled.\n\n-- [site:name] team\";s:7:\"subject\";s:57:\"Account details for [user:name] at [site:name] (canceled)\";}s:8:\"langcode\";s:2:\"en\";}" -])->execute(); + 'collection' => '', + 'name' => 'user.mail', + 'data' => "a:10:{s:14:\"cancel_confirm\";a:2:{s:4:\"body\";s:369:\"[user:name],\n\nA request to cancel your account has been made at [site:name].\n\nYou may now cancel your account on [site:url-brief] by clicking this link or copying and pasting it into your browser:\n\n[user:cancel-url]\n\nNOTE: The cancellation of your account is not reversible.\n\nThis link expires in one day and nothing will happen if it is not used.\n\n-- [site:name] team\";s:7:\"subject\";s:59:\"Account cancellation request for [user:name] at [site:name]\";}s:14:\"password_reset\";a:2:{s:4:\"body\";s:397:\"[user:name],\n\nA request to reset the password for your account has been made at [site:name].\n\nYou may now log in by clicking this link or copying and pasting it to your browser:\n\n[user:one-time-login-url]\n\nThis link can only be used once to log in and will lead you to a page where you can set your password. It expires after one day and nothing will happen if it's not used.\n\n-- [site:name] team\";s:7:\"subject\";s:60:\"Replacement login information for [user:name] at [site:name]\";}s:22:\"register_admin_created\";a:2:{s:4:\"body\";s:463:\"[user:name],\n\nA site administrator at [site:name] has created an account for you. You may now log in by clicking this link or copying and pasting it to your browser:\n\n[user:one-time-login-url]\n\nThis link can only be used once to log in and will lead you to a page where you can set your password.\n\nAfter setting your password, you will be able to log in at [site:login-url] in the future using:\n\nusername: [user:name]\npassword: Your password\n\n-- [site:name] team\";s:7:\"subject\";s:58:\"An administrator created an account for you at [site:name]\";}s:29:\"register_no_approval_required\";a:2:{s:4:\"body\";s:437:\"[user:name],\n\nThank you for registering at [site:name]. You may now log in by clicking this link or copying and pasting it to your browser:\n\n[user:one-time-login-url]\n\nThis link can only be used once to log in and will lead you to a page where you can set your password.\n\nAfter setting your password, you will be able to log in at [site:login-url] in the future using:\n\nusername: [user:name]\npassword: Your password\n\n-- [site:name] team\";s:7:\"subject\";s:46:\"Account details for [user:name] at [site:name]\";}s:25:\"register_pending_approval\";a:2:{s:4:\"body\";s:281:\"[user:name],\n\nThank you for registering at [site:name]. Your application for an account is currently pending approval. Once it has been approved, you will receive another email containing information about how to log in, set your password, and other details.\n\n\n-- [site:name] team\";s:7:\"subject\";s:71:\"Account details for [user:name] at [site:name] (pending admin approval)\";}s:31:\"register_pending_approval_admin\";a:2:{s:4:\"body\";s:56:\"[user:name] has applied for an account.\n\n[user:edit-url]\";s:7:\"subject\";s:71:\"Account details for [user:name] at [site:name] (pending admin approval)\";}s:16:\"status_activated\";a:2:{s:4:\"body\";s:446:\"[user:name],\n\nYour account at [site:name] has been activated.\n\nYou may now log in by clicking this link or copying and pasting it into your browser:\n\n[user:one-time-login-url]\n\nThis link can only be used once to log in and will lead you to a page where you can set your password.\n\nAfter setting your password, you will be able to log in at [site:login-url] in the future using:\n\nusername: [user:name]\npassword: Your password\n\n-- [site:name] team\";s:7:\"subject\";s:57:\"Account details for [user:name] at [site:name] (approved)\";}s:14:\"status_blocked\";a:2:{s:4:\"body\";s:89:\"[user:name],\n\nYour account on [site:account-name] has been blocked.\n\n-- [site:name] team\";s:7:\"subject\";s:56:\"Account details for [user:name] at [site:name] (blocked)\";}s:15:\"status_canceled\";a:2:{s:4:\"body\";s:82:\"[user:name],\n\nYour account on [site:name] has been canceled.\n\n-- [site:name] team\";s:7:\"subject\";s:57:\"Account details for [user:name] at [site:name] (canceled)\";}s:8:\"langcode\";s:2:\"en\";}", + ])->execute(); 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 c321185..086390f 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/user/tests/src/Unit/PermissionAccessCheckTest.php b/core/modules/user/tests/src/Unit/PermissionAccessCheckTest.php index 84290cc..dcace81 100644 --- a/core/modules/user/tests/src/Unit/PermissionAccessCheckTest.php +++ b/core/modules/user/tests/src/Unit/PermissionAccessCheckTest.php @@ -80,7 +80,7 @@ public function testAccess($requirements, $access, array $contexts = [], $messag ['allowed', TRUE], ['denied', FALSE], ['other', FALSE] - ] + ] )); $route = new Route('', [], $requirements); diff --git a/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php b/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php index 012dec4..7d860b2 100644 --- a/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php +++ b/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php @@ -562,21 +562,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' => [ @@ -1030,16 +1030,16 @@ public function optionLink($text, $section, $class = '', $title = '') { } return \Drupal::l($text, new Url('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), + ], ])); } 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 13d6b11..8e22904 100644 --- a/core/modules/views/src/Plugin/views/exposed_form/ExposedFormPluginBase.php +++ b/core/modules/views/src/Plugin/views/exposed_form/ExposedFormPluginBase.php @@ -55,7 +55,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/field/FieldPluginBase.php b/core/modules/views/src/Plugin/views/field/FieldPluginBase.php index ef23c8d..d1c2091 100644 --- a/core/modules/views/src/Plugin/views/field/FieldPluginBase.php +++ b/core/modules/views/src/Plugin/views/field/FieldPluginBase.php @@ -1388,7 +1388,7 @@ protected function renderAsLink($alter, $text, $tokens) { ]; $alter += [ - 'path' => NULL + 'path' => NULL, ]; $path = $alter['path']; diff --git a/core/modules/views/src/Plugin/views/query/Sql.php b/core/modules/views/src/Plugin/views/query/Sql.php index 09a754b..bfc7cd5 100644 --- a/core/modules/views/src/Plugin/views/query/Sql.php +++ b/core/modules/views/src/Plugin/views/query/Sql.php @@ -1778,7 +1778,7 @@ public function getAggregationInfo() { 'filter' => 'groupby_numeric', 'sort' => 'groupby_numeric', ], - ] + ], ]; } diff --git a/core/modules/views/src/Plugin/views/relationship/EntityReverse.php b/core/modules/views/src/Plugin/views/relationship/EntityReverse.php index 568bcd2..6b14016 100644 --- a/core/modules/views/src/Plugin/views/relationship/EntityReverse.php +++ b/core/modules/views/src/Plugin/views/relationship/EntityReverse.php @@ -80,7 +80,7 @@ public function query() { 'left_field' => 'entity_id', 'table' => $this->definition['base'], 'field' => $this->definition['base field'], - 'adjusted' => TRUE + 'adjusted' => TRUE, ]; if (!empty($this->options['required'])) { diff --git a/core/modules/views/src/Plugin/views/sort/SortPluginBase.php b/core/modules/views/src/Plugin/views/sort/SortPluginBase.php index 3cc82bf..c1497fb 100644 --- a/core/modules/views/src/Plugin/views/sort/SortPluginBase.php +++ b/core/modules/views/src/Plugin/views/sort/SortPluginBase.php @@ -207,7 +207,7 @@ public function buildExposeForm(&$form, FormStateInterface $form_state) { '#required' => TRUE, '#size' => 40, '#weight' => -1, - ]; + ]; } /** diff --git a/core/modules/views/src/Plugin/views/style/Table.php b/core/modules/views/src/Plugin/views/style/Table.php index bbc9a1e..4a0dd44 100644 --- a/core/modules/views/src/Plugin/views/style/Table.php +++ b/core/modules/views/src/Plugin/views/style/Table.php @@ -335,7 +335,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 0b3dcc9..16b0b29 100644 --- a/core/modules/views/src/Plugin/views/wizard/WizardPluginBase.php +++ b/core/modules/views/src/Plugin/views/wizard/WizardPluginBase.php @@ -1038,7 +1038,7 @@ protected function defaultDisplaySortsUser($form, FormStateInterface $form_state 'entity_type' => isset($data['table']['entity type']) ? $data['table']['entity type'] : NULL, 'entity_field' => isset($data[$column]['entity field']) ? $data[$column]['entity field'] : NULL, 'plugin_id' => $data[$column]['sort']['id'], - ]; + ]; } } diff --git a/core/modules/views/tests/src/Functional/Handler/FieldGroupRowsTest.php b/core/modules/views/tests/src/Functional/Handler/FieldGroupRowsTest.php index d38ba41..3ff1bc6 100644 --- a/core/modules/views/tests/src/Functional/Handler/FieldGroupRowsTest.php +++ b/core/modules/views/tests/src/Functional/Handler/FieldGroupRowsTest.php @@ -47,11 +47,11 @@ protected function setUp($import_test_views = TRUE) { // Create the unlimited text field. $field_storage = FieldStorageConfig::create([ - 'field_name' => $this->fieldName, - 'entity_type' => 'node', - 'type' => 'text', - 'cardinality' => FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED, - ]); + 'field_name' => $this->fieldName, + 'entity_type' => 'node', + 'type' => 'text', + 'cardinality' => FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED, + ]); $field_storage->save(); // Create an instance of the text field on the content type. diff --git a/core/modules/views/tests/src/Functional/Plugin/ArgumentDefaultTest.php b/core/modules/views/tests/src/Functional/Plugin/ArgumentDefaultTest.php index 57eb232..cf05426 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', - ]; + ]; /** * Modules to enable. @@ -143,7 +143,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/Handler/FieldFieldTest.php b/core/modules/views/tests/src/Kernel/Handler/FieldFieldTest.php index 8bdab81..637b04e 100644 --- a/core/modules/views/tests/src/Kernel/Handler/FieldFieldTest.php +++ b/core/modules/views/tests/src/Kernel/Handler/FieldFieldTest.php @@ -279,8 +279,8 @@ public function testAttachedRender() { $render = $executable->display_handler->render(); $expected_attachments = [ 'library' => [ - 'views/views.module' - ] + 'views/views.module', + ], ]; foreach ($this->entities as $entity) { $expected_attachments['library'][] = 'foo/fake_library'; diff --git a/core/modules/views/tests/src/Kernel/Handler/FilterCombineTest.php b/core/modules/views/tests/src/Kernel/Handler/FilterCombineTest.php index feffbaf..addb01c 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 e1093e4..3f65ea7 100644 --- a/core/modules/views/tests/src/Kernel/Handler/FilterNumericTest.php +++ b/core/modules/views/tests/src/Kernel/Handler/FilterNumericTest.php @@ -308,9 +308,9 @@ public function testFilterNumericEmpty() { $this->executeView($view); $resultset = [ [ - 'name' => 'John', - 'age' => 25, - ], + 'name' => 'John', + 'age' => 25, + ], [ 'name' => 'George', 'age' => 27, @@ -363,9 +363,9 @@ public function testFilterNumericExposedGroupedNotEmpty() { $this->executeView($view); $resultset = [ [ - 'name' => 'John', - 'age' => 25, - ], + 'name' => 'John', + 'age' => 25, + ], [ 'name' => 'George', 'age' => 27, diff --git a/core/modules/views/tests/src/Kernel/Handler/SortDateTest.php b/core/modules/views/tests/src/Kernel/Handler/SortDateTest.php index 2d1a2fc..a78b74b 100644 --- a/core/modules/views/tests/src/Kernel/Handler/SortDateTest.php +++ b/core/modules/views/tests/src/Kernel/Handler/SortDateTest.php @@ -98,7 +98,7 @@ protected function expectedResultSet($granularity, $reverse = TRUE) { ['name' => 'Meredith'], ['name' => 'Paul'], ['name' => 'John'], - ]; + ]; break; case 'hour': $expected = [ diff --git a/core/modules/views/tests/src/Kernel/Plugin/JoinTest.php b/core/modules/views/tests/src/Kernel/Plugin/JoinTest.php index 1c196a1..d111312 100644 --- a/core/modules/views/tests/src/Kernel/Plugin/JoinTest.php +++ b/core/modules/views/tests/src/Kernel/Plugin/JoinTest.php @@ -156,7 +156,7 @@ public function testBasePlugin() { $configuration['extra'] = [ [ 'field' => 'name', - 'value' => $random_name_1 + 'value' => $random_name_1, ], [ 'field' => 'name', diff --git a/core/modules/views/tests/src/Unit/EntityViewsDataTest.php b/core/modules/views/tests/src/Unit/EntityViewsDataTest.php index d8b63ce..289b906 100644 --- a/core/modules/views/tests/src/Unit/EntityViewsDataTest.php +++ b/core/modules/views/tests/src/Unit/EntityViewsDataTest.php @@ -155,15 +155,15 @@ protected function setupBaseFields(array $base_fields) { ->setDescription('A description of the term.') ->setTranslatable(TRUE) ->setDisplayOptions('view', [ - 'label' => 'hidden', - 'type' => 'text_default', - 'weight' => 0, - ]) + 'label' => 'hidden', + 'type' => 'text_default', + 'weight' => 0, + ]) ->setDisplayConfigurable('view', TRUE) ->setDisplayOptions('form', [ - 'type' => 'text_textfield', - 'weight' => 0, - ]) + 'type' => 'text_textfield', + 'weight' => 0, + ]) ->setDisplayConfigurable('form', TRUE); // Add a URL field; this example is from the Comment entity. @@ -410,7 +410,7 @@ protected function setupFieldStorageDefinition() { ->method('getDefinition') ->willReturnMap([ ['user', TRUE, static::userEntityInfo()], - ] + ] ); $user_id_field_storage_definition = $this->getMock('Drupal\Core\Field\FieldStorageDefinitionInterface'); $user_id_field_storage_definition->expects($this->any()) @@ -548,10 +548,10 @@ public function testBaseTableFields() { 'left_field' => 'id', 'field' => 'entity_id', 'extra' => [[ - 'field' => 'deleted', - 'value' => 0, - 'numeric' => TRUE, - ], + 'field' => 'deleted', + 'value' => 0, + 'numeric' => TRUE, + ], ], ], $data['entity_test__string']['table']['join']['entity_test']); } @@ -703,10 +703,10 @@ public function testDataTableFields() { 'left_field' => 'id', 'field' => 'entity_id', 'extra' => [[ - 'field' => 'deleted', - 'value' => 0, - 'numeric' => TRUE, - ], + 'field' => 'deleted', + 'value' => 0, + 'numeric' => TRUE, + ], ], ], $data['entity_test_mul__string']['table']['join']['entity_test_mul']); } @@ -889,10 +889,10 @@ public function testRevisionTableFields() { 'left_field' => 'id', 'field' => 'entity_id', 'extra' => [[ - 'field' => 'deleted', - 'value' => 0, - 'numeric' => TRUE, - ], + 'field' => 'deleted', + 'value' => 0, + 'numeric' => TRUE, + ], ], ], $data['entity_test_mulrev__string']['table']['join']['entity_test_mulrev_property_data']); @@ -902,10 +902,10 @@ public function testRevisionTableFields() { 'left_field' => 'revision_id', 'field' => 'entity_id', 'extra' => [[ - 'field' => 'deleted', - 'value' => 0, - 'numeric' => TRUE, - ], + 'field' => 'deleted', + 'value' => 0, + 'numeric' => TRUE, + ], ], ], $data['entity_test_mulrev_revision__string']['table']['join']['entity_test_mulrev_property_revision']); } 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 98a1554..7490837 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 9242545..e90484e 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 633ce9b..15efadb 100644 --- a/core/modules/views/views.views.inc +++ b/core/modules/views/views.views.inc @@ -21,14 +21,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', ], ]; @@ -114,7 +114,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 fca2099..7f2aaeb 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' => t('Administrative description'), - '#default_value' => $view->get('description'), - ]; + '#type' => 'textfield', + '#title' => t('Administrative description'), + '#default_value' => $view->get('description'), + ]; $form['details']['tag'] = [ '#type' => 'textfield', '#title' => t('Administrative tags'), diff --git a/core/modules/views_ui/src/ViewUI.php b/core/modules/views_ui/src/ViewUI.php index b2be658..e68abb4 100644 --- a/core/modules/views_ui/src/ViewUI.php +++ b/core/modules/views_ui/src/ViewUI.php @@ -672,9 +672,9 @@ public function renderPreview($display_id, $args = []) { [ 'data' => [ '#prefix' => '
    ',
-                     'queries' => $queries,
-                     '#suffix' => '
    ', - ], + 'queries' => $queries, + '#suffix' => '', + ], ], ]; } diff --git a/core/modules/views_ui/tests/src/Functional/ViewsUITourTest.php b/core/modules/views_ui/tests/src/Functional/ViewsUITourTest.php index 839fe3a..060d722 100644 --- a/core/modules/views_ui/tests/src/Functional/ViewsUITourTest.php +++ b/core/modules/views_ui/tests/src/Functional/ViewsUITourTest.php @@ -102,10 +102,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 7dcb3ba..5fce496 100644 --- a/core/phpcs.xml.dist +++ b/core/phpcs.xml.dist @@ -14,6 +14,8 @@ ./core/lib/Drupal/Component/Diff/ + + diff --git a/core/tests/Drupal/KernelTests/Core/Config/ConfigDependencyTest.php b/core/tests/Drupal/KernelTests/Core/Config/ConfigDependencyTest.php index a9cd9f1..f166d5b 100644 --- a/core/tests/Drupal/KernelTests/Core/Config/ConfigDependencyTest.php +++ b/core/tests/Drupal/KernelTests/Core/Config/ConfigDependencyTest.php @@ -264,7 +264,7 @@ public function testConfigEntityUninstallComplex(array $entity_id_suffixes) { 'id' => 'entity_' . $entity_id_suffixes[0], 'dependencies' => [ 'enforced' => [ - 'module' => ['node', 'config_test'] + 'module' => ['node', 'config_test'], ], ], ] diff --git a/core/tests/Drupal/KernelTests/Core/Database/DatabaseTestBase.php b/core/tests/Drupal/KernelTests/Core/Database/DatabaseTestBase.php index 6fcfaa4..59f32a1 100644 --- a/core/tests/Drupal/KernelTests/Core/Database/DatabaseTestBase.php +++ b/core/tests/Drupal/KernelTests/Core/Database/DatabaseTestBase.php @@ -38,17 +38,17 @@ public function ensureSampleDataNull() { db_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 c18910e..6da7ffe 100644 --- a/core/tests/Drupal/KernelTests/Core/Entity/Element/EntityAutocompleteElementFormTest.php +++ b/core/tests/Drupal/KernelTests/Core/Entity/Element/EntityAutocompleteElementFormTest.php @@ -197,13 +197,13 @@ public function testValidEntityAutocompleteElement() { '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]), + $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]), + $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 8545efe..f27033b 100644 --- a/core/tests/Drupal/KernelTests/Core/Entity/EntityAccessControlHandlerTest.php +++ b/core/tests/Drupal/KernelTests/Core/Entity/EntityAccessControlHandlerTest.php @@ -153,16 +153,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 0bb5b16..e5cef5a 100644 --- a/core/tests/Drupal/KernelTests/Core/Entity/EntityQueryRelationshipTest.php +++ b/core/tests/Drupal/KernelTests/Core/Entity/EntityQueryRelationshipTest.php @@ -83,7 +83,7 @@ protected function setUp() { $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 9edee5c..2260166 100644 --- a/core/tests/Drupal/KernelTests/Core/Entity/EntityQueryTest.php +++ b/core/tests/Drupal/KernelTests/Core/Entity/EntityQueryTest.php @@ -97,26 +97,26 @@ protected function setUp() { } // Each unit is a list of field name, langcode and a column-value array. $units[] = [$figures, 'en', [ - 'color' => 'red', - 'shape' => 'triangle', - ], + 'color' => 'red', + 'shape' => 'triangle', + ], ]; $units[] = [$figures, 'en', [ - 'color' => 'blue', - 'shape' => 'circle', - ], + 'color' => 'blue', + 'shape' => 'circle', + ], ]; // To make it easier to test sorting, the greetings get formats according // to their langcode. $units[] = [$greetings, 'tr', [ - 'value' => 'merhaba', - 'format' => 'format-tr', - ], + 'value' => 'merhaba', + 'format' => 'format-tr', + ], ]; $units[] = [$greetings, 'pl', [ - 'value' => 'siema', - 'format' => 'format-pl', - ], + 'value' => 'siema', + 'format' => 'format-pl', + ], ]; // Make these languages available to the greetings field. ConfigurableLanguage::createFromLangcode('tr')->save(); @@ -950,7 +950,7 @@ public function testPendingRevisions() { $entity->isDefaultRevision(FALSE); $entity->{$this->figures}->setValue([ 'color' => 'red', - 'shape' => 'square' + 'shape' => 'square', ]); $entity->save(); diff --git a/core/tests/Drupal/KernelTests/Core/Entity/EntityTranslationTest.php b/core/tests/Drupal/KernelTests/Core/Entity/EntityTranslationTest.php index bcd702a..b6580da 100644 --- a/core/tests/Drupal/KernelTests/Core/Entity/EntityTranslationTest.php +++ b/core/tests/Drupal/KernelTests/Core/Entity/EntityTranslationTest.php @@ -247,10 +247,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, - ]) + 'user_id' => $properties[$langcode]['user_id'], + 'name' => 'some name', + $langcode_key => LanguageInterface::LANGCODE_NOT_SPECIFIED, + ]) ->save(); $entities = $storage->loadMultiple(); diff --git a/core/tests/Drupal/KernelTests/Core/File/MimeTypeTest.php b/core/tests/Drupal/KernelTests/Core/File/MimeTypeTest.php index 05ac7c2..9e7f8e9 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 ea76f0a..3e5d72e 100644 --- a/core/tests/Drupal/KernelTests/Core/KeyValueStore/GarbageCollectionTest.php +++ b/core/tests/Drupal/KernelTests/Core/KeyValueStore/GarbageCollectionTest.php @@ -45,12 +45,12 @@ public function testGarbageCollection() { for ($i = 0; $i <= 3; $i++) { db_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/Core/Render/Element/TableTest.php b/core/tests/Drupal/KernelTests/Core/Render/Element/TableTest.php index 5966eaa..b6a2ac9 100644 --- a/core/tests/Drupal/KernelTests/Core/Render/Element/TableTest.php +++ b/core/tests/Drupal/KernelTests/Core/Render/Element/TableTest.php @@ -232,18 +232,18 @@ public function testThemeTableResponsivePriority() { public function testThemeTableHeaderRenderArray() { $header = [ [ - 'data' => [ - '#markup' => 'one', - ], - ], + 'data' => [ + '#markup' => 'one', + ], + ], 'two', [ - 'data' => [ - '#type' => 'html_tag', - '#tag' => 'b', - '#value' => 'three', - ], - ], + 'data' => [ + '#type' => 'html_tag', + '#tag' => 'b', + '#value' => 'three', + ], + ], ]; $rows = [[1, 2, 3], [4, 5, 6], [7, 8, 9]]; $table = [ @@ -272,18 +272,18 @@ public function testThemeTableRowRenderArray() { ], [ [ - 'data' => [ - '#markup' => '2-one', - ], - ], + 'data' => [ + '#markup' => '2-one', + ], + ], '2-two', [ - 'data' => [ - '#type' => 'html_tag', - '#tag' => 'b', - '#value' => '2-three', - ], - ], + 'data' => [ + '#type' => 'html_tag', + '#tag' => 'b', + '#value' => '2-three', + ], + ], ], ]; $table = [ diff --git a/core/tests/Drupal/KernelTests/Core/Theme/RegistryTest.php b/core/tests/Drupal/KernelTests/Core/Theme/RegistryTest.php index 7f6d2ec..452e19b 100644 --- a/core/tests/Drupal/KernelTests/Core/Theme/RegistryTest.php +++ b/core/tests/Drupal/KernelTests/Core/Theme/RegistryTest.php @@ -99,8 +99,8 @@ public function testMultipleSubThemes() { $preprocess_functions = $registry_base_theme->get()['theme_test_function_suggestions']['preprocess functions']; $this->assertSame([ - 'template_preprocess_theme_test_function_suggestions', - 'test_basetheme_preprocess_theme_test_function_suggestions', + 'template_preprocess_theme_test_function_suggestions', + 'test_basetheme_preprocess_theme_test_function_suggestions', ], $preprocess_functions, "Theme functions don't have template_preprocess but do have template_preprocess_HOOK"); } diff --git a/core/tests/Drupal/Tests/Component/DependencyInjection/Dumper/OptimizedPhpArrayDumperTest.php b/core/tests/Drupal/Tests/Component/DependencyInjection/Dumper/OptimizedPhpArrayDumperTest.php index c1b7095..596eb27 100644 --- a/core/tests/Drupal/Tests/Component/DependencyInjection/Dumper/OptimizedPhpArrayDumperTest.php +++ b/core/tests/Drupal/Tests/Component/DependencyInjection/Dumper/OptimizedPhpArrayDumperTest.php @@ -363,8 +363,8 @@ public function getDefinitionsDataProvider() { ] + $base_service_definition; $service_definitions[] = [ - 'shared' => FALSE, - ] + $base_service_definition; + 'shared' => FALSE, + ] + $base_service_definition; // Test factory. $service_definitions[] = [ @@ -513,11 +513,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 f919598..2893522 100644 --- a/core/tests/Drupal/Tests/Component/FileCache/FileCacheFactoryTest.php +++ b/core/tests/Drupal/Tests/Component/FileCache/FileCacheFactoryTest.php @@ -157,7 +157,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 80fc7dd..fda72b7 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() { // 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 f3824e8..3d7a042 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 5fe2b44..f61b330 100644 --- a/core/tests/Drupal/Tests/Core/DependencyInjection/Compiler/TaggedHandlersPassTest.php +++ b/core/tests/Drupal/Tests/Core/DependencyInjection/Compiler/TaggedHandlersPassTest.php @@ -321,9 +321,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 0d56516..70afd0e 100644 --- a/core/tests/Drupal/Tests/Core/Entity/ContentEntityBaseUnitTest.php +++ b/core/tests/Drupal/Tests/Core/Entity/ContentEntityBaseUnitTest.php @@ -148,7 +148,7 @@ protected function setUp() { ->will($this->returnValue([ 'id' => 'id', 'uuid' => 'uuid', - ])); + ])); $this->entityManager = new EntityManager(); diff --git a/core/tests/Drupal/Tests/Core/Entity/EntityFormTest.php b/core/tests/Drupal/Tests/Core/Entity/EntityFormTest.php index dcde7f0..74c4c87 100644 --- a/core/tests/Drupal/Tests/Core/Entity/EntityFormTest.php +++ b/core/tests/Drupal/Tests/Core/Entity/EntityFormTest.php @@ -73,34 +73,34 @@ public function testFormId($expected, $definition) { public function providerTestFormIds() { return [ ['node_article_form', [ - 'entity_type' => 'node', - 'bundle' => 'article', - 'operation' => 'default', - ], + 'entity_type' => 'node', + 'bundle' => 'article', + 'operation' => 'default', + ], ], ['node_article_delete_form', [ - 'entity_type' => 'node', - 'bundle' => 'article', - 'operation' => 'delete', - ], + 'entity_type' => 'node', + 'bundle' => 'article', + 'operation' => 'delete', + ], ], ['user_user_form', [ - 'entity_type' => 'user', - 'bundle' => 'user', - 'operation' => 'default', - ], + 'entity_type' => 'user', + 'bundle' => 'user', + 'operation' => 'default', + ], ], ['user_form', [ - 'entity_type' => 'user', - 'bundle' => '', - 'operation' => 'default', - ], + 'entity_type' => 'user', + 'bundle' => '', + 'operation' => 'default', + ], ], ['user_delete_form', [ - 'entity_type' => 'user', - 'bundle' => '', - 'operation' => 'delete', - ], + '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 d4e0442..a59bdb8 100644 --- a/core/tests/Drupal/Tests/Core/Entity/EntityTypeBundleInfoTest.php +++ b/core/tests/Drupal/Tests/Core/Entity/EntityTypeBundleInfoTest.php @@ -196,12 +196,12 @@ public function testGetBundleInfo($entity_type_id, $expected) { public function providerTestGetBundleInfo() { return [ ['apple', [ - 'apple' => ['label' => 'Apple'], - ], + 'apple' => ['label' => 'Apple'], + ], ], ['banana', [ - 'banana' => ['label' => 'Banana'], - ], + 'banana' => ['label' => 'Banana'], + ], ], ['pear', []], ]; diff --git a/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageSchemaTest.php b/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageSchemaTest.php index d16ece2..ca9bc85 100644 --- a/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageSchemaTest.php +++ b/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageSchemaTest.php @@ -524,7 +524,7 @@ public function testGetSchemaTranslatable() { 'langcode' => [ 'type' => 'varchar', 'not null' => TRUE, - ] + ], ], 'primary key' => ['id'], 'unique keys' => [], @@ -940,8 +940,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 8d0f252..3bdf4a8 100644 --- a/core/tests/Drupal/Tests/Core/Entity/TypedData/EntityAdapterUnitTest.php +++ b/core/tests/Drupal/Tests/Core/Entity/TypedData/EntityAdapterUnitTest.php @@ -144,7 +144,7 @@ protected function setUp() { ->will($this->returnValue([ 'id' => 'id', 'uuid' => 'uuid', - ])); + ])); $this->entityManager = new EntityManager(); diff --git a/core/tests/Drupal/Tests/Core/Extension/ModuleHandlerTest.php b/core/tests/Drupal/Tests/Core/Extension/ModuleHandlerTest.php index 4fda002..1245574 100644 --- a/core/tests/Drupal/Tests/Core/Extension/ModuleHandlerTest.php +++ b/core/tests/Drupal/Tests/Core/Extension/ModuleHandlerTest.php @@ -177,7 +177,7 @@ public function testSetModuleList() { $fixture_module_handler = $this->getModuleHandler(); $module_handler = $this->getMockBuilder(ModuleHandler::class) ->setConstructorArgs([ - $this->root, [], $this->cacheBackend + $this->root, [], $this->cacheBackend, ]) ->setMethods(['resetImplementations']) ->getMock(); diff --git a/core/tests/Drupal/Tests/Core/Form/FormSubmitterTest.php b/core/tests/Drupal/Tests/Core/Form/FormSubmitterTest.php index 15df6f6..a5d651b 100644 --- a/core/tests/Drupal/Tests/Core/Form/FormSubmitterTest.php +++ b/core/tests/Drupal/Tests/Core/Form/FormSubmitterTest.php @@ -141,7 +141,7 @@ public function testRedirectWithUrl(Url $redirect_value, $result, $status = 303) ->will($this->returnValueMap([ ['test_route_a', [], ['absolute' => TRUE], FALSE, 'test-route'], ['test_route_b', ['key' => 'value'], ['absolute' => TRUE], FALSE, 'test-route/value'], - ]) + ]) ); $form_state = $this->getMock('Drupal\Core\Form\FormStateInterface'); diff --git a/core/tests/Drupal/Tests/Core/Plugin/CategorizingPluginManagerTraitTest.php b/core/tests/Drupal/Tests/Core/Plugin/CategorizingPluginManagerTraitTest.php index db67ad7..3949d2b 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() { */ public function testGetCategories() { $this->assertSame(array_values($this->pluginManager->getCategories()), [ - 'fruits', - 'vegetables', - ]); + 'fruits', + 'vegetables', + ]); } /** diff --git a/core/tests/Drupal/Tests/Core/Plugin/Discovery/HookDiscoveryTest.php b/core/tests/Drupal/Tests/Core/Plugin/Discovery/HookDiscoveryTest.php index 9f4eb95..87cb333 100644 --- a/core/tests/Drupal/Tests/Core/Plugin/Discovery/HookDiscoveryTest.php +++ b/core/tests/Drupal/Tests/Core/Plugin/Discovery/HookDiscoveryTest.php @@ -97,7 +97,7 @@ public function testGetDefinition() { ->will($this->returnValueMap([ ['hook_discovery_test', 'test_plugin', [], $this->hookDiscoveryTestTestPlugin()], ['hook_discovery_test2', 'test_plugin', [], $this->hookDiscoveryTest2TestPlugin()], - ] + ] )); $this->assertNull($this->hookDiscovery->getDefinition('test_non_existant', FALSE)); diff --git a/core/tests/Drupal/Tests/Core/Render/RendererBubblingTest.php b/core/tests/Drupal/Tests/Core/Render/RendererBubblingTest.php index f55e348..3a154a8 100644 --- a/core/tests/Drupal/Tests/Core/Render/RendererBubblingTest.php +++ b/core/tests/Drupal/Tests/Core/Render/RendererBubblingTest.php @@ -187,7 +187,7 @@ public function providerTestContextBubblingEdgeCases() { '#cache' => [ 'keys' => ['set_test'], 'contexts' => [], - ], + ], ]; $expected_cache_items = [ 'set_test:bar:baz:foo' => [ @@ -622,7 +622,7 @@ public function testOverWriteCacheKeys() { $data = [ '#cache' => [ 'keys' => ['llama', 'bar'], - ], + ], '#pre_render' => [__NAMESPACE__ . '\\BubblingTest::bubblingCacheOverwritePrerender'], ]; $this->setExpectedException(\LogicException::class, 'Cache keys may not be changed after initial setup. Use the contexts property instead to bubble additional metadata.'); diff --git a/core/tests/Drupal/Tests/Core/Template/TwigExtensionTest.php b/core/tests/Drupal/Tests/Core/Template/TwigExtensionTest.php index a872e30..5013735 100644 --- a/core/tests/Drupal/Tests/Core/Template/TwigExtensionTest.php +++ b/core/tests/Drupal/Tests/Core/Template/TwigExtensionTest.php @@ -279,11 +279,11 @@ public function providerTestRenderVar() { */ public function testEscapeWithGeneratedLink() { $twig = new \Twig_Environment(NULL, [ - 'debug' => TRUE, - 'cache' => FALSE, - 'autoescape' => 'html', - 'optimizations' => 0, - ] + 'debug' => TRUE, + 'cache' => FALSE, + 'autoescape' => 'html', + 'optimizations' => 0, + ] ); $twig->addExtension($this->systemUnderTest); diff --git a/core/tests/Drupal/Tests/Core/TypedData/RecursiveContextualValidatorTest.php b/core/tests/Drupal/Tests/Core/TypedData/RecursiveContextualValidatorTest.php index 9ba110f..33999a4 100644 --- a/core/tests/Drupal/Tests/Core/TypedData/RecursiveContextualValidatorTest.php +++ b/core/tests/Drupal/Tests/Core/TypedData/RecursiveContextualValidatorTest.php @@ -332,7 +332,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 ff4cb01..b72d582 100644 --- a/core/tests/Drupal/Tests/Core/UrlTest.php +++ b/core/tests/Drupal/Tests/Core/UrlTest.php @@ -125,9 +125,9 @@ public function testUrlFromRequest() { ->method('matchRequest') ->with($this->getRequestConstraint('/node')) ->willReturn([ - RouteObjectInterface::ROUTE_NAME => 'view.frontpage.page_1', - '_raw_variables' => new ParameterBag(), - ]); + RouteObjectInterface::ROUTE_NAME => 'view.frontpage.page_1', + '_raw_variables' => new ParameterBag(), + ]); $this->router->expects($this->at(1)) ->method('matchRequest') ->with($this->getRequestConstraint('/node/1')) diff --git a/core/tests/Drupal/Tests/Core/Utility/LinkGeneratorTest.php b/core/tests/Drupal/Tests/Core/Utility/LinkGeneratorTest.php index c53b474..c3dcd02 100644 --- a/core/tests/Drupal/Tests/Core/Utility/LinkGeneratorTest.php +++ b/core/tests/Drupal/Tests/Core/Utility/LinkGeneratorTest.php @@ -119,7 +119,7 @@ public function testGenerateHrefs($route_name, array $parameters, $absolute, $ex $result = $this->linkGenerator->generate('Test', $url); $this->assertLink([ 'attributes' => ['href' => $expected_url], - ], $result); + ], $result); } /**