bug #44269 [DoctrineBridge] Revert " add support for the JSON type" (dunglas)

fabpot · fabpot · commit 079608766d04 · 2021-11-25T14:53:06.000+01:00
This PR was merged into the 4.4 branch. Discussion ---------- [DoctrineBridge] Revert " add support for the JSON type" This reverts commit 1e218c5. | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no  | Deprecations? | no  | Tickets | n/a | License | MIT | Doc PR | n/a As pointed out by @stof and @fancyweb on Slack, my patch is not in sync with Doctrine's code. Contrary to what is stated in the docs, Doctrine allows (almost) any PHP type to be stored as JSON. I also fixed the documentation of Doctrine: doctrine/dbal#5022 Commits ------- a1e22dc Revert "[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,7 +189,6 @@ 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:
@@ -317,7 +316,6 @@ 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', [new Type(Type::BUILTIN_TYPE_ARRAY, true, null, true)]],
+            ['json', null],
         ];
 
         if (class_exists(Types::class)) {
-            $provider[] = ['json', [new Type(Type::BUILTIN_TYPE_ARRAY, true, null, true)]];
+            $provider[] = ['json', null];
         }
 
         return $provider;
