Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
<?php

namespace Rector\Tests\TypeDeclarationDocblocks\Rector\Class_\AddReturnDocblockDataProviderRector\Fixture;

use PHPUnit\Framework\Attributes\DataProvider;
use PHPUnit\Framework\TestCase;

final class NestedArrayIsMixed extends TestCase
{
#[DataProvider('provideData')]
public function testSomething()
{
}

public static function provideData(): \Generator
{
yield [[]];
yield [[1, 2, 3, 4]];
}
}

?>
-----
<?php

namespace Rector\Tests\TypeDeclarationDocblocks\Rector\Class_\AddReturnDocblockDataProviderRector\Fixture;

use PHPUnit\Framework\Attributes\DataProvider;
use PHPUnit\Framework\TestCase;

final class NestedArrayIsMixed extends TestCase
{
#[DataProvider('provideData')]
public function testSomething()
{
}

/**
* @return \Generator<array<int, array<mixed>>>
*/
public static function provideData(): \Generator
{
yield [[]];
yield [[1, 2, 3, 4]];
}
}

?>
6 changes: 1 addition & 5 deletions rules/TypeDeclaration/NodeAnalyzer/CallTypesResolver.php
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,7 @@ public function resolveTypesFromCalls(array $calls): array
continue;
}

if ($arg->name instanceof Identifier) {
$positionOrName = $arg->name->toString();
} else {
$positionOrName = $position;
}
$positionOrName = $arg->name instanceof Identifier ? $arg->name->toString() : $position;

$staticTypesByArgumentPosition[$positionOrName][] = $this->resolveArgValueType($arg);
}
Expand Down
4 changes: 2 additions & 2 deletions rules/TypeDeclarationDocblocks/NodeDocblockTypeDecorator.php
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,13 @@ public function decorateGenericIterableReturnType(
PhpDocInfo $classMethodPhpDocInfo,
ClassMethod $classMethod
): bool {
$typeNode = $this->createTypeNode($type);

if ($this->isBareMixedType($type)) {
// no value
return false;
}

$typeNode = $this->createTypeNode($type);

// no value iterable type
if ($typeNode instanceof IdentifierTypeNode) {
return false;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,6 @@ public function refactor(Node $node): ?Node
$hasChanged = false;

$dataProviderClassMethods = $this->dataProviderMethodsFinder->findDataProviderNodesInClass($node);

if ($dataProviderClassMethods === []) {
return null;
}
Expand Down
2 changes: 2 additions & 0 deletions src/PHPStanStaticTypeMapper/TypeMapper/ArrayTypeMapper.php
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ public function mapToPHPStanPhpDocTypeNode(Type $type): TypeNode
}

if ($itemType instanceof ArrayType && $this->isGenericArrayCandidate($itemType)) {

return $this->createGenericArrayType($type, true);
}

Expand Down Expand Up @@ -182,6 +183,7 @@ private function createGenericArrayType(ArrayType $arrayType, bool $withKey = fa
}

$identifierTypeNode->setAttribute(self::HAS_GENERIC_TYPE_PARENT, $withKey);

return new GenericTypeNode($identifierTypeNode, $genericTypes);
}

Expand Down
10 changes: 8 additions & 2 deletions src/PHPStanStaticTypeMapper/TypeMapper/ObjectTypeMapper.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@
use PhpParser\Node\Name;
use PhpParser\Node\Name\FullyQualified;
use PHPStan\PhpDocParser\Ast\Type\TypeNode;
use PHPStan\Type\ArrayType;
use PHPStan\Type\Generic\GenericObjectType;
use PHPStan\Type\MixedType;
use PHPStan\Type\ObjectType;
use PHPStan\Type\Type;
use PHPStan\Type\TypeTraverser;
Expand All @@ -36,6 +38,10 @@ public function getNodeClass(): string
public function mapToPHPStanPhpDocTypeNode(Type $type): TypeNode
{
$type = TypeTraverser::map($type, static function (Type $type, callable $traverse): Type {
if ($type instanceof ArrayType && ($type->getItemType() instanceof MixedType && $type->getKeyType() instanceof MixedType)) {
return new ArrayType(new MixedType(), new MixedType(true));
}

if (! $type instanceof ObjectType) {
return $traverse($type);
}
Expand All @@ -52,10 +58,10 @@ public function mapToPHPStanPhpDocTypeNode(Type $type): TypeNode
}

if ($type instanceof GenericObjectType) {
return $traverse(new GenericObjectType('\\' . $type->getClassName(), $type->getTypes()));
return $traverse(new GenericObjectType('\\' . $type->getClassName(), $type->getTypes()), $traverse);
}

return $traverse($type);
return $traverse($type, $traverse);
});

return $type->toPhpDocNode();
Expand Down
Loading