core/includes/common.inc | 2 +- core/lib/Drupal/Core/Render/Renderer.php | 1 - core/lib/Drupal/Core/Render/RendererInterface.php | 10 +++++----- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/core/includes/common.inc b/core/includes/common.inc index 654723c..8aab5dc 100644 --- a/core/includes/common.inc +++ b/core/includes/common.inc @@ -854,7 +854,7 @@ function drupal_js_defaults($data = NULL) { * Merges two #attached arrays. * * The values under the 'drupalSettings' key are merged in a special way, to - * match the behavior of + * match the behavior of: * * @code * jQuery.extend(true, {}, $settings_items[0], $settings_items[1], ...) diff --git a/core/lib/Drupal/Core/Render/Renderer.php b/core/lib/Drupal/Core/Render/Renderer.php index a3dd23d..69e99a0 100644 --- a/core/lib/Drupal/Core/Render/Renderer.php +++ b/core/lib/Drupal/Core/Render/Renderer.php @@ -586,7 +586,6 @@ public static function mergeBubbleableMetadata(array $a, array $b) { /** * {@inheritdoc} */ - public static function mergeAttachments(array $a, array $b) { // If both #attached arrays contain drupalSettings, then merge them // correctly; adding the same settings multiple times needs to behave diff --git a/core/lib/Drupal/Core/Render/RendererInterface.php b/core/lib/Drupal/Core/Render/RendererInterface.php index 990a087..418298b 100644 --- a/core/lib/Drupal/Core/Render/RendererInterface.php +++ b/core/lib/Drupal/Core/Render/RendererInterface.php @@ -305,10 +305,10 @@ public function getCacheableRenderArray(array $elements); public static function mergeBubbleableMetadata(array $a, array $b); /** - * Merges two attachments (#attached) arrays. + * Merges two attachments arrays (which live under the '#attached' key). * * The values under the 'drupalSettings' key are merged in a special way, to - * match the behavior of + * match the behavior of: * * @code * jQuery.extend(true, {}, $settings_items[0], $settings_items[1], ...) @@ -339,12 +339,12 @@ public static function mergeBubbleableMetadata(array $a, array $b); * the same as if rendered in one PHP request and merged by PHP. * * @param array $a - * An attachments (#attached) array. + * An attachments array. * @param array $b - * Another attachments (#attached) array. + * Another attachments array. * * @return array - * The merged attachments (#attached) array. + * The merged attachments array. */ public static function mergeAttachments(array $a, array $b);