From 1859406c878e08dedebd1c121c610eb066473248 Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Mon, 1 Apr 2024 14:31:46 +0100
Subject: [PATCH] Revert "Issue #3437286 by immaculatexavier, longwave: Use
argument unpacking in FieldItemList::delegateMethod()"
This reverts commit a73384d86142f7712984e6e112d460fa33b9faad.
---
core/lib/Drupal/Core/Field/FieldItemList.php | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/core/lib/Drupal/Core/Field/FieldItemList.php b/core/lib/Drupal/Core/Field/FieldItemList.php
index 08b55608e4f9..c1d3b70edb99 100644
--- a/core/lib/Drupal/Core/Field/FieldItemList.php
+++ b/core/lib/Drupal/Core/Field/FieldItemList.php
@@ -220,14 +220,19 @@ public function deleteRevision() {
*
* @param string $method
* The name of the method to be invoked.
- * @param mixed ...$args
- * Any arguments to be forwarded to the invoked method.
*
* @return array
* An array of results keyed by delta.
*/
- protected function delegateMethod($method, ...$args) {
- return array_map(fn($item) => $item->{$method}(...$args), $this->list);
+ protected function delegateMethod($method) {
+ $result = [];
+ $args = array_slice(func_get_args(), 1);
+ foreach ($this->list as $delta => $item) {
+ // call_user_func_array() is way slower than a direct call so we avoid
+ // using it if have no parameters.
+ $result[$delta] = $args ? call_user_func_array([$item, $method], $args) : $item->{$method}();
+ }
+ return $result;
}
/**
--
GitLab