Skip to content

Commit 8170452

Browse files
Merge branch '4.4' into 5.3
* 4.4: [Process] intersect with getenv() in case-insensitive manner to get default envs [Serializer] fix support for lazy/unset properties Fix redundant type casts Revert "[DoctrineBridge] add support for the JSON type"
2 parents 9b220eb + 6ac7b70 commit 8170452

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

PropertyInfo/DoctrineExtractor.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,6 @@ public function getTypes(string $class, string $property, array $context = [])
167167
switch ($typeOfField) {
168168
case Types::ARRAY:
169169
case 'json_array':
170-
case 'json':
171170
return [new Type(Type::BUILTIN_TYPE_ARRAY, $nullable, null, true)];
172171

173172
case Types::SIMPLE_ARRAY:
@@ -282,7 +281,6 @@ private function getPhpType(string $doctrineType): ?string
282281
case Types::ARRAY:
283282
case Types::SIMPLE_ARRAY:
284283
case 'json_array':
285-
case 'json':
286284
return Type::BUILTIN_TYPE_ARRAY;
287285
}
288286

Tests/PropertyInfo/DoctrineExtractorTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ public function typesProvider()
207207
new Type(Type::BUILTIN_TYPE_INT),
208208
new Type(Type::BUILTIN_TYPE_OBJECT, false, DoctrineRelation::class)
209209
)]],
210-
['json', [new Type(Type::BUILTIN_TYPE_ARRAY, true, null, true)]],
210+
['json', null],
211211
];
212212

213213
return $provider;

0 commit comments

Comments
 (0)