Merged branch '4.6'

Author: alongosz

phpstan-baseline.neon

@@ -2742,12 +2742,6 @@ parameters:
 			count: 1
 			path: src/lib/Translation/Extractor/NotificationTranslationExtractor.php
 
-		-
-			message: '#^Possibly invalid array key type bool\|float\|int\|string\.$#'
-			identifier: offsetAccess.invalidOffset
-			count: 2
-			path: src/lib/Translation/Extractor/SortingTranslationExtractor.php
-
 		-
 			message: '#^Parameter \#1 \$fqcn of static method Symfony\\Component\\Form\\Util\\StringUtil\:\:fqcnToBlockPrefix\(\) expects string, class\-string\|false given\.$#'
 			identifier: argument.type

src/lib/Translation/Extractor/SortingTranslationExtractor.php

@@ -45,9 +45,7 @@ public function extract(): MessageCatalogue
 
         $sortConstants = array_filter(
             $locationClass->getConstants(),
-            static function ($value, $key): bool {
-                return is_scalar($value) && strtolower(substr($key, 0, 11)) === 'sort_field_';
-            },
+            static fn ($value, $key): bool => is_int($value) && str_starts_with(strtolower($key), 'sort_field_'),
             ARRAY_FILTER_USE_BOTH
         );