Skip to content

Commit 3e677f0

Browse files
committed
Merge branch '5.4' into 6.0
* 5.4: Don't rely on session service in tests [Mime] Fix encoding filenames in multipart/form-data Properly warn about deprecation of IS_AUTHENTICATED_ANONYMOUSLY [Lock] Create tables in transaction only if supported by driver [Validator] Improve French translation [HttpFoundation] Take php session.cookie settings into account [Translations] Add missing translations for Galician (gl) [ErrorHandler] fix on patching return types on Windows [DependencyInjection] fix linting callable classes alias `cache.app.taggable` to `cache.app` if using `cache.adapter.redis_tag_aware` restore the overriden locale on tearDown - avoid interfering with any configured value [Serializer] Improve UidNormalizer denormalize error message [DependencyInjection] Cast tag value to string
2 parents b16f64a + e0c0dd0 commit 3e677f0

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

Internal/TentativeTypes.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class TentativeTypes
3030
'format' => 'string',
3131
'getTimezone' => 'DateTimeZone|false',
3232
'getOffset' => 'int',
33-
'getTimestamp' => 'int|false',
33+
'getTimestamp' => 'int',
3434
'diff' => 'DateInterval',
3535
'__wakeup' => 'void',
3636
],
@@ -254,6 +254,7 @@ class TentativeTypes
254254
'isEquivalentTo' => 'bool',
255255
'isLenient' => 'bool',
256256
'isWeekend' => 'bool',
257+
'roll' => 'bool',
257258
'isSet' => 'bool',
258259
'setTime' => 'bool',
259260
'setTimeZone' => 'bool',

Resources/bin/patch-type-declarations

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ set_error_handler(function ($type, $msg, $file, $line, $context = []) use (&$dep
7171

7272
$exclude = getenv('SYMFONY_PATCH_TYPE_EXCLUDE') ?: null;
7373
foreach ($loader->getClassMap() as $class => $file) {
74-
if (false !== strpos($file = realpath($file), '/vendor/')) {
74+
if (false !== strpos($file = realpath($file), \DIRECTORY_SEPARATOR.'vendor'.\DIRECTORY_SEPARATOR)) {
7575
continue;
7676
}
7777

0 commit comments

Comments
 (0)