getElementTypeByRefHandle() cleanup

Author: brandonkelly

src/services/Elements.php

@@ -2337,22 +2337,26 @@ public function createExporter(mixed $config): ElementExporterInterface
      */
     public function getElementTypeByRefHandle(string $refHandle): ?string
     {
-        if (array_key_exists($refHandle, $this->_elementTypesByRefHandle)) {
-            return $this->_elementTypesByRefHandle[$refHandle];
+        if (!isset($this->_elementTypesByRefHandle[$refHandle])) {
+            $this->_elementTypesByRefHandle[$refHandle] = $this->elementTypeByRefHandle($refHandle);
         }
+        return $this->_elementTypesByRefHandle[$refHandle] ?: null;
+    }
 
+    private function elementTypeByRefHandle(string $refHandle): string|false
+    {
         foreach ($this->getAllElementTypes() as $class) {
             /** @var string|ElementInterface $class */
             /** @phpstan-var class-string<ElementInterface>|ElementInterface $class */
             if (
                 ($elementRefHandle = $class::refHandle()) !== null &&
                 strcasecmp($elementRefHandle, $refHandle) === 0
             ) {
-                return $this->_elementTypesByRefHandle[$refHandle] = $class;
+                return $class;
             }
         }
 
-        return $this->_elementTypesByRefHandle[$refHandle] = null;
+        return false;
     }
 
     /**