Fix an error when a non-Formie field was mistakenly added to a form

verbb · Oct 23, 2024 · 12c99e1 · 12c99e1
1 parent 300a379
commit 12c99e1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 12 deletions.
diff --git a/src/fields/Forms.php b/src/fields/Forms.php
@@ -17,16 +17,6 @@ class Forms extends BaseRelationField
     // Public Methods
     // =========================================================================
 
-    public function __construct($config = [])
-    {
-        // Fix an error (not sure of cause...)
-        if (array_key_exists('formId', $config)) {
-            unset($config['formId']);
-        }
-
-        parent::__construct($config);
-    }
-
     /**
      * @inheritdoc
      */

diff --git a/src/services/Fields.php b/src/services/Fields.php
@@ -901,8 +901,8 @@ public function createField($config): FieldInterface
         }
 
         try {
-            $field = ComponentHelper::createComponent($config, FieldInterface::class);
-        } catch (MissingComponentException $e) {
+            $field = ComponentHelper::createComponent($config, FormFieldInterface::class);
+        } catch (InvalidConfigException | MissingComponentException $e) {
             $config['errorMessage'] = $e->getMessage();
             $config['expectedType'] = $config['type'];
             unset($config['type']);