From f9f5f8df3ea940a7ece7cb74cecf56be816e2eb5 Mon Sep 17 00:00:00 2001 From: Thomas Calvet Date: Fri, 6 Mar 2020 09:58:06 +0100 Subject: [PATCH] [DoctrineBridge][DoctrineExtractor] Fix wrong guessed type for "json" type --- src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php | 2 -- .../Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php b/src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php index 4ceca2c6acae..8917ce4327c6 100644 --- a/src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php +++ b/src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php @@ -178,7 +178,6 @@ public function getTypes($class, $property, array $context = []) switch ($typeOfField) { case self::$useDeprecatedConstants ? DBALType::TARRAY : '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: @@ -266,7 +265,6 @@ private function getPhpType($doctrineType) case self::$useDeprecatedConstants ? DBALType::TARRAY : '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/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php b/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php index c4efb6c93610..b9abd03347e8 100644 --- a/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php +++ b/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php @@ -182,7 +182,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;