Loosen constraint for enum ignore setting

silverstripe · Sep 27, 2021 · b851362 · b851362
1 parent 0b7eff1
commit b851362
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/src/Schema/DataObject/Plugin/DBFieldTypes.php b/src/Schema/DataObject/Plugin/DBFieldTypes.php
@@ -41,7 +41,7 @@ public function apply(ModelType $type, Schema $schema, array $config = []): void
         $mapping = $config['enumTypeMapping'] ?? [];
         foreach ($type->getFields() as $field) {
             if ($field instanceof ModelField && $field->getModel() instanceof DataObjectModel) {
-                $ignored = $ignore[$type->getName()][$field->getName()] ?? null;
+                $ignored = $ignore[$field->getName()] ?? null;
                 if (!!$ignored) {
                     continue;
                 }

diff --git a/tests/Schema/DataObject/Plugin/DBFieldTypesTest.php b/tests/Schema/DataObject/Plugin/DBFieldTypesTest.php
@@ -128,9 +128,7 @@ public function testEnumIgnore()
         $schema = new Schema('test');
         $plugin->apply($type, $schema, [
             'ignore' => [
-                'DataObjectFake' => [
-                    'myEnum' => true,
-                ]
+                'myEnum' => true,
             ]
         ]);