Merge pull request #538 from creative-commoners/pulls/5.0/nested-wild…

…card-queries FIX: NestedInputBuilder doesn't work with nested '*'
silverstripe · Jun 22, 2023 · ff11a35 · ff11a35
2 parents 0e02071 + 6c8d0d7
commit ff11a35
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/src/Schema/Services/NestedInputBuilder.php b/src/Schema/Services/NestedInputBuilder.php
@@ -97,9 +97,6 @@ public function populateSchema(): void
 
         if ($this->fields === Schema::ALL) {
             $this->fields = $this->buildAllFieldsConfig($type);
-        } elseif (isset($this->fields[Schema::ALL]) && $this->fields[Schema::ALL]) {
-            unset($this->fields[Schema::ALL]);
-            $this->fields = array_merge($this->fields, $this->buildAllFieldsConfig($type));
         }
         $this->addInputTypesToSchema($type, $this->fields, null, null, $prefix);
         $rootTypeName = $prefix . $this->getTypeName($type);
@@ -167,10 +164,11 @@ protected function addInputTypesToSchema(
         if (!$inputType) {
             $inputType = InputType::create($inputTypeName);
         }
+        if (isset($fields[Schema::ALL]) && $fields[Schema::ALL]) {
+            unset($fields[Schema::ALL]);
+            $fields = array_merge($fields, $this->buildAllFieldsConfig($type));
+        }
         foreach ($fields as $fieldName => $data) {
-            if ($fieldName === Schema::ALL) {
-                $this->buildAllFieldsConfig($type);
-            }
             if ($data === false) {
                 continue;
             }