Increase PHPStan rule level to 10

sebastianbergmann · Nov 18, 2024 · 6351aa6 · 6351aa6
1 parent 5d5e186
commit 6351aa6
Show file tree

Hide file tree

Showing 20 changed files with 28 additions and 25 deletions.
diff --git a/phpstan.neon b/phpstan.neon
@@ -1,5 +1,5 @@
 parameters:
-    level: 9
+    level: 10
     paths:
         - src
         - tests/unit
diff --git a/src/ReflectionMapper.php b/src/ReflectionMapper.php
@@ -33,8 +33,6 @@ public function fromParameterTypes(ReflectionFunction|ReflectionMethod $reflecto
         foreach ($reflector->getParameters() as $parameter) {
             $name = $parameter->getName();
 
-            assert($name !== '');
-
             if (!$parameter->hasType()) {
                 $parameters[] = new Parameter($name, new UnknownType);
 
@@ -90,9 +88,7 @@ public function fromReturnType(ReflectionFunction|ReflectionMethod $reflector):
             return $this->mapUnionType($returnType, $reflector);
         }
 
-        if ($returnType instanceof ReflectionIntersectionType) {
-            return $this->mapIntersectionType($returnType, $reflector);
-        }
+        return $this->mapIntersectionType($returnType, $reflector);
     }
 
     public function fromPropertyType(ReflectionProperty $reflector): Type
@@ -113,9 +109,7 @@ public function fromPropertyType(ReflectionProperty $reflector): Type
             return $this->mapUnionType($propertyType, $reflector);
         }
 
-        if ($propertyType instanceof ReflectionIntersectionType) {
-            return $this->mapIntersectionType($propertyType, $reflector);
-        }
+        return $this->mapIntersectionType($propertyType, $reflector);
     }
 
     private function mapNamedType(ReflectionNamedType $type, ReflectionFunction|ReflectionMethod|ReflectionProperty $reflector): Type

diff --git a/src/type/CallableType.php b/src/type/CallableType.php
@@ -165,12 +165,6 @@ private function isClassCallback(SimpleType $type): bool
             [$className, $methodName] = $type->value();
         }
 
-        /** @phpstan-ignore isset.variable */
-        assert(isset($className));
-
-        /** @phpstan-ignore isset.variable */
-        assert(isset($methodName));
-
         if (!class_exists($className)) {
             return false;
         }

diff --git a/src/type/IntersectionType.php b/src/type/IntersectionType.php
@@ -9,7 +9,6 @@
  */
 namespace SebastianBergmann\Type;
 
-use function array_is_list;
 use function assert;
 use function count;
 use function implode;
@@ -35,7 +34,7 @@ public function __construct(Type ...$types)
         $this->ensureOnlyValidTypes(...$types);
         $this->ensureNoDuplicateTypes(...$types);
 
-        assert(array_is_list($types) && !empty($types));
+        assert(!empty($types));
 
         $this->types = $types;
     }

diff --git a/src/type/UnionType.php b/src/type/UnionType.php
@@ -9,7 +9,6 @@
  */
 namespace SebastianBergmann\Type;
 
-use function array_is_list;
 use function assert;
 use function count;
 use function implode;
@@ -33,7 +32,7 @@ public function __construct(Type ...$types)
         $this->ensureMinimumOfTwoTypes(...$types);
         $this->ensureOnlyValidTypes(...$types);
 
-        assert(array_is_list($types) && !empty($types));
+        assert(!empty($types));
 
         $this->types = $types;
     }
@@ -76,12 +75,7 @@ public function name(): string
 
         sort($types);
 
-        $name = implode('|', $types);
-
-        /** @phpstan-ignore empty.variable */
-        assert(!empty($name));
-
-        return $name;
+        return implode('|', $types);
     }
 
     public function allowsNull(): bool

