Skip to content

Commit ef15641

Browse files
Merge branch '5.4' into 6.0
* 5.4: [Process] intersect with getenv() in case-insensitive manner to get default envs [Serializer] fix support for lazy/unset properties Fix redundant type casts [Notifier] Fix AllMySms bridge body content Revert "[DoctrineBridge] add support for the JSON type"
2 parents b7e4841 + 1ffda1f commit ef15641

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
@@ -168,7 +168,6 @@ public function getTypes(string $class, string $property, array $context = []):
168168
switch ($typeOfField) {
169169
case Types::ARRAY:
170170
case 'json_array':
171-
case 'json':
172171
return [new Type(Type::BUILTIN_TYPE_ARRAY, $nullable, null, true)];
173172

174173
case Types::SIMPLE_ARRAY:
@@ -283,7 +282,6 @@ private function getPhpType(string $doctrineType): ?string
283282
case Types::ARRAY:
284283
case Types::SIMPLE_ARRAY:
285284
case 'json_array':
286-
case 'json':
287285
return Type::BUILTIN_TYPE_ARRAY;
288286
}
289287

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)