From db906a7bfe463409d013fbb6848b741f96972feb Mon Sep 17 00:00:00 2001
From: xjm <xjm@65776.no-reply.drupal.org>
Date: Tue, 27 Dec 2022 08:11:14 -0600
Subject: [PATCH] Issue #3328066 by rpayanm, joachim: simplify logic in
ConfigManager::getEntityTypeIdByName()
(cherry picked from commit 75035a0f82f065a36349fbe75f3220c514a8981b)
---
core/lib/Drupal/Core/Config/ConfigManager.php | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/core/lib/Drupal/Core/Config/ConfigManager.php b/core/lib/Drupal/Core/Config/ConfigManager.php
index d9c354100606..2bdba2f215fe 100644
--- a/core/lib/Drupal/Core/Config/ConfigManager.php
+++ b/core/lib/Drupal/Core/Config/ConfigManager.php
@@ -7,7 +7,6 @@
use Drupal\Core\Config\Entity\ConfigEntityInterface;
use Drupal\Core\Config\Entity\ConfigEntityTypeInterface;
use Drupal\Core\Entity\EntityRepositoryInterface;
-use Drupal\Core\Entity\EntityTypeInterface;
use Drupal\Core\Entity\EntityTypeManagerInterface;
use Drupal\Core\Extension\ExtensionPathResolver;
use Drupal\Core\Serialization\Yaml;
@@ -120,10 +119,13 @@ public function __construct(EntityTypeManagerInterface $entity_type_manager, Con
* {@inheritdoc}
*/
public function getEntityTypeIdByName($name) {
- $entities = array_filter($this->entityTypeManager->getDefinitions(), function (EntityTypeInterface $entity_type) use ($name) {
- return ($entity_type instanceof ConfigEntityTypeInterface && $config_prefix = $entity_type->getConfigPrefix()) && strpos($name, $config_prefix . '.') === 0;
- });
- return key($entities);
+ foreach ($this->entityTypeManager->getDefinitions() as $entity_type_id => $entity_type) {
+ if (($entity_type instanceof ConfigEntityTypeInterface && $config_prefix = $entity_type->getConfigPrefix()) && str_starts_with($name, $config_prefix . '.')) {
+ return $entity_type_id;
+ }
+ }
+
+ return NULL;
}
/**
--
GitLab