diff --git a/tests/unit/type/CallableTypeTest.php b/tests/unit/type/CallableTypeTest.php
@@ -146,7 +146,9 @@ public function testObjectWithoutInvokeMethodCannotBeAssignedToCallable(): void
 
     public function testCanBeQueriedForType(): void
     {
+        /** @phpstan-ignore method.alreadyNarrowedType */
         $this->assertTrue($this->type->isCallable());
+
         $this->assertFalse($this->type->isFalse());
         $this->assertFalse($this->type->isGenericObject());
         $this->assertFalse($this->type->isIntersection());

diff --git a/tests/unit/type/FalseTypeTest.php b/tests/unit/type/FalseTypeTest.php
@@ -79,6 +79,7 @@ public function testCanBeQueriedForType(): void
     {
         $type = new FalseType;
 
+        /** @phpstan-ignore method.alreadyNarrowedType */
         $this->assertTrue($type->isFalse());
 
         /** @phpstan-ignore method.impossibleType */

diff --git a/tests/unit/type/GenericObjectTypeTest.php b/tests/unit/type/GenericObjectTypeTest.php
@@ -78,7 +78,9 @@ public function testNonObjectCannotBeAssignedToGenericObject(): void
 
     public function testCanBeQueriedForType(): void
     {
+        /** @phpstan-ignore method.alreadyNarrowedType */
         $this->assertTrue($this->type->isGenericObject());
+
         $this->assertFalse($this->type->isCallable());
         $this->assertFalse($this->type->isFalse());
         $this->assertFalse($this->type->isIntersection());

diff --git a/tests/unit/type/IntersectionTypeTest.php b/tests/unit/type/IntersectionTypeTest.php
@@ -73,7 +73,9 @@ public function testTypesCanBeQueried(): void
 
     public function testCanBeQueriedForType(): void
     {
+        /** @phpstan-ignore method.alreadyNarrowedType */
         $this->assertTrue($this->type->isIntersection());
+
         $this->assertFalse($this->type->isCallable());
         $this->assertFalse($this->type->isFalse());
         $this->assertFalse($this->type->isGenericObject());

diff --git a/tests/unit/type/IterableTypeTest.php b/tests/unit/type/IterableTypeTest.php
@@ -88,7 +88,9 @@ public function testSomethingThatIsNotIterableCannotBeAssignedToIterable(): void
 
     public function testCanBeQueriedForType(): void
     {
+        /** @phpstan-ignore method.alreadyNarrowedType */
         $this->assertTrue($this->type->isIterable());
+
         $this->assertFalse($this->type->isCallable());
         $this->assertFalse($this->type->isFalse());
         $this->assertFalse($this->type->isGenericObject());

diff --git a/tests/unit/type/MixedTypeTest.php b/tests/unit/type/MixedTypeTest.php
@@ -79,6 +79,7 @@ public function testCanBeQueriedForType(): void
     {
         $type = new MixedType;
 
+        /** @phpstan-ignore method.alreadyNarrowedType */
         $this->assertTrue($type->isMixed());
 
         /** @phpstan-ignore method.impossibleType */

diff --git a/tests/unit/type/NeverTypeTest.php b/tests/unit/type/NeverTypeTest.php
@@ -75,6 +75,7 @@ public function testCanBeQueriedForType(): void
     {
         $type = new NeverType;
 
+        /** @phpstan-ignore method.alreadyNarrowedType */
         $this->assertTrue($type->isNever());
 
         /** @phpstan-ignore method.impossibleType */

diff --git a/tests/unit/type/NullTypeTest.php b/tests/unit/type/NullTypeTest.php
@@ -79,7 +79,9 @@ public function testCanBeRepresentedAsString(): void
 
     public function testCanBeQueriedForType(): void
     {
+        /** @phpstan-ignore method.alreadyNarrowedType */
         $this->assertTrue($this->type->isNull());
+
         $this->assertFalse($this->type->isCallable());
         $this->assertFalse($this->type->isFalse());
         $this->assertFalse($this->type->isGenericObject());

diff --git a/tests/unit/type/ObjectTypeTest.php b/tests/unit/type/ObjectTypeTest.php
@@ -138,7 +138,9 @@ public function testHasClassName(): void
 
     public function testCanBeQueriedForType(): void
     {
+        /** @phpstan-ignore method.alreadyNarrowedType */
         $this->assertTrue($this->childClass->isObject());
+
         $this->assertFalse($this->childClass->isCallable());
         $this->assertFalse($this->childClass->isFalse());
         $this->assertFalse($this->childClass->isGenericObject());

diff --git a/tests/unit/type/SimpleTypeTest.php b/tests/unit/type/SimpleTypeTest.php
@@ -158,6 +158,7 @@ public function testCanBeQueriedForType(): void
     {
         $type = new SimpleType('bool', false);
 
+        /** @phpstan-ignore method.alreadyNarrowedType */
         $this->assertTrue($type->isSimple());
 
         /** @phpstan-ignore method.impossibleType */

diff --git a/tests/unit/type/StaticTypeTest.php b/tests/unit/type/StaticTypeTest.php
@@ -135,6 +135,7 @@ public function testCanBeQueriedForType(): void
     {
         $type = new StaticType(TypeName::fromQualifiedName(stdClass::class), false);
 
+        /** @phpstan-ignore method.alreadyNarrowedType */
         $this->assertTrue($type->isStatic());
 
         /** @phpstan-ignore method.impossibleType */

diff --git a/tests/unit/type/TrueTypeTest.php b/tests/unit/type/TrueTypeTest.php
@@ -79,6 +79,7 @@ public function testCanBeQueriedForType(): void
     {
         $type = new TrueType;
 
+        /** @phpstan-ignore method.alreadyNarrowedType */
         $this->assertTrue($type->isTrue());
 
         /** @phpstan-ignore method.impossibleType */

diff --git a/tests/unit/type/UnionTypeTest.php b/tests/unit/type/UnionTypeTest.php
@@ -184,6 +184,7 @@ public function testCanBeQueriedForType(): void
             new SimpleType('string', false),
         );
 
+        /** @phpstan-ignore method.alreadyNarrowedType */
         $this->assertTrue($type->isUnion());
 
         /** @phpstan-ignore method.impossibleType */

diff --git a/tests/unit/type/UnknownTypeTest.php b/tests/unit/type/UnknownTypeTest.php
@@ -64,7 +64,9 @@ public function testCanBeRepresentedAsString(): void
 
     public function testCanBeQueriedForType(): void
     {
+        /** @phpstan-ignore method.alreadyNarrowedType */
         $this->assertTrue($this->type->isUnknown());
+
         $this->assertFalse($this->type->isCallable());
         $this->assertFalse($this->type->isFalse());
         $this->assertFalse($this->type->isGenericObject());

diff --git a/tests/unit/type/VoidTypeTest.php b/tests/unit/type/VoidTypeTest.php
@@ -75,6 +75,7 @@ public function testCanBeQueriedForType(): void
     {
         $type = new VoidType;
 
+        /** @phpstan-ignore method.alreadyNarrowedType */
         $this->assertTrue($type->isVoid());
 
         /** @phpstan-ignore method.impossibleType */