Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CakePHP/Sniffs/Commenting/TypeHintSniff.php
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@ protected function getSortedTypeHint(array $types): string
'callable-string',
'class-string',
'interface-string',
'scalar',
'string',
'float',
'int',
Expand Down
2 changes: 1 addition & 1 deletion CakePHP/Tests/Commenting/TypeHintUnitTest.1.inc
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@ function test()
/** @var class-string<\Cake\I18n\Number>|null */
$testVar;

/** @psalm-var null|string|class-string<\Cake\I18n\Number>|array $testVar2 */
/** @psalm-var null|scalar|class-string<\Cake\I18n\Number>|array $testVar2 */
$testVar2;
}
2 changes: 1 addition & 1 deletion CakePHP/Tests/Commenting/TypeHintUnitTest.1.inc.fixed
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@ function test()
/** @var class-string<\Cake\I18n\Number>|null */
$testVar;

/** @psalm-var array|class-string<\Cake\I18n\Number>|string|null $testVar2 */
/** @psalm-var array|class-string<\Cake\I18n\Number>|scalar|null $testVar2 */
$testVar2;
}