diff --git a/core/includes/install.core.inc b/core/includes/install.core.inc index 4570a17..bab9cbf 100644 --- a/core/includes/install.core.inc +++ b/core/includes/install.core.inc @@ -1159,14 +1159,12 @@ function install_select_profile(&$install_state) { * Determines the installation profile to use in the installer. * * A profile will be selected in the following order of conditions: - * * - Only one profile is available. * - A specific profile name is requested in installation parameters: - * - for interactive installations via request query parameters. - * - for non-interactive installations via install_drupal() settings. - * - A discovered profile that is a distribution. - * If multiple profiles are distributions, then the first discovered profile - * will be selected. + * - For interactive installations via request query parameters. + * - For non-interactive installations via install_drupal() settings. + * - A discovered profile that is a distribution. If multiple profiles are + * distributions, then the first discovered profile will be selected. * - Only one visible profile is available. * * @param array $install_state diff --git a/core/lib/Drupal/Core/Cache/CacheContexts.php b/core/lib/Drupal/Core/Cache/CacheContexts.php index 8ffe792..bede04d 100644 --- a/core/lib/Drupal/Core/Cache/CacheContexts.php +++ b/core/lib/Drupal/Core/Cache/CacheContexts.php @@ -204,9 +204,9 @@ protected function getService($context_id) { * @return array * An array with the parsed results, with each result being an array * containing: - * - the cache context ID - * - the associated parameter (for a calculated cache context), or NULL if - * there is no parameter. + * - The cache context ID. + * - The associated parameter (for a calculated cache context), or NULL if + * there is no parameter. */ public static function parseTokens(array $context_tokens) { $contexts_with_parameters = []; diff --git a/core/lib/Drupal/Core/Menu/MenuLinkTreeElement.php b/core/lib/Drupal/Core/Menu/MenuLinkTreeElement.php index 596b02a..a52b6c2 100644 --- a/core/lib/Drupal/Core/Menu/MenuLinkTreeElement.php +++ b/core/lib/Drupal/Core/Menu/MenuLinkTreeElement.php @@ -17,13 +17,13 @@ * plus what their parent is. But they don't know where exactly in a menu link * tree they live. * - Instances of this class are complimentary to those objects, they know: - * - all additional metadata from {menu_tree}, which contains "materialized" - * metadata about a menu link tree, such as whether a link in the tree has - * visible children and the depth relative to the root; - * - plus all additional metadata that's adjusted for the current tree query, - * such as whether the link is in the active trail, whether the link is - * accessible for the current user, and the link's children (which are only - * loaded if the link was marked as "expanded" by the query). + * - All additional metadata from {menu_tree}, which contains "materialized" + * metadata about a menu link tree, such as whether a link in the tree has + * visible children and the depth relative to the root. + * - Plus all additional metadata that's adjusted for the current tree query, + * such as whether the link is in the active trail, whether the link is + * accessible for the current user, and the link's children (which are only + * loaded if the link was marked as "expanded" by the query). * * @see \Drupal\Core\Menu\MenuTreeStorage::loadTreeData() */ diff --git a/core/lib/Drupal/Core/Render/BareHtmlPageRendererInterface.php b/core/lib/Drupal/Core/Render/BareHtmlPageRendererInterface.php index fa78a18..1b4a5f5 100644 --- a/core/lib/Drupal/Core/Render/BareHtmlPageRendererInterface.php +++ b/core/lib/Drupal/Core/Render/BareHtmlPageRendererInterface.php @@ -38,8 +38,9 @@ * in a limited environment). * * Currently, there are two types of bare pages available: - * - install (hook_preprocess_install_page(), install-page.html.twig) - * - maintenance (hook_preprocess_maintenance_page(), maintenance-page.html.twig) + * - Install (hook_preprocess_install_page(), install-page.html.twig). + * - Maintenance (hook_preprocess_maintenance_page(), + * maintenance-page.html.twig). * * @see \Drupal\Core\Render\MainContent\HtmlRenderer */ diff --git a/core/modules/filter/src/FilterProcessResult.php b/core/modules/filter/src/FilterProcessResult.php index 672ccb7..80ad9e5 100644 --- a/core/modules/filter/src/FilterProcessResult.php +++ b/core/modules/filter/src/FilterProcessResult.php @@ -17,14 +17,14 @@ * The typical use case for a text filter plugin's processing method is to just * apply some filtering to the given text, but for more advanced use cases, * it may be necessary to also: - * - declare asset libraries to be loaded; - * - declare cache tags that the filtered text depends upon, so when either of + * - Declare asset libraries to be loaded. + * - Declare cache tags that the filtered text depends upon, so when either of * those cache tags is invalidated, the filtered text should also be - * invalidated; - * - declare cache context to vary by, e.g. 'language' to do language-specific - * filtering. - * - declare a maximum age for the filtered text - * - apply uncacheable filtering, for example because it differs per user. + * invalidated. + * - Declare cache context to vary by, e.g. 'language' to do language-specific + * filtering. + * - Declare a maximum age for the filtered text. + * - Apply uncacheable filtering, for example because it differs per user. * * In case a filter needs one or more of these advanced use cases, it can use * the additional methods available. diff --git a/core/modules/language/src/Tests/LanguageUILanguageNegotiationTest.php b/core/modules/language/src/Tests/LanguageUILanguageNegotiationTest.php index 8e38003..446874f 100644 --- a/core/modules/language/src/Tests/LanguageUILanguageNegotiationTest.php +++ b/core/modules/language/src/Tests/LanguageUILanguageNegotiationTest.php @@ -23,30 +23,26 @@ use Drupal\block\Entity\Block; /** - * Tests UI language switching. + * Tests the language UI for language switching. * - * - URL (PATH) > DEFAULT - * UI Language base on URL prefix, browser language preference has no - * influence: - * admin/config - * UI in site default language - * zh-hans/admin/config - * UI in Chinese - * blah-blah/admin/config - * 404 - * - URL (PATH) > BROWSER > DEFAULT - * admin/config - * UI in user's browser language preference if the site has that - * language added, if not, the default language - * zh-hans/admin/config - * UI in Chinese - * blah-blah/admin/config - * 404 - * - URL (DOMAIN) > DEFAULT - * http://example.com/admin/config - * UI language in site default - * http://example.cn/admin/config - * UI language in Chinese + * The uses cases that get tested, are: + * - URL (PATH) > DEFAULT: Test that the URL prefix setting gets precedence over + * the default language. The browser language preference does not have any + * influence. Following use cases get tested: + * - admin/config: Tests the UI using the precedence rules. + * - zh-hans/admin/config: Tests the UI in Chinese. + * - blah-blah/admin/config: Tests the 404 page. + * - URL (PATH) > BROWSER > DEFAULT: Test that the URL prefix setting gets + * precedence over the browser language preference, which in turn gets + * precedence over the default language. Following use cases get tested: + * - admin/config: Tests the UI using the precedence rules. + * - zh-hans/admin/config: Tests the UI in Chinese. + * - blah-blah/admin/config: Tests the 404 page. + * - URL (DOMAIN) > DEFAULT: Tests that the URL domain setting gets precedence + * over the default language. Following use cases get tested: + * - admin/config: Tests the UI using the precedence rules. + * - zh-hans/admin/config: Tests the UI in Chinese. + * - blah-blah/admin/config: Tests the 404 page. * * @group language */ diff --git a/core/modules/system/theme.api.php b/core/modules/system/theme.api.php index 0db0c70..fcbacf1 100644 --- a/core/modules/system/theme.api.php +++ b/core/modules/system/theme.api.php @@ -164,27 +164,27 @@ * * @section assets Assets * We can distinguish between three types of assets: - * - unconditional page-level assets (loaded on all pages where the theme is in - * use): these are defined in the theme's *.info.yml file. - * - conditional page-level assets (loaded on all pages where the theme is in - * use and a certain condition is met): these are attached in - * hook_page_attachments_alter(), e.g.: - * @code - * function THEME_page_attachments_alter(array &$page) { - * if ($some_condition) { - * $page['#attached']['library'][] = 'mytheme/something'; - * } - * } - * @endcode - * - template-specific assets (loaded on all pages where a specific template is - * in use): these can be added by in preprocessing functions, using @code - * $variables['#attached'] @endcode, e.g.: - * @code - * function THEME_preprocess_menu_local_action(array &$variables) { - * // We require Modernizr's touch test for button styling. - * $variables['#attached']['library'][] = 'core/modernizr'; - * } - * @endcode + * - Unconditional page-level assets (loaded on all pages where the theme is in + * use): these are defined in the theme's *.info.yml file. + * - Conditional page-level assets (loaded on all pages where the theme is in + * use and a certain condition is met): these are attached in + * hook_page_attachments_alter(), e.g.: + * @code + * function THEME_page_attachments_alter(array &$page) { + * if ($some_condition) { + * $page['#attached']['library'][] = 'mytheme/something'; + * } + * } + * @endcode + * - Template-specific assets (loaded on all pages where a specific template is + * in use): these can be added by in preprocessing functions, using @code + * $variables['#attached'] @endcode, e.g.: + * @code + * function THEME_preprocess_menu_local_action(array &$variables) { + * // We require Modernizr's touch test for button styling. + * $variables['#attached']['library'][] = 'core/modernizr'; + * } + * @endcode * * @see hooks * @see callbacks diff --git a/core/tests/Drupal/Tests/Core/Access/AccessResultTest.php b/core/tests/Drupal/Tests/Core/Access/AccessResultTest.php index 6f5e769..43ae63a 100644 --- a/core/tests/Drupal/Tests/Core/Access/AccessResultTest.php +++ b/core/tests/Drupal/Tests/Core/Access/AccessResultTest.php @@ -473,15 +473,15 @@ public function testInheritCacheability() { * every single bit of cacheability metadata, which would lead to a mind- * boggling number of permutations, in this test, we only consider the * permutations of all pairs of the following set: - * - Allowed, implements CDI, is cacheable - * - Allowed, implements CDI, is not cacheable - * - Allowed, does not implement CDI (hence not cacheable) - * - Forbidden, implements CDI, is cacheable - * - Forbidden, implements CDI, is not cacheable - * - Forbidden, does not implement CDI (hence not cacheable) - * - Neutral, implements CDI, is cacheable - * - Neutral, implements CDI, is not cacheable - * - Neutral, does not implement CDI (hence not cacheable) + * - Allowed, implements CDI and is cacheable. + * - Allowed, implements CDI and is not cacheable. + * - Allowed, does not implement CDI (hence not cacheable). + * - Forbidden, implements CDI and is cacheable. + * - Forbidden, implements CDI and is not cacheable. + * - Forbidden, does not implement CDI (hence not cacheable). + * - Neutral, implements CDI and is cacheable. + * - Neutral, implements CDI and is not cacheable. + * - Neutral, does not implement CDI (hence not cacheable). * * (Where "CDI" is CacheableDependencyInterface.) * @@ -491,14 +491,14 @@ public function testInheritCacheability() { * * There are two "contagious" patterns: * - Any operation with a forbidden access result yields a forbidden result. - * This therefore also applies to the cacheability metadata associated with - * a forbidden result. - * This is the case for items 4, 5 and 6 in the set above. + * This therefore also applies to the cacheability metadata associated with + * a forbidden result. This is the case for bullets 4, 5 and 6 in the set + * above. * - Any operation yields an access result object that is of the same class - * (implementation) as the first operand. This is because operations are - * invoked on the first operand. Therefore, if the first implementation - * does not implement CacheableDependencyInterface, then the result won't - * either. This is the case for items 3, 6 and 9 in the set above. + * (implementation) as the first operand. This is because operations are + * invoked on the first operand. Therefore, if the first implementation + * does not implement CacheableDependencyInterface, then the result won't + * either. This is the case for bullets 3, 6 and 9 in the set above. */ public function andOrCacheabilityPropagationProvider() { // ct: cacheable=true, cf: cacheable=false, un: uncacheable. diff --git a/core/tests/Drupal/Tests/Core/Render/RendererPostRenderCacheTest.php b/core/tests/Drupal/Tests/Core/Render/RendererPostRenderCacheTest.php index 18c6c09..34767eb 100644 --- a/core/tests/Drupal/Tests/Core/Render/RendererPostRenderCacheTest.php +++ b/core/tests/Drupal/Tests/Core/Render/RendererPostRenderCacheTest.php @@ -33,8 +33,8 @@ protected function setUp() { * * @return array * An array containing: - * - a render array containing a #post_render_cache callback - * - the context used for that #post_render_cache callback. + * - A render array containing a #post_render_cache callback. + * - The context used for that #post_render_cache callback. */ protected function generatePostRenderCacheElement() { $context = ['foo' => $this->randomContextValue()];