core/lib/Drupal/Core/Asset/AssetResolver.php | 22 +++++++++++----------- .../Drupal/Core/Asset/AttachedAssetsInterface.php | 2 +- .../system/src/Tests/Common/AttachedAssetsTest.php | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/core/lib/Drupal/Core/Asset/AssetResolver.php b/core/lib/Drupal/Core/Asset/AssetResolver.php index a35f823..1b02761 100644 --- a/core/lib/Drupal/Core/Asset/AssetResolver.php +++ b/core/lib/Drupal/Core/Asset/AssetResolver.php @@ -270,7 +270,7 @@ public function getJsAssets(AttachedAssetsInterface $assets, $optimize) { // @todo Refactor this when the default scope is changed to 'footer' in // https://www.drupal.org/node/784626 // If the core/drupalSettings library is being loaded or is already loaded, - // get the JavaScript settings assets. and converts them into a single + // get the JavaScript settings assets, and convert them into a single // "regular" JavaScript asset. $libraries_to_load = $this->getLibrariesToLoad($assets); $settings_needed = in_array('core/drupalSettings', $libraries_to_load) || in_array('core/drupalSettings', $this->libraryDependencyResolver->getLibrariesWithDependencies($assets->getAlreadyLoadedLibraries())); @@ -300,22 +300,22 @@ public function getJsAssets(AttachedAssetsInterface $assets, $optimize) { /** * Sorts CSS and JavaScript resources. * - * This sort order helps optimize front-end performance while providing modules - * and themes with the necessary control for ordering the CSS and JavaScript - * appearing on a page. + * This sort order helps optimize front-end performance while providing + * modules and themes with the necessary control for ordering the CSS and + * JavaScript appearing on a page. * * @param $a - * First item for comparison. The compared items should be associative arrays - * of member items. + * First item for comparison. The compared items should be associative + * arrays of member items. * @param $b * Second item for comparison. * * @return int */ public static function sort($a, $b) { - // First order by group, so that all items in the CSS_AGGREGATE_DEFAULT group - // appear before items in the CSS_AGGREGATE_THEME group. Modules may create - // additional groups by defining their own constants. + // First order by group, so that all items in the CSS_AGGREGATE_DEFAULT + // group appear before items in the CSS_AGGREGATE_THEME group. Modules may + // create additional groups by defining their own constants. if ($a['group'] < $b['group']) { return -1; } @@ -323,8 +323,8 @@ public static function sort($a, $b) { return 1; } // Within a group, order all infrequently needed, page-specific files after - // common files needed throughout the website. Separating this way allows for - // the aggregate file generated for all of the common files to be reused + // common files needed throughout the website. Separating this way allows + // for the aggregate file generated for all of the common files to be reused // across a site visit without being cut by a page using a less common file. elseif ($a['every_page'] && !$b['every_page']) { return -1; diff --git a/core/lib/Drupal/Core/Asset/AttachedAssetsInterface.php b/core/lib/Drupal/Core/Asset/AttachedAssetsInterface.php index 338e8b4..956cf62 100644 --- a/core/lib/Drupal/Core/Asset/AttachedAssetsInterface.php +++ b/core/lib/Drupal/Core/Asset/AttachedAssetsInterface.php @@ -23,7 +23,7 @@ * Creates an AttachedAssetsInterface object from a render array. * * @param array $render_array - * A render array + * A render array. * * @return \Drupal\Core\Asset\AttachedAssetsInterface * diff --git a/core/modules/system/src/Tests/Common/AttachedAssetsTest.php b/core/modules/system/src/Tests/Common/AttachedAssetsTest.php index 169752c..7cd97b3 100644 --- a/core/modules/system/src/Tests/Common/AttachedAssetsTest.php +++ b/core/modules/system/src/Tests/Common/AttachedAssetsTest.php @@ -221,7 +221,7 @@ function testFooterHTML() { } /** - * Tests that for assets that have cache = FALSE, Drupal automatically sets preprocess = FALSE. + * Tests that for assets with cache = FALSE, Drupal sets preprocess = FALSE. */ function testNoCache() { $build['#attached']['library'][] = 'common_test/no-cache';