Skip to content

Commit 9b373d7

Browse files
Merge branch '5.1' into 5.2
* 5.1: µCS fix CS fix CS fix [travis] use PHP 8.0 to patch return types and run deps=low Add me as a Notifier code owner Update sl_SI translations Don't trigger deprecation for deprecated aliases pointing to deprecated definitions [HttpFoundation] use atomic writes in MockFileSessionStorage Make EmailMessage & SmsMessage transport nullable remove unused argument [DI] fix param annotation [Config] Add \Symfony\Component\Config\Loader::load() return type Simplify PHP CS Fixer config Rename normalize param
2 parents 098c09e + 15713e5 commit 9b373d7

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

DebugClassLoader.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,11 @@ class DebugClassLoader
6767
'string' => 'string',
6868
'self' => 'self',
6969
'parent' => 'parent',
70+
'mixed' => 'mixed',
7071
] + (\PHP_VERSION_ID >= 80000 ? [
72+
'static' => 'static',
7173
'$this' => 'static',
7274
] : [
73-
'mixed' => 'mixed',
7475
'static' => 'object',
7576
'$this' => 'object',
7677
]);

0 commit comments

Comments
 (0)