From ca19c94c7c6146f09ef7b5efead5623121cc3cf4 Mon Sep 17 00:00:00 2001
From: catch <6915-catch@users.noreply.drupalcode.org>
Date: Fri, 30 Aug 2024 17:21:04 +0900
Subject: [PATCH] Issue #3334045 by yash.rode, joachim, quietone:
Drupal\Core\Template\Attribute doesn't support adding attributes with array
syntax if attribute name not already initialised
---
core/lib/Drupal/Core/Template/Attribute.php | 7 +++++++
core/tests/Drupal/Tests/Core/Template/AttributeTest.php | 8 ++++++--
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/core/lib/Drupal/Core/Template/Attribute.php b/core/lib/Drupal/Core/Template/Attribute.php
index 63f21c2d1626..7422e26f463d 100644
--- a/core/lib/Drupal/Core/Template/Attribute.php
+++ b/core/lib/Drupal/Core/Template/Attribute.php
@@ -94,6 +94,13 @@ public function offsetGet($name): mixed {
if (isset($this->storage[$name])) {
return $this->storage[$name];
}
+ // The 'class' array key is expected to be itself an array, and therefore
+ // can be accessed using array append syntax before it has been initialized.
+ if ($name === 'class') {
+ // Initialize the class attribute as an empty array if not set.
+ $this->offsetSet('class', []);
+ return $this->storage['class'];
+ }
return NULL;
}
diff --git a/core/tests/Drupal/Tests/Core/Template/AttributeTest.php b/core/tests/Drupal/Tests/Core/Template/AttributeTest.php
index f76bc92c7576..46ac4daf36df 100644
--- a/core/tests/Drupal/Tests/Core/Template/AttributeTest.php
+++ b/core/tests/Drupal/Tests/Core/Template/AttributeTest.php
@@ -148,12 +148,16 @@ public function testRemoveAttribute(): void {
* @covers ::addClass
*/
public function testAddClasses(): void {
- // Add empty Attribute object with no classes.
+ // Add a class with the array syntax without first initializing the 'class'
+ // attribute.
$attribute = new Attribute();
+ $attribute['class'][] = 'test-class';
+ $this->assertEquals(new AttributeArray('class', ['test-class']), $attribute['class']);
+ $attribute = new Attribute();
// Add no class on empty attribute.
$attribute->addClass();
- $this->assertEmpty($attribute['class']);
+ $this->assertEmpty($attribute['class']->value());
// Test various permutations of adding values to empty Attribute objects.
foreach ([NULL, FALSE, '', []] as $value) {
--
GitLab