fix tests

schmittjoh · Jul 17, 2024 · 75c2aff · 75c2aff
1 parent 4f4e238
commit 75c2aff
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 14 deletions.
diff --git a/src/GraphNavigator/DeserializationGraphNavigator.php b/src/GraphNavigator/DeserializationGraphNavigator.php
@@ -225,7 +225,7 @@ public function accept($data, ?array $type = null)
                             $this->visitor->endVisitingObject($metadata, $data, $type);
 
                             throw new PropertyMissingException("Property $propertyMetadata->name is missing from data ");
-                        } else {
+                        } elseif ($this->visitor->getRequireAllRequiredProperties()) {
                             $this->visitor->endVisitingObject($metadata, $data, $type);
 
                             throw $e;

diff --git a/src/Handler/UnionHandler.php b/src/Handler/UnionHandler.php
@@ -82,21 +82,27 @@ public function deserializeUnion(DeserializationVisitorInterface $visitor, mixed
         foreach ($type['params'] as $possibleType) {
             $propertyMetadata = $context->getMetadataStack()->top();
             $finalType = null;
-            if (null !== $propertyMetadata->unionDiscriminatorMap) {
-                if (array_key_exists($propertyMetadata->unionDiscriminatorField, $data) && array_key_exists($data[$propertyMetadata->unionDiscriminatorField], $propertyMetadata->unionDiscriminatorMap)) {
-                    $lkup = $data[$propertyMetadata->unionDiscriminatorField];
+            if (null !== $propertyMetadata->unionDiscriminatorField) {
+                if (!array_key_exists($propertyMetadata->unionDiscriminatorField, $data)) {
+                    throw new NonVisitableTypeException("Union Discriminator Field '$propertyMetadata->unionDiscriminatorField' not found in data1");
+                }
+
+                $lkup = $data[$propertyMetadata->unionDiscriminatorField];
+                if (!empty($propertyMetadata->unionDiscriminatorMap)) {
+                    if (array_key_exists($lkup, $propertyMetadata->unionDiscriminatorMap)) {
+                        $finalType = [
+                            'name' => $propertyMetadata->unionDiscriminatorMap[$lkup],
+                            'params' => [],
+                        ];
+                    } else {
+                        throw new NonVisitableTypeException("Union Discriminator Map does not contain key '$lkup'");
+                    }
+                } else {
                     $finalType = [
-                        'name' => $propertyMetadata->unionDiscriminatorMap[$lkup],
+                        'name' => $lkup,
                         'params' => [],
                     ];
-                } else {
-                    throw new NonVisitableTypeException("Union Discriminator Map does not contain field '$propertyMetadata->unionDiscriminatorField'");
                 }
-            } elseif (null !== $propertyMetadata->unionDiscriminatorField) {
-                $finalType = [
-                    'name' => $data[$propertyMetadata->unionDiscriminatorField],
-                    'params' => [],
-                ];
             }
 
             if (null !== $finalType && null !== $finalType['name']) {
@@ -131,6 +137,7 @@ public function deserializeUnion(DeserializationVisitorInterface $visitor, mixed
                 }
             }
         }
+
         return null;
     }
 

diff --git a/tests/Fixtures/DiscriminatedAuthor.php b/tests/Fixtures/DiscriminatedAuthor.php
@@ -6,7 +6,6 @@
 
 use JMS\Serializer\Annotation\SerializedName;
 use JMS\Serializer\Annotation\Type;
-use JMS\Serializer\Annotation\Discriminator;
 
 class DiscriminatedAuthor
 {

diff --git a/tests/Fixtures/TypedProperties/ComplexDiscriminatedUnion.php b/tests/Fixtures/TypedProperties/ComplexDiscriminatedUnion.php
@@ -10,7 +10,6 @@
 
 class ComplexDiscriminatedUnion
 {
-    #[Type('JMS\Serializer\Tests\Fixtures\DiscriminatedAuthor|JMS\Serializer\Tests\Fixtures\DiscriminatedComment')]
     #[UnionDiscriminator(field: 'type')]
     private DiscriminatedAuthor|DiscriminatedComment $data;