Create multi-dimensional array instead of fiddling with composed keys

simplesamlphp · Sep 12, 2024 · f05c7de · f05c7de
1 parent 9c38466
commit f05c7de
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/src/Registry/ElementRegistry.php b/src/Registry/ElementRegistry.php
@@ -56,9 +56,10 @@ public static function getInstance(): AbstractElementRegistry
  public function registerElementHandler(string $class): void
  {
  Assert::subclassOf($class, AbstractElement::class);
+ $namespace = class::NS;
  $className = AbstractElement::getClassName($class);
- $key = ($class::NS === null) ? $className : implode(':', [$class::NS, $className]);
- $this->registry[$key] = $class;
+
+ $this->registry[$namespace][$key] = $class;
  }
 
 
@@ -79,11 +80,6 @@ public function getElementHandler(?string $namespace, string $element): ?string
  Assert::nullOrValidURI($namespace, InvalidDOMElementException::class);
  Assert::validNCName($element, InvalidDOMElementException::class);
 
- $key = ($namespace === null) ? $element : implode(':', [$namespace, $element]);
- if (array_key_exists($key, $this->registry) === true) {
- return $this->registry[$key];
- }
-
- return null;
+ return $this->registry[$namespace][$element] ?? null;
  }
 }