bug #43988 [DoctrineBridge] add support for the JSON type (dunglas)

fabpot · fabpot · commit 0eacfd93f6e0 · 2021-11-10T08:32:36.000+01:00
This PR was merged into the 4.4 branch. Discussion ---------- [DoctrineBridge] add support for the JSON type | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no  | Deprecations? | no  | Tickets | Fix api-platform/core#4547, api-platform/core#4553 | License | MIT | Doc PR | n/a The `json_array` Doctrine type is deprecated since DBAL 2.6 (we require version 2.7) and has been removed in DBAL 3.0 This PR adds back support for this new type. Commits ------- 1e218c5 [DoctrineBridge] add support for the JSON type
diff --git a/src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php b/src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php
@@ -189,6 +189,7 @@ public function getTypes($class, $property, array $context = [])
                         case self::$useDeprecatedConstants ? DBALType::TARRAY : Types::ARRAY:
                         // no break
                         case 'json_array':
+                        case 'json':
                             return [new Type(Type::BUILTIN_TYPE_ARRAY, $nullable, null, true)];
 
                         case self::$useDeprecatedConstants ? DBALType::SIMPLE_ARRAY : Types::SIMPLE_ARRAY:
@@ -316,6 +317,7 @@ private function getPhpType(string $doctrineType): ?string
             case self::$useDeprecatedConstants ? DBALType::SIMPLE_ARRAY : Types::SIMPLE_ARRAY:
             // no break
             case 'json_array':
+            case 'json':
                 return Type::BUILTIN_TYPE_ARRAY;
         }
 
diff --git a/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php b/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php
@@ -254,11 +254,11 @@ public function typesProvider()
                 new Type(Type::BUILTIN_TYPE_INT),
                 new Type(Type::BUILTIN_TYPE_OBJECT, false, DoctrineRelation::class)
             )]],
-            ['json', null],
+            ['json', [new Type(Type::BUILTIN_TYPE_ARRAY, true, null, true)]],
         ];
 
         if (class_exists(Types::class)) {
-            $provider[] = ['json', null];
+            $provider[] = ['json', [new Type(Type::BUILTIN_TYPE_ARRAY, true, null, true)]];
         }
 
         return $provider;
