Merge branch 'php8.4' of https://github.com/LongTermSupport/php-qa-ci into php8.4

Author: LTSCommerce

composer.lock

@@ -89,6 +89,7 @@
 final class RequireExplicitDIAttributeRule implements Rule
 {
     public const string IDENTIFIER_REQUIRE_EXPLICIT_DI_ATTRIBUTE = RuleIdentifierInterface::PREFIX . '.requireExplicitDIAttribute';
+
     public const string IDENTIFIER_CONFLICTING_DI_ATTRIBUTES     = RuleIdentifierInterface::PREFIX . '.conflictingDIAttributes';
 
     private const array ALLOWED_NAMESPACES_WITHOUT_ATTRIBUTE = [

src/PHPStan/Rules/RequireExplicitDIAttributeRule.php

@@ -136,7 +136,7 @@ public function processNode(Node $node, Scope $scope): array
         // legitimate mutable state (e.g. lazy-initialised caches) and
         // cannot be made readonly without extracting that state.
         foreach ($node->stmts as $stmt) {
-            if ($stmt instanceof \PhpParser\Node\Stmt\Property && !$stmt->isReadonly()) {
+            if ($stmt instanceof Node\Stmt\Property && !$stmt->isReadonly()) {
                 return [];
             }
         }
@@ -176,5 +176,4 @@ private function isDoctrineEntity(Class_ $node): bool
 
         return false;
     }
-
 }

src/PHPStan/Rules/RequireReadonlyServiceRule.php

@@ -99,7 +99,7 @@ public function processNode(Node $node, Scope $scope): array
                 \sprintf(
                     'PHPStan rule identifier "%s" is a magic string. '
                     . 'Declare it as a class constant composed from RuleIdentifierInterface::PREFIX '
-                    . '(e.g. public const string IDENTIFIER = RuleIdentifierInterface::PREFIX . \'.something\') '
+                    . "(e.g. public const string IDENTIFIER = RuleIdentifierInterface::PREFIX . '.something') "
                     . 'and pass the constant to ->identifier() instead.',
                     $firstArg->value->value,
                 ),

src/PHPStan/Rules/RequireRuleIdentifierConstantRule.php

@@ -28,7 +28,9 @@
 final class RequireTypeSuffixRule implements Rule
 {
     public const string IDENTIFIER_INTERFACE_SUFFIX = RuleIdentifierInterface::PREFIX . '.interfaceSuffix';
+
     public const string IDENTIFIER_ENUM_SUFFIX      = RuleIdentifierInterface::PREFIX . '.enumSuffix';
+
     public const string IDENTIFIER_TRAIT_SUFFIX     = RuleIdentifierInterface::PREFIX . '.traitSuffix';
 
     /**

src/PHPStan/Rules/RequireTypeSuffixRule.php

@@ -120,9 +120,9 @@ private function isDeclaredAsArray(mixed $type): bool
     private function hasListAnnotation(string $docComment, string $paramName): bool
     {
         // Matches: @param list<T> $paramName or list<T<U>> $paramName (one level of nesting)
-        $escapedName = \preg_quote($paramName, '/');
+        $escapedName = preg_quote($paramName, '/');
         $pattern     = '/@param\s+list\s*<(?:[^<>]|<[^>]*>)*>\s+\$' . $escapedName . '\b/';
 
-        return (bool) \preg_match($pattern, $docComment);
+        return (bool)\Safe\preg_match($pattern, $docComment);
     }
 }

src/PHPStan/Rules/RequireVariadicForSingleListParamRule.php

@@ -42,6 +42,6 @@
 // unit-testing custom PHPStan rules directly — without running the full
 // static-analysis pipeline.
 $phpstanPhar = \dirname(__DIR__) . '/vendor-phar/phpstan.phar';
-if (\file_exists($phpstanPhar)) {
+if (file_exists($phpstanPhar)) {
     require_once 'phar://' . $phpstanPhar . '/vendor/autoload.php';
 }