Merge pull request #1508 from kukulich/phpstan7

PHPStan level 7

Author: Ocramius

phpstan.neon

@@ -3,7 +3,7 @@ includes:
     - tools/vendor/phpstan/phpstan-phpunit/rules.neon
 
 parameters:
-    level: 6
+    level: 7
 
     paths:
         - src

src/Reflection/Adapter/ReflectionEnum.php

@@ -18,6 +18,7 @@
 use Roave\BetterReflection\Reflection\ReflectionMethod as BetterReflectionMethod;
 use Roave\BetterReflection\Reflection\ReflectionProperty as BetterReflectionProperty;
 use Roave\BetterReflection\Util\FileHelper;
+use UnitEnum;
 use ValueError;
 
 use function array_combine;
@@ -56,6 +57,7 @@ public function __get(string $name): mixed
 
     public function getName(): string
     {
+        /** @phpstan-var class-string<UnitEnum> */
         return $this->betterReflectionEnum->getName();
     }
 

src/Reflection/ReflectionAttribute.php

@@ -16,7 +16,7 @@
 /** @psalm-immutable */
 class ReflectionAttribute
 {
-    /** @var non-empty-string */
+    /** @var class-string */
     private string $name;
 
     /** @var array<int|string, Node\Expr> */
@@ -29,7 +29,10 @@ public function __construct(
         private ReflectionClass|ReflectionMethod|ReflectionFunction|ReflectionClassConstant|ReflectionEnumCase|ReflectionProperty|ReflectionParameter $owner,
         private bool $isRepeated,
     ) {
-        $this->name = $node->name->toString();
+        /** @var class-string $name */
+        $name = $node->name->toString();
+
+        $this->name = $name;
 
         $arguments = [];
         foreach ($node->args as $argNo => $arg) {
@@ -48,7 +51,7 @@ public function withOwner(ReflectionClass|ReflectionMethod|ReflectionFunction|Re
         return $clone;
     }
 
-    /** @return non-empty-string */
+    /** @return class-string */
     public function getName(): string
     {
         return $this->name;

src/Reflection/ReflectionEnum.php

@@ -47,17 +47,16 @@ private function __construct(
     /**
      * @internal
      *
-     * @param EnumNode              $node
      * @param non-empty-string|null $namespace
-     *
-     * @psalm-suppress MoreSpecificImplementedParamType
      */
     public static function createFromNode(
         Reflector $reflector,
         ClassNode|InterfaceNode|TraitNode|EnumNode $node,
         LocatedSource $locatedSource,
         string|null $namespace = null,
     ): self {
+        assert($node instanceof EnumNode);
+
         return new self($reflector, $node, $locatedSource, $namespace);
     }
 

src/Reflection/ReflectionFunction.php

@@ -170,7 +170,11 @@ private function assertIsNoClosure(): void
         }
     }
 
-    /** @throws FunctionDoesNotExist */
+    /**
+     * @throws FunctionDoesNotExist
+     *
+     * @phpstan-assert callable $functionName
+     */
     private function assertFunctionExist(string $functionName): void
     {
         if (! function_exists($functionName)) {

src/Reflection/ReflectionIntersectionType.php

@@ -40,9 +40,7 @@ public function withOwner(ReflectionParameter|ReflectionMethod|ReflectionFunctio
     {
         $clone = clone $this;
 
-        foreach ($clone->types as $typeNo => $innerType) {
-            $clone->types[$typeNo] = $innerType->withOwner($owner);
-        }
+        $clone->types = array_map(static fn (ReflectionNamedType $type): ReflectionNamedType => $type->withOwner($owner), $clone->types);
 
         return $clone;
     }

src/Reflection/ReflectionProperty.php

@@ -667,13 +667,13 @@ private function assertObject(mixed $object): object
     /** @return int-mask-of<ReflectionPropertyAdapter::IS_*> */
     private function computeModifiers(PropertyNode $node): int
     {
-        $modifiers  = $node->isReadonly() ? CoreReflectionProperty::IS_READONLY : 0;
-        $modifiers += $node->isStatic() ? CoreReflectionProperty::IS_STATIC : 0;
-        $modifiers += $node->isPrivate() ? CoreReflectionProperty::IS_PRIVATE : 0;
+        $modifiers  = $node->isReadonly() ? ReflectionPropertyAdapter::IS_READONLY : 0;
+        $modifiers += $node->isStatic() ? ReflectionPropertyAdapter::IS_STATIC : 0;
+        $modifiers += $node->isPrivate() ? ReflectionPropertyAdapter::IS_PRIVATE : 0;
         $modifiers += ! $node->isPrivate() && $node->isPrivateSet() ? ReflectionPropertyAdapter::IS_PRIVATE_SET_COMPATIBILITY : 0;
-        $modifiers += $node->isProtected() ? CoreReflectionProperty::IS_PROTECTED : 0;
+        $modifiers += $node->isProtected() ? ReflectionPropertyAdapter::IS_PROTECTED : 0;
         $modifiers += ! $node->isProtected() && $node->isProtectedSet() ? ReflectionPropertyAdapter::IS_PROTECTED_SET_COMPATIBILITY : 0;
-        $modifiers += $node->isPublic() ? CoreReflectionProperty::IS_PUBLIC : 0;
+        $modifiers += $node->isPublic() ? ReflectionPropertyAdapter::IS_PUBLIC : 0;
         $modifiers += $node->isFinal() ? ReflectionPropertyAdapter::IS_FINAL_COMPATIBILITY : 0;
         $modifiers += $node->isAbstract() ? ReflectionPropertyAdapter::IS_ABSTRACT_COMPATIBILITY : 0;
 
@@ -688,11 +688,12 @@ private function computeModifiers(PropertyNode $node): int
             ! ($modifiers & (ReflectionPropertyAdapter::IS_PROTECTED_SET_COMPATIBILITY | ReflectionPropertyAdapter::IS_PRIVATE_SET_COMPATIBILITY))
             && ! $node->isPublicSet()
             && $node->isPublic()
-            && ($modifiers & CoreReflectionProperty::IS_READONLY)
+            && ($modifiers & ReflectionPropertyAdapter::IS_READONLY)
         ) {
             $modifiers += ReflectionPropertyAdapter::IS_PROTECTED_SET_COMPATIBILITY;
         }
 
+        /** @phpstan-ignore return.type */
         return $modifiers;
     }
 

src/Reflection/ReflectionUnionType.php

@@ -43,9 +43,7 @@ public function withOwner(ReflectionParameter|ReflectionMethod|ReflectionFunctio
     {
         $clone = clone $this;
 
-        foreach ($clone->types as $typeNo => $innerType) {
-            $clone->types[$typeNo] = $innerType->withOwner($owner);
-        }
+        $clone->types = array_map(static fn (ReflectionNamedType|ReflectionIntersectionType $type): ReflectionNamedType|ReflectionIntersectionType => $type->withOwner($owner), $clone->types);
 
         return $clone;
     }

src/SourceLocator/SourceStubber/PhpStormStubs/CachingVisitor.php

@@ -201,7 +201,7 @@ private function updateConstantValue(Node\Expr\FuncCall|Node\Const_ $node, strin
         // prevent autoloading while discovering class constants
         $parts = explode('::', $constantName, 2);
         if (count($parts) === 2) {
-            [$className, $classConstName] = $parts;
+            [$className] = $parts;
 
             if (! class_exists($className, false)) {
                 return;
@@ -217,6 +217,7 @@ private function updateConstantValue(Node\Expr\FuncCall|Node\Const_ $node, strin
         $constantValue           = @constant($constantName);
         $normalizedConstantValue = is_resource($constantValue)
             ? $this->builderFactory->funcCall('constant', [$constantName])
+            /** @phpstan-ignore argument.type */
             : $this->builderFactory->val($constantValue);
 
         if ($node instanceof Node\Expr\FuncCall) {

src/SourceLocator/SourceStubber/ReflectionSourceStubber.php

@@ -598,15 +598,21 @@ private function setParameterDefaultValue(ReflectionParameter $parameterReflecti
     private function formatType(CoreReflectionType $type): Name|NullableType|UnionType|IntersectionType
     {
         if ($type instanceof CoreReflectionIntersectionType) {
+            /** @phpstan-var list<CoreReflectionNamedType> $intersectionTypes */
+            $intersectionTypes = $type->getTypes();
+
             /** @var list<Name> $types */
-            $types = $this->formatTypes($type->getTypes());
+            $types = $this->formatTypes($intersectionTypes);
 
             return new IntersectionType($types);
         }
 
         if ($type instanceof CoreReflectionUnionType) {
+            /** @phpstan-var list<CoreReflectionIntersectionType|CoreReflectionNamedType> $unionTypes */
+            $unionTypes = $type->getTypes();
+
             /** @var list<Name|IntersectionType> $types */
-            $types = $this->formatTypes($type->getTypes());
+            $types = $this->formatTypes($unionTypes);
 
             return new UnionType($types);
         }