From 60a4206017128e8f258eb79aa9091663eb9e2520 Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Thu, 27 Jan 2022 01:54:45 +0000
Subject: [PATCH] Issue #3172166 by Pooja Ganjage, ekes, Megha_kundar,
tstoeckler, mbovan, Spokje, alexpott: Element::properties() produces notices
if given an array with integer keys
---
core/lib/Drupal/Core/Render/Element.php | 2 +-
core/tests/Drupal/Tests/Core/Render/ElementTest.php | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/core/lib/Drupal/Core/Render/Element.php b/core/lib/Drupal/Core/Render/Element.php
index dfd4eb099d36..75c3ab740174 100644
--- a/core/lib/Drupal/Core/Render/Element.php
+++ b/core/lib/Drupal/Core/Render/Element.php
@@ -24,7 +24,7 @@ class Element {
* TRUE of the key is a property, FALSE otherwise.
*/
public static function property($key) {
- return $key[0] == '#';
+ return is_string($key) && $key[0] == '#';
}
/**
diff --git a/core/tests/Drupal/Tests/Core/Render/ElementTest.php b/core/tests/Drupal/Tests/Core/Render/ElementTest.php
index a09cb3f61feb..5de025b37192 100644
--- a/core/tests/Drupal/Tests/Core/Render/ElementTest.php
+++ b/core/tests/Drupal/Tests/Core/Render/ElementTest.php
@@ -19,6 +19,7 @@ public function testProperty() {
$this->assertTrue(Element::property('#property'));
$this->assertFalse(Element::property('property'));
$this->assertFalse(Element::property('property#'));
+ $this->assertFalse(Element::property(0));
}
/**
@@ -29,13 +30,16 @@ public function testProperties() {
'#property1' => 'property1',
'#property2' => 'property2',
'property3' => 'property3',
+ 0 => [],
];
$properties = Element::properties($element);
+ $this->assertCount(2, $properties);
$this->assertContains('#property1', $properties);
$this->assertContains('#property2', $properties);
$this->assertNotContains('property3', $properties);
+ $this->assertNotContains(0, $properties);
}
/**
--
GitLab