Skip to content

Commit e365b5e

Browse files
fabpotfabpot
committed
Merge branch '4.4' into 5.1
* 4.4: Fix CS Fix CS [Validator] Add Polish translation for ISIN constraint
2 parents e887431 + 0da0aa2 commit e365b5e

File tree

2 files changed

+22
-0
lines changed

2 files changed

+22
-0
lines changed

‎Form/DoctrineOrmTypeGuesser.php‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,15 @@ public function guessType(string $class, string $property)
6060

6161
switch ($metadata->getTypeOfField($property)) {
6262
case self::$useDeprecatedConstants ? Type::TARRAY : Types::ARRAY:
63+
// no break
6364
case self::$useDeprecatedConstants ? Type::SIMPLE_ARRAY : Types::SIMPLE_ARRAY:
6465
return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\CollectionType', [], Guess::MEDIUM_CONFIDENCE);
6566
case self::$useDeprecatedConstants ? Type::BOOLEAN : Types::BOOLEAN:
6667
return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\CheckboxType', [], Guess::HIGH_CONFIDENCE);
6768
case self::$useDeprecatedConstants ? Type::DATETIME : Types::DATETIME_MUTABLE:
69+
// no break
6870
case self::$useDeprecatedConstants ? Type::DATETIMETZ : Types::DATETIMETZ_MUTABLE:
71+
// no break
6972
case 'vardatetime':
7073
return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\DateTimeType', [], Guess::HIGH_CONFIDENCE);
7174
case 'datetime_immutable':
@@ -86,7 +89,9 @@ public function guessType(string $class, string $property)
8689
case self::$useDeprecatedConstants ? Type::FLOAT : Types::FLOAT:
8790
return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\NumberType', [], Guess::MEDIUM_CONFIDENCE);
8891
case self::$useDeprecatedConstants ? Type::INTEGER : Types::INTEGER:
92+
// no break
8993
case self::$useDeprecatedConstants ? Type::BIGINT : Types::BIGINT:
94+
// no break
9095
case self::$useDeprecatedConstants ? Type::SMALLINT : Types::SMALLINT:
9196
return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\IntegerType', [], Guess::MEDIUM_CONFIDENCE);
9297
case self::$useDeprecatedConstants ? Type::STRING : Types::STRING:

‎PropertyInfo/DoctrineExtractor.php‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,11 @@ public function getTypes(string $class, string $property, array $context = [])
142142
case Type::BUILTIN_TYPE_OBJECT:
143143
switch ($typeOfField) {
144144
case self::$useDeprecatedConstants ? DBALType::DATE : Types::DATE_MUTABLE:
145+
// no break
145146
case self::$useDeprecatedConstants ? DBALType::DATETIME : Types::DATETIME_MUTABLE:
147+
// no break
146148
case self::$useDeprecatedConstants ? DBALType::DATETIMETZ : Types::DATETIMETZ_MUTABLE:
149+
// no break
147150
case 'vardatetime':
148151
case self::$useDeprecatedConstants ? DBALType::TIME : Types::TIME_MUTABLE:
149152
return [new Type(Type::BUILTIN_TYPE_OBJECT, $nullable, 'DateTime')];
@@ -162,6 +165,7 @@ public function getTypes(string $class, string $property, array $context = [])
162165
case Type::BUILTIN_TYPE_ARRAY:
163166
switch ($typeOfField) {
164167
case self::$useDeprecatedConstants ? DBALType::TARRAY : Types::ARRAY:
168+
// no break
165169
case 'json_array':
166170
return [new Type(Type::BUILTIN_TYPE_ARRAY, $nullable, null, true)];
167171

@@ -241,32 +245,43 @@ private function getPhpType(string $doctrineType): ?string
241245
{
242246
switch ($doctrineType) {
243247
case self::$useDeprecatedConstants ? DBALType::SMALLINT : Types::SMALLINT:
248+
// no break
244249
case self::$useDeprecatedConstants ? DBALType::INTEGER : Types::INTEGER:
245250
return Type::BUILTIN_TYPE_INT;
246251

247252
case self::$useDeprecatedConstants ? DBALType::FLOAT : Types::FLOAT:
248253
return Type::BUILTIN_TYPE_FLOAT;
249254

250255
case self::$useDeprecatedConstants ? DBALType::BIGINT : Types::BIGINT:
256+
// no break
251257
case self::$useDeprecatedConstants ? DBALType::STRING : Types::STRING:
258+
// no break
252259
case self::$useDeprecatedConstants ? DBALType::TEXT : Types::TEXT:
260+
// no break
253261
case self::$useDeprecatedConstants ? DBALType::GUID : Types::GUID:
262+
// no break
254263
case self::$useDeprecatedConstants ? DBALType::DECIMAL : Types::DECIMAL:
255264
return Type::BUILTIN_TYPE_STRING;
256265

257266
case self::$useDeprecatedConstants ? DBALType::BOOLEAN : Types::BOOLEAN:
258267
return Type::BUILTIN_TYPE_BOOL;
259268

260269
case self::$useDeprecatedConstants ? DBALType::BLOB : Types::BLOB:
270+
// no break
261271
case 'binary':
262272
return Type::BUILTIN_TYPE_RESOURCE;
263273

264274
case self::$useDeprecatedConstants ? DBALType::OBJECT : Types::OBJECT:
275+
// no break
265276
case self::$useDeprecatedConstants ? DBALType::DATE : Types::DATE_MUTABLE:
277+
// no break
266278
case self::$useDeprecatedConstants ? DBALType::DATETIME : Types::DATETIME_MUTABLE:
279+
// no break
267280
case self::$useDeprecatedConstants ? DBALType::DATETIMETZ : Types::DATETIMETZ_MUTABLE:
281+
// no break
268282
case 'vardatetime':
269283
case self::$useDeprecatedConstants ? DBALType::TIME : Types::TIME_MUTABLE:
284+
// no break
270285
case 'date_immutable':
271286
case 'datetime_immutable':
272287
case 'datetimetz_immutable':
@@ -275,7 +290,9 @@ private function getPhpType(string $doctrineType): ?string
275290
return Type::BUILTIN_TYPE_OBJECT;
276291

277292
case self::$useDeprecatedConstants ? DBALType::TARRAY : Types::ARRAY:
293+
// no break
278294
case self::$useDeprecatedConstants ? DBALType::SIMPLE_ARRAY : Types::SIMPLE_ARRAY:
295+
// no break
279296
case 'json_array':
280297
return Type::BUILTIN_TYPE_ARRAY;
281298
}

0 commit comments

Comments
 (0)