From 9cc714cc44d361581f316f51276d35d17787a2d5 Mon Sep 17 00:00:00 2001
From: sandippoddar <sandip.poddar@innoraft.com>
Date: Wed, 12 Feb 2025 11:49:57 +0530
Subject: [PATCH 1/2] Issue #3497677: Widen type for $violations in
EntityConstraintViolationList constructor
---
core/lib/Drupal/Core/Entity/ContentEntityBase.php | 2 +-
.../Drupal/Core/Entity/EntityConstraintViolationList.php | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/core/lib/Drupal/Core/Entity/ContentEntityBase.php b/core/lib/Drupal/Core/Entity/ContentEntityBase.php
index 039fdce703eb..4c5459b3c26f 100644
--- a/core/lib/Drupal/Core/Entity/ContentEntityBase.php
+++ b/core/lib/Drupal/Core/Entity/ContentEntityBase.php
@@ -516,7 +516,7 @@ public function postSave(EntityStorageInterface $storage, $update = TRUE) {
public function validate() {
$this->validated = TRUE;
$violations = $this->getTypedData()->validate();
- return new EntityConstraintViolationList($this, iterator_to_array($violations));
+ return new EntityConstraintViolationList($this, $violations);
}
/**
diff --git a/core/lib/Drupal/Core/Entity/EntityConstraintViolationList.php b/core/lib/Drupal/Core/Entity/EntityConstraintViolationList.php
index 2537c6bfd7c2..4922aea324bc 100644
--- a/core/lib/Drupal/Core/Entity/EntityConstraintViolationList.php
+++ b/core/lib/Drupal/Core/Entity/EntityConstraintViolationList.php
@@ -44,10 +44,10 @@ class EntityConstraintViolationList extends ConstraintViolationList implements E
*
* @param \Drupal\Core\Entity\FieldableEntityInterface $entity
* The entity that has been validated.
- * @param array $violations
- * The array of violations.
+ * @param iterable $violations
+ * The iterable of violations.
*/
- public function __construct(FieldableEntityInterface $entity, array $violations = []) {
+ public function __construct(FieldableEntityInterface $entity, iterable $violations = []) {
parent::__construct($violations);
$this->entity = $entity;
}
--
GitLab
From 53ec18f74fae14c836433d5356c2417ad0fc1b76 Mon Sep 17 00:00:00 2001
From: Dave Long <24510-longwave@users.noreply.drupalcode.org>
Date: Wed, 12 Feb 2025 09:37:50 +0000
Subject: [PATCH 2/2] Improve comment
---
core/lib/Drupal/Core/Entity/EntityConstraintViolationList.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/core/lib/Drupal/Core/Entity/EntityConstraintViolationList.php b/core/lib/Drupal/Core/Entity/EntityConstraintViolationList.php
index 4922aea324bc..8b711537581c 100644
--- a/core/lib/Drupal/Core/Entity/EntityConstraintViolationList.php
+++ b/core/lib/Drupal/Core/Entity/EntityConstraintViolationList.php
@@ -45,7 +45,7 @@ class EntityConstraintViolationList extends ConstraintViolationList implements E
* @param \Drupal\Core\Entity\FieldableEntityInterface $entity
* The entity that has been validated.
* @param iterable $violations
- * The iterable of violations.
+ * The set of violations.
*/
public function __construct(FieldableEntityInterface $entity, iterable $violations = []) {
parent::__construct($violations);
--
GitLab