Merge branch '3.4' into 4.4

* 3.4: [Config] fix test [Intl][3.4] Bump ICU 66.1 fix import from config file using type: glob [DoctrineBridge][DoctrineExtractor] Fix wrong guessed type for "json" type
symfony · Mar 13, 2020 · 6c99d25 · 6c99d25
2 parents 1b45647 + e818172
commit 6c99d25
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/PropertyInfo/DoctrineExtractor.php b/PropertyInfo/DoctrineExtractor.php
@@ -175,7 +175,6 @@ public function getTypes($class, $property, array $context = [])
                     switch ($typeOfField) {
                         case self::$useDeprecatedConstants ? DBALType::TARRAY : Types::ARRAY:
                         case 'json_array':
-                        case self::$useDeprecatedConstants ? false : Types::JSON:
                             return [new Type(Type::BUILTIN_TYPE_ARRAY, $nullable, null, true)];
 
                         case self::$useDeprecatedConstants ? DBALType::SIMPLE_ARRAY : Types::SIMPLE_ARRAY:
@@ -290,7 +289,6 @@ private function getPhpType(string $doctrineType): ?string
             case self::$useDeprecatedConstants ? DBALType::TARRAY : Types::ARRAY:
             case self::$useDeprecatedConstants ? DBALType::SIMPLE_ARRAY : Types::SIMPLE_ARRAY:
             case 'json_array':
-            case self::$useDeprecatedConstants ? false : Types::JSON:
                 return Type::BUILTIN_TYPE_ARRAY;
         }
 

diff --git a/Tests/PropertyInfo/DoctrineExtractorTest.php b/Tests/PropertyInfo/DoctrineExtractorTest.php
@@ -221,7 +221,7 @@ public function typesProvider()
         ];
 
         if (class_exists(Types::class)) {
-            $provider[] = ['json', [new Type(Type::BUILTIN_TYPE_ARRAY, true, null, true)]];
+            $provider[] = ['json', null];
         }
 
         return $provider;