FormElements: Correctly load decorators by name

Icinga · Jun 23, 2023 · 914f083 · 914f083
1 parent 413480e
commit 914f083
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/src/FormElement/FormElements.php b/src/FormElement/FormElements.php
@@ -244,8 +244,15 @@ public function setDefaultElementDecorator($decorator)
         } else {
             $this->ensureDefaultElementDecoratorLoaderRegistered();
 
-            $d = $this->loadPlugin('decorator', $decorator);
+            $class = $this->loadPlugin('decorator', $decorator);
+            if (! $class) {
+                throw new InvalidArgumentException(sprintf(
+                    "Can't create decorator of unknown type '%s",
+                    $decorator
+                ));
+            }
 
+            $d = new $class();
             if (! $d instanceof FormElementDecorator && ! $d instanceof DecoratorInterface) {
                 throw new InvalidArgumentException(sprintf(
                     "Expected instance of %s for decorator '%s',"