Merge pull request #114 from TomHAnderson/hotfix/input-req-opt

Fix for required and optional field mix
API-Skeletons · Jan 26, 2023 · 9729208 · 9729208
2 parents c0e8d5d + 5f488e6
commit 9729208
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/Input/InputFactory.php b/src/Input/InputFactory.php
@@ -51,7 +51,7 @@ public function get(string $id, array $requiredFields = [], array $optionalField
                      * no reason to set or update an identifier.  For the case where an identifier
                      * should be set or updated, this facotry is not the correct solution.
                      */
-                    if (! empty($optionalFields)) {
+                    if (! empty($optionalFields) || ! empty($requiredFields)) {
                         // Include field as optional
                         if (in_array($fieldName, $optionalFields) || $optionalFields === ['*']) {
                             if ($optionalFields === ['*'] && $this->entityManager->getClassMetadata($id)->isIdentifier($fieldName)) {
@@ -61,8 +61,8 @@ public function get(string $id, array $requiredFields = [], array $optionalField
                             $fields[$fieldName]['description'] = $targetEntity->getMetadataConfig()['fields'][$fieldName]['description'];
                             $fields[$fieldName]['type']        = $this->typeManager->get($targetEntity->getMetadataConfig()['fields'][$fieldName]['type']);
                         }
-                    } elseif (! empty($requiredFields)) {
-                        // Include fields as required
+
+                        // Include field as required
                         if (in_array($fieldName, $requiredFields) || $requiredFields === ['*']) {
                             if ($requiredFields === ['*'] && $this->entityManager->getClassMetadata($id)->isIdentifier($fieldName)) {
                                 continue;