Skip to content

Commit d02c662

Browse files
Merge branch '6.0' into 6.1
* 6.0: Fix merge [FrameworkBundle] fix tests [FrameworkBundle] fix wiring of annotations.cached_reader [SecurityBundle] Remove dead `class_exists` checks Fix BC break [DependencyInjection] Ignore unused bindings defined by attribute [ErrorHandler] update tentative types
2 parents 5ba1bb7 + 732ca20 commit d02c662

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

Internal/TentativeTypes.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class TentativeTypes
3737
'DateTime' => [
3838
'__wakeup' => 'void',
3939
'__set_state' => 'DateTime',
40-
'createFromImmutable' => 'DateTime',
40+
'createFromImmutable' => 'static',
4141
'createFromFormat' => 'DateTime|false',
4242
'getLastErrors' => 'array|false',
4343
'format' => 'string',
@@ -72,7 +72,7 @@ class TentativeTypes
7272
'setDate' => 'DateTimeImmutable',
7373
'setISODate' => 'DateTimeImmutable',
7474
'setTimestamp' => 'DateTimeImmutable',
75-
'createFromMutable' => 'DateTimeImmutable',
75+
'createFromMutable' => 'static',
7676
],
7777
'DateTimeZone' => [
7878
'getName' => 'string',
@@ -1150,8 +1150,8 @@ class TentativeTypes
11501150
'getFlags' => 'int',
11511151
'setMaxLineLen' => 'void',
11521152
'getMaxLineLen' => 'int',
1153-
'hasChildren' => 'bool',
1154-
'getChildren' => '?RecursiveIterator',
1153+
'hasChildren' => 'false',
1154+
'getChildren' => 'null',
11551155
'seek' => 'void',
11561156
'getCurrentLine' => 'string',
11571157
],
@@ -1240,7 +1240,7 @@ class TentativeTypes
12401240
'current' => 'never',
12411241
'next' => 'void',
12421242
'key' => 'never',
1243-
'valid' => 'bool',
1243+
'valid' => 'false',
12441244
'rewind' => 'void',
12451245
],
12461246
'CallbackFilterIterator' => [

0 commit comments

Comments
 (0)