makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-07 20:08:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/17512] Fix sorting types check logic

Browse source 
PHPBB-17512
This commit is contained in:
rxu 2025-05-15 20:34:16 +07:00
parent 146f917d19
commit 6a0c949ed1
No known key found for this signature in database
GPG key ID: 955F0567380E586A
1 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
build/code_sniffer/phpbb/Sniffs/CodeLayout/UnionTypesCheckSniff.php
View file

@ -81,9 +81,9 @@ class UnionTypesCheckSniff implements Sniff
$data = [$type, $type_hint]; $data = [$type, $type_hint];
$phpcsFile->addError($error, $stack_pointer, 'ShortNullableSyntax', $data); $phpcsFile->addError($error, $stack_pointer, 'ShortNullableSyntax', $data);
} }
else if (($types_array = explode('|', $type_hint)) > 1) // Check union type layout else if ((count($types_array = explode('|', $type_hint))) > 1) // Check union type layout
{ {
$types_array_sorted = $types_array_null_less = $types_array; $types_array_null_less = $types_array;
// Check 'null' to be the last element // Check 'null' to be the last element
$null_position = array_search('null', $types_array); $null_position = array_search('null', $types_array);
@ -99,12 +99,17 @@ class UnionTypesCheckSniff implements Sniff
{ {
array_splice($types_array_null_less, $null_position, 1); array_splice($types_array_null_less, $null_position, 1);
} }
sort($types_array_sorted);
if (!empty(array_diff_assoc($types_array_null_less, $types_array_sorted))) if (count($types_array_null_less) > 1)
{ {
$error = 'Union type elements must be sorted alphabetically excepting the "null" type hint must be the last if any; found %s'; $types_array_null_less_sorted = $types_array_null_less;
$data = [implode('|', $types_array)]; sort($types_array_null_less_sorted);
$phpcsFile->addError($error, $stack_pointer, 'AlphabeticalSort', $data); if (!empty(array_diff_assoc($types_array_null_less, $types_array_null_less_sorted)))
{
$error = 'Union type elements must be sorted alphabetically excepting the "null" type hint must be the last if any; found %s';
$data = [implode('|', $types_array)];
$phpcsFile->addError($error, $stack_pointer, 'AlphabeticalSort', $data);
}
} }
} }
} }