diff --git a/rules/Privatization/TypeManipulator/TypeNormalizer.php b/rules/Privatization/TypeManipulator/TypeNormalizer.php index 8594031162a..2b1d7323602 100644 --- a/rules/Privatization/TypeManipulator/TypeNormalizer.php +++ b/rules/Privatization/TypeManipulator/TypeNormalizer.php @@ -80,7 +80,7 @@ public function generalizeConstantTypes(Type $type): Type } // should be string[] - $itemType = $traverseCallback($type->getItemType(), $traverseCallback); + $itemType = $traverseCallback($type->getItemType()); if ($itemType instanceof ConstantStringType) { $itemType = new StringType(); @@ -159,7 +159,7 @@ public function generalizeConstantTypes(Type $type): Type return $uniqueGeneralizedUnionTypes[0]; } - $convertedType = $traverseCallback($type, $traverseCallback); + $convertedType = $traverseCallback($type); if ($convertedType instanceof NeverType) { return new MixedType(); } @@ -236,7 +236,7 @@ private function resolveNameShortDocTypeNode(UnionType $unionType): TypeNode return new ShortenedObjectType($shortClassName, $type->getClassName()); } - return $traverseCallback($type, $traverseCallback); + return $traverseCallback($type); }); return $this->staticTypeMapper->mapPHPStanTypeToPHPStanPhpDocTypeNode($objectShortGeneralizedUnionType); diff --git a/src/PHPStanStaticTypeMapper/TypeMapper/ObjectTypeMapper.php b/src/PHPStanStaticTypeMapper/TypeMapper/ObjectTypeMapper.php index 5ec5f035fdd..5df7718ffd5 100644 --- a/src/PHPStanStaticTypeMapper/TypeMapper/ObjectTypeMapper.php +++ b/src/PHPStanStaticTypeMapper/TypeMapper/ObjectTypeMapper.php @@ -61,10 +61,10 @@ public function mapToPHPStanPhpDocTypeNode(Type $type): TypeNode } if ($type instanceof GenericObjectType) { - return $traverse(new GenericObjectType('\\' . $type->getClassName(), $type->getTypes()), $traverse); + return $traverse(new GenericObjectType('\\' . $type->getClassName(), $type->getTypes())); } - return $traverse($type, $traverse); + return $traverse($type); }); return $type->toPhpDocNode();