Skip to content

Commit 9b578a9

Browse files
committed
Merge branch '3.4' into 4.4
* 3.4: Fix CS [Validator] Add Polish translation for ISIN constraint
2 parents b6062a8 + bbc57b3 commit 9b578a9

File tree

2 files changed

+21
-0
lines changed

2 files changed

+21
-0
lines changed

Form/DoctrineOrmTypeGuesser.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,9 @@ public function guessType($class, $property)
6565
case self::$useDeprecatedConstants ? Type::BOOLEAN : Types::BOOLEAN:
6666
return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\CheckboxType', [], Guess::HIGH_CONFIDENCE);
6767
case self::$useDeprecatedConstants ? Type::DATETIME : Types::DATETIME_MUTABLE:
68+
// no break
6869
case self::$useDeprecatedConstants ? Type::DATETIMETZ : Types::DATETIMETZ_MUTABLE:
70+
// no break
6971
case 'vardatetime':
7072
return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\DateTimeType', [], Guess::HIGH_CONFIDENCE);
7173
case 'datetime_immutable':
@@ -86,7 +88,9 @@ public function guessType($class, $property)
8688
case self::$useDeprecatedConstants ? Type::FLOAT : Types::FLOAT:
8789
return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\NumberType', [], Guess::MEDIUM_CONFIDENCE);
8890
case self::$useDeprecatedConstants ? Type::INTEGER : Types::INTEGER:
91+
// no break
8992
case self::$useDeprecatedConstants ? Type::BIGINT : Types::BIGINT:
93+
// no break
9094
case self::$useDeprecatedConstants ? Type::SMALLINT : Types::SMALLINT:
9195
return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\IntegerType', [], Guess::MEDIUM_CONFIDENCE);
9296
case self::$useDeprecatedConstants ? Type::STRING : Types::STRING:

PropertyInfo/DoctrineExtractor.php

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,8 +154,11 @@ public function getTypes($class, $property, array $context = [])
154154
case Type::BUILTIN_TYPE_OBJECT:
155155
switch ($typeOfField) {
156156
case self::$useDeprecatedConstants ? DBALType::DATE : Types::DATE_MUTABLE:
157+
// no break
157158
case self::$useDeprecatedConstants ? DBALType::DATETIME : Types::DATETIME_MUTABLE:
159+
// no break
158160
case self::$useDeprecatedConstants ? DBALType::DATETIMETZ : Types::DATETIMETZ_MUTABLE:
161+
// no break
159162
case 'vardatetime':
160163
case self::$useDeprecatedConstants ? DBALType::TIME : Types::TIME_MUTABLE:
161164
return [new Type(Type::BUILTIN_TYPE_OBJECT, $nullable, 'DateTime')];
@@ -174,6 +177,7 @@ public function getTypes($class, $property, array $context = [])
174177
case Type::BUILTIN_TYPE_ARRAY:
175178
switch ($typeOfField) {
176179
case self::$useDeprecatedConstants ? DBALType::TARRAY : Types::ARRAY:
180+
// no break
177181
case 'json_array':
178182
return [new Type(Type::BUILTIN_TYPE_ARRAY, $nullable, null, true)];
179183

@@ -253,32 +257,43 @@ private function getPhpType(string $doctrineType): ?string
253257
{
254258
switch ($doctrineType) {
255259
case self::$useDeprecatedConstants ? DBALType::SMALLINT : Types::SMALLINT:
260+
// no break
256261
case self::$useDeprecatedConstants ? DBALType::INTEGER : Types::INTEGER:
257262
return Type::BUILTIN_TYPE_INT;
258263

259264
case self::$useDeprecatedConstants ? DBALType::FLOAT : Types::FLOAT:
260265
return Type::BUILTIN_TYPE_FLOAT;
261266

262267
case self::$useDeprecatedConstants ? DBALType::BIGINT : Types::BIGINT:
268+
// no break
263269
case self::$useDeprecatedConstants ? DBALType::STRING : Types::STRING:
270+
// no break
264271
case self::$useDeprecatedConstants ? DBALType::TEXT : Types::TEXT:
272+
// no break
265273
case self::$useDeprecatedConstants ? DBALType::GUID : Types::GUID:
274+
// no break
266275
case self::$useDeprecatedConstants ? DBALType::DECIMAL : Types::DECIMAL:
267276
return Type::BUILTIN_TYPE_STRING;
268277

269278
case self::$useDeprecatedConstants ? DBALType::BOOLEAN : Types::BOOLEAN:
270279
return Type::BUILTIN_TYPE_BOOL;
271280

272281
case self::$useDeprecatedConstants ? DBALType::BLOB : Types::BLOB:
282+
// no break
273283
case 'binary':
274284
return Type::BUILTIN_TYPE_RESOURCE;
275285

276286
case self::$useDeprecatedConstants ? DBALType::OBJECT : Types::OBJECT:
287+
// no break
277288
case self::$useDeprecatedConstants ? DBALType::DATE : Types::DATE_MUTABLE:
289+
// no break
278290
case self::$useDeprecatedConstants ? DBALType::DATETIME : Types::DATETIME_MUTABLE:
291+
// no break
279292
case self::$useDeprecatedConstants ? DBALType::DATETIMETZ : Types::DATETIMETZ_MUTABLE:
293+
// no break
280294
case 'vardatetime':
281295
case self::$useDeprecatedConstants ? DBALType::TIME : Types::TIME_MUTABLE:
296+
// no break
282297
case 'date_immutable':
283298
case 'datetime_immutable':
284299
case 'datetimetz_immutable':
@@ -287,7 +302,9 @@ private function getPhpType(string $doctrineType): ?string
287302
return Type::BUILTIN_TYPE_OBJECT;
288303

289304
case self::$useDeprecatedConstants ? DBALType::TARRAY : Types::ARRAY:
305+
// no break
290306
case self::$useDeprecatedConstants ? DBALType::SIMPLE_ARRAY : Types::SIMPLE_ARRAY:
307+
// no break
291308
case 'json_array':
292309
return Type::BUILTIN_TYPE_ARRAY;
293310
}

0 commit comments

Comments
 (0)