[TypeDeclarationDocblocks] Handle multiple objects on AddReturnDocblockDataProviderRector

[samsonasik]

it currently only got last objects, which cause phpstan notice:

Generator expects value type array<int, array<DateTimeImmutable|string>>, array<int, array<int, DateTime|string>> given.

see https://phpstan.org/r/db520ab6-fc4f-4c45-ac1f-b91801f2e065

[samsonasik]

It seems there is bug on TypeFactory and TypeHasher

rector-src/src/NodeTypeResolver/PHPStan/Type/TypeFactory.php

Lines 195 to 211 in 76dc419

	private function unwrapConstantArrayTypes(ConstantArrayType $constantArrayType): array
	{
	$unwrappedTypes = [];
	$flattenKeyTypes = TypeUtils::flattenTypes($constantArrayType->getIterableKeyType());
	$flattenItemTypes = TypeUtils::flattenTypes($constantArrayType->getIterableValueType());
	foreach ($flattenItemTypes as $position => $nestedFlattenItemType) {
	$nestedFlattenKeyType = $flattenKeyTypes[$position] ?? null;
	if (! $nestedFlattenKeyType instanceof Type) {
	$nestedFlattenKeyType = new MixedType();
	}
	$unwrappedTypes[] = new ArrayType($nestedFlattenKeyType, $nestedFlattenItemType);
	}
	return $unwrappedTypes;

rector-src/src/NodeTypeResolver/PHPStan/TypeHasher.php

Lines 26 to 52 in 76dc419

	public function createTypeHash(Type $type): string
	{
	if ($type instanceof MixedType) {
	return $type->describe(VerbosityLevel::precise()) . $type->isExplicitMixed();
	}
	if ($type instanceof ArrayType) {
	return $this->createTypeHash($type->getIterableValueType()) . $this->createTypeHash(
	$type->getIterableKeyType()
	) . '[]';
	}
	if ($type instanceof GenericObjectType) {
	return $type->describe(VerbosityLevel::precise());
	}
	if ($type instanceof TypeWithClassName) {
	return $this->resolveUniqueTypeWithClassNameHash($type);
	}
	if ($type->isConstantValue()->yes()) {
	return $type::class;
	}
	$type = $this->normalizeObjectType($type);
	return $type->describe(VerbosityLevel::value());
	}

[samsonasik]

Fixed 🎉

[samsonasik]

@TomasVotruba I updated to use 77 as max length union to show the fix, otherwise, it just \Iterator<mixed> for this fixture test

https://github.com/rectorphp/rector-src/pull/7298/files#diff-2a2097385262575254922102ea5d5304cc01549cfcbdc51ef87c240199f2c4d5

The fix for this case is loop when inner is ConstantArrayType too.

https://github.com/rectorphp/rector-src/pull/7298/files#diff-a5bab2fbc05ee30b694214b4e5b5c805297d9e916fc482845f92e70fd9bd3c06

Proven works at

https://phpstan.org/r/3a7c2934-6256-48c6-a4ba-351f42d4d0df

[TomasVotruba]

This might be tricky to keep in readable line. The longer the docblock will be, the more mess might get int. But let's give 77 a try.

[samsonasik]

this loop again to make result of inner constant array to avoid just added the last one,

[samsonasik]

All checks have passed 🎉 @TomasVotruba I am merging it ;)

[TomasVotruba]

👍

[github-actions]

This pull request has been automatically locked because it has been closed for 150 days. Please open a new PR if you want to continue the work.