CS fixes

Author: nicolas-grekas

Extractor/PhpDocExtractor.php

@@ -60,7 +60,7 @@ class PhpDocExtractor implements PropertyDescriptionExtractorInterface, Property
     public function __construct(?DocBlockFactoryInterface $docBlockFactory = null, ?array $mutatorPrefixes = null, ?array $accessorPrefixes = null, ?array $arrayMutatorPrefixes = null)
     {
         if (!class_exists(DocBlockFactory::class)) {
-            throw new \LogicException(sprintf('Unable to use the "%s" class as the "phpdocumentor/reflection-docblock" package is not installed. Try running composer require "phpdocumentor/reflection-docblock".', __CLASS__));
+            throw new \LogicException(\sprintf('Unable to use the "%s" class as the "phpdocumentor/reflection-docblock" package is not installed. Try running composer require "phpdocumentor/reflection-docblock".', __CLASS__));
         }
 
         $this->docBlockFactory = $docBlockFactory ?: DocBlockFactory::createInstance();
@@ -221,7 +221,7 @@ private function filterDocBlockParams(DocBlock $docBlock, string $allowedParam):
      */
     private function getDocBlock(string $class, string $property): array
     {
-        $propertyHash = sprintf('%s::%s', $class, $property);
+        $propertyHash = \sprintf('%s::%s', $class, $property);
 
         if (isset($this->docBlocks[$propertyHash])) {
             return $this->docBlocks[$propertyHash];

Extractor/PhpStanExtractor.php

@@ -57,11 +57,11 @@ final class PhpStanExtractor implements PropertyTypeExtractorInterface, Construc
     public function __construct(?array $mutatorPrefixes = null, ?array $accessorPrefixes = null, ?array $arrayMutatorPrefixes = null)
     {
         if (!class_exists(ContextFactory::class)) {
-            throw new \LogicException(sprintf('Unable to use the "%s" class as the "phpdocumentor/type-resolver" package is not installed. Try running composer require "phpdocumentor/type-resolver".', __CLASS__));
+            throw new \LogicException(\sprintf('Unable to use the "%s" class as the "phpdocumentor/type-resolver" package is not installed. Try running composer require "phpdocumentor/type-resolver".', __CLASS__));
         }
 
         if (!class_exists(PhpDocParser::class)) {
-            throw new \LogicException(sprintf('Unable to use the "%s" class as the "phpstan/phpdoc-parser" package is not installed. Try running composer require "phpstan/phpdoc-parser".', __CLASS__));
+            throw new \LogicException(\sprintf('Unable to use the "%s" class as the "phpstan/phpdoc-parser" package is not installed. Try running composer require "phpstan/phpdoc-parser".', __CLASS__));
         }
 
         $this->phpStanTypeHelper = new PhpStanTypeHelper();

Extractor/ReflectionExtractor.php

@@ -366,7 +366,7 @@ public function getWriteInfo(string $class, string $property, array $context = [
                 return new PropertyWriteInfo(PropertyWriteInfo::TYPE_PROPERTY, $property, $this->getWriteVisiblityForProperty($reflProperty), $reflProperty->isStatic());
             }
 
-            $errors[] = [sprintf('The property "%s" in class "%s" is a promoted readonly property.', $property, $reflClass->getName())];
+            $errors[] = [\sprintf('The property "%s" in class "%s" is a promoted readonly property.', $property, $reflClass->getName())];
             $allowMagicSet = $allowMagicCall = false;
         }
 
@@ -389,7 +389,7 @@ public function getWriteInfo(string $class, string $property, array $context = [
         }
 
         if (!$allowAdderRemover && null !== $adderAccessName && null !== $removerAccessName) {
-            $errors[] = [sprintf(
+            $errors[] = [\sprintf(
                 'The property "%s" in class "%s" can be defined with the methods "%s()" but '.
                 'the new value must be an array or an instance of \Traversable',
                 $property,
@@ -589,7 +589,7 @@ private function isAllowedProperty(string $class, string $property, bool $writeA
                     return (bool) ($this->propertyReflectionFlags & \ReflectionProperty::IS_PRIVATE);
                 }
 
-                if (\PHP_VERSION_ID >= 80400 &&$reflectionProperty->isVirtual() && !$reflectionProperty->hasHook(\PropertyHookType::Set)) {
+                if (\PHP_VERSION_ID >= 80400 && $reflectionProperty->isVirtual() && !$reflectionProperty->hasHook(\PropertyHookType::Set)) {
                     return false;
                 }
             }
@@ -721,9 +721,9 @@ private function findAdderAndRemover(\ReflectionClass $reflClass, array $singula
             }
 
             if ($addMethodFound && !$removeMethodFound) {
-                $errors[] = [sprintf('The add method "%s" in class "%s" was found, but the corresponding remove method "%s" was not found', $addMethod, $reflClass->getName(), $removeMethod)];
+                $errors[] = [\sprintf('The add method "%s" in class "%s" was found, but the corresponding remove method "%s" was not found', $addMethod, $reflClass->getName(), $removeMethod)];
             } elseif (!$addMethodFound && $removeMethodFound) {
-                $errors[] = [sprintf('The remove method "%s" in class "%s" was found, but the corresponding add method "%s" was not found', $removeMethod, $reflClass->getName(), $addMethod)];
+                $errors[] = [\sprintf('The remove method "%s" in class "%s" was found, but the corresponding add method "%s" was not found', $removeMethod, $reflClass->getName(), $addMethod)];
             }
         }
 
@@ -741,9 +741,9 @@ private function isMethodAccessible(\ReflectionClass $class, string $methodName,
             $method = $class->getMethod($methodName);
 
             if (\ReflectionMethod::IS_PUBLIC === $this->methodReflectionFlags && !$method->isPublic()) {
-                $errors[] = sprintf('The method "%s" in class "%s" was found but does not have public access.', $methodName, $class->getName());
+                $errors[] = \sprintf('The method "%s" in class "%s" was found but does not have public access.', $methodName, $class->getName());
             } elseif ($method->getNumberOfRequiredParameters() > $parameters || $method->getNumberOfParameters() < $parameters) {
-                $errors[] = sprintf('The method "%s" in class "%s" requires %d arguments, but should accept only %d.', $methodName, $class->getName(), $method->getNumberOfRequiredParameters(), $parameters);
+                $errors[] = \sprintf('The method "%s" in class "%s" requires %d arguments, but should accept only %d.', $methodName, $class->getName(), $method->getNumberOfRequiredParameters(), $parameters);
             } else {
                 return [true, $errors];
             }
@@ -843,7 +843,7 @@ private function getWriteVisiblityForProperty(\ReflectionProperty $reflectionPro
 
             if ($reflectionProperty->isProtectedSet()) {
                 return PropertyWriteInfo::VISIBILITY_PROTECTED;
-           }
+            }
         }
 
         if ($reflectionProperty->isPrivate()) {

PhpStan/NameScope.php

@@ -48,11 +48,11 @@ public function resolveStringName(string $name): string
             }
             array_shift($nameParts);
 
-            return sprintf('%s\\%s', $this->uses[$firstNamePart], implode('\\', $nameParts));
+            return \sprintf('%s\\%s', $this->uses[$firstNamePart], implode('\\', $nameParts));
         }
 
         if (null !== $this->namespace) {
-            return sprintf('%s\\%s', $this->namespace, $name);
+            return \sprintf('%s\\%s', $this->namespace, $name);
         }
 
         return $name;

PhpStan/NameScopeFactory.php

@@ -56,7 +56,7 @@ private function extractFromFullClassName(\ReflectionClass $reflection): array
 
         if (\is_string($fileName) && is_file($fileName)) {
             if (false === $contents = file_get_contents($fileName)) {
-                throw new \RuntimeException(sprintf('Unable to read file "%s".', $fileName));
+                throw new \RuntimeException(\sprintf('Unable to read file "%s".', $fileName));
             }
 
             $factory = new ContextFactory();

Tests/Extractor/ReflectionExtractorTest.php

@@ -743,6 +743,7 @@ public function testVirtualProperties()
 
     /**
      * @dataProvider provideAsymmetricVisibilityMutator
+     *
      * @requires PHP 8.4
      */
     public function testAsymmetricVisibilityMutator(string $property, string $readVisibility, string $writeVisibility)
@@ -768,6 +769,7 @@ public static function provideAsymmetricVisibilityMutator(): iterable
 
     /**
      * @dataProvider provideVirtualPropertiesMutator
+     *
      * @requires PHP 8.4
      */
     public function testVirtualPropertiesMutator(string $property, string $readVisibility, string $writeVisibility)

Tests/Extractor/SerializerExtractorTest.php

@@ -58,6 +58,6 @@ public function testGetPropertiesWithAnyGroup()
 
     public function testGetPropertiesWithNonExistentClassReturnsNull()
     {
-        $this->assertSame(null, $this->extractor->getProperties('NonExistent'));
+        $this->assertNull($this->extractor->getProperties('NonExistent'));
     }
 }

Type.php

@@ -79,7 +79,7 @@ class Type
     public function __construct(string $builtinType, bool $nullable = false, ?string $class = null, bool $collection = false, array|self|null $collectionKeyType = null, array|self|null $collectionValueType = null)
     {
         if (!\in_array($builtinType, self::$builtinTypes)) {
-            throw new \InvalidArgumentException(sprintf('"%s" is not a valid PHP type.', $builtinType));
+            throw new \InvalidArgumentException(\sprintf('"%s" is not a valid PHP type.', $builtinType));
         }
 
         $this->builtinType = $builtinType;
@@ -99,7 +99,7 @@ private function validateCollectionArgument(array|self|null $collectionArgument,
         if (\is_array($collectionArgument)) {
             foreach ($collectionArgument as $type) {
                 if (!$type instanceof self) {
-                    throw new \TypeError(sprintf('"%s()": Argument #%d (%s) must be of type "%s[]", "%s" or "null", array value "%s" given.', __METHOD__, $argumentIndex, $argumentName, self::class, self::class, get_debug_type($collectionArgument)));
+                    throw new \TypeError(\sprintf('"%s()": Argument #%d (%s) must be of type "%s[]", "%s" or "null", array value "%s" given.', __METHOD__, $argumentIndex, $argumentName, self::class, self::class, get_debug_type($collectionArgument)));
                 }
             }
 

Util/PhpDocTypeHelper.php

@@ -118,7 +118,7 @@ private function createType(DocType $type, bool $nullable): ?Type
 
             [$phpType, $class] = $this->getPhpTypeAndClass((string) $fqsen);
 
-            $collection = \is_a($class, \Traversable::class, true) || \is_a($class, \ArrayAccess::class, true);
+            $collection = is_a($class, \Traversable::class, true) || is_a($class, \ArrayAccess::class, true);
 
             // it's safer to fall back to other extractors if the generic type is too abstract
             if (!$collection && !class_exists($class)) {

Util/PhpStanTypeHelper.php

@@ -125,7 +125,7 @@ private function extractTypes(TypeNode $node, NameScope $nameScope): array
                 return [$mainType];
             }
 
-            $collection = $mainType->isCollection() || \is_a($mainType->getClassName(), \Traversable::class, true) || \is_a($mainType->getClassName(), \ArrayAccess::class, true);
+            $collection = $mainType->isCollection() || is_a($mainType->getClassName(), \Traversable::class, true) || is_a($mainType->getClassName(), \ArrayAccess::class, true);
 
             // it's safer to fall back to other extractors if the generic type is too abstract
             if (!$collection && !class_exists($mainType->getClassName()) && !interface_exists($mainType->getClassName(), false)) {