commit cd41b3a43d816bb6e2dacfc2d2e380610f893f2c Author: andriyun Date: Fri Sep 8 20:11:18 2017 +0300 2901739 Fix 'Squiz.Arrays.ArrayDeclaration' coding standard diff --git a/core/includes/install.core.inc b/core/includes/install.core.inc index cfc0497..c153b8d 100644 --- a/core/includes/install.core.inc +++ b/core/includes/install.core.inc @@ -754,8 +754,7 @@ function install_tasks($install_state) { 'run' => $install_state['settings_verified'] ? INSTALL_TASK_SKIP : INSTALL_TASK_RUN_IF_NOT_COMPLETED, 'function' => 'Drupal\Core\Installer\Form\SiteSettingsForm', ], - 'install_write_profile' => [ - ], + 'install_write_profile' => [], 'install_verify_database_ready' => [ 'run' => $install_state['database_ready'] ? INSTALL_TASK_SKIP : INSTALL_TASK_RUN_IF_NOT_COMPLETED, ], @@ -770,10 +769,8 @@ function install_tasks($install_state) { 'display_name' => t('Install site'), 'type' => 'batch', ], - 'install_profile_themes' => [ - ], - 'install_install_profile' => [ - ], + 'install_profile_themes' => [], + 'install_install_profile' => [], 'install_import_translations' => [ 'display_name' => t('Set up translations'), 'display' => $needs_translations, @@ -813,8 +810,7 @@ function install_tasks($install_state) { 'type' => 'batch', 'run' => $needs_translations ? INSTALL_TASK_RUN_IF_NOT_COMPLETED : INSTALL_TASK_SKIP, ], - 'install_finished' => [ - ], + 'install_finished' => [], ]; // Allow the installation profile to modify the full list of tasks. diff --git a/core/lib/Drupal/Component/Utility/Random.php b/core/lib/Drupal/Component/Utility/Random.php index 3c98b83..cf34835 100644 --- a/core/lib/Drupal/Component/Utility/Random.php +++ b/core/lib/Drupal/Component/Utility/Random.php @@ -143,7 +143,9 @@ public function word($length) { $vowels = ["a", "e", "i", "o", "u"]; $cons = ["b", "c", "d", "g", "h", "j", "k", "l", "m", "n", "p", "r", "s", "t", "u", "v", "w", "tr", - "cr", "br", "fr", "th", "dr", "ch", "ph", "wr", "st", "sp", "sw", "pr", "sl", "cl", "sh"]; + "cr", "br", "fr", "th", "dr", "ch", "ph", "wr", "st", "sp", "sw", "pr", + "sl", "cl", "sh", + ]; $num_vowels = count($vowels); $num_cons = count($cons); @@ -219,7 +221,8 @@ public function sentences($min_word_count, $capitalize = FALSE) { "utrum", "uxor", "valde", "valetudo", "validus", "vel", "velit", "veniam", "venio", "vereor", "vero", "verto", "vicis", "vindico", "virtus", "voco", "volutpat", "vulpes", "vulputate", "wisi", "ymo", - "zelus"]; + "zelus", + ]; $dictionary_flipped = array_flip($dictionary); $greeking = ''; diff --git a/core/lib/Drupal/Core/Config/DatabaseStorage.php b/core/lib/Drupal/Core/Config/DatabaseStorage.php index 1368dff..73de382 100644 --- a/core/lib/Drupal/Core/Config/DatabaseStorage.php +++ b/core/lib/Drupal/Core/Config/DatabaseStorage.php @@ -317,8 +317,10 @@ 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] + return $this->connection->query( + 'SELECT DISTINCT collection FROM {' . $this->connection->escapeTable($this->table) . '} WHERE collection <> :collection ORDER by collection', [ + ':collection' => StorageInterface::DEFAULT_COLLECTION, + ] )->fetchCol(); } catch (\Exception $e) { diff --git a/core/lib/Drupal/Core/Database/Driver/pgsql/Connection.php b/core/lib/Drupal/Core/Database/Driver/pgsql/Connection.php index 3769e54..16f0184 100644 --- a/core/lib/Drupal/Core/Database/Driver/pgsql/Connection.php +++ b/core/lib/Drupal/Core/Database/Driver/pgsql/Connection.php @@ -54,20 +54,21 @@ class Connection extends DatabaseConnection { * @see http://www.postgresql.org/docs/9.4/static/sql-keywords-appendix.html */ protected $postgresqlReservedKeyWords = ['all', 'analyse', 'analyze', 'and', - 'any', 'array', 'as', 'asc', 'asymmetric', 'authorization', 'binary', 'both', - 'case', 'cast', 'check', 'collate', 'collation', 'column', 'concurrently', - 'constraint', 'create', 'cross', 'current_catalog', 'current_date', - 'current_role', 'current_schema', 'current_time', 'current_timestamp', - 'current_user', 'default', 'deferrable', 'desc', 'distinct', 'do', 'else', - 'end', 'except', 'false', 'fetch', 'for', 'foreign', 'freeze', 'from', 'full', - 'grant', 'group', 'having', 'ilike', 'in', 'initially', 'inner', 'intersect', - 'into', 'is', 'isnull', 'join', 'lateral', 'leading', 'left', 'like', 'limit', - 'localtime', 'localtimestamp', 'natural', 'not', 'notnull', 'null', 'offset', - 'on', 'only', 'or', 'order', 'outer', 'over', 'overlaps', 'placing', - 'primary', 'references', 'returning', 'right', 'select', 'session_user', - 'similar', 'some', 'symmetric', 'table', 'then', 'to', 'trailing', 'true', - 'union', 'unique', 'user', 'using', 'variadic', 'verbose', 'when', 'where', - 'window', 'with']; + 'any', 'array', 'as', 'asc', 'asymmetric', 'authorization', 'binary', 'both', + 'case', 'cast', 'check', 'collate', 'collation', 'column', 'concurrently', + 'constraint', 'create', 'cross', 'current_catalog', 'current_date', + 'current_role', 'current_schema', 'current_time', 'current_timestamp', + 'current_user', 'default', 'deferrable', 'desc', 'distinct', 'do', 'else', + 'end', 'except', 'false', 'fetch', 'for', 'foreign', 'freeze', 'from', 'full', + 'grant', 'group', 'having', 'ilike', 'in', 'initially', 'inner', 'intersect', + 'into', 'is', 'isnull', 'join', 'lateral', 'leading', 'left', 'like', 'limit', + 'localtime', 'localtimestamp', 'natural', 'not', 'notnull', 'null', 'offset', + 'on', 'only', 'or', 'order', 'outer', 'over', 'overlaps', 'placing', + 'primary', 'references', 'returning', 'right', 'select', 'session_user', + 'similar', 'some', 'symmetric', 'table', 'then', 'to', 'trailing', 'true', + 'union', 'unique', 'user', 'using', 'variadic', 'verbose', 'when', 'where', + 'window', 'with', + ]; /** * Constructs a connection object. diff --git a/core/lib/Drupal/Core/Entity/EntityPublishedTrait.php b/core/lib/Drupal/Core/Entity/EntityPublishedTrait.php index 59fddd5..eb4d82e 100644 --- a/core/lib/Drupal/Core/Entity/EntityPublishedTrait.php +++ b/core/lib/Drupal/Core/Entity/EntityPublishedTrait.php @@ -32,11 +32,13 @@ public static function publishedBaseFieldDefinitions(EntityTypeInterface $entity throw new UnsupportedEntityTypeDefinitionException('The entity type ' . $entity_type->id() . ' does not have a "published" entity key.'); } - return [$entity_type->getKey('published') => BaseFieldDefinition::create('boolean') - ->setLabel(new TranslatableMarkup('Published')) - ->setRevisionable(TRUE) - ->setTranslatable(TRUE) - ->setDefaultValue(TRUE)]; + return [ + $entity_type->getKey('published') => BaseFieldDefinition::create('boolean') + ->setLabel(new TranslatableMarkup('Published')) + ->setRevisionable(TRUE) + ->setTranslatable(TRUE) + ->setDefaultValue(TRUE), + ]; } /** diff --git a/core/lib/Drupal/Core/Extension/module.api.php b/core/lib/Drupal/Core/Extension/module.api.php index 944d354..0830f32 100644 --- a/core/lib/Drupal/Core/Extension/module.api.php +++ b/core/lib/Drupal/Core/Extension/module.api.php @@ -449,8 +449,7 @@ function hook_install_tasks(&$install_state) { // tasks are complete, with a link to reload the current page and therefore // pass on to the final Drupal installation tasks when the user is ready to // do so). - 'myprofile_final_site_setup' => [ - ], + 'myprofile_final_site_setup' => [], ]; return $tasks; } diff --git a/core/lib/Drupal/Core/Mail/MailFormatHelper.php b/core/lib/Drupal/Core/Mail/MailFormatHelper.php index 021028f..ca63ca0 100644 --- a/core/lib/Drupal/Core/Mail/MailFormatHelper.php +++ b/core/lib/Drupal/Core/Mail/MailFormatHelper.php @@ -106,7 +106,8 @@ public static function htmlToText($string, $allowed_tags = NULL) { if (empty(static::$supportedTags)) { static::$supportedTags = ['a', 'em', 'i', 'strong', 'b', 'br', 'p', 'blockquote', 'ul', 'ol', 'li', 'dl', 'dt', 'dd', 'h1', 'h2', 'h3', - 'h4', 'h5', 'h6', 'hr']; + 'h4', 'h5', 'h6', 'hr', + ]; } // Make sure only supported tags are kept. diff --git a/core/lib/Drupal/Core/Render/HtmlResponse.php b/core/lib/Drupal/Core/Render/HtmlResponse.php index 555e504..763696d 100644 --- a/core/lib/Drupal/Core/Render/HtmlResponse.php +++ b/core/lib/Drupal/Core/Render/HtmlResponse.php @@ -31,9 +31,11 @@ public function setContent($content) { // A render array can automatically be converted to a string and set the // necessary metadata. if (is_array($content) && (isset($content['#markup']))) { - $content += ['#attached' => [ - 'html_response_attachment_placeholders' => [], - 'placeholders' => []], + $content += [ + '#attached' => [ + 'html_response_attachment_placeholders' => [], + 'placeholders' => [], + ], ]; $this->addCacheableDependency(CacheableMetadata::createFromRenderArray($content)); $this->setAttachments($content['#attached']); diff --git a/core/lib/Drupal/Core/Routing/RouteProvider.php b/core/lib/Drupal/Core/Routing/RouteProvider.php index ea412f5..94030df 100644 --- a/core/lib/Drupal/Core/Routing/RouteProvider.php +++ b/core/lib/Drupal/Core/Routing/RouteProvider.php @@ -347,7 +347,8 @@ protected function getRoutesByPath($path) { // dump the route pattern without those optional parts. try { $routes = $this->connection->query("SELECT name, route, fit FROM {" . $this->connection->escapeTable($this->tableName) . "} WHERE pattern_outline IN ( :patterns[] ) AND number_parts >= :count_parts", [ - ':patterns[]' => $ancestors, ':count_parts' => count($parts), + ':patterns[]' => $ancestors, + ':count_parts' => count($parts), ]) ->fetchAll(\PDO::FETCH_ASSOC); } diff --git a/core/modules/aggregator/src/Plugin/aggregator/fetcher/DefaultFetcher.php b/core/modules/aggregator/src/Plugin/aggregator/fetcher/DefaultFetcher.php index 91c7ac3..9b88e43 100644 --- a/core/modules/aggregator/src/Plugin/aggregator/fetcher/DefaultFetcher.php +++ b/core/modules/aggregator/src/Plugin/aggregator/fetcher/DefaultFetcher.php @@ -84,11 +84,13 @@ public function fetch(FeedInterface $feed) { /** @var \Psr\Http\Message\UriInterface $actual_uri */ $actual_uri = NULL; - $response = $this->httpClientFactory->fromOptions(['allow_redirects' => [ - 'on_redirect' => function(RequestInterface $request, ResponseInterface $response, UriInterface $uri) use (&$actual_uri) { - $actual_uri = (string) $uri; - } - ]])->send($request); + $response = $this->httpClientFactory->fromOptions([ + 'allow_redirects' => [ + 'on_redirect' => function(RequestInterface $request, ResponseInterface $response, UriInterface $uri) use (&$actual_uri) { + $actual_uri = (string) $uri; + } + ], + ])->send($request); // In case of a 304 Not Modified, there is no new content, so return // FALSE. diff --git a/core/modules/big_pipe/tests/src/Unit/Render/Placeholder/BigPipeStrategyTest.php b/core/modules/big_pipe/tests/src/Unit/Render/Placeholder/BigPipeStrategyTest.php index 9de0942..c63792e 100644 --- a/core/modules/big_pipe/tests/src/Unit/Render/Placeholder/BigPipeStrategyTest.php +++ b/core/modules/big_pipe/tests/src/Unit/Render/Placeholder/BigPipeStrategyTest.php @@ -83,25 +83,29 @@ public function placeholdersProvider() { '_no_big_pipe present, no session, no-JS cookie present' => [$placeholders, 'GET', TRUE, FALSE, TRUE, []], '_no_big_pipe present, session, no-JS cookie absent' => [$placeholders, 'GET', TRUE, TRUE, FALSE, []], '_no_big_pipe present, session, no-JS cookie present' => [$placeholders, 'GET', TRUE, TRUE, TRUE, []], - '_no_big_pipe absent, session, no-JS cookie absent: (JS-powered) BigPipe placeholder used for HTML placeholders' => [$placeholders, 'GET', FALSE, TRUE, FALSE, [ - $cases['html']->placeholder => $cases['html']->bigPipePlaceholderRenderArray, - $cases['html_attribute_value']->placeholder => $cases['html_attribute_value']->bigPipeNoJsPlaceholderRenderArray, - $cases['html_attribute_value_subset']->placeholder => $cases['html_attribute_value_subset']->bigPipeNoJsPlaceholderRenderArray, - $cases['edge_case__invalid_html']->placeholder => $cases['edge_case__invalid_html']->bigPipeNoJsPlaceholderRenderArray, - $cases['edge_case__html_non_lazy_builder']->placeholder => $cases['edge_case__html_non_lazy_builder']->bigPipePlaceholderRenderArray, - $cases['exception__lazy_builder']->placeholder => $cases['exception__lazy_builder']->bigPipePlaceholderRenderArray, - $cases['exception__embedded_response']->placeholder => $cases['exception__embedded_response']->bigPipePlaceholderRenderArray, - ]], + '_no_big_pipe absent, session, no-JS cookie absent: (JS-powered) BigPipe placeholder used for HTML placeholders' => [ + $placeholders, 'GET', FALSE, TRUE, FALSE, [ + $cases['html']->placeholder => $cases['html']->bigPipePlaceholderRenderArray, + $cases['html_attribute_value']->placeholder => $cases['html_attribute_value']->bigPipeNoJsPlaceholderRenderArray, + $cases['html_attribute_value_subset']->placeholder => $cases['html_attribute_value_subset']->bigPipeNoJsPlaceholderRenderArray, + $cases['edge_case__invalid_html']->placeholder => $cases['edge_case__invalid_html']->bigPipeNoJsPlaceholderRenderArray, + $cases['edge_case__html_non_lazy_builder']->placeholder => $cases['edge_case__html_non_lazy_builder']->bigPipePlaceholderRenderArray, + $cases['exception__lazy_builder']->placeholder => $cases['exception__lazy_builder']->bigPipePlaceholderRenderArray, + $cases['exception__embedded_response']->placeholder => $cases['exception__embedded_response']->bigPipePlaceholderRenderArray, + ], + ], '_no_big_pipe absent, session, no-JS cookie absent: (JS-powered) BigPipe placeholder used for HTML placeholders — but unsafe method' => [$placeholders, 'POST', FALSE, TRUE, FALSE, []], - '_no_big_pipe absent, session, no-JS cookie present: no-JS BigPipe placeholder used for HTML placeholders' => [$placeholders, 'GET', FALSE, TRUE, TRUE, [ - $cases['html']->placeholder => $cases['html']->bigPipeNoJsPlaceholderRenderArray, - $cases['html_attribute_value']->placeholder => $cases['html_attribute_value']->bigPipeNoJsPlaceholderRenderArray, - $cases['html_attribute_value_subset']->placeholder => $cases['html_attribute_value_subset']->bigPipeNoJsPlaceholderRenderArray, - $cases['edge_case__invalid_html']->placeholder => $cases['edge_case__invalid_html']->bigPipeNoJsPlaceholderRenderArray, - $cases['edge_case__html_non_lazy_builder']->placeholder => $cases['edge_case__html_non_lazy_builder']->bigPipeNoJsPlaceholderRenderArray, - $cases['exception__lazy_builder']->placeholder => $cases['exception__lazy_builder']->bigPipeNoJsPlaceholderRenderArray, - $cases['exception__embedded_response']->placeholder => $cases['exception__embedded_response']->bigPipeNoJsPlaceholderRenderArray, - ]], + '_no_big_pipe absent, session, no-JS cookie present: no-JS BigPipe placeholder used for HTML placeholders' => [ + $placeholders, 'GET', FALSE, TRUE, TRUE, [ + $cases['html']->placeholder => $cases['html']->bigPipeNoJsPlaceholderRenderArray, + $cases['html_attribute_value']->placeholder => $cases['html_attribute_value']->bigPipeNoJsPlaceholderRenderArray, + $cases['html_attribute_value_subset']->placeholder => $cases['html_attribute_value_subset']->bigPipeNoJsPlaceholderRenderArray, + $cases['edge_case__invalid_html']->placeholder => $cases['edge_case__invalid_html']->bigPipeNoJsPlaceholderRenderArray, + $cases['edge_case__html_non_lazy_builder']->placeholder => $cases['edge_case__html_non_lazy_builder']->bigPipeNoJsPlaceholderRenderArray, + $cases['exception__lazy_builder']->placeholder => $cases['exception__lazy_builder']->bigPipeNoJsPlaceholderRenderArray, + $cases['exception__embedded_response']->placeholder => $cases['exception__embedded_response']->bigPipeNoJsPlaceholderRenderArray, + ] + ], '_no_big_pipe absent, session, no-JS cookie present: no-JS BigPipe placeholder used for HTML placeholders — but unsafe method' => [$placeholders, 'POST', FALSE, TRUE, TRUE, []], ]; } diff --git a/core/modules/block/tests/src/Functional/Views/DisplayBlockTest.php b/core/modules/block/tests/src/Functional/Views/DisplayBlockTest.php index d122099..0a18d7f 100644 --- a/core/modules/block/tests/src/Functional/Views/DisplayBlockTest.php +++ b/core/modules/block/tests/src/Functional/Views/DisplayBlockTest.php @@ -267,7 +267,7 @@ public function testBlockRendering() { $result = $this->xpath('//div[contains(@class, "region-sidebar-first")]/div[contains(@class, "block-views")]/h2'); $this->assertTrue(empty($result), 'The title is not visible.'); - $this->assertCacheTags(array_merge($block->getCacheTags(), ['block_view', 'config:block_list', 'config:system.site', 'config:views.view.test_view_block' , 'http_response', 'rendered'])); + $this->assertCacheTags(array_merge($block->getCacheTags(), ['block_view', 'config:block_list', 'config:system.site', 'config:views.view.test_view_block', 'http_response', 'rendered'])); } /** @@ -293,7 +293,7 @@ public function testBlockEmptyRendering() { $this->assertEqual(0, count($this->xpath('//div[contains(@class, "block-views-blocktest-view-block-block-1")]'))); // Ensure that the view cacheability metadata is propagated even, for an // empty block. - $this->assertCacheTags(array_merge($block->getCacheTags(), ['block_view', 'config:block_list', 'config:views.view.test_view_block' , 'http_response', 'rendered'])); + $this->assertCacheTags(array_merge($block->getCacheTags(), ['block_view', 'config:block_list', 'config:views.view.test_view_block', 'http_response', 'rendered'])); $this->assertCacheContexts(['url.query_args:_wrapper_format']); // Add a header displayed on empty result. @@ -311,7 +311,7 @@ public function testBlockEmptyRendering() { $this->drupalGet($url); $this->assertEqual(1, count($this->xpath('//div[contains(@class, "block-views-blocktest-view-block-block-1")]'))); - $this->assertCacheTags(array_merge($block->getCacheTags(), ['block_view', 'config:block_list', 'config:views.view.test_view_block' , 'http_response', 'rendered'])); + $this->assertCacheTags(array_merge($block->getCacheTags(), ['block_view', 'config:block_list', 'config:views.view.test_view_block', 'http_response', 'rendered'])); $this->assertCacheContexts(['url.query_args:_wrapper_format']); // Hide the header on empty results. diff --git a/core/modules/block/tests/src/Unit/Menu/BlockLocalTasksTest.php b/core/modules/block/tests/src/Unit/Menu/BlockLocalTasksTest.php index 6d7dbf2..6e442d7 100644 --- a/core/modules/block/tests/src/Unit/Menu/BlockLocalTasksTest.php +++ b/core/modules/block/tests/src/Unit/Menu/BlockLocalTasksTest.php @@ -16,9 +16,9 @@ protected function setUp() { $this->directoryList = ['block' => 'core/modules/block']; parent::setUp(); - $config_factory = $this->getConfigFactoryStub(['system.theme' => [ - 'default' => 'test_c', - ]]); + $config_factory = $this->getConfigFactoryStub([ + 'system.theme' => ['default' => 'test_c'], + ]); $themes = []; $themes['test_a'] = (object) [ diff --git a/core/modules/block_content/tests/src/Unit/Menu/BlockContentLocalTasksTest.php b/core/modules/block_content/tests/src/Unit/Menu/BlockContentLocalTasksTest.php index ced7e84..30b7c25 100644 --- a/core/modules/block_content/tests/src/Unit/Menu/BlockContentLocalTasksTest.php +++ b/core/modules/block_content/tests/src/Unit/Menu/BlockContentLocalTasksTest.php @@ -19,9 +19,9 @@ protected function setUp() { ]; parent::setUp(); - $config_factory = $this->getConfigFactoryStub(['system.theme' => [ - 'default' => 'test_c', - ]]); + $config_factory = $this->getConfigFactoryStub([ + 'system.theme' => ['default' => 'test_c'], + ]); $themes = []; $themes['test_a'] = (object) [ diff --git a/core/modules/ckeditor/tests/modules/src/Kernel/CKEditorTest.php b/core/modules/ckeditor/tests/modules/src/Kernel/CKEditorTest.php index 4fbead9..4f1da31 100644 --- a/core/modules/ckeditor/tests/modules/src/Kernel/CKEditorTest.php +++ b/core/modules/ckeditor/tests/modules/src/Kernel/CKEditorTest.php @@ -479,7 +479,7 @@ protected function getDefaultToolbarConfig() { ], [ 'name' => 'Tools', - 'items' => ['Source', ], + 'items' => ['Source'], ], '/', ]; diff --git a/core/modules/ckeditor/tests/src/Functional/CKEditorLoadingTest.php b/core/modules/ckeditor/tests/src/Functional/CKEditorLoadingTest.php index 9d66071..cad0947 100644 --- a/core/modules/ckeditor/tests/src/Functional/CKEditorLoadingTest.php +++ b/core/modules/ckeditor/tests/src/Functional/CKEditorLoadingTest.php @@ -101,13 +101,17 @@ public function testLoading() { list($settings, $editor_settings_present, $editor_js_present, $body, $format_selector) = $this->getThingsToCheck(); $ckeditor_plugin = $this->container->get('plugin.manager.editor')->createInstance('ckeditor'); $editor = Editor::load('filtered_html'); - $expected = ['formats' => ['filtered_html' => [ - 'format' => 'filtered_html', - 'editor' => 'ckeditor', - 'editorSettings' => $this->castSafeStrings($ckeditor_plugin->getJSSettings($editor)), - 'editorSupportsContentFiltering' => TRUE, - 'isXssSafe' => FALSE, - ]]]; + $expected = [ + 'formats' => [ + 'filtered_html' => [ + 'format' => 'filtered_html', + 'editor' => 'ckeditor', + 'editorSettings' => $this->castSafeStrings($ckeditor_plugin->getJSSettings($editor)), + 'editorSupportsContentFiltering' => TRUE, + 'isXssSafe' => FALSE, + ], + ], + ]; $this->assertTrue($editor_settings_present, "Text Editor module's JavaScript settings are on the page."); $this->assertIdentical($expected, $this->castSafeStrings($settings['editor']), "Text Editor module's JavaScript settings on the page are correct."); $this->assertTrue($editor_js_present, 'Text Editor JavaScript is present.'); @@ -138,7 +142,9 @@ public function testLoading() { 'editorSettings' => $this->castSafeStrings($ckeditor_plugin->getJSSettings($editor)), 'editorSupportsContentFiltering' => TRUE, 'isXssSafe' => FALSE, - ]]]; + ], + ], + ]; $this->assertTrue($editor_settings_present, "Text Editor module's JavaScript settings are on the page."); $this->assertIdentical($expected, $this->castSafeStrings($settings['editor']), "Text Editor module's JavaScript settings on the page are correct."); $this->assertTrue($editor_js_present, 'Text Editor JavaScript is present.'); diff --git a/core/modules/comment/src/CommentViewBuilder.php b/core/modules/comment/src/CommentViewBuilder.php index ec6d49a..51a9185 100644 --- a/core/modules/comment/src/CommentViewBuilder.php +++ b/core/modules/comment/src/CommentViewBuilder.php @@ -126,12 +126,15 @@ public function buildComponents(array &$build, array $entities, array $displays, $display = $displays[$entity->bundle()]; if ($display->getComponent('links')) { $build[$id]['links'] = [ - '#lazy_builder' => ['comment.lazy_builders:renderLinks', [ - $entity->id(), - $view_mode, - $entity->language()->getId(), - !empty($entity->in_preview), - ]], + '#lazy_builder' => [ + 'comment.lazy_builders:renderLinks', + [ + $entity->id(), + $view_mode, + $entity->language()->getId(), + !empty($entity->in_preview), + ], + ], '#create_placeholder' => TRUE, ]; } diff --git a/core/modules/comment/src/Plugin/Field/FieldFormatter/CommentDefaultFormatter.php b/core/modules/comment/src/Plugin/Field/FieldFormatter/CommentDefaultFormatter.php index b03accc..7021488 100644 --- a/core/modules/comment/src/Plugin/Field/FieldFormatter/CommentDefaultFormatter.php +++ b/core/modules/comment/src/Plugin/Field/FieldFormatter/CommentDefaultFormatter.php @@ -192,12 +192,15 @@ public function viewElements(FieldItemListInterface $items, $langcode) { $elements['#cache']['contexts'][] = 'user.roles'; if ($this->currentUser->hasPermission('post comments')) { $output['comment_form'] = [ - '#lazy_builder' => ['comment.lazy_builders:renderForm', [ - $entity->getEntityTypeId(), - $entity->id(), - $field_name, - $this->getFieldSetting('comment_type'), - ]], + '#lazy_builder' => [ + 'comment.lazy_builders:renderForm', + [ + $entity->getEntityTypeId(), + $entity->id(), + $field_name, + $this->getFieldSetting('comment_type'), + ], + ], '#create_placeholder' => TRUE, ]; } 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 671947d..50a14c1 100644 --- a/core/modules/comment/src/Plugin/migrate/source/d6/Comment.php +++ b/core/modules/comment/src/Plugin/migrate/source/d6/Comment.php @@ -21,8 +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/Tests/CommentNewIndicatorTest.php b/core/modules/comment/src/Tests/CommentNewIndicatorTest.php index 55609e3..318e17c 100644 --- a/core/modules/comment/src/Tests/CommentNewIndicatorTest.php +++ b/core/modules/comment/src/Tests/CommentNewIndicatorTest.php @@ -129,10 +129,12 @@ public function testCommentNewCommentsIndicator() { $response = $this->renderNewCommentsNodeLinks([$this->node->id()]); $this->assertResponse(200); $json = Json::decode($response); - $expected = [$this->node->id() => [ - 'new_comment_count' => 1, - 'first_new_comment_link' => $this->node->url('canonical', ['fragment' => 'new']), - ]]; + $expected = [ + $this->node->id() => [ + 'new_comment_count' => 1, + 'first_new_comment_link' => $this->node->url('canonical', ['fragment' => 'new']), + ], + ]; $this->assertIdentical($expected, $json); // Failing to specify node IDs for the endpoint should return a 404. diff --git a/core/modules/config/src/Tests/ConfigEntityTest.php b/core/modules/config/src/Tests/ConfigEntityTest.php index a0c857b..2cd47ff 100644 --- a/core/modules/config/src/Tests/ConfigEntityTest.php +++ b/core/modules/config/src/Tests/ConfigEntityTest.php @@ -147,8 +147,8 @@ public function testCRUD() { try { $id_length_config_test->save(); $this->pass(SafeMarkup::format("config_test entity with ID length @length was saved.", [ - '@length' => strlen($id_length_config_test->id())] - )); + '@length' => strlen($id_length_config_test->id()), + ])); } catch (ConfigEntityIdLengthException $e) { $this->fail($e->getMessage()); diff --git a/core/modules/config/tests/config_override_test/src/ConfigOverriderLowPriority.php b/core/modules/config/tests/config_override_test/src/ConfigOverriderLowPriority.php index b8109db..1156b00 100644 --- a/core/modules/config/tests/config_override_test/src/ConfigOverriderLowPriority.php +++ b/core/modules/config/tests/config_override_test/src/ConfigOverriderLowPriority.php @@ -18,13 +18,13 @@ public function loadOverrides($names) { $overrides = []; if (!empty($GLOBALS['config_test_run_module_overrides'])) { if (in_array('system.site', $names)) { - $overrides = ['system.site' => - [ + $overrides = [ + 'system.site' => [ 'name' => 'Should not apply because of higher priority listener', // This override should apply because it is not overridden by the // higher priority listener. 'slogan' => 'Yay for overrides!', - ] + ], ]; } } diff --git a/core/modules/config_translation/tests/src/Unit/ConfigMapperManagerTest.php b/core/modules/config_translation/tests/src/Unit/ConfigMapperManagerTest.php index 9f064ac..ec6d6f1 100644 --- a/core/modules/config_translation/tests/src/Unit/ConfigMapperManagerTest.php +++ b/core/modules/config_translation/tests/src/Unit/ConfigMapperManagerTest.php @@ -88,44 +88,62 @@ public function providerTestHasTranslatable() { [$this->getElement(['aaa' => 'bbb']), FALSE], [$this->getElement(['translatable' => FALSE]), FALSE], [$this->getElement(['translatable' => TRUE]), TRUE], - [$this->getNestedElement([ - $this->getElement([]), - ]), FALSE], - [$this->getNestedElement([ - $this->getElement(['translatable' => TRUE]), - ]), TRUE], - [$this->getNestedElement([ - $this->getElement(['aaa' => 'bbb']), - $this->getElement(['ccc' => 'ddd']), - $this->getElement(['eee' => 'fff']), - ]), FALSE], - [$this->getNestedElement([ - $this->getElement(['aaa' => 'bbb']), - $this->getElement(['ccc' => 'ddd']), - $this->getElement(['translatable' => TRUE]), - ]), TRUE], - [$this->getNestedElement([ - $this->getElement(['aaa' => 'bbb']), + [ $this->getNestedElement([ - $this->getElement(['ccc' => 'ddd']), - $this->getElement(['eee' => 'fff']), + $this->getElement([]) ]), + FALSE, + ], + [ $this->getNestedElement([ - $this->getElement(['ggg' => 'hhh']), - $this->getElement(['iii' => 'jjj']), + $this->getElement(['translatable' => TRUE]), ]), - ]), FALSE], - [$this->getNestedElement([ - $this->getElement(['aaa' => 'bbb']), + TRUE, + ], + [ $this->getNestedElement([ + $this->getElement(['aaa' => 'bbb']), $this->getElement(['ccc' => 'ddd']), $this->getElement(['eee' => 'fff']), ]), + FALSE, + ], + [ $this->getNestedElement([ - $this->getElement(['ggg' => 'hhh']), + $this->getElement(['aaa' => 'bbb']), + $this->getElement(['ccc' => 'ddd']), $this->getElement(['translatable' => TRUE]), ]), - ]), TRUE], + TRUE, + ], + [ + $this->getNestedElement([ + $this->getElement(['aaa' => 'bbb']), + $this->getNestedElement([ + $this->getElement(['ccc' => 'ddd']), + $this->getElement(['eee' => 'fff']), + ]), + $this->getNestedElement([ + $this->getElement(['ggg' => 'hhh']), + $this->getElement(['iii' => 'jjj']), + ]), + ]), + FALSE + ], + [ + $this->getNestedElement([ + $this->getElement(['aaa' => 'bbb']), + $this->getNestedElement([ + $this->getElement(['ccc' => 'ddd']), + $this->getElement(['eee' => 'fff']), + ]), + $this->getNestedElement([ + $this->getElement(['ggg' => 'hhh']), + $this->getElement(['translatable' => TRUE]), + ]), + ]), + TRUE, + ], ]; } diff --git a/core/modules/contact/src/Controller/ContactController.php b/core/modules/contact/src/Controller/ContactController.php index b8b69d5..3565534 100644 --- a/core/modules/contact/src/Controller/ContactController.php +++ b/core/modules/contact/src/Controller/ContactController.php @@ -65,7 +65,8 @@ public function contactSitePage(ContactFormInterface $contact_form = NULL) { if (empty($contact_form)) { if ($this->currentUser()->hasPermission('administer contact forms')) { drupal_set_message($this->t('The contact form has not been configured. Add one or more forms .', [ - ':add' => $this->url('contact.form_add')]), 'error'); + ':add' => $this->url('contact.form_add'), + ]), 'error'); return []; } else { diff --git a/core/modules/content_translation/src/Controller/ContentTranslationController.php b/core/modules/content_translation/src/Controller/ContentTranslationController.php index c18eab3..190778d 100644 --- a/core/modules/content_translation/src/Controller/ContentTranslationController.php +++ b/core/modules/content_translation/src/Controller/ContentTranslationController.php @@ -196,14 +196,16 @@ public function overview(RouteMatchInterface $route_match, $entity_type_id = NUL if (isset($links['edit'])) { $links['edit']['title'] = $this->t('Edit'); } - $status = ['data' => [ - '#type' => 'inline_template', - '#template' => '{% if status %}{{ "Published"|t }}{% else %}{{ "Not published"|t }}{% endif %}{% if outdated %} {{ "outdated"|t }}{% endif %}', - '#context' => [ - 'status' => $metadata->isPublished(), - 'outdated' => $metadata->isOutdated(), + $status = [ + 'data' => [ + '#type' => 'inline_template', + '#template' => '{% if status %}{{ "Published"|t }}{% else %}{{ "Not published"|t }}{% endif %}{% if outdated %} {{ "outdated"|t }}{% endif %}', + '#context' => [ + 'status' => $metadata->isPublished(), + 'outdated' => $metadata->isOutdated(), + ], ], - ]]; + ]; if ($is_original) { $language_name = $this->t('@language_name (Original language)', ['@language_name' => $language_name]); diff --git a/core/modules/content_translation/tests/src/Unit/Menu/ContentTranslationLocalTasksTest.php b/core/modules/content_translation/tests/src/Unit/Menu/ContentTranslationLocalTasksTest.php index a72d9b7..f6c14cb 100644 --- a/core/modules/content_translation/tests/src/Unit/Menu/ContentTranslationLocalTasksTest.php +++ b/core/modules/content_translation/tests/src/Unit/Menu/ContentTranslationLocalTasksTest.php @@ -49,20 +49,30 @@ public function testBlockAdminDisplay($route, $expected) { */ public function providerTestBlockAdminDisplay() { return [ - ['entity.node.canonical', [[ - 'content_translation.local_tasks:entity.node.content_translation_overview', + [ 'entity.node.canonical', - 'entity.node.edit_form', - 'entity.node.delete_form', - 'entity.node.version_history', - ]]], - ['entity.node.content_translation_overview', [[ - 'content_translation.local_tasks:entity.node.content_translation_overview', - 'entity.node.canonical', - 'entity.node.edit_form', - 'entity.node.delete_form', - 'entity.node.version_history', - ]]], + [ + [ + 'content_translation.local_tasks:entity.node.content_translation_overview', + 'entity.node.canonical', + 'entity.node.edit_form', + 'entity.node.delete_form', + 'entity.node.version_history', + ], + ], + ], + [ + 'entity.node.content_translation_overview', + [ + [ + 'content_translation.local_tasks:entity.node.content_translation_overview', + 'entity.node.canonical', + 'entity.node.edit_form', + 'entity.node.delete_form', + 'entity.node.version_history', + ], + ], + ], ]; } diff --git a/core/modules/datetime/tests/src/Functional/DateTimeFieldTest.php b/core/modules/datetime/tests/src/Functional/DateTimeFieldTest.php index 3df2582..5412990 100644 --- a/core/modules/datetime/tests/src/Functional/DateTimeFieldTest.php +++ b/core/modules/datetime/tests/src/Functional/DateTimeFieldTest.php @@ -573,35 +573,48 @@ public function testDatelistWidget() { protected function datelistDataProvider($field_label) { return [ // Nothing selected. - [['year' => '', 'month' => '', 'day' => '', 'hour' => '', 'minute' => ''], [ - "The $field_label date is required.", - ]], + [ + ['year' => '', 'month' => '', 'day' => '', 'hour' => '', 'minute' => ''], + ["The $field_label date is required."], + ], // Year only selected, validation error on Month, Day, Hour, Minute. - [['year' => 2012, 'month' => '', 'day' => '', 'hour' => '', 'minute' => ''], [ - "The $field_label date is incomplete.", - 'A value must be selected for month.', - 'A value must be selected for day.', - 'A value must be selected for hour.', - 'A value must be selected for minute.', - ]], + [ + ['year' => 2012, 'month' => '', 'day' => '', 'hour' => '', 'minute' => ''], + [ + "The $field_label date is incomplete.", + 'A value must be selected for month.', + 'A value must be selected for day.', + 'A value must be selected for hour.', + 'A value must be selected for minute.', + ], + ], // Year and Month selected, validation error on Day, Hour, Minute. - [['year' => 2012, 'month' => '12', 'day' => '', 'hour' => '', 'minute' => ''], [ - "The $field_label date is incomplete.", - 'A value must be selected for day.', - 'A value must be selected for hour.', - 'A value must be selected for minute.', - ]], + [ + ['year' => 2012, 'month' => '12', 'day' => '', 'hour' => '', 'minute' => ''], + [ + "The $field_label date is incomplete.", + 'A value must be selected for day.', + 'A value must be selected for hour.', + 'A value must be selected for minute.', + ], + ], // Year, Month and Day selected, validation error on Hour, Minute. - [['year' => 2012, 'month' => '12', 'day' => '31', 'hour' => '', 'minute' => ''], [ - "The $field_label date is incomplete.", - 'A value must be selected for hour.', - 'A value must be selected for minute.', - ]], + [ + ['year' => 2012, 'month' => '12', 'day' => '31', 'hour' => '', 'minute' => ''], + [ + "The $field_label date is incomplete.", + 'A value must be selected for hour.', + 'A value must be selected for minute.', + ], + ], // Year, Month, Day and Hour selected, validation error on Minute only. - [['year' => 2012, 'month' => '12', 'day' => '31', 'hour' => '0', 'minute' => ''], [ - "The $field_label date is incomplete.", - 'A value must be selected for minute.', - ]], + [ + ['year' => 2012, 'month' => '12', 'day' => '31', 'hour' => '0', 'minute' => ''], + [ + "The $field_label date is incomplete.", + 'A value must be selected for minute.', + ], + ], ]; } diff --git a/core/modules/dblog/src/Controller/DbLogController.php b/core/modules/dblog/src/Controller/DbLogController.php index 10e2af8..b9126f9 100644 --- a/core/modules/dblog/src/Controller/DbLogController.php +++ b/core/modules/dblog/src/Controller/DbLogController.php @@ -135,20 +135,24 @@ public function overview() { [ 'data' => $this->t('Type'), 'field' => 'w.type', - 'class' => [RESPONSIVE_PRIORITY_MEDIUM]], + 'class' => [RESPONSIVE_PRIORITY_MEDIUM], + ], [ 'data' => $this->t('Date'), 'field' => 'w.wid', 'sort' => 'desc', - 'class' => [RESPONSIVE_PRIORITY_LOW]], + 'class' => [RESPONSIVE_PRIORITY_LOW], + ], $this->t('Message'), [ 'data' => $this->t('User'), 'field' => 'ufd.name', - 'class' => [RESPONSIVE_PRIORITY_MEDIUM]], + 'class' => [RESPONSIVE_PRIORITY_MEDIUM], + ], [ 'data' => $this->t('Operations'), - 'class' => [RESPONSIVE_PRIORITY_LOW]], + 'class' => [RESPONSIVE_PRIORITY_LOW], + ], ]; $query = $this->database->select('watchdog', 'w') diff --git a/core/modules/editor/src/Tests/EditorLoadingTest.php b/core/modules/editor/src/Tests/EditorLoadingTest.php index 419215f..aa6ce24 100644 --- a/core/modules/editor/src/Tests/EditorLoadingTest.php +++ b/core/modules/editor/src/Tests/EditorLoadingTest.php @@ -140,13 +140,17 @@ public function testLoading() { $this->drupalLogin($this->privilegedUser); $this->drupalGet('node/add/article'); list($settings, $editor_settings_present, $editor_js_present, $body, $format_selector) = $this->getThingsToCheck('body'); - $expected = ['formats' => ['full_html' => [ - 'format' => 'full_html', - 'editor' => 'unicorn', - 'editorSettings' => ['ponyModeEnabled' => TRUE], - 'editorSupportsContentFiltering' => TRUE, - 'isXssSafe' => FALSE, - ]]]; + $expected = [ + 'formats' => [ + 'full_html' => [ + 'format' => 'full_html', + 'editor' => 'unicorn', + 'editorSettings' => ['ponyModeEnabled' => TRUE], + 'editorSupportsContentFiltering' => TRUE, + 'isXssSafe' => FALSE, + ], + ], + ]; $this->assertTrue($editor_settings_present, "Text Editor module's JavaScript settings are on the page."); $this->assertIdentical($expected, $settings['editor'], "Text Editor module's JavaScript settings on the page are correct."); $this->assertTrue($editor_js_present, 'Text Editor JavaScript is present.'); @@ -174,13 +178,17 @@ public function testLoading() { $this->drupalLogin($this->untrustedUser); $this->drupalGet('node/add/article'); list($settings, $editor_settings_present, $editor_js_present, $body, $format_selector) = $this->getThingsToCheck('body'); - $expected = ['formats' => ['plain_text' => [ - 'format' => 'plain_text', - 'editor' => 'unicorn', - 'editorSettings' => ['ponyModeEnabled' => TRUE], - 'editorSupportsContentFiltering' => TRUE, - 'isXssSafe' => FALSE, - ]]]; + $expected = [ + 'formats' => [ + 'plain_text' => [ + 'format' => 'plain_text', + 'editor' => 'unicorn', + 'editorSettings' => ['ponyModeEnabled' => TRUE], + 'editorSupportsContentFiltering' => TRUE, + 'isXssSafe' => FALSE, + ], + ], + ]; $this->assertTrue($editor_settings_present, "Text Editor module's JavaScript settings are on the page."); $this->assertIdentical($expected, $settings['editor'], "Text Editor module's JavaScript settings on the page are correct."); $this->assertTrue($editor_js_present, 'Text Editor JavaScript is present.'); diff --git a/core/modules/editor/tests/src/Unit/EditorXssFilter/StandardTest.php b/core/modules/editor/tests/src/Unit/EditorXssFilter/StandardTest.php index ce63092..35820a0 100644 --- a/core/modules/editor/tests/src/Unit/EditorXssFilter/StandardTest.php +++ b/core/modules/editor/tests/src/Unit/EditorXssFilter/StandardTest.php @@ -364,8 +364,11 @@ public function providerTestFilterXss() { // IMG STYLE with expression. // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#IMG_STYLE_with_expression - $data[] = ['exp/*', 'exp/*']; + $data[] = [ + 'exp/*', + 'exp/*', + ]; // STYLE tag (Older versions of Netscape only). // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#STYLE_tag_.28Older_versions_of_Netscape_only.29 @@ -443,7 +446,9 @@ public function providerTestFilterXss() { // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#Downlevel-Hidden_block $data[] = ['', "\n alert('XSS');\n "]; + ', + "\n alert('XSS');\n ", + ]; // BASE tag. // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#BASE_tag diff --git a/core/modules/field/src/Tests/Number/NumberFieldTest.php b/core/modules/field/src/Tests/Number/NumberFieldTest.php index c691410..64da6c1 100644 --- a/core/modules/field/src/Tests/Number/NumberFieldTest.php +++ b/core/modules/field/src/Tests/Number/NumberFieldTest.php @@ -45,9 +45,7 @@ public function testNumberDecimalField() { 'field_name' => $field_name, 'entity_type' => 'entity_test', 'type' => 'decimal', - 'settings' => [ - 'precision' => 8, 'scale' => 4, - ] + 'settings' => ['precision' => 8, 'scale' => 4], ])->save(); FieldConfig::create([ 'field_name' => $field_name, @@ -143,8 +141,10 @@ public function testNumberIntegerField() { 'entity_type' => 'entity_test', 'bundle' => 'entity_test', 'settings' => [ - 'min' => $minimum, 'max' => $maximum, 'prefix' => 'ThePrefix', - ] + 'min' => $minimum, + 'max' => $maximum, + 'prefix' => 'ThePrefix', + ], ])->save(); entity_get_form_display('entity_test', 'entity_test', 'default') diff --git a/core/modules/field/tests/src/Kernel/FieldStorageCrudTest.php b/core/modules/field/tests/src/Kernel/FieldStorageCrudTest.php index 52eb4e4..dfc50f2 100644 --- a/core/modules/field/tests/src/Kernel/FieldStorageCrudTest.php +++ b/core/modules/field/tests/src/Kernel/FieldStorageCrudTest.php @@ -433,8 +433,9 @@ public function testUpdateForbid() { 'type' => 'test_field', 'settings' => [ 'changeable' => 0, - 'unchangeable' => 0 - ]]); + 'unchangeable' => 0, + ], + ]); $field_storage->save(); $field_storage->setSetting('changeable', $field_storage->getSetting('changeable') + 1); try { 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 dd38569..0050004 100644 --- a/core/modules/field/tests/src/Kernel/Migrate/d7/MigrateFieldFormatterSettingsTest.php +++ b/core/modules/field/tests/src/Kernel/Migrate/d7/MigrateFieldFormatterSettingsTest.php @@ -122,9 +122,7 @@ protected function setUp() { [ 'label' => 'hidden', 'type' => 'text_default', - 'settings' => - [ - ], + 'settings' => [], 'module' => 'text', 'weight' => 0, ], diff --git a/core/modules/field_layout/tests/src/Functional/FieldLayoutTest.php b/core/modules/field_layout/tests/src/Functional/FieldLayoutTest.php index 058e6c3..9bab0b5 100644 --- a/core/modules/field_layout/tests/src/Functional/FieldLayoutTest.php +++ b/core/modules/field_layout/tests/src/Functional/FieldLayoutTest.php @@ -28,9 +28,9 @@ protected function setUp() { $this->createNode([ 'type' => 'article', 'title' => 'The node title', - 'body' => [[ - 'value' => 'The node body', - ]], + 'body' => [ + ['value' => 'The node body'], + ], ]); $this->drupalLogin($this->drupalCreateUser([ 'access administration pages', diff --git a/core/modules/field_layout/tests/src/FunctionalJavascript/FieldLayoutTest.php b/core/modules/field_layout/tests/src/FunctionalJavascript/FieldLayoutTest.php index 8ddbeaf..162d223 100644 --- a/core/modules/field_layout/tests/src/FunctionalJavascript/FieldLayoutTest.php +++ b/core/modules/field_layout/tests/src/FunctionalJavascript/FieldLayoutTest.php @@ -25,9 +25,9 @@ protected function setUp() { $entity = EntityTest::create([ 'name' => 'The name for this entity', - 'field_test_text' => [[ - 'value' => 'The field test text value', - ]], + 'field_test_text' => [ + ['value' => 'The field test text value'], + ], ]); $entity->save(); $this->drupalLogin($this->drupalCreateUser([ diff --git a/core/modules/field_ui/src/Form/FieldStorageConfigEditForm.php b/core/modules/field_ui/src/Form/FieldStorageConfigEditForm.php index 49a45e1..29f4367 100644 --- a/core/modules/field_ui/src/Form/FieldStorageConfigEditForm.php +++ b/core/modules/field_ui/src/Form/FieldStorageConfigEditForm.php @@ -107,11 +107,13 @@ protected function getCardinalityForm() { '#parents' => [], '#type' => 'fieldset', '#title' => $this->t('Allowed number of values'), - '#attributes' => ['class' => [ - 'container-inline', - 'fieldgroup', - 'form-composite', - ]], + '#attributes' => [ + 'class' => [ + 'container-inline', + 'fieldgroup', + 'form-composite', + ], + ], ]; if ($enforced_cardinality = $this->getEnforcedCardinality()) { diff --git a/core/modules/field_ui/tests/src/FunctionalJavascript/EntityDisplayTest.php b/core/modules/field_ui/tests/src/FunctionalJavascript/EntityDisplayTest.php index 6da3c41..ae2c56c 100644 --- a/core/modules/field_ui/tests/src/FunctionalJavascript/EntityDisplayTest.php +++ b/core/modules/field_ui/tests/src/FunctionalJavascript/EntityDisplayTest.php @@ -25,9 +25,9 @@ protected function setUp() { $entity = EntityTest::create([ 'name' => 'The name for this entity', - 'field_test_text' => [[ - 'value' => 'The field test text value', - ]], + 'field_test_text' => [ + ['value' => 'The field test text value'], + ], ]); $entity->save(); $this->drupalLogin($this->drupalCreateUser([ diff --git a/core/modules/filter/src/Plugin/Filter/FilterHtml.php b/core/modules/filter/src/Plugin/Filter/FilterHtml.php index 6e800c3..1425abf 100644 --- a/core/modules/filter/src/Plugin/Filter/FilterHtml.php +++ b/core/modules/filter/src/Plugin/Filter/FilterHtml.php @@ -371,7 +371,9 @@ public function tips($long = FALSE) { 'q' => [$this->t('Quoted inline'), '' . $this->t('Quoted inline') . ''], // Assumes and describes tr, td, th. 'table' => [$this->t('Table'), '
' . $this->t('Table header') . '
' . $this->t('Table cell') . '
'], - 'tr' => NULL, 'td' => NULL, 'th' => NULL, + 'tr' => NULL, + 'td' => NULL, + 'th' => NULL, 'del' => [$this->t('Deleted'), '' . $this->t('Deleted') . ''], 'ins' => [$this->t('Inserted'), '' . $this->t('Inserted') . ''], // Assumes and describes li. @@ -380,7 +382,8 @@ public function tips($long = FALSE) { 'li' => NULL, // Assumes and describes dt and dd. 'dl' => [$this->t('Definition lists are similar to other HTML lists. <dl> begins the definition list, <dt> begins the definition term and <dd> begins the definition description.'), '
' . $this->t('First term') . '
' . $this->t('First definition') . '
' . $this->t('Second term') . '
' . $this->t('Second definition') . '
'], - 'dt' => NULL, 'dd' => NULL, + 'dt' => NULL, + 'dd' => NULL, 'h1' => [$this->t('Heading'), '

