fix(jsonld): check if supportedTypes exists (api-platform#6825)

soyuka · Nov 29, 2024 · 4d7deea · 4d7deea
1 parent 7c9cca6
commit 4d7deea
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/src/JsonLd/Serializer/ErrorNormalizer.php b/src/JsonLd/Serializer/ErrorNormalizer.php
@@ -58,6 +58,10 @@ public function supportsNormalization(mixed $data, ?string $format = null, array
 
     public function getSupportedTypes(?string $format): array
     {
-        return $this->inner->getSupportedTypes($format);
+        if (method_exists($this->inner, 'getSupportedTypes')) {
+            return $this->inner->getSupportedTypes($format);
+        }
+
+        return [];
     }
 }
diff --git a/src/Metadata/Util/PropertyInfoToTypeInfoHelper.php b/src/Metadata/Util/PropertyInfoToTypeInfoHelper.php
@@ -17,6 +17,7 @@
 use Symfony\Component\TypeInfo\Exception\InvalidArgumentException;
 use Symfony\Component\TypeInfo\Type;
 use Symfony\Component\TypeInfo\Type\BuiltinType;
+use Symfony\Component\TypeInfo\Type\NullableType;
 use Symfony\Component\TypeInfo\Type\UnionType;
 use Symfony\Component\TypeInfo\TypeIdentifier;
 
@@ -126,11 +127,16 @@ public static function createTypeFromLegacyValues(string $builtinType, bool $nul
 
     public static function unwrapNullableType(Type $type): Type
     {
-        if (!$type instanceof UnionType) {
+        // BC layer for "symfony/type-info" < 7.2
+        if (method_exists($type, 'asNonNullable')) {
+            return (!$type instanceof UnionType) ? $type : $type->asNonNullable();
+        }
+
+        if (!$type instanceof NullableType) {
             return $type;
         }
 
-        return $type->asNonNullable();
+        return $type->getWrappedType();
     }
 
     /**