Fix type extractors

sonata-project · Oct 18, 2024 · 8298060 · 8298060
1 parent 74e3185
commit 8298060
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 18 deletions.
diff --git a/src/Serializer/BlockTypeExtractor.php b/src/Serializer/BlockTypeExtractor.php
@@ -17,9 +17,6 @@
 use Symfony\Component\PropertyInfo\PropertyTypeExtractorInterface;
 use Symfony\Component\PropertyInfo\Type as LegacyType;
 use Symfony\Component\TypeInfo\Type;
-use Symfony\Component\TypeInfo\Type\BuiltinType;
-use Symfony\Component\TypeInfo\Type\UnionType;
-use Symfony\Component\TypeInfo\TypeIdentifier;
 
 final class BlockTypeExtractor implements PropertyTypeExtractorInterface
 {
@@ -75,20 +72,13 @@ public function getType(string $class, string $property, array $context = []): ?
             return null;
         }
         if ('position' === $property) {
-            return new UnionType(
-                new BuiltinType(TypeIdentifier::INT),
-                new BuiltinType(TypeIdentifier::STRING),
-            );
+            return Type::nullable(Type::union(Type::int(), Type::string()));
         }
         if ('enabled' === $property) {
-            return new UnionType(
-                new BuiltinType(TypeIdentifier::BOOL),
-                new BuiltinType(TypeIdentifier::INT),
-                new BuiltinType(TypeIdentifier::STRING),
-            );
+            return Type::nullable(Type::union(Type::bool(), Type::int(), Type::string()));
         }
         if (\in_array($property, self::NULLABLE_STRINGS, true)) {
-            return new BuiltinType(TypeIdentifier::STRING);
+            return Type::nullable(Type::string());
         }
 
         return null;

diff --git a/src/Serializer/InterfaceTypeExtractor.php b/src/Serializer/InterfaceTypeExtractor.php
@@ -18,7 +18,6 @@
 use Symfony\Component\PropertyInfo\PropertyTypeExtractorInterface;
 use Symfony\Component\PropertyInfo\Type as LegacyType;
 use Symfony\Component\TypeInfo\Type;
-use Symfony\Component\TypeInfo\Type\ObjectType;
 
 final class InterfaceTypeExtractor implements PropertyTypeExtractorInterface
 {
@@ -86,17 +85,17 @@ public function getType(string $class, string $property, array $context = []): ?
     {
         if ($this->pageClass === $class) {
             if ('children' === $property) {
-                return new ObjectType($this->pageClass);
+                return Type::collection(Type::object($this->pageClass));
             }
             if ('blocks' === $property) {
-                return new ObjectType($this->blockClass);
+                return Type::collection(Type::object($this->blockClass));
             }
             if ('parent' === $property) {
-                return new ObjectType($this->pageClass);
+                return Type::collection(Type::object($this->pageClass));
             }
         } elseif ($this->blockClass === $class) {
             if ('children' === $property) {
-                return new ObjectType($this->blockClass);
+                return Type::collection(Type::object($this->blockClass));
             }
         }