' . $this->t('Title') . '

'], 'h2' => [$this->t('Heading'), '

' . $this->t('Subtitle') . '

'], 'h3' => [$this->t('Heading'), '

' . $this->t('Subtitle three') . '

'], @@ -396,19 +399,17 @@ public function tips($long = FALSE) { ['data' => $tips[$tag][0], 'class' => ['description']], // The markup must be escaped because this is the example code for the // user. - ['data' => - [ + [ + 'data' => [ '#prefix' => '', '#plain_text' => $tips[$tag][1], - '#suffix' => '' + '#suffix' => '', ], - 'class' => ['type']], + 'class' => ['type'], + ], // The markup must not be escaped because this is the example output // for the user. - ['data' => - ['#markup' => $tips[$tag][1]], - 'class' => ['get'], - ], + ['data' => ['#markup' => $tips[$tag][1]], 'class' => ['get']], ]; } else { diff --git a/core/modules/forum/forum.module b/core/modules/forum/forum.module index 51472cf..b668956 100644 --- a/core/modules/forum/forum.module +++ b/core/modules/forum/forum.module @@ -455,11 +455,14 @@ function template_preprocess_forums(&$variables) { $variables['topics'][$id]->title_link = \Drupal::l($topic->getTitle(), $topic->urlInfo()); $variables['topics'][$id]->message = ''; } - $forum_submitted = ['#theme' => 'forum_submitted', '#topic' => (object) [ - 'uid' => $topic->getOwnerId(), - 'name' => $topic->getOwner()->getDisplayName(), - 'created' => $topic->getCreatedTime(), - ]]; + $forum_submitted = [ + '#theme' => 'forum_submitted', + '#topic' => (object) [ + 'uid' => $topic->getOwnerId(), + 'name' => $topic->getOwner()->getDisplayName(), + 'created' => $topic->getCreatedTime(), + ], + ]; $variables['topics'][$id]->submitted = \Drupal::service('renderer')->render($forum_submitted); $forum_submitted = [ '#theme' => 'forum_submitted', diff --git a/core/modules/hal/tests/src/Kernel/DenormalizeTest.php b/core/modules/hal/tests/src/Kernel/DenormalizeTest.php index d3662cb..4bc8b71 100644 --- a/core/modules/hal/tests/src/Kernel/DenormalizeTest.php +++ b/core/modules/hal/tests/src/Kernel/DenormalizeTest.php @@ -62,8 +62,7 @@ public function testTypeHandling() { // No type. $data_with_no_type = [ - '_links' => [ - ], + '_links' => [], ]; try { $this->serializer->denormalize($data_with_no_type, $this->entityClass, $this->format); diff --git a/core/modules/hal/tests/src/Kernel/FileNormalizeTest.php b/core/modules/hal/tests/src/Kernel/FileNormalizeTest.php index 8f535c5..c4b67f5 100644 --- a/core/modules/hal/tests/src/Kernel/FileNormalizeTest.php +++ b/core/modules/hal/tests/src/Kernel/FileNormalizeTest.php @@ -44,8 +44,7 @@ public function testNormalize() { $expected_array = [ 'uri' => [ - [ - 'value' => file_create_url($file->getFileUri())], + ['value' => file_create_url($file->getFileUri())], ], ]; diff --git a/core/modules/image/tests/src/Kernel/Migrate/d6/MigrateImageCacheTest.php b/core/modules/image/tests/src/Kernel/Migrate/d6/MigrateImageCacheTest.php index d938140..e92685b 100644 --- a/core/modules/image/tests/src/Kernel/Migrate/d6/MigrateImageCacheTest.php +++ b/core/modules/image/tests/src/Kernel/Migrate/d6/MigrateImageCacheTest.php @@ -141,9 +141,11 @@ public function testInvalidCropValues() { $this->startCollectingMessages(); $this->executeMigration('d6_imagecache_presets'); - $this->assertEqual(['error' => [ - 'The Drupal 8 image crop effect does not support numeric values for x and y offsets. Use keywords to set crop effect offsets instead.' - ]], $this->migrateMessages); + $this->assertEqual([ + 'error' => [ + 'The Drupal 8 image crop effect does not support numeric values for x and y offsets. Use keywords to set crop effect offsets instead.', + ], + ], $this->migrateMessages); } /** diff --git a/core/modules/language/tests/src/Kernel/Views/ArgumentLanguageTest.php b/core/modules/language/tests/src/Kernel/Views/ArgumentLanguageTest.php index 27c7410..3f69cf4 100644 --- a/core/modules/language/tests/src/Kernel/Views/ArgumentLanguageTest.php +++ b/core/modules/language/tests/src/Kernel/Views/ArgumentLanguageTest.php @@ -35,9 +35,9 @@ public function testArgument() { ]); $this->executeView($view, [$langcode]); - $expected = [[ - 'name' => $name, - ]]; + $expected = [ + ['name' => $name], + ]; $this->assertIdenticalResultset($view, $expected, ['views_test_data_name' => 'name']); $view->destroy(); } diff --git a/core/modules/language/tests/src/Kernel/Views/FilterLanguageTest.php b/core/modules/language/tests/src/Kernel/Views/FilterLanguageTest.php index c9dc98c..c94d623 100644 --- a/core/modules/language/tests/src/Kernel/Views/FilterLanguageTest.php +++ b/core/modules/language/tests/src/Kernel/Views/FilterLanguageTest.php @@ -36,9 +36,9 @@ public function testFilter() { ]); $this->executeView($view); - $expected = [[ - 'name' => $name, - ]]; + $expected = [ + ['name' => $name], + ]; $this->assertIdenticalResultset($view, $expected, ['views_test_data_name' => 'name']); $expected = [ diff --git a/core/modules/locale/locale.batch.inc b/core/modules/locale/locale.batch.inc index 7edc85d..fade172 100644 --- a/core/modules/locale/locale.batch.inc +++ b/core/modules/locale/locale.batch.inc @@ -238,11 +238,13 @@ function locale_translation_http_check($uri) { $logger = \Drupal::logger('locale'); try { $actual_uri = NULL; - $response = \Drupal::service('http_client_factory')->fromOptions(['allow_redirects' => [ - 'on_redirect' => function(RequestInterface $request, ResponseInterface $response, UriInterface $request_uri) use (&$actual_uri) { - $actual_uri = (string) $request_uri; - } - ]])->head($uri); + $response = \Drupal::service('http_client_factory')->fromOptions([ + 'allow_redirects' => [ + 'on_redirect' => function(RequestInterface $request, ResponseInterface $response, UriInterface $request_uri) use (&$actual_uri) { + $actual_uri = (string) $request_uri; + } + ], + ])->head($uri); $result = []; // Return the effective URL if it differs from the requested. diff --git a/core/modules/locale/tests/src/Functional/LocaleImportFunctionalTest.php b/core/modules/locale/tests/src/Functional/LocaleImportFunctionalTest.php index e3a2c26..581c98f 100644 --- a/core/modules/locale/tests/src/Functional/LocaleImportFunctionalTest.php +++ b/core/modules/locale/tests/src/Functional/LocaleImportFunctionalTest.php @@ -341,7 +341,8 @@ public function testConfigtranslationImportingPoFile() { // Import a .po file to translate. $this->importPoFile($this->getPoFileWithConfigDe(), [ - 'langcode' => $langcode]); + 'langcode' => $langcode, + ]); // Check that the 'Anonymous' string is translated. $config = \Drupal::languageManager()->getLanguageConfigOverride($langcode, 'user.settings'); diff --git a/core/modules/menu_ui/tests/src/Functional/MenuCacheTagsTest.php b/core/modules/menu_ui/tests/src/Functional/MenuCacheTagsTest.php index f7bf7f8..0b08ebd 100644 --- a/core/modules/menu_ui/tests/src/Functional/MenuCacheTagsTest.php +++ b/core/modules/menu_ui/tests/src/Functional/MenuCacheTagsTest.php @@ -82,9 +82,9 @@ public function testMenuBlock() { 'parent' => '', 'title' => 'Alpaca', 'menu_name' => 'llama', - 'link' => [[ - 'uri' => 'internal:/', - ]], + 'link' => [ + ['uri' => 'internal:/'], + ], 'bundle' => 'menu_name', ]); $menu_link_2->save(); diff --git a/core/modules/node/src/NodeViewBuilder.php b/core/modules/node/src/NodeViewBuilder.php index f96302b..f0971fb 100644 --- a/core/modules/node/src/NodeViewBuilder.php +++ b/core/modules/node/src/NodeViewBuilder.php @@ -29,12 +29,14 @@ public function buildComponents(array &$build, array $entities, array $displays, if ($display->getComponent('links')) { $build[$id]['links'] = [ - '#lazy_builder' => [get_called_class() . '::renderLinks', [ - $entity->id(), - $view_mode, - $entity->language()->getId(), - !empty($entity->in_preview), - ]], + '#lazy_builder' => [ + get_called_class() . '::renderLinks', [ + $entity->id(), + $view_mode, + $entity->language()->getId(), + !empty($entity->in_preview), + ], + ], ]; } diff --git a/core/modules/node/src/Tests/NodeRevisionsTest.php b/core/modules/node/src/Tests/NodeRevisionsTest.php index 1982266..230e836 100644 --- a/core/modules/node/src/Tests/NodeRevisionsTest.php +++ b/core/modules/node/src/Tests/NodeRevisionsTest.php @@ -168,9 +168,14 @@ public function testRevisions() { // Confirm that revisions revert properly. $this->drupalPostForm("node/" . $node->id() . "/revisions/" . $nodes[1]->getRevisionid() . "/revert", [], t('Revert')); - $this->assertRaw(t('@type %title has been reverted to the revision from %revision-date.', - ['@type' => 'Basic page', '%title' => $nodes[1]->label(), - '%revision-date' => format_date($nodes[1]->getRevisionCreationTime())]), 'Revision reverted.'); + $this->assertRaw( + t('@type %title has been reverted to the revision from %revision-date.', [ + '@type' => 'Basic page', + '%title' => $nodes[1]->label(), + '%revision-date' => format_date($nodes[1]->getRevisionCreationTime()) + ]), + 'Revision reverted.' + ); $node_storage->resetCache([$node->id()]); $reverted_node = $node_storage->load($node->id()); $this->assertTrue(($nodes[1]->body->value == $reverted_node->body->value), 'Node reverted correctly.'); @@ -191,9 +196,11 @@ public function testRevisions() { // Confirm revisions delete properly. $this->drupalPostForm("node/" . $node->id() . "/revisions/" . $nodes[1]->getRevisionId() . "/delete", [], t('Delete')); - $this->assertRaw(t('Revision from %revision-date of @type %title has been deleted.', - ['%revision-date' => format_date($nodes[1]->getRevisionCreationTime()), - '@type' => 'Basic page', '%title' => $nodes[1]->label()]), 'Revision deleted.'); + $this->assertRaw(t('Revision from %revision-date of @type %title has been deleted.', [ + '%revision-date' => format_date($nodes[1]->getRevisionCreationTime()), + '@type' => 'Basic page', + '%title' => $nodes[1]->label(), + ]), 'Revision deleted.'); $this->assertTrue(db_query('SELECT COUNT(vid) FROM {node_revision} WHERE nid = :nid and vid = :vid', [':nid' => $node->id(), ':vid' => $nodes[1]->getRevisionId()])->fetchField() == 0, 'Revision not found.'); $this->assertTrue(db_query('SELECT COUNT(vid) FROM {node_field_revision} WHERE nid = :nid and vid = :vid', [':nid' => $node->id(), ':vid' => $nodes[1]->getRevisionId()])->fetchField() == 0, 'Field revision not found.'); diff --git a/core/modules/node/tests/src/Functional/Views/BulkFormAccessTest.php b/core/modules/node/tests/src/Functional/Views/BulkFormAccessTest.php index 04948c5..194b9b0 100644 --- a/core/modules/node/tests/src/Functional/Views/BulkFormAccessTest.php +++ b/core/modules/node/tests/src/Functional/Views/BulkFormAccessTest.php @@ -67,9 +67,9 @@ public function testNodeEditAccess() { // Create a private node (author may view, edit and delete, others may not). $node = $this->drupalCreateNode([ 'type' => 'article', - 'private' => [[ - 'value' => TRUE, - ]], + 'private' => [ + ['value' => TRUE], + ], 'uid' => $author->id(), ]); // Create an account that may view the private node, but not edit it. @@ -134,9 +134,9 @@ public function testNodeDeleteAccess() { // Create a private node (author may view, edit and delete, others may not). $private_node = $this->drupalCreateNode([ 'type' => 'article', - 'private' => [[ - 'value' => TRUE, - ]], + 'private' => [ + ['value' => TRUE], + ], 'uid' => $author->id(), ]); // Create an account that may view the private node, but not delete it. @@ -146,9 +146,9 @@ public function testNodeDeleteAccess() { // deleted by the author. $own_node = $this->drupalCreateNode([ 'type' => 'article', - 'private' => [[ - 'value' => TRUE, - ]], + 'private' => [ + ['value' => TRUE], + ], 'uid' => $account->id(), ]); $this->drupalLogin($account); diff --git a/core/modules/node/tests/src/Functional/Views/FilterNodeAccessTest.php b/core/modules/node/tests/src/Functional/Views/FilterNodeAccessTest.php index 44f08a6..7eb7097 100644 --- a/core/modules/node/tests/src/Functional/Views/FilterNodeAccessTest.php +++ b/core/modules/node/tests/src/Functional/Views/FilterNodeAccessTest.php @@ -54,10 +54,12 @@ protected function setUp($import_test_views = TRUE) { $this->drupalLogin($web_user); foreach ([0 => 'Public', 1 => 'Private'] as $is_private => $type) { $settings = [ - 'body' => [[ - 'value' => $type . ' node', - 'format' => filter_default_format(), - ]], + 'body' => [ + [ + 'value' => $type . ' node', + 'format' => filter_default_format(), + ], + ], 'title' => t('@private_public Article created by @user', ['@private_public' => $type, '@user' => $web_user->getUsername()]), 'type' => 'article', 'uid' => $web_user->id(), diff --git a/core/modules/node/tests/src/Traits/NodeCreationTrait.php b/core/modules/node/tests/src/Traits/NodeCreationTrait.php index 56d6fa5..6e0cf6a 100644 --- a/core/modules/node/tests/src/Traits/NodeCreationTrait.php +++ b/core/modules/node/tests/src/Traits/NodeCreationTrait.php @@ -67,10 +67,12 @@ public function getNodeByTitle($title, $reset = FALSE) { protected function createNode(array $settings = []) { // Populate defaults array. $settings += [ - 'body' => [[ - 'value' => $this->randomMachineName(32), - 'format' => filter_default_format(), - ]], + 'body' => [ + [ + 'value' => $this->randomMachineName(32), + 'format' => filter_default_format(), + ], + ], 'title' => $this->randomMachineName(8), 'type' => 'page', 'uid' => \Drupal::currentUser()->id(), diff --git a/core/modules/rest/src/Tests/RESTTestBase.php b/core/modules/rest/src/Tests/RESTTestBase.php index 40a9fe2..3f97e46 100644 --- a/core/modules/rest/src/Tests/RESTTestBase.php +++ b/core/modules/rest/src/Tests/RESTTestBase.php @@ -306,10 +306,12 @@ protected function entityValues($entity_type_id) { return [ 'name' => $this->randomMachineName(), 'user_id' => 1, - 'field_test_text' => [0 => [ - 'value' => $this->randomString(), - 'format' => 'plain_text', - ]], + 'field_test_text' => [ + 0 => [ + 'value' => $this->randomString(), + 'format' => 'plain_text', + ], + ], ]; case 'config_test': return [ diff --git a/core/modules/rest/tests/src/Functional/ResourceTest.php b/core/modules/rest/tests/src/Functional/ResourceTest.php index 8a32016..1e8babe 100644 --- a/core/modules/rest/tests/src/Functional/ResourceTest.php +++ b/core/modules/rest/tests/src/Functional/ResourceTest.php @@ -41,10 +41,12 @@ protected function setUp() { $this->entity = EntityTest::create([ 'name' => $this->randomMachineName(), 'user_id' => 1, - 'field_test_text' => [0 => [ - 'value' => $this->randomString(), - 'format' => 'plain_text', - ]], + 'field_test_text' => [ + 0 => [ + 'value' => $this->randomString(), + 'format' => 'plain_text', + ], + ], ]); $this->entity->save(); diff --git a/core/modules/rest/tests/src/Kernel/Entity/ConfigDependenciesTest.php b/core/modules/rest/tests/src/Kernel/Entity/ConfigDependenciesTest.php index f62ee03..51ad3e9 100644 --- a/core/modules/rest/tests/src/Kernel/Entity/ConfigDependenciesTest.php +++ b/core/modules/rest/tests/src/Kernel/Entity/ConfigDependenciesTest.php @@ -30,9 +30,9 @@ public function testCalculateDependencies(array $configuration) { $rest_config = RestResourceConfig::create($configuration); $result = $config_dependencies->calculateDependencies($rest_config); - $this->assertEquals(['module' => [ - 'basic_auth', 'serialization', 'hal', - ]], $result); + $this->assertEquals([ + 'module' => ['basic_auth', 'serialization', 'hal'], + ], $result); } /** diff --git a/core/modules/search/src/Plugin/SearchPluginBase.php b/core/modules/search/src/Plugin/SearchPluginBase.php index 7bf4f0f..7312df4 100644 --- a/core/modules/search/src/Plugin/SearchPluginBase.php +++ b/core/modules/search/src/Plugin/SearchPluginBase.php @@ -146,16 +146,18 @@ public function buildSearchUrlQuery(FormStateInterface $form_state) { public function getHelp() { // This default search help is appropriate for plugins like NodeSearch // that use the SearchQuery class. - $help = ['list' => [ - '#theme' => 'item_list', - '#items' => [ - $this->t('Search looks for exact, case-insensitive keywords; keywords shorter than a minimum length are ignored.'), - $this->t('Use upper-case OR to get more results. Example: cat OR dog (content contains either "cat" or "dog").'), - $this->t('You can use upper-case AND to require all words, but this is the same as the default behavior. Example: cat AND dog (same as cat dog, content must contain both "cat" and "dog").'), - $this->t('Use quotes to search for a phrase. Example: "the cat eats mice".'), - $this->t('You can precede keywords by - to exclude them; you must still have at least one "positive" keyword. Example: cat -dog (content must contain cat and cannot contain dog).'), + $help = [ + 'list' => [ + '#theme' => 'item_list', + '#items' => [ + $this->t('Search looks for exact, case-insensitive keywords; keywords shorter than a minimum length are ignored.'), + $this->t('Use upper-case OR to get more results. Example: cat OR dog (content contains either "cat" or "dog").'), + $this->t('You can use upper-case AND to require all words, but this is the same as the default behavior. Example: cat AND dog (same as cat dog, content must contain both "cat" and "dog").'), + $this->t('Use quotes to search for a phrase. Example: "the cat eats mice".'), + $this->t('You can precede keywords by - to exclude them; you must still have at least one "positive" keyword. Example: cat -dog (content must contain cat and cannot contain dog).'), + ], ], - ]]; + ]; return $help; } diff --git a/core/modules/search/src/Tests/SearchNodeUpdateAndDeletionTest.php b/core/modules/search/src/Tests/SearchNodeUpdateAndDeletionTest.php index 9b86052..c19814e 100644 --- a/core/modules/search/src/Tests/SearchNodeUpdateAndDeletionTest.php +++ b/core/modules/search/src/Tests/SearchNodeUpdateAndDeletionTest.php @@ -39,7 +39,8 @@ public function testSearchIndexUpdateOnNodeChange() { $node = $this->drupalCreateNode([ 'title' => 'Someone who says Ni!', 'body' => [['value' => "We are the knights who say Ni!"]], - 'type' => 'page']); + 'type' => 'page', + ]); $node_search_plugin = $this->container->get('plugin.manager.search')->createInstance('node_search'); // Update the search index. @@ -73,7 +74,8 @@ public function testSearchIndexUpdateOnNodeDeletion() { $node = $this->drupalCreateNode([ 'title' => 'No dragons here', 'body' => [['value' => 'Again: No dragons here']], - 'type' => 'page']); + 'type' => 'page', + ]); $node_search_plugin = $this->container->get('plugin.manager.search')->createInstance('node_search'); // Update the search index. diff --git a/core/modules/search/src/Tests/SearchRankingTest.php b/core/modules/search/src/Tests/SearchRankingTest.php index 28241d2..55da9ac 100644 --- a/core/modules/search/src/Tests/SearchRankingTest.php +++ b/core/modules/search/src/Tests/SearchRankingTest.php @@ -53,9 +53,9 @@ public function testRankings() { foreach ($node_ranks as $node_rank) { $settings = [ 'type' => 'page', - 'comment' => [[ - 'status' => CommentItemInterface::HIDDEN, - ]], + 'comment' => [ + ['status' => CommentItemInterface::HIDDEN], + ], 'title' => 'Drupal rocks', 'body' => [['value' => "Drupal's search rocks"]], // Node is one day old. diff --git a/core/modules/search/tests/src/Functional/SearchMultilingualEntityTest.php b/core/modules/search/tests/src/Functional/SearchMultilingualEntityTest.php index 3dfc117..9b3a6dd 100644 --- a/core/modules/search/tests/src/Functional/SearchMultilingualEntityTest.php +++ b/core/modules/search/tests/src/Functional/SearchMultilingualEntityTest.php @@ -78,16 +78,11 @@ protected function setUp() { // After the third node, we don't care what the settings are. But we // need to have at least 5 to make sure the throttling is working // correctly. So, let's make 8 total. - [ - ], - [ - ], - [ - ], - [ - ], - [ - ], + [], + [], + [], + [], + [], ]; $this->searchableNodes = []; foreach ($nodes as $setting) { diff --git a/core/modules/simpletest/tests/src/Unit/TestDiscoveryTest.php b/core/modules/simpletest/tests/src/Unit/TestDiscoveryTest.php index 88a2aca..625297e 100644 --- a/core/modules/simpletest/tests/src/Unit/TestDiscoveryTest.php +++ b/core/modules/simpletest/tests/src/Unit/TestDiscoveryTest.php @@ -348,8 +348,7 @@ public function testGetTestClassesWithSelectedTypes() { $result = $test_discovery->getTestClasses(NULL, ['PHPUnit-Kernel']); $this->assertCount(2, $result); $this->assertEquals([ - 'example' => [ - ], + 'example' => [], 'example2' => [ 'Drupal\Tests\test_module\Kernel\KernelExampleTest3' => [ 'name' => 'Drupal\Tests\test_module\Kernel\KernelExampleTest3', diff --git a/core/modules/system/src/Form/DateFormatDeleteForm.php b/core/modules/system/src/Form/DateFormatDeleteForm.php index 901c34b..fd9eed5 100644 --- a/core/modules/system/src/Form/DateFormatDeleteForm.php +++ b/core/modules/system/src/Form/DateFormatDeleteForm.php @@ -42,8 +42,9 @@ public static function create(ContainerInterface $container) { */ public function getQuestion() { return t('Are you sure you want to delete the format %name : %format?', [ - '%name' => $this->entity->label(), - '%format' => $this->dateFormatter->format(REQUEST_TIME, $this->entity->id())] + '%name' => $this->entity->label(), + '%format' => $this->dateFormatter->format(REQUEST_TIME, $this->entity->id()), + ] ); } diff --git a/core/modules/system/src/Tests/Ajax/DialogTest.php b/core/modules/system/src/Tests/Ajax/DialogTest.php index ec94782..90c548b 100644 --- a/core/modules/system/src/Tests/Ajax/DialogTest.php +++ b/core/modules/system/src/Tests/Ajax/DialogTest.php @@ -175,10 +175,12 @@ public function testDialog() { 'edit-preview' => [ 'callback' => '::preview', 'event' => 'click', - 'url' => Url::fromRoute('ajax_test.dialog_form', [], ['query' => [ + 'url' => Url::fromRoute('ajax_test.dialog_form', [], [ + 'query' => [ MainContentViewSubscriber::WRAPPER_FORMAT => 'drupal_modal', FormBuilderInterface::AJAX_FORM_REQUEST => TRUE, - ]])->toString(), + ], + ])->toString(), 'dialogType' => 'ajax', 'submit' => [ '_triggering_element_name' => 'op', diff --git a/core/modules/system/src/Tests/System/PageTitleTest.php b/core/modules/system/src/Tests/System/PageTitleTest.php index 3b4d38a..44e33cb 100644 --- a/core/modules/system/src/Tests/System/PageTitleTest.php +++ b/core/modules/system/src/Tests/System/PageTitleTest.php @@ -113,9 +113,9 @@ public function testRoutingTitle() { $this->assertEqual('Test dynamic title', (string) $result[0]); // Set some custom translated strings. - $this->addCustomTranslations('en', ['' => [ - 'Static title' => 'Static title translated' - ]]); + $this->addCustomTranslations('en', [ + '' => ['Static title' => 'Static title translated'], + ]); $this->writeCustomTranslations(); // Ensure that the title got translated. diff --git a/core/modules/system/src/Tests/Update/UpdatePathTestBase.php b/core/modules/system/src/Tests/Update/UpdatePathTestBase.php index 16a4295..05719fb 100644 --- a/core/modules/system/src/Tests/Update/UpdatePathTestBase.php +++ b/core/modules/system/src/Tests/Update/UpdatePathTestBase.php @@ -243,10 +243,14 @@ protected function runUpdates() { } // The site might be broken at the time so logging in using the UI might // not work, so we use the API itself. - drupal_rewrite_settings(['settings' => ['update_free_access' => (object) [ - 'value' => TRUE, - 'required' => TRUE, - ]]]); + drupal_rewrite_settings([ + 'settings' => [ + 'update_free_access' => (object) [ + 'value' => TRUE, + 'required' => TRUE, + ], + ], + ]); $this->drupalGet($this->updateUrl); $this->clickLink(t('Continue')); diff --git a/core/modules/system/tests/modules/ajax_forms_test/src/Form/AjaxFormsTestSimpleForm.php b/core/modules/system/tests/modules/ajax_forms_test/src/Form/AjaxFormsTestSimpleForm.php index f69a123..b8e9213 100644 --- a/core/modules/system/tests/modules/ajax_forms_test/src/Form/AjaxFormsTestSimpleForm.php +++ b/core/modules/system/tests/modules/ajax_forms_test/src/Form/AjaxFormsTestSimpleForm.php @@ -31,7 +31,8 @@ public function buildForm(array $form, FormStateInterface $form_state) { '#options' => [ 'red' => 'red', 'green' => 'green', - 'blue' => 'blue'], + 'blue' => 'blue', + ], '#ajax' => [ 'callback' => [$object, 'selectCallback'], ], diff --git a/core/modules/system/tests/modules/database_test/database_test.install b/core/modules/system/tests/modules/database_test/database_test.install index 62cf38a..b4e3ca5 100644 --- a/core/modules/system/tests/modules/database_test/database_test.install +++ b/core/modules/system/tests/modules/database_test/database_test.install @@ -207,7 +207,8 @@ function database_test_schema() { 'type' => 'int', 'unsigned' => TRUE, 'not null' => FALSE, - 'default' => 0], + 'default' => 0, + ], ], 'primary key' => ['id'], 'unique keys' => [ diff --git a/core/modules/system/tests/modules/database_test/src/Controller/DatabaseTestController.php b/core/modules/system/tests/modules/database_test/src/Controller/DatabaseTestController.php index bd6dd9c..56ea9d1 100644 --- a/core/modules/system/tests/modules/database_test/src/Controller/DatabaseTestController.php +++ b/core/modules/system/tests/modules/database_test/src/Controller/DatabaseTestController.php @@ -91,7 +91,7 @@ public function testTablesort() { 'tid' => ['data' => t('Task ID'), 'field' => 'tid', 'sort' => 'desc'], 'pid' => ['data' => t('Person ID'), 'field' => 'pid'], 'task' => ['data' => t('Task'), 'field' => 'task'], - 'priority' => ['data' => t('Priority'), 'field' => 'priority', ], + 'priority' => ['data' => t('Priority'), 'field' => 'priority'], ]; $query = db_select('test_task', 't'); @@ -123,7 +123,7 @@ public function testTablesortFirst() { 'tid' => ['data' => t('Task ID'), 'field' => 'tid', 'sort' => 'desc'], 'pid' => ['data' => t('Person ID'), 'field' => 'pid'], 'task' => ['data' => t('Task'), 'field' => 'task'], - 'priority' => ['data' => t('Priority'), 'field' => 'priority', ], + 'priority' => ['data' => t('Priority'), 'field' => 'priority'], ]; $query = db_select('test_task', 't'); diff --git a/core/modules/system/tests/modules/early_rendering_controller_test/src/EarlyRenderingTestController.php b/core/modules/system/tests/modules/early_rendering_controller_test/src/EarlyRenderingTestController.php index 0b0cdf4..9ba11b7 100644 --- a/core/modules/system/tests/modules/early_rendering_controller_test/src/EarlyRenderingTestController.php +++ b/core/modules/system/tests/modules/early_rendering_controller_test/src/EarlyRenderingTestController.php @@ -62,7 +62,8 @@ public function renderArray() { '#pre_render' => [function () { $elements = $this->earlyRenderContent(); return $elements; - }], + } + ], ]; } diff --git a/core/modules/system/tests/modules/entity_test_update/entity_test_update.module b/core/modules/system/tests/modules/entity_test_update/entity_test_update.module index 225c549..bd674dd 100644 --- a/core/modules/system/tests/modules/entity_test_update/entity_test_update.module +++ b/core/modules/system/tests/modules/entity_test_update/entity_test_update.module @@ -103,13 +103,15 @@ function _entity_test_update_create_test_entities($start = 1, $end = 50, $add_tr 'id' => $i, 'name' => $i, 'test_single_property' => $i . ' - test single property', - 'test_multiple_properties' => [[ - 'value1' => $i . ' - test multiple properties - value1', - 'value2' => $i . ' - test multiple properties - value2', - ]], + 'test_multiple_properties' => [ + [ + 'value1' => $i . ' - test multiple properties - value1', + 'value2' => $i . ' - test multiple properties - value2', + ], + ], 'test_single_property_multiple_values' => [ ['value' => $i . ' - test single property multiple values 0'], - ['value' => $i . ' - test single property multiple values 1'] + ['value' => $i . ' - test single property multiple values 1'], ], 'test_multiple_properties_multiple_values' => [ [ @@ -119,7 +121,7 @@ function _entity_test_update_create_test_entities($start = 1, $end = 50, $add_tr [ 'value1' => $i . ' - test multiple properties multiple values - value1 1', 'value2' => $i . ' - test multiple properties multiple values - value2 1', - ] + ], ], 'test_non_rev_field' => $i . ' - test non-revisionable field', 'test_non_mul_field' => $i . ' - test non-translatable field', @@ -132,7 +134,7 @@ function _entity_test_update_create_test_entities($start = 1, $end = 50, $add_tr [ 'value1' => $i . ' - field test configurable field - value1 1', 'value2' => $i . ' - field test configurable field - value2 1', - ] + ], ], 'test_entity_base_field_info' => $i . ' - test entity base field info', ]); @@ -141,13 +143,15 @@ function _entity_test_update_create_test_entities($start = 1, $end = 50, $add_tr $entity->addTranslation('ro', [ 'name' => $i . ' - ro', 'test_single_property' => $i . ' - test single property - ro', - 'test_multiple_properties' => [[ - 'value1' => $i . ' - test multiple properties - value1 - ro', - 'value2' => $i . ' - test multiple properties - value2 - ro', - ]], + 'test_multiple_properties' => [ + [ + 'value1' => $i . ' - test multiple properties - value1 - ro', + 'value2' => $i . ' - test multiple properties - value2 - ro', + ], + ], 'test_single_property_multiple_values' => [ ['value' => $i . ' - test single property multiple values 0 - ro'], - ['value' => $i . ' - test single property multiple values 1 - ro'] + ['value' => $i . ' - test single property multiple values 1 - ro'], ], 'test_multiple_properties_multiple_values' => [ [ @@ -157,7 +161,7 @@ function _entity_test_update_create_test_entities($start = 1, $end = 50, $add_tr [ 'value1' => $i . ' - test multiple properties multiple values - value1 1 - ro', 'value2' => $i . ' - test multiple properties multiple values - value2 1 - ro', - ] + ], ], 'test_non_rev_field' => $i . ' - test non-revisionable field - ro', 'field_test_configurable_field' => [ @@ -168,7 +172,7 @@ function _entity_test_update_create_test_entities($start = 1, $end = 50, $add_tr [ 'value1' => $i . ' - field test configurable field - value1 1 - ro', 'value2' => $i . ' - field test configurable field - value2 1 - ro', - ] + ], ], 'test_entity_base_field_info' => $i . ' - test entity base field info - ro', ]); diff --git a/core/modules/system/tests/src/Functional/Theme/ThemeInfoTest.php b/core/modules/system/tests/src/Functional/Theme/ThemeInfoTest.php index 534f614..e372bb2 100644 --- a/core/modules/system/tests/src/Functional/Theme/ThemeInfoTest.php +++ b/core/modules/system/tests/src/Functional/Theme/ThemeInfoTest.php @@ -66,11 +66,11 @@ public function testStylesheets() { // should work nevertheless. $this->drupalGet('theme-test/info/stylesheets'); - $this->assertIdentical(1, count($this->xpath('//link[contains(@href, :href)]', [':href' => "$base/base-add.css"])), "$base/base-add.css found"); - $this->assertIdentical(0, count($this->xpath('//link[contains(@href, :href)]', [':href' => "base-remove.css"])), "base-remove.css not found"); + $this->assertIdentical(1, count($this->xpath('//link[contains(@href, :href)]', [':href' => "$base/base-add.css"])), "$base/base-add.css found"); + $this->assertIdentical(0, count($this->xpath('//link[contains(@href, :href)]', [':href' => "base-remove.css"])), "base-remove.css not found"); - $this->assertIdentical(1, count($this->xpath('//link[contains(@href, :href)]', [':href' => "$sub/sub-add.css"])), "$sub/sub-add.css found"); - $this->assertIdentical(0, count($this->xpath('//link[contains(@href, :href)]', [':href' => "sub-remove.css"])), "sub-remove.css not found"); + $this->assertIdentical(1, count($this->xpath('//link[contains(@href, :href)]', [':href' => "$sub/sub-add.css"])), "$sub/sub-add.css found"); + $this->assertIdentical(0, count($this->xpath('//link[contains(@href, :href)]', [':href' => "sub-remove.css"])), "sub-remove.css not found"); $this->assertIdentical(0, count($this->xpath('//link[contains(@href, :href)]', [':href' => "base-add.sub-remove.css"])), "base-add.sub-remove.css not found"); // Verify that CSS files with the same name are loaded from both the base theme and subtheme. diff --git a/core/modules/system/tests/src/Unit/Menu/SystemLocalTasksTest.php b/core/modules/system/tests/src/Unit/Menu/SystemLocalTasksTest.php index c632a3e..cfa51fa 100644 --- a/core/modules/system/tests/src/Unit/Menu/SystemLocalTasksTest.php +++ b/core/modules/system/tests/src/Unit/Menu/SystemLocalTasksTest.php @@ -61,10 +61,13 @@ public function testSystemAdminLocalTasks($route, $expected) { public function getSystemAdminRoutes() { return [ ['system.admin_content', [['system.admin_content']]], - ['system.theme_settings_theme', [ - ['system.themes_page', 'system.theme_settings'], - ['system.theme_settings_global', 'system.theme_settings_theme:bartik'], - ]], + [ + 'system.theme_settings_theme', + [ + ['system.themes_page', 'system.theme_settings'], + ['system.theme_settings_global', 'system.theme_settings_theme:bartik'], + ], + ], ]; } diff --git a/core/modules/taxonomy/tests/src/Functional/TermTranslationFieldViewTest.php b/core/modules/taxonomy/tests/src/Functional/TermTranslationFieldViewTest.php index dfd5e51..236ac70 100644 --- a/core/modules/taxonomy/tests/src/Functional/TermTranslationFieldViewTest.php +++ b/core/modules/taxonomy/tests/src/Functional/TermTranslationFieldViewTest.php @@ -74,10 +74,12 @@ protected function setUpNode() { $node = Node::create([ 'title' => $this->randomMachineName(), 'type' => 'article', - 'description' => [[ - 'value' => $this->randomMachineName(), - 'format' => 'basic_html' - ]], + 'description' => [ + [ + 'value' => $this->randomMachineName(), + 'format' => 'basic_html', + ], + ], $this->termFieldName => [['target_id' => $this->term->id()]], 'langcode' => $this->baseLangcode, ]); diff --git a/core/modules/text/tests/src/Unit/Migrate/TextCckTest.php b/core/modules/text/tests/src/Unit/Migrate/TextCckTest.php index 3a6949a..73d7e2e 100644 --- a/core/modules/text/tests/src/Unit/Migrate/TextCckTest.php +++ b/core/modules/text/tests/src/Unit/Migrate/TextCckTest.php @@ -123,37 +123,33 @@ public function testProcessBooleanTextExplicitValues() { */ public function getFieldTypeProvider() { return [ - ['string_long', 'text_textfield', [ - 'text_processing' => FALSE, - ]], + ['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_long', 'text_textfield', [ - 'text_processing' => TRUE, - ]], + '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'], ['boolean', 'optionwidgets_onoff'], - ['text_long', 'text_textarea', [ - 'text_processing' => TRUE, - ]], - ['string_long', 'text_textarea', [ - 'text_processing' => FALSE, - ]], + ['text_long', 'text_textarea', ['text_processing' => TRUE]], + ['string_long', 'text_textarea', ['text_processing' => FALSE]], [NULL, 'undefined'], ]; } 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 d550b40..44fb04e 100644 --- a/core/modules/text/tests/src/Unit/Migrate/d6/TextFieldTest.php +++ b/core/modules/text/tests/src/Unit/Migrate/d6/TextFieldTest.php @@ -123,37 +123,33 @@ public function testProcessBooleanTextExplicitValues() { */ public function getFieldTypeProvider() { return [ - ['string_long', 'text_textfield', [ - 'text_processing' => FALSE, - ]], + ['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_long', 'text_textfield', [ - 'text_processing' => TRUE, - ]], + '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'], ['boolean', 'optionwidgets_onoff'], - ['text_long', 'text_textarea', [ - 'text_processing' => TRUE, - ]], - ['string_long', 'text_textarea', [ - 'text_processing' => FALSE, - ]], + ['text_long', 'text_textarea', ['text_processing' => TRUE]], + ['string_long', 'text_textarea', ['text_processing' => FALSE]], [NULL, 'undefined'], ]; } 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 2a93bca..6f2d967 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 @@ -123,37 +123,33 @@ public function testProcessBooleanTextExplicitValues() { */ public function getFieldTypeProvider() { return [ - ['string_long', 'text_textfield', [ - 'text_processing' => FALSE, - ]], + ['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_long', 'text_textfield', [ - 'text_processing' => TRUE, - ]], + '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'], ['boolean', 'optionwidgets_onoff'], - ['text_long', 'text_textarea', [ - 'text_processing' => TRUE, - ]], - ['string_long', 'text_textarea', [ - 'text_processing' => FALSE, - ]], + ['text_long', 'text_textarea', ['text_processing' => TRUE]], + ['string_long', 'text_textarea', ['text_processing' => FALSE]], [NULL, 'undefined'], ]; } 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 f8e1318..52418fe 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 @@ -122,37 +122,33 @@ public function testProcessBooleanTextExplicitValues() { */ public function getFieldTypeProvider() { return [ - ['string_long', 'text_textfield', [ - 'text_processing' => FALSE, - ]], + ['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_long', 'text_textfield', [ - 'text_processing' => TRUE, - ]], + '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'], ['boolean', 'optionwidgets_onoff'], - ['text_long', 'text_textarea', [ - 'text_processing' => TRUE, - ]], - ['string_long', 'text_textarea', [ - 'text_processing' => FALSE, - ]], + ['text_long', 'text_textarea', ['text_processing' => TRUE]], + ['string_long', 'text_textarea', ['text_processing' => FALSE]], [NULL, 'undefined'], ]; } diff --git a/core/modules/update/src/Form/UpdateManagerUpdate.php b/core/modules/update/src/Form/UpdateManagerUpdate.php index 60f506a..0b31968 100644 --- a/core/modules/update/src/Form/UpdateManagerUpdate.php +++ b/core/modules/update/src/Form/UpdateManagerUpdate.php @@ -181,10 +181,12 @@ public function buildForm(array $form, FormStateInterface $form_state) { } // Use the project title for the tableselect checkboxes. - $entry['title'] = ['data' => [ - '#title' => $entry['title'], - '#markup' => $entry['title'], - ]]; + $entry['title'] = [ + 'data' => [ + '#title' => $entry['title'], + '#markup' => $entry['title'], + ], + ]; $entry['#attributes'] = ['class' => ['update-' . $type]]; // Drupal core needs to be upgraded manually. diff --git a/core/modules/user/src/Form/UserPermissionsForm.php b/core/modules/user/src/Form/UserPermissionsForm.php index 3c5e46b..26f26c9 100644 --- a/core/modules/user/src/Form/UserPermissionsForm.php +++ b/core/modules/user/src/Form/UserPermissionsForm.php @@ -129,14 +129,16 @@ public function buildForm(array $form, FormStateInterface $form_state) { foreach ($permissions_by_provider as $provider => $permissions) { // Module name. - $form['permissions'][$provider] = [[ - '#wrapper_attributes' => [ - 'colspan' => count($role_names) + 1, - 'class' => ['module'], - 'id' => 'module-' . $provider, + $form['permissions'][$provider] = [ + [ + '#wrapper_attributes' => [ + 'colspan' => count($role_names) + 1, + 'class' => ['module'], + 'id' => 'module-' . $provider, + ], + '#markup' => $this->moduleHandler->getName($provider), ], - '#markup' => $this->moduleHandler->getName($provider), - ]]; + ]; foreach ($permissions as $perm => $perm_item) { // Fill in default values for the permission. $perm_item += [ diff --git a/core/modules/user/src/Plugin/Search/UserSearch.php b/core/modules/user/src/Plugin/Search/UserSearch.php index 08ea724..ca4820c 100644 --- a/core/modules/user/src/Plugin/Search/UserSearch.php +++ b/core/modules/user/src/Plugin/Search/UserSearch.php @@ -162,13 +162,15 @@ public function execute() { * {@inheritdoc} */ public function getHelp() { - $help = ['list' => [ - '#theme' => 'item_list', - '#items' => [ - $this->t('User search looks for user names and partial user names. Example: mar would match usernames mar, delmar, and maryjane.'), - $this->t('You can use * as a wildcard within your keyword. Example: m*r would match user names mar, delmar, and elementary.'), + $help = [ + 'list' => [ + '#theme' => 'item_list', + '#items' => [ + $this->t('User search looks for user names and partial user names. Example: mar would match usernames mar, delmar, and maryjane.'), + $this->t('You can use * as a wildcard within your keyword. Example: m*r would match user names mar, delmar, and elementary.'), + ], ], - ]]; + ]; return $help; } diff --git a/core/modules/user/src/Plugin/migrate/source/UserPictureInstance.php b/core/modules/user/src/Plugin/migrate/source/UserPictureInstance.php index 1f8e13a..b7013ba 100644 --- a/core/modules/user/src/Plugin/migrate/source/UserPictureInstance.php +++ b/core/modules/user/src/Plugin/migrate/source/UserPictureInstance.php @@ -29,7 +29,8 @@ public function initializeIterator() { 'file_directory' => $this->variableGet('user_picture_path', 'pictures'), 'max_filesize' => $this->variableGet('user_picture_file_size', '30') . 'KB', 'max_resolution' => $this->variableGet('user_picture_dimensions', '85x85'), - ]]); + ], + ]); } /** diff --git a/core/modules/user/user.module b/core/modules/user/user.module index 61faa3b..5a77845 100644 --- a/core/modules/user/user.module +++ b/core/modules/user/user.module @@ -78,7 +78,7 @@ function user_help($route_name, RouteMatchInterface $route_match) { $output .= '
' . t('Setting permissions') . '
'; $output .= '
' . t('After creating roles, you can set permissions for each role on the Permissions page. Granting a permission allows users who have been assigned a particular role to perform an action on the site, such as viewing content, editing or creating a particular type of content, administering settings for a particular module, or using a particular function of the site (such as search).', [':permissions_user' => \Drupal::url('user.admin_permissions')]) . '
'; $output .= '
' . t('Managing account settings') . '
'; - $output .= '
' . t('The Account settings page allows you to manage settings for the displayed name of the Anonymous user role, personal contact forms, user registration settings, and account cancellation settings. On this page you can also manage settings for account personalization, and adapt the text for the email messages that users receive when they register or request a password recovery. You may also set which role is automatically assigned new permissions whenever a module is enabled (the Administrator role).', [':accounts' => \Drupal::url('entity.user.admin_form')]) . '
'; + $output .= '
' . t('The Account settings page allows you to manage settings for the displayed name of the Anonymous user role, personal contact forms, user registration settings, and account cancellation settings. On this page you can also manage settings for account personalization, and adapt the text for the email messages that users receive when they register or request a password recovery. You may also set which role is automatically assigned new permissions whenever a module is enabled (the Administrator role).', [':accounts' => \Drupal::url('entity.user.admin_form')]) . '
'; $output .= '
' . t('Managing user account fields') . '
'; $output .= '
' . t('Because User accounts are an entity type, you can extend them by adding fields through the Manage fields tab on the Account settings page. By adding fields for e.g., a picture, a biography, or address, you can a create a custom profile for the users of the website. For background information on entities and fields, see the Field module help page.', [':field_help' => (\Drupal::moduleHandler()->moduleExists('field')) ? \Drupal::url('help.page', ['name' => 'field']) : '#', ':accounts' => \Drupal::url('entity.user.admin_form')]) . '
'; $output .= ''; diff --git a/core/modules/views/src/Plugin/views/filter/FilterPluginBase.php b/core/modules/views/src/Plugin/views/filter/FilterPluginBase.php index a036e15..4cbc0fb 100644 --- a/core/modules/views/src/Plugin/views/filter/FilterPluginBase.php +++ b/core/modules/views/src/Plugin/views/filter/FilterPluginBase.php @@ -131,9 +131,11 @@ protected function defineOptions() { 'required' => ['default' => FALSE], 'remember' => ['default' => FALSE], 'multiple' => ['default' => FALSE], - 'remember_roles' => ['default' => [ - RoleInterface::AUTHENTICATED_ID => RoleInterface::AUTHENTICATED_ID, - ]], + 'remember_roles' => [ + 'default' => [ + RoleInterface::AUTHENTICATED_ID => RoleInterface::AUTHENTICATED_ID, + ], + ], ], ]; diff --git a/core/modules/views/src/Tests/FieldApiDataTest.php b/core/modules/views/src/Tests/FieldApiDataTest.php index 246a324..f6d5159 100644 --- a/core/modules/views/src/Tests/FieldApiDataTest.php +++ b/core/modules/views/src/Tests/FieldApiDataTest.php @@ -335,8 +335,7 @@ public function testEntityFieldFilter() { // Filter by 'field name 2: fr', which doesn't exist. $view->setDisplay('embed_4'); $this->executeView($view); - $expected = [ - ]; + $expected = []; $this->assertIdenticalResultset($view, $expected, $map); $view->destroy(); diff --git a/core/modules/views/src/Tests/Plugin/DisplayFeedTest.php b/core/modules/views/src/Tests/Plugin/DisplayFeedTest.php index 8905c8d..e8d2549 100644 --- a/core/modules/views/src/Tests/Plugin/DisplayFeedTest.php +++ b/core/modules/views/src/Tests/Plugin/DisplayFeedTest.php @@ -45,10 +45,12 @@ public function testFeedOutput() { $node_title = 'This "cool" & "neat" article\'s title'; $node = $this->drupalCreateNode([ 'title' => $node_title, - 'body' => [0 => [ - 'value' => 'A paragraph', - 'format' => filter_default_format(), - ]], + 'body' => [ + 0 => [ + 'value' => 'A paragraph', + 'format' => filter_default_format(), + ], + ], ]); // Test the site name setting. @@ -103,10 +105,12 @@ public function testFeedFieldOutput() { $node_title = 'This "cool" & "neat" article\'s title'; $this->drupalCreateNode([ 'title' => $node_title, - 'body' => [0 => [ - 'value' => 'A paragraph', - 'format' => filter_default_format(), - ]], + 'body' => [ + 0 => [ + 'value' => 'A paragraph', + 'format' => filter_default_format(), + ], + ], ]); $this->drupalGet('test-feed-display-fields.xml'); diff --git a/core/modules/views/src/Tests/ViewTestData.php b/core/modules/views/src/Tests/ViewTestData.php index 7b9bc9e..3c9ace7 100644 --- a/core/modules/views/src/Tests/ViewTestData.php +++ b/core/modules/views/src/Tests/ViewTestData.php @@ -80,7 +80,8 @@ public static function schemaDefinition() { 'type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, - 'default' => 0], + 'default' => 0, + ], 'job' => [ 'description' => "The person's job", 'type' => 'varchar', diff --git a/core/modules/views/tests/src/Functional/Plugin/ExposedFormTest.php b/core/modules/views/tests/src/Functional/Plugin/ExposedFormTest.php index 220dc24..eaa5aaa 100644 --- a/core/modules/views/tests/src/Functional/Plugin/ExposedFormTest.php +++ b/core/modules/views/tests/src/Functional/Plugin/ExposedFormTest.php @@ -278,8 +278,7 @@ public function testTextInputRequired() { */ public function testExposedSortAndItemsPerPage() { for ($i = 0; $i < 50; $i++) { - $entity = EntityTest::create([ - ]); + $entity = EntityTest::create([]); $entity->save(); } $contexts = [ diff --git a/core/modules/views/tests/src/Functional/Plugin/PagerTest.php b/core/modules/views/tests/src/Functional/Plugin/PagerTest.php index 8085256..c80fa09 100644 --- a/core/modules/views/tests/src/Functional/Plugin/PagerTest.php +++ b/core/modules/views/tests/src/Functional/Plugin/PagerTest.php @@ -93,7 +93,7 @@ public function testStorePagerSettings() { $this->assertText('20 items'); // add new display and test the settings again, by override it. - $edit = [ ]; + $edit = []; // Add a display and override the pager settings. $this->drupalPostForm('admin/structure/views/view/test_store_pager_settings/edit', $edit, t('Add Page')); $edit = [ diff --git a/core/modules/views/tests/src/Functional/Plugin/ViewsBulkTest.php b/core/modules/views/tests/src/Functional/Plugin/ViewsBulkTest.php index 0ca6f87..32b66cc 100644 --- a/core/modules/views/tests/src/Functional/Plugin/ViewsBulkTest.php +++ b/core/modules/views/tests/src/Functional/Plugin/ViewsBulkTest.php @@ -71,7 +71,8 @@ public function testBulkSelection() { // Create third node now that the admin overview has been rendered. $node_3 = $this->drupalCreateNode([ 'type' => 'page', - 'title' => 'The third node'] + 'title' => 'The third node', + ] ); // Now click 'Apply to selected items' and assert the second node is diff --git a/core/modules/views/tests/src/Kernel/Handler/FilterNumericTest.php b/core/modules/views/tests/src/Kernel/Handler/FilterNumericTest.php index b154a78..e1093e4 100644 --- a/core/modules/views/tests/src/Kernel/Handler/FilterNumericTest.php +++ b/core/modules/views/tests/src/Kernel/Handler/FilterNumericTest.php @@ -288,8 +288,7 @@ public function testFilterNumericEmpty() { ]); $this->executeView($view); - $resultset = [ - ]; + $resultset = []; $this->assertIdenticalResultset($view, $resultset, $this->columnMap); $view->destroy(); @@ -345,8 +344,7 @@ public function testFilterNumericExposedGroupedEmpty() { $this->container->get('router.builder')->rebuild(); $this->executeView($view); - $resultset = [ - ]; + $resultset = []; $this->assertIdenticalResultset($view, $resultset, $this->columnMap); } diff --git a/core/modules/views/tests/src/Unit/EntityViewsDataTest.php b/core/modules/views/tests/src/Unit/EntityViewsDataTest.php index 74bcc08..eefc541 100644 --- a/core/modules/views/tests/src/Unit/EntityViewsDataTest.php +++ b/core/modules/views/tests/src/Unit/EntityViewsDataTest.php @@ -298,7 +298,9 @@ public function testRevisionTableWithRevisionDataTableAndDataTable() { $this->assertCount(1, $revision_field_data['table']['join']); $this->assertEquals([ 'entity_test_mul_property_data' => [ - 'left_field' => 'revision_id', 'field' => 'revision_id', 'type' => 'INNER' + 'left_field' => 'revision_id', + 'field' => 'revision_id', + 'type' => 'INNER', ], ], $revision_field_data['table']['join']); @@ -306,7 +308,9 @@ public function testRevisionTableWithRevisionDataTableAndDataTable() { $this->assertCount(1, $revision_base_data['table']['join']); $this->assertEquals([ 'entity_test_mulrev_property_revision' => [ - 'left_field' => 'revision_id', 'field' => 'revision_id', 'type' => 'INNER' + 'left_field' => 'revision_id', + 'field' => 'revision_id', + 'type' => 'INNER', ], ], $revision_base_data['table']['join']); @@ -342,7 +346,9 @@ public function testRevisionTableWithRevisionDataTable() { $this->assertCount(1, $revision_field_data['table']['join']); $this->assertEquals([ 'entity_test_mulrev_field_data' => [ - 'left_field' => 'revision_id', 'field' => 'revision_id', 'type' => 'INNER' + 'left_field' => 'revision_id', + 'field' => 'revision_id', + 'type' => 'INNER', ], ], $revision_field_data['table']['join']); @@ -350,7 +356,9 @@ public function testRevisionTableWithRevisionDataTable() { $this->assertCount(1, $revision_base_data['table']['join']); $this->assertEquals([ 'entity_test_mulrev_property_revision' => [ - 'left_field' => 'revision_id', 'field' => 'revision_id', 'type' => 'INNER' + 'left_field' => 'revision_id', + 'field' => 'revision_id', + 'type' => 'INNER', ], ], $revision_base_data['table']['join']); $this->assertFalse(isset($data['data_table'])); @@ -532,10 +540,11 @@ 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']); } @@ -687,10 +696,11 @@ 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']); } @@ -872,10 +882,11 @@ 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']); $this->assertStringField($data['entity_test_mulrev_revision__string']['string']); @@ -884,10 +895,11 @@ 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/HandlerBaseTest.php b/core/modules/views/tests/src/Unit/Plugin/HandlerBaseTest.php index 12b7ca1..c3f3f1d 100644 --- a/core/modules/views/tests/src/Unit/Plugin/HandlerBaseTest.php +++ b/core/modules/views/tests/src/Unit/Plugin/HandlerBaseTest.php @@ -73,19 +73,24 @@ public function testGetEntityTypeForFieldWithRelationship() { $this->viewsData->expects($this->any()) ->method('get') ->willReturnMap([ - ['test_entity_type_table', [ - 'table' => ['entity type' => 'test_entity_type'], - 'test_relationship' => [ - 'relationship' => [ - 'base' => 'test_other_entity_type_table', - 'base field' => 'id', + [ + 'test_entity_type_table', + [ + 'table' => ['entity type' => 'test_entity_type'], + 'test_relationship' => [ + 'relationship' => [ + 'base' => 'test_other_entity_type_table', + 'base field' => 'id', + ], ], ], - ]], - ['test_other_entity_type_table', [ - 'table' => ['entity type' => 'test_other_entity_type'], - ]], - ]); + ], + [ + 'test_other_entity_type_table', + ['table' => ['entity type' => 'test_other_entity_type']], + ], + ] + ); $handler->setViewsData($this->viewsData); $this->assertEquals('test_other_entity_type', $handler->getEntityType()); diff --git a/core/modules/views/tests/src/Unit/PluginBaseTest.php b/core/modules/views/tests/src/Unit/PluginBaseTest.php index 718cf44..622b42a 100644 --- a/core/modules/views/tests/src/Unit/PluginBaseTest.php +++ b/core/modules/views/tests/src/Unit/PluginBaseTest.php @@ -79,8 +79,7 @@ public function providerTestUnpackOptions() { 'storage' => [ 'key' => 'value', ], - 'options' => [ - ], + 'options' => [], 'definition' => [ 'key' => ['default' => 'value2'], ], @@ -172,9 +171,7 @@ public function providerTestUnpackOptions() { ], 'definition' => [ 'key0' => ['default' => 'value0'], - 'key1' => ['contains' => [ - 'key1:1' => ['default' => 'value1:1'], - ]], + 'key1' => ['contains' => ['key1:1' => ['default' => 'value1:1']]], ], 'expected' => [ 'key0' => 'value', @@ -188,29 +185,29 @@ public function providerTestUnpackOptions() { 'key2' => [ 'key2:1' => [ 'key2:1:1' => 'value0', - 'key2:1:2' => [ - 'key2:1:2:1' => 'value1', - ], + 'key2:1:2' => ['key2:1:2:1' => 'value1'], ], ], ], 'definition' => [ - 'key2' => ['contains' => [ - 'key2:1' => ['contains' => [ - 'key2:1:1' => ['default' => 'value2:1:2:1'], - 'key2:1:2' => ['contains' => [ - 'key2:1:2:1' => ['default' => 'value2:1:2:1'], - ]], - ]], - ]], + 'key2' => [ + 'contains' => [ + 'key2:1' => [ + 'contains' => [ + 'key2:1:1' => ['default' => 'value2:1:2:1'], + 'key2:1:2' => [ + 'contains' => ['key2:1:2:1' => ['default' => 'value2:1:2:1']], + ], + ], + ], + ], + ], ], 'expected' => [ 'key2' => [ 'key2:1' => [ 'key2:1:1' => 'value0', - 'key2:1:2' => [ - 'key2:1:2:1' => 'value1', - ], + 'key2:1:2' => ['key2:1:2:1' => 'value1'], ], ], ], @@ -261,10 +258,12 @@ public function providerTestSetOptionDefault() { 'storage' => [], 'definition' => [ 'key' => ['default' => 'value'], - 'key2' => ['contains' => [ - 'key2:1' => ['default' => 'value2:1'], - 'key2:2' => ['default' => 'value2:2'], - ]], + 'key2' => [ + 'contains' => [ + 'key2:1' => ['default' => 'value2:1'], + 'key2:2' => ['default' => 'value2:2'], + ], + ], ], 'expected' => [ 'key' => 'value', diff --git a/core/modules/views/tests/src/Unit/ViewExecutableTest.php b/core/modules/views/tests/src/Unit/ViewExecutableTest.php index f30a19d..c11e648 100644 --- a/core/modules/views/tests/src/Unit/ViewExecutableTest.php +++ b/core/modules/views/tests/src/Unit/ViewExecutableTest.php @@ -364,12 +364,14 @@ public function testAddHandler() { ->method('setOption') ->with($this->callback(function($argument) { return $argument; - }), ['test_field' => [ - 'id' => 'test_field', - 'table' => 'test_entity', - 'field' => 'test_field', - 'plugin_id' => 'standard', - ]]); + }), [ + 'test_field' => [ + 'id' => 'test_field', + 'table' => 'test_entity', + 'field' => 'test_field', + 'plugin_id' => 'standard', + ], + ]); } foreach (['field', 'filter', 'argument', 'sort'] as $handler_type) { @@ -405,14 +407,16 @@ public function testAddHandlerWithEntityField() { ->method('setOption') ->with($this->callback(function($argument) { return $argument; - }), ['test_field' => [ - 'id' => 'test_field', - 'table' => 'test_entity', - 'field' => 'test_field', - 'entity_type' => 'test_entity_type', - 'entity_field' => 'test_field', - 'plugin_id' => 'standard', - ]]); + }), [ + 'test_field' => [ + 'id' => 'test_field', + 'table' => 'test_entity', + 'field' => 'test_field', + 'entity_type' => 'test_entity_type', + 'entity_field' => 'test_field', + 'plugin_id' => 'standard', + ], + ]); } foreach (['field', 'filter', 'argument', 'sort'] as $handler_type) { diff --git a/core/modules/views/views.module b/core/modules/views/views.module index 6b51029..8b70764 100644 --- a/core/modules/views/views.module +++ b/core/modules/views/views.module @@ -116,8 +116,12 @@ function views_theme($existing, $type, $theme, $path) { 'row' => ['view' => NULL, 'options' => NULL, 'row' => NULL, 'field_alias' => NULL], 'exposed_form' => ['view' => NULL, 'options' => NULL], 'pager' => [ - 'view' => NULL, 'options' => NULL, - 'tags' => [], 'quantity' => 9, 'element' => 0, 'parameters' => [] + 'view' => NULL, + 'options' => NULL, + 'tags' => [], + 'quantity' => 9, + 'element' => 0, + 'parameters' => [], ], ]; diff --git a/core/modules/views_ui/src/Form/Ajax/Rearrange.php b/core/modules/views_ui/src/Form/Ajax/Rearrange.php index 2a46120..1ffb710 100644 --- a/core/modules/views_ui/src/Form/Ajax/Rearrange.php +++ b/core/modules/views_ui/src/Form/Ajax/Rearrange.php @@ -125,11 +125,13 @@ public function buildForm(array $form, FormStateInterface $form_state) { '#attributes' => ['class' => ['views-remove-checkbox']], '#default_value' => 0, '#suffix' => \Drupal::l(SafeMarkup::format('@text', ['@text' => $this->t('Remove')]), - Url::fromRoute('', [], ['attributes' => [ - 'id' => 'views-remove-link-' . $id, - 'class' => ['views-hidden', 'views-button-remove', 'views-remove-link'], - 'alt' => $this->t('Remove this item'), - 'title' => $this->t('Remove this item')], + Url::fromRoute('', [], [ + 'attributes' => [ + 'id' => 'views-remove-link-' . $id, + 'class' => ['views-hidden', 'views-button-remove', 'views-remove-link'], + 'alt' => $this->t('Remove this item'), + 'title' => $this->t('Remove this item'), + ], ]) ), ]; diff --git a/core/phpcs.xml.dist b/core/phpcs.xml.dist index 5eeb7ce..894e978 100644 --- a/core/phpcs.xml.dist +++ b/core/phpcs.xml.dist @@ -148,6 +148,43 @@ + + + + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + @@ -166,5 +203,4 @@ - diff --git a/core/tests/Drupal/FunctionalTests/Entity/ContentEntityFormCorrectUserInputMappingOnFieldDeltaElementsTest.php b/core/tests/Drupal/FunctionalTests/Entity/ContentEntityFormCorrectUserInputMappingOnFieldDeltaElementsTest.php index ba30da9..e8c8ae5 100644 --- a/core/tests/Drupal/FunctionalTests/Entity/ContentEntityFormCorrectUserInputMappingOnFieldDeltaElementsTest.php +++ b/core/tests/Drupal/FunctionalTests/Entity/ContentEntityFormCorrectUserInputMappingOnFieldDeltaElementsTest.php @@ -75,10 +75,12 @@ public function testCorrectUserInputMappingOnComplexFields() { $storage = $this->container->get('entity_type.manager')->getStorage($this->entityTypeId); /** @var ContentEntityInterface $entity */ - $entity = $storage->create([$this->fieldName => [ - ['shape' => 'rectangle', 'color' => 'green'], - ['shape' => 'circle', 'color' => 'blue'], - ]]); + $entity = $storage->create([ + $this->fieldName => [ + ['shape' => 'rectangle', 'color' => 'green'], + ['shape' => 'circle', 'color' => 'blue'], + ], + ]); $entity->save(); $this->drupalGet($this->entityTypeId . '/manage/' . $entity->id() . '/edit'); diff --git a/core/tests/Drupal/FunctionalTests/Update/UpdatePathTestBase.php b/core/tests/Drupal/FunctionalTests/Update/UpdatePathTestBase.php index 5d4b7ac..4aca500 100644 --- a/core/tests/Drupal/FunctionalTests/Update/UpdatePathTestBase.php +++ b/core/tests/Drupal/FunctionalTests/Update/UpdatePathTestBase.php @@ -317,10 +317,14 @@ protected function runUpdates() { } // The site might be broken at the time so logging in using the UI might // not work, so we use the API itself. - drupal_rewrite_settings(['settings' => ['update_free_access' => (object) [ - 'value' => TRUE, - 'required' => TRUE, - ]]]); + drupal_rewrite_settings([ + 'settings' => [ + 'update_free_access' => (object) [ + 'value' => TRUE, + 'required' => TRUE, + ], + ], + ]); $this->drupalGet($this->updateUrl); $this->clickLink(t('Continue')); diff --git a/core/tests/Drupal/KernelTests/Core/Config/ConfigDependencyTest.php b/core/tests/Drupal/KernelTests/Core/Config/ConfigDependencyTest.php index 79b01cb..87d30dc 100644 --- a/core/tests/Drupal/KernelTests/Core/Config/ConfigDependencyTest.php +++ b/core/tests/Drupal/KernelTests/Core/Config/ConfigDependencyTest.php @@ -161,11 +161,13 @@ public function testDependencyManagement() { $missing_dependencies = $config_manager->findMissingContentDependencies(); $this->assertEqual([], $missing_dependencies); - $expected = [$entity_test->uuid() => [ - 'entity_type' => 'entity_test', - 'bundle' => $entity_test->bundle(), - 'uuid' => $entity_test->uuid(), - ]]; + $expected = [ + $entity_test->uuid() => [ + 'entity_type' => 'entity_test', + 'bundle' => $entity_test->bundle(), + 'uuid' => $entity_test->uuid(), + ], + ]; // Delete the content entity so that is it now missing. $entity_test->delete(); $missing_dependencies = $config_manager->findMissingContentDependencies(); diff --git a/core/tests/Drupal/KernelTests/Core/Database/SelectTest.php b/core/tests/Drupal/KernelTests/Core/Database/SelectTest.php index 0d332d0..3472e2b 100644 --- a/core/tests/Drupal/KernelTests/Core/Database/SelectTest.php +++ b/core/tests/Drupal/KernelTests/Core/Database/SelectTest.php @@ -496,8 +496,7 @@ public function testRegexCondition() { ]; $test_groups[] = [ 'regex' => '#Singer', - 'expected' => [ - ], + 'expected' => [], ]; foreach ($test_groups as $test_group) { diff --git a/core/tests/Drupal/KernelTests/Core/Entity/EntityQueryTest.php b/core/tests/Drupal/KernelTests/Core/Entity/EntityQueryTest.php index 0430369..763fa44 100644 --- a/core/tests/Drupal/KernelTests/Core/Entity/EntityQueryTest.php +++ b/core/tests/Drupal/KernelTests/Core/Entity/EntityQueryTest.php @@ -94,23 +94,27 @@ 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(); ConfigurableLanguage::createFromLangcode('pl')->save(); @@ -866,7 +870,8 @@ public function testBaseFieldMultipleColumns() { 'description' => [ 'value' => $this->randomString(), 'format' => 'format1', - ]]); + ], + ]); $term1->save(); $term2 = Term::create([ @@ -875,7 +880,8 @@ public function testBaseFieldMultipleColumns() { 'description' => [ 'value' => $this->randomString(), 'format' => 'format2', - ]]); + ], + ]); $term2->save(); $ids = \Drupal::entityQuery('taxonomy_term') diff --git a/core/tests/Drupal/KernelTests/Core/Image/ToolkitGdTest.php b/core/tests/Drupal/KernelTests/Core/Image/ToolkitGdTest.php index bb2e481..0c01af1 100644 --- a/core/tests/Drupal/KernelTests/Core/Image/ToolkitGdTest.php +++ b/core/tests/Drupal/KernelTests/Core/Image/ToolkitGdTest.php @@ -365,7 +365,7 @@ public function testManipulations() { if ($image->getToolkit()->getType() == $image_original_type || $corner != $this->transparent) { $correct_colors = $this->colorsAreEqual($color, $corner); $this->assertTrue($correct_colors, SafeMarkup::format('Image %file object after %action action has the correct color placement at corner %corner.', - ['%file' => $file, '%action' => $op, '%corner' => $key])); + ['%file' => $file, '%action' => $op, '%corner' => $key])); } } } diff --git a/core/tests/Drupal/Tests/Component/DependencyInjection/ContainerTest.php b/core/tests/Drupal/Tests/Component/DependencyInjection/ContainerTest.php index f78304b..7b8fc87 100644 --- a/core/tests/Drupal/Tests/Component/DependencyInjection/ContainerTest.php +++ b/core/tests/Drupal/Tests/Component/DependencyInjection/ContainerTest.php @@ -715,12 +715,18 @@ protected function getMockContainerDefinition() { ]), 'properties' => $this->getCollection(['_someProperty' => 'foo']), 'calls' => [ - ['setContainer', $this->getCollection([ - $this->getServiceCall('service_container'), - ])], - ['setOtherConfigParameter', $this->getCollection([ - $this->getParameterCall('some_other_config'), - ])], + [ + 'setContainer', + $this->getCollection([ + $this->getServiceCall('service_container'), + ]), + ], + [ + 'setOtherConfigParameter', + $this->getCollection([ + $this->getParameterCall('some_other_config'), + ]), + ], ], 'priority' => 0, ]; @@ -824,9 +830,12 @@ protected function getMockContainerDefinition() { [NULL, 'bar'], ], 'calls' => [ - ['setContainer', $this->getCollection([ - $this->getServiceCall('service_container'), - ])], + [ + 'setContainer', + $this->getCollection([ + $this->getServiceCall('service_container'), + ]), + ], ], ]; diff --git a/core/tests/Drupal/Tests/Component/FileCache/FileCacheFactoryTest.php b/core/tests/Drupal/Tests/Component/FileCache/FileCacheFactoryTest.php index 4fe9d3c..c317bd8 100644 --- a/core/tests/Drupal/Tests/Component/FileCache/FileCacheFactoryTest.php +++ b/core/tests/Drupal/Tests/Component/FileCache/FileCacheFactoryTest.php @@ -105,51 +105,54 @@ public function configurationDataProvider() { $class = get_class($file_cache); // Test fallback configuration. - $data['fallback-configuration'] = [[ - ], [], FileCache::class]; + $data['fallback-configuration'] = [ + [], + [], + FileCache::class, + ]; // Test default configuration. - $data['default-configuration'] = [[ - 'default' => [ - 'class' => $class, - ], - ], [], $class]; + $data['default-configuration'] = [ + ['default' => ['class' => $class]], + [], + $class, + ]; // Test specific per collection setting. - $data['collection-setting'] = [[ - 'test_foo_settings' => [ - 'class' => $class, - ], - ], [], $class]; + $data['collection-setting'] = [ + ['test_foo_settings' => ['class' => $class]], + [], + $class, + ]; // Test default configuration plus specific per collection setting. - $data['default-plus-collection-setting'] = [[ - 'default' => [ - 'class' => '\stdClass', + $data['default-plus-collection-setting'] = [ + [ + 'default' => ['class' => '\stdClass'], + 'test_foo_settings' => ['class' => $class], ], - 'test_foo_settings' => [ - 'class' => $class, - ], - ], [], $class]; + [], + $class, + ]; // Test default configuration plus class specific override. - $data['default-plus-class-override'] = [[ - 'default' => [ - 'class' => '\stdClass', - ], - ], [ 'class' => $class ], $class]; + $data['default-plus-class-override'] = [ + ['default' => ['class' => '\stdClass']], + ['class' => $class], + $class, + ]; // Test default configuration plus class specific override plus specific // per collection setting. - $data['default-plus-class-plus-collection-setting'] = [[ - 'default' => [ - 'class' => '\stdClass', - ], - 'test_foo_settings' => [ - 'class' => $class, + $data['default-plus-class-plus-collection-setting'] = [ + [ + 'default' => ['class' => '\stdClass'], + 'test_foo_settings' => ['class' => $class], ], - ], [ 'class' => '\stdClass'], $class]; + ['class' => '\stdClass'], + $class, + ]; return $data; } diff --git a/core/tests/Drupal/Tests/Component/Gettext/PoHeaderTest.php b/core/tests/Drupal/Tests/Component/Gettext/PoHeaderTest.php index 144cc51..52e2505 100644 --- a/core/tests/Drupal/Tests/Component/Gettext/PoHeaderTest.php +++ b/core/tests/Drupal/Tests/Component/Gettext/PoHeaderTest.php @@ -279,7 +279,8 @@ public function providerTestPluralsFormula() { 193 => 1, 194 => 1, 'default' => 2, - ], ], + ], + ], [ 'nplurals=4; plural=(((n==1)||(n==11))?(0):(((n==2)||(n==12))?(1):(((n>2)&&(n<20))?(2):3)));', [ diff --git a/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityStorageTest.php b/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityStorageTest.php index c4540e1..01dafab 100644 --- a/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityStorageTest.php +++ b/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityStorageTest.php @@ -553,7 +553,7 @@ public function testLoadMultipleAll() { $bar_config_object->getName()->willReturn('foo'); $this->configFactory->listAll('the_provider.the_config_prefix.') - ->willReturn(['the_provider.the_config_prefix.foo' , 'the_provider.the_config_prefix.bar']); + ->willReturn(['the_provider.the_config_prefix.foo', 'the_provider.the_config_prefix.bar']); $this->configFactory->loadMultiple(['the_provider.the_config_prefix.foo', 'the_provider.the_config_prefix.bar']) ->willReturn([$foo_config_object->reveal(), $bar_config_object->reveal()]); diff --git a/core/tests/Drupal/Tests/Core/Datetime/DateHelperTest.php b/core/tests/Drupal/Tests/Core/Datetime/DateHelperTest.php index 2521d77..455cbcf 100644 --- a/core/tests/Drupal/Tests/Core/Datetime/DateHelperTest.php +++ b/core/tests/Drupal/Tests/Core/Datetime/DateHelperTest.php @@ -29,78 +29,102 @@ public function testWeekDaysOrdered($first_day, $expected) { public function providerTestWeekDaysOrdered() { $data = []; - $data[] = [0, [ - 0 => 'Sunday', - 1 => 'Monday', - 2 => 'Tuesday', - 3 => 'Wednesday', - 4 => 'Thursday', - 5 => 'Friday', - 6 => 'Saturday', - ]]; - $data[] = [1, [ - 1 => 'Monday', - 2 => 'Tuesday', - 3 => 'Wednesday', - 4 => 'Thursday', - 5 => 'Friday', - 6 => 'Saturday', - 0 => 'Sunday', - ]]; - $data[] = [2, [ - 2 => 'Tuesday', - 3 => 'Wednesday', - 4 => 'Thursday', - 5 => 'Friday', - 6 => 'Saturday', - 0 => 'Sunday', - 1 => 'Monday', - ]]; - $data[] = [3, [ - 3 => 'Wednesday', - 4 => 'Thursday', - 5 => 'Friday', - 6 => 'Saturday', - 0 => 'Sunday', - 1 => 'Monday', - 2 => 'Tuesday', - ]]; - $data[] = [4, [ - 4 => 'Thursday', - 5 => 'Friday', - 6 => 'Saturday', - 0 => 'Sunday', - 1 => 'Monday', - 2 => 'Tuesday', - 3 => 'Wednesday', - ]]; - $data[] = [5, [ - 5 => 'Friday', - 6 => 'Saturday', - 0 => 'Sunday', - 1 => 'Monday', - 2 => 'Tuesday', - 3 => 'Wednesday', - 4 => 'Thursday', - ]]; - $data[] = [6, [ - 6 => 'Saturday', - 0 => 'Sunday', - 1 => 'Monday', - 2 => 'Tuesday', - 3 => 'Wednesday', - 4 => 'Thursday', - 5 => 'Friday', - ]]; - $data[] = [7, [ - 0 => 'Sunday', - 1 => 'Monday', - 2 => 'Tuesday', - 3 => 'Wednesday', - 4 => 'Thursday', - 5 => 'Friday', - 6 => 'Saturday', - ]]; + $data[] = [ + 0, + [ + 0 => 'Sunday', + 1 => 'Monday', + 2 => 'Tuesday', + 3 => 'Wednesday', + 4 => 'Thursday', + 5 => 'Friday', + 6 => 'Saturday', + ], + ]; + $data[] = [ + 1, + [ + 1 => 'Monday', + 2 => 'Tuesday', + 3 => 'Wednesday', + 4 => 'Thursday', + 5 => 'Friday', + 6 => 'Saturday', + 0 => 'Sunday', + ] + ]; + $data[] = [ + 2, + [ + 2 => 'Tuesday', + 3 => 'Wednesday', + 4 => 'Thursday', + 5 => 'Friday', + 6 => 'Saturday', + 0 => 'Sunday', + 1 => 'Monday', + ], + ]; + $data[] = [ + 3, + [ + 3 => 'Wednesday', + 4 => 'Thursday', + 5 => 'Friday', + 6 => 'Saturday', + 0 => 'Sunday', + 1 => 'Monday', + 2 => 'Tuesday', + ], + ]; + $data[] = [ + 4, + [ + 4 => 'Thursday', + 5 => 'Friday', + 6 => 'Saturday', + 0 => 'Sunday', + 1 => 'Monday', + 2 => 'Tuesday', + 3 => 'Wednesday', + ], + ]; + $data[] = [ + 5, + [ + 5 => 'Friday', + 6 => 'Saturday', + 0 => 'Sunday', + 1 => 'Monday', + 2 => 'Tuesday', + 3 => 'Wednesday', + 4 => 'Thursday', + ], + ]; + $data[] = [ + 6, + [ + 6 => 'Saturday', + 0 => 'Sunday', + 1 => 'Monday', + 2 => 'Tuesday', + 3 => 'Wednesday', + 4 => 'Thursday', + 5 => 'Friday', + ], + ]; + $data[] = [ + 7, + [ + 0 => 'Sunday', + 1 => 'Monday', + 2 => 'Tuesday', + 3 => 'Wednesday', + 4 => 'Thursday', + 5 => 'Friday', + 6 => 'Saturday', + ], + ]; return $data; } diff --git a/core/tests/Drupal/Tests/Core/DrupalKernel/DiscoverServiceProvidersTest.php b/core/tests/Drupal/Tests/Core/DrupalKernel/DiscoverServiceProvidersTest.php index 8983c8d..4d198b9 100644 --- a/core/tests/Drupal/Tests/Core/DrupalKernel/DiscoverServiceProvidersTest.php +++ b/core/tests/Drupal/Tests/Core/DrupalKernel/DiscoverServiceProvidersTest.php @@ -52,8 +52,7 @@ public function testDiscoverServiceNoContainerYamls() { 'app' => [ 'core' => 'core/core.services.yml', ], - 'site' => [ - ], + 'site' => [], ]; $this->assertAttributeSame($expect, 'serviceYamls', $kernel); } diff --git a/core/tests/Drupal/Tests/Core/DrupalKernel/DrupalKernelTest.php b/core/tests/Drupal/Tests/Core/DrupalKernel/DrupalKernelTest.php index 7278fd6..3dc70c2 100644 --- a/core/tests/Drupal/Tests/Core/DrupalKernel/DrupalKernelTest.php +++ b/core/tests/Drupal/Tests/Core/DrupalKernel/DrupalKernelTest.php @@ -177,12 +177,14 @@ public function testFindSitePath() { EOD; // Create the expected directory structure. - vfsStream::create(['sites' => [ - 'sites.php' => $sites_php, - 'example' => [ - 'settings.php' => 'test' - ] - ]]); + vfsStream::create([ + 'sites' => [ + 'sites.php' => $sites_php, + 'example' => [ + 'settings.php' => 'test', + ], + ], + ]); $request = new Request(); $request->server->set('SERVER_NAME', 'www.example.org'); diff --git a/core/tests/Drupal/Tests/Core/Entity/EntityFormTest.php b/core/tests/Drupal/Tests/Core/Entity/EntityFormTest.php index 4bed37d..dcde7f0 100644 --- a/core/tests/Drupal/Tests/Core/Entity/EntityFormTest.php +++ b/core/tests/Drupal/Tests/Core/Entity/EntityFormTest.php @@ -73,30 +73,35 @@ 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 6242322..1cc5076 100644 --- a/core/tests/Drupal/Tests/Core/Entity/EntityTypeBundleInfoTest.php +++ b/core/tests/Drupal/Tests/Core/Entity/EntityTypeBundleInfoTest.php @@ -194,15 +194,13 @@ 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/Routing/DefaultHtmlRouteProviderTest.php b/core/tests/Drupal/Tests/Core/Entity/Routing/DefaultHtmlRouteProviderTest.php index 7e853bc..36f58c3 100644 --- a/core/tests/Drupal/Tests/Core/Entity/Routing/DefaultHtmlRouteProviderTest.php +++ b/core/tests/Drupal/Tests/Core/Entity/Routing/DefaultHtmlRouteProviderTest.php @@ -165,9 +165,11 @@ public function providerTestGetAddFormRoute() { $route ->setDefault('bundle_parameter', 'the_bundle_entity_type_id') ->setRequirement('_entity_create_access', 'the_entity_type_id:{the_bundle_entity_type_id}') - ->setOption('parameters', ['the_bundle_entity_type_id' => [ - 'type' => 'entity:the_bundle_entity_type_id', - ]]); + ->setOption('parameters', [ + 'the_bundle_entity_type_id' => [ + 'type' => 'entity:the_bundle_entity_type_id', + ], + ]); $data['add_form_bundle_entity_id_key_type_null'] = [clone $route, $entity_type5->reveal(), $bundle_entity_type->reveal()]; $entity_type6 = $this->getEntityType($entity_type5); @@ -185,10 +187,12 @@ public function providerTestGetAddFormRoute() { $route // Unset the 'the_entity_type_id' requirement. ->setRequirements(['_entity_create_access' => $route->getRequirement('_entity_create_access')]) - ->setOption('parameters', ['the_bundle_entity_type_id' => [ - 'type' => 'entity:the_bundle_entity_type_id', - 'with_config_overrides' => TRUE, - ]]); + ->setOption('parameters', [ + 'the_bundle_entity_type_id' => [ + 'type' => 'entity:the_bundle_entity_type_id', + 'with_config_overrides' => TRUE, + ], + ]); $data['add_form_bundle_entity_id_key_type_integer'] = [clone $route, $entity_type7->reveal(), $bundle_entity_type->reveal(), $field_storage_definition->reveal()]; return $data; diff --git a/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageTest.php b/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageTest.php index b3e339b..0e0a148 100644 --- a/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageTest.php +++ b/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageTest.php @@ -444,26 +444,34 @@ public function testGetTableMappingSimpleWithFields(array $entity_keys) { */ public function providerTestGetTableMappingSimple() { return [ - [[ - 'id' => 'test_id', - 'bundle' => NULL, - 'uuid' => NULL, - ]], - [[ - 'id' => 'test_id', - 'bundle' => 'test_bundle', - 'uuid' => NULL, - ]], - [[ - 'id' => 'test_id', - 'bundle' => NULL, - 'uuid' => 'test_uuid', - ]], - [[ - 'id' => 'test_id', - 'bundle' => 'test_bundle', - 'uuid' => 'test_uuid', - ]], + [ + [ + 'id' => 'test_id', + 'bundle' => NULL, + 'uuid' => NULL, + ], + ], + [ + [ + 'id' => 'test_id', + 'bundle' => 'test_bundle', + 'uuid' => NULL, + ], + ], + [ + [ + 'id' => 'test_id', + 'bundle' => NULL, + 'uuid' => 'test_uuid', + ], + ], + [ + [ + 'id' => 'test_id', + 'bundle' => 'test_bundle', + 'uuid' => 'test_uuid', + ], + ], ]; } @@ -1137,9 +1145,11 @@ public function testLoadMultiplePersistentCached() { $this->cache->expects($this->once()) ->method('getMultiple') ->with([$key]) - ->will($this->returnValue([$key => (object) [ + ->will($this->returnValue([ + $key => (object) [ 'data' => $entity, - ]])); + ], + ])); $this->cache->expects($this->never()) ->method('set'); diff --git a/core/tests/Drupal/Tests/Core/EntityReferenceSelection/EntityReferenceSelectionUnitTest.php b/core/tests/Drupal/Tests/Core/EntityReferenceSelection/EntityReferenceSelectionUnitTest.php index eec5b0f..4952165 100644 --- a/core/tests/Drupal/Tests/Core/EntityReferenceSelection/EntityReferenceSelectionUnitTest.php +++ b/core/tests/Drupal/Tests/Core/EntityReferenceSelection/EntityReferenceSelectionUnitTest.php @@ -165,7 +165,7 @@ public function testSetConfigurationBcLevel() { 'setting3' => 'foobar', 'handler_settings' => [ 'setting1' => 'foo', - 'setting2' => ['qux' => 'qux value'], + 'setting2' => ['qux' => 'qux value'], 'setting3' => 'foobar', ], ]; diff --git a/core/tests/Drupal/Tests/Core/Extension/ModuleHandlerTest.php b/core/tests/Drupal/Tests/Core/Extension/ModuleHandlerTest.php index bfe3a06..4fda002 100644 --- a/core/tests/Drupal/Tests/Core/Extension/ModuleHandlerTest.php +++ b/core/tests/Drupal/Tests/Core/Extension/ModuleHandlerTest.php @@ -374,12 +374,14 @@ public function testCachedGetImplementations() { public function testCachedGetImplementationsMissingMethod() { $this->cacheBackend->expects($this->exactly(1)) ->method('get') - ->will($this->onConsecutiveCalls( - (object) ['data' => ['hook' => [ - 'module_handler_test' => [], - 'module_handler_test_missing' => [], - ]]] - )); + ->will($this->onConsecutiveCalls((object) [ + 'data' => [ + 'hook' => [ + 'module_handler_test' => [], + 'module_handler_test_missing' => [], + ], + ], + ])); // Ensure buildImplementationInfo doesn't get called and that we work off cached results. $module_handler = $this->getMockBuilder(ModuleHandler::class) @@ -445,9 +447,8 @@ public function testGetHookInfo() { ->method('get') ->will($this->onConsecutiveCalls( NULL, - (object) ['data' => - ['hook_foo' => ['group' => 'hook']]]) - ); + (object) ['data' => ['hook_foo' => ['group' => 'hook']]] + )); // Results from building from mocked environment. $this->assertEquals([ diff --git a/core/tests/Drupal/Tests/Core/Form/FormCacheTest.php b/core/tests/Drupal/Tests/Core/Form/FormCacheTest.php index 8b2734d..3ae9d6c 100644 --- a/core/tests/Drupal/Tests/Core/Form/FormCacheTest.php +++ b/core/tests/Drupal/Tests/Core/Form/FormCacheTest.php @@ -299,16 +299,18 @@ public function testLoadCachedFormStateWithFiles() { ->method('isAnonymous') ->willReturn(TRUE); - $cached_form_state = ['build_info' => ['files' => [ - [ - 'module' => 'a_module', - 'type' => 'the_type', - 'name' => 'some_name', + $cached_form_state = [ + 'build_info' => [ + 'files' => [ + [ + 'module' => 'a_module', + 'type' => 'the_type', + 'name' => 'some_name', + ], + ['module' => 'another_module'], + ], ], - [ - 'module' => 'another_module', - ], - ]]]; + ]; $this->moduleHandler->expects($this->at(0)) ->method('loadInclude') ->with('a_module', 'the_type', 'some_name'); diff --git a/core/tests/Drupal/Tests/Core/PathProcessor/PathProcessorTest.php b/core/tests/Drupal/Tests/Core/PathProcessor/PathProcessorTest.php index 57dfbfa..929930a 100644 --- a/core/tests/Drupal/Tests/Core/PathProcessor/PathProcessorTest.php +++ b/core/tests/Drupal/Tests/Core/PathProcessor/PathProcessorTest.php @@ -131,10 +131,12 @@ public function testProcessInbound() { ->getMock(); $negotiator->expects($this->any()) ->method('getNegotiationMethods') - ->will($this->returnValue([LanguageNegotiationUrl::METHOD_ID => [ - 'class' => 'Drupal\language\Plugin\LanguageNegotiation\LanguageNegotiationUrl', - 'weight' => 9, - ]])); + ->will($this->returnValue([ + LanguageNegotiationUrl::METHOD_ID => [ + 'class' => 'Drupal\language\Plugin\LanguageNegotiation\LanguageNegotiationUrl', + 'weight' => 9, + ], + ])); $method = new LanguageNegotiationUrl(); $method->setConfig($config_factory_stub); $method->setLanguageManager($this->languageManager); diff --git a/core/tests/Drupal/Tests/Core/Plugin/Discovery/YamlDirectoryDiscoveryTest.php b/core/tests/Drupal/Tests/Core/Plugin/Discovery/YamlDirectoryDiscoveryTest.php index a2c000e..01f837c 100644 --- a/core/tests/Drupal/Tests/Core/Plugin/Discovery/YamlDirectoryDiscoveryTest.php +++ b/core/tests/Drupal/Tests/Core/Plugin/Discovery/YamlDirectoryDiscoveryTest.php @@ -28,8 +28,7 @@ public function testGetDefinitions() { 'subdir2' => [ 'plugin3.yml' => "id: plugin3\ntest_provider: module_a", ], - 'subdir3' => [ - ] + 'subdir3' => [], ], 'module_b' => [ 'subdir1' => [ diff --git a/core/tests/Drupal/Tests/Core/Plugin/Discovery/YamlDiscoveryTest.php b/core/tests/Drupal/Tests/Core/Plugin/Discovery/YamlDiscoveryTest.php index 096c33f..04e686a 100644 --- a/core/tests/Drupal/Tests/Core/Plugin/Discovery/YamlDiscoveryTest.php +++ b/core/tests/Drupal/Tests/Core/Plugin/Discovery/YamlDiscoveryTest.php @@ -88,8 +88,8 @@ public function testGetDefinitionsWithTranslatableDefinitions() { ], 'test_2' => [ 'test_2.test.yml' => $file_2, - ]] - ); + ], + ]); $discovery = new YamlDiscovery('test', ['test_1' => vfsStream::url('root/test_1'), 'test_2' => vfsStream::url('root/test_2')]); $discovery->addTranslatableProperty('title', 'title_context'); diff --git a/core/tests/Drupal/Tests/Core/Render/RendererBubblingTest.php b/core/tests/Drupal/Tests/Core/Render/RendererBubblingTest.php index 0666367..1f6316e 100644 --- a/core/tests/Drupal/Tests/Core/Render/RendererBubblingTest.php +++ b/core/tests/Drupal/Tests/Core/Render/RendererBubblingTest.php @@ -554,17 +554,23 @@ public function providerTestBubblingWithPrerender() { $data = []; // Test element without theme. - $data[] = [[ - 'foo' => [ - '#pre_render' => [__NAMESPACE__ . '\\BubblingTest::bubblingPreRender'], - ]]]; + $data[] = [ + [ + 'foo' => [ + '#pre_render' => [__NAMESPACE__ . '\\BubblingTest::bubblingPreRender'], + ], + ], + ]; // Test element with theme. - $data[] = [[ - '#theme' => 'common_test_render_element', - 'foo' => [ - '#pre_render' => [__NAMESPACE__ . '\\BubblingTest::bubblingPreRender'], - ]]]; + $data[] = [ + [ + '#theme' => 'common_test_render_element', + 'foo' => [ + '#pre_render' => [__NAMESPACE__ . '\\BubblingTest::bubblingPreRender'], + ] + ] + ]; return $data; } diff --git a/core/tests/Drupal/Tests/Core/Render/RendererPlaceholdersTest.php b/core/tests/Drupal/Tests/Core/Render/RendererPlaceholdersTest.php index 11b7c89..36a3f94 100644 --- a/core/tests/Drupal/Tests/Core/Render/RendererPlaceholdersTest.php +++ b/core/tests/Drupal/Tests/Core/Render/RendererPlaceholdersTest.php @@ -875,13 +875,16 @@ public function testInvalidLazyBuilderArguments() { */ public function testScalarLazybuilderCallbackContext() { $element = []; - $element['#lazy_builder'] = ['\Drupal\Tests\Core\Render\PlaceholdersTest::callback', [ - 'string' => 'foo', - 'bool' => TRUE, - 'int' => 1337, - 'float' => 3.14, - 'null' => NULL, - ]]; + $element['#lazy_builder'] = [ + '\Drupal\Tests\Core\Render\PlaceholdersTest::callback', + [ + 'string' => 'foo', + 'bool' => TRUE, + 'int' => 1337, + 'float' => 3.14, + 'null' => NULL, + ], + ]; $result = $this->renderer->renderRoot($element); $this->assertInstanceOf('\Drupal\Core\Render\Markup', $result); @@ -894,15 +897,18 @@ public function testScalarLazybuilderCallbackContext() { */ public function testNonScalarLazybuilderCallbackContext() { $element = []; - $element['#lazy_builder'] = ['\Drupal\Tests\Core\Render\PlaceholdersTest::callback', [ - 'string' => 'foo', - 'bool' => TRUE, - 'int' => 1337, - 'float' => 3.14, - 'null' => NULL, - // array is not one of the scalar types. - 'array' => ['hi!'], - ]]; + $element['#lazy_builder'] = [ + '\Drupal\Tests\Core\Render\PlaceholdersTest::callback', + [ + 'string' => 'foo', + 'bool' => TRUE, + 'int' => 1337, + 'float' => 3.14, + 'null' => NULL, + // array is not one of the scalar types. + 'array' => ['hi!'], + ], + ]; $this->setExpectedException(\DomainException::class, "A #lazy_builder callback's context may only contain scalar values or NULL."); $this->renderer->renderRoot($element); diff --git a/core/tests/Drupal/Tests/Core/Render/RendererTest.php b/core/tests/Drupal/Tests/Core/Render/RendererTest.php index 7ac4a90..bf5c1ab 100644 --- a/core/tests/Drupal/Tests/Core/Render/RendererTest.php +++ b/core/tests/Drupal/Tests/Core/Render/RendererTest.php @@ -74,98 +74,145 @@ public function providerTestRenderBasic() { // Pass an empty string. $data[] = ['', '']; // Previously printed, see ::renderTwice for a more integration-like test. - $data[] = [[ - '#markup' => 'foo', - '#printed' => TRUE, - ], '']; + $data[] = [ + ['#markup' => 'foo', '#printed' => TRUE], + '', + ]; // Printed in pre_render. - $data[] = [[ - '#markup' => 'foo', - '#pre_render' => [[new TestCallables(), 'preRenderPrinted']] - ], '']; + $data[] = [ + [ + '#markup' => 'foo', + '#pre_render' => [[new TestCallables(), 'preRenderPrinted']], + ], + '', + ]; // Basic #markup based renderable array. - $data[] = [[ - '#markup' => 'foo', - ], 'foo']; + $data[] = [ + ['#markup' => 'foo'], + 'foo', + ]; // Basic #plain_text based renderable array. - $data[] = [[ - '#plain_text' => 'foo', - ], 'foo']; + $data[] = [ + ['#plain_text' => 'foo'], + 'foo', + ]; // Mixing #plain_text and #markup based renderable array. - $data[] = [[ - '#plain_text' => 'foo', - '#markup' => 'bar', - ], '<em>foo</em>']; + $data[] = [ + ['#plain_text' => 'foo', '#markup' => 'bar'], + '<em>foo</em>', + ]; // Safe strings in #plain_text are still escaped. - $data[] = [[ - '#plain_text' => Markup::create('foo'), - ], '<em>foo</em>']; + $data[] = [ + ['#plain_text' => Markup::create('foo')], + '<em>foo</em>', + ]; // Renderable child element. - $data[] = [[ - 'child' => ['#markup' => 'bar'], - ], 'bar']; - // XSS filtering test. - $data[] = [[ - 'child' => ['#markup' => "This is test"], - ], "This is alert('XSS') test"]; + $data[] = [ + ['child' => ['#markup' => 'bar']], + 'bar', + ]; // XSS filtering test. - $data[] = [[ - 'child' => ['#markup' => "This is test", '#allowed_tags' => ['script']], - ], "This is test"]; + $data[] = [ + ['child' => ['#markup' => "This is test"]], + "This is alert('XSS') test", + ]; // XSS filtering test. - $data[] = [[ - 'child' => ['#markup' => "This is test", '#allowed_tags' => ['em', 'strong']], - ], "This is alert('XSS') test"]; + $data[] = [ + [ + 'child' => [ + '#markup' => "This is test", + '#allowed_tags' => ['script'], + ], + ], + "This is test", + ]; + // XSS filtering test. + $data[] = [ + [ + 'child' => [ + '#markup' => "This is test", + '#allowed_tags' => ['em', 'strong'], + ], + ], + "This is alert('XSS') test", + ]; // Html escaping test. - $data[] = [[ - 'child' => ['#plain_text' => "This is test"], - ], "This is <script><em>alert('XSS')</em></script> <strong>test</strong>"]; + $data[] = [ + [ + 'child' => [ + '#plain_text' => "This is test", + ], + ], + "This is <script><em>alert('XSS')</em></script> <strong>test</strong>", + ]; // XSS filtering by default test. - $data[] = [[ - 'child' => ['#markup' => "This is test"], - ], "This is alert('XSS') test"]; + $data[] = [ + [ + 'child' => [ + '#markup' => "This is test", + ], + ], + "This is alert('XSS') test", + ]; // Ensure non-XSS tags are not filtered out. - $data[] = [[ - 'child' => ['#markup' => "This is test"], - ], "This is alert('not a giraffe') test"]; + $data[] = [ + [ + 'child' => [ + '#markup' => "This is test", + ], + ], + "This is alert('not a giraffe') test", + ]; // #children set but empty, and renderable children. - $data[] = [[ - '#children' => '', - 'child' => ['#markup' => 'bar'], - ], 'bar']; + $data[] = [ + ['#children' => '', 'child' => ['#markup' => 'bar']], + 'bar', + ]; // #children set, not empty, and renderable children. #children will be // assumed oto be the rendered child elements, even though the #markup for // 'child' differs. - $data[] = [[ - '#children' => 'foo', - 'child' => ['#markup' => 'bar'], - ], 'foo']; + $data[] = [ + ['#children' => 'foo', 'child' => ['#markup' => 'bar']], + 'foo', + ]; // Ensure that content added to #markup via a #pre_render callback is safe. - $data[] = [[ - '#markup' => 'foo', - '#pre_render' => [function($elements) { - $elements['#markup'] .= ''; - return $elements; - }] - ], 'fooalert("bar");']; + $data[] = [ + [ + '#markup' => 'foo', + '#pre_render' => [function($elements) { + $elements['#markup'] .= ''; + return $elements; + } + ], + ], + 'fooalert("bar");', + ]; // Test #allowed_tags in combination with #markup and #pre_render. - $data[] = [[ - '#markup' => 'foo', - '#allowed_tags' => ['script'], - '#pre_render' => [function($elements) { - $elements['#markup'] .= ''; - return $elements; - }] - ], 'foo']; + $data[] = [ + [ + '#markup' => 'foo', + '#allowed_tags' => ['script'], + '#pre_render' => [function($elements) { + $elements['#markup'] .= ''; + return $elements; + } + ], + ], + 'foo', + ]; // Ensure output is escaped when adding content to #check_plain through // a #pre_render callback. - $data[] = [[ - '#plain_text' => 'foo', - '#pre_render' => [function($elements) { - $elements['#plain_text'] .= ''; - return $elements; - }] - ], 'foo<script>alert("bar");</script>']; + $data[] = [ + [ + '#plain_text' => 'foo', + '#pre_render' => [function($elements) { + $elements['#plain_text'] .= ''; + return $elements; + } + ], + ], + 'foo<script>alert("bar");</script>', + ]; // Part 2: render arrays using #theme and #theme_wrappers. diff --git a/core/tests/Drupal/Tests/Core/Utility/UnroutedUrlAssemblerTest.php b/core/tests/Drupal/Tests/Core/Utility/UnroutedUrlAssemblerTest.php index 01b16ad..4df9172 100644 --- a/core/tests/Drupal/Tests/Core/Utility/UnroutedUrlAssemblerTest.php +++ b/core/tests/Drupal/Tests/Core/Utility/UnroutedUrlAssemblerTest.php @@ -121,10 +121,10 @@ public function providerTestAssembleWithLocalUri() { ['base:example', ['query' => ['foo' => 'bar']], FALSE, '/example?foo=bar'], ['base:example', ['query' => ['foo' => '"bar"']], FALSE, '/example?foo=%22bar%22'], ['base:example', ['query' => ['foo' => '"bar"', 'zoo' => 'baz']], FALSE, '/example?foo=%22bar%22&zoo=baz'], - ['base:example', ['fragment' => 'example', ], FALSE, '/example#example'], + ['base:example', ['fragment' => 'example'], FALSE, '/example#example'], ['base:example', [], TRUE, '/subdir/example'], ['base:example', ['query' => ['foo' => 'bar']], TRUE, '/subdir/example?foo=bar'], - ['base:example', ['fragment' => 'example', ], TRUE, '/subdir/example#example'], + ['base:example', ['fragment' => 'example'], TRUE, '/subdir/example#example'], ['base:/drupal.org', [], FALSE, '/drupal.org'], ]; }