Skip to content

Commit e7d5c89

Browse files
Merge branch '6.0' into 6.1
* 6.0: Exclude from baseline generation deprecations triggered in legacy test [HttpFoundation] Update "[Session] Overwrite invalid session id" to only validate when files session storage is used [DoctrineBridge] Add missing break [PropertyInfo] CS fix [Serializer] Try all possible denormalization route with union types when ALLOW_EXTRA_ATTRIBUTES=false CS fix [Cache] Respect $save option in ChainAdapter [ExpressionLanguage] fix tests (bis) [ExpressionLanguage] fix tests Allow passing null in twig_is_selected_choice [Cache] Respect $save option in ArrayAdapter [HttpKernel] Disable session tracking while collecting profiler data [MonologBridge] Fixed support of elasticsearch 7.+ in ElasticsearchLogstashHandler [DoctrineBridge] Extend type guessing on enum fields [FrameworkBundle] Lower JsonSerializableNormalizer priority [Messenger] move resetting services at worker stopped into ResetServicesListener [Mailer] Fix Error Handling for OhMySMTP Bridge Fix for missing sender name in case with usage of the EnvelopeListener
2 parents 630eed7 + 6f280b4 commit e7d5c89

File tree

2 files changed

+0
-6
lines changed

2 files changed

+0
-6
lines changed

Extension/Core/Type/FileType.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -193,11 +193,8 @@ private static function getMaxFilesize(): int|float
193193

194194
switch (substr($iniMax, -1)) {
195195
case 't': $max *= 1024;
196-
// no break
197196
case 'g': $max *= 1024;
198-
// no break
199197
case 'm': $max *= 1024;
200-
// no break
201198
case 'k': $max *= 1024;
202199
}
203200

Util/ServerParams.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,8 @@ public function getPostMaxSize(): int|float|null
5858

5959
switch (substr($iniMax, -1)) {
6060
case 't': $max *= 1024;
61-
// no break
6261
case 'g': $max *= 1024;
63-
// no break
6462
case 'm': $max *= 1024;
65-
// no break
6663
case 'k': $max *= 1024;
6764
}
6865

0 commit comments

Comments
 (0)