Skip to content
/ rector-src Public

[type-declaration-docblocks] Generalize unioned array item #7285

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TomasVotruba merged 2 commits into from
Sep 15, 2025
Merged

[type-declaration-docblocks] Generalize unioned array item #7285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ff172e
fixtures
TomasVotruba Sep 15, 2025
4fb5db0
generalize unioned array item
TomasVotruba Sep 15, 2025
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
2 changes: 1 addition & 1 deletion ...ctor/ClassMethod/AddParamArrayDocblockFromDataProviderRector/Fixture/complex_case.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ use PHPUnit\Framework\TestCase;
final class ComplexCase extends TestCase
{
/**
* @param array<string, array<'anotherKey', int>> $first
* @param array<string, array<string, int>> $first
* @param array<string, int> $second
*/
#[DataProvider('getData')]
Expand Down
4 changes: 2 additions & 2 deletions ...tor/Fixture/avoid_extreme_nesting.php.inc → ...ure/Nesting/avoid_extreme_nesting.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Rector\Tests\TypeDeclarationDocblocks\Rector\ClassMethod\DocblockReturnArrayFromDirectArrayInstanceRector\Fixture;
namespace Rector\Tests\TypeDeclarationDocblocks\Rector\ClassMethod\DocblockReturnArrayFromDirectArrayInstanceRector\Fixture\Nesting;

final class AvoidExtremeNesting
{
Expand All @@ -26,7 +26,7 @@ final class AvoidExtremeNesting
-----
<?php

namespace Rector\Tests\TypeDeclarationDocblocks\Rector\ClassMethod\DocblockReturnArrayFromDirectArrayInstanceRector\Fixture;
namespace Rector\Tests\TypeDeclarationDocblocks\Rector\ClassMethod\DocblockReturnArrayFromDirectArrayInstanceRector\Fixture\Nesting;

final class AvoidExtremeNesting
{
Expand Down
6 changes: 3 additions & 3 deletions ...tanceRector/Fixture/complex_array.php.inc → ...tor/Fixture/Nesting/complex_array.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Rector\Tests\TypeDeclarationDocblocks\Rector\ClassMethod\DocblockReturnArrayFromDirectArrayInstanceRector\Fixture;
namespace Rector\Tests\TypeDeclarationDocblocks\Rector\ClassMethod\DocblockReturnArrayFromDirectArrayInstanceRector\Fixture\Nesting;

class ComplexArray
{
Expand All @@ -26,12 +26,12 @@ class ComplexArray
-----
<?php

namespace Rector\Tests\TypeDeclarationDocblocks\Rector\ClassMethod\DocblockReturnArrayFromDirectArrayInstanceRector\Fixture;
namespace Rector\Tests\TypeDeclarationDocblocks\Rector\ClassMethod\DocblockReturnArrayFromDirectArrayInstanceRector\Fixture\Nesting;

class ComplexArray
{
/**
* @return array<string, \stdClass|array<string, int|string|array<string, string>>>
* @return array<string, mixed>
*/
public function run(): array
{
Expand Down
4 changes: 2 additions & 2 deletions ...eRector/Fixture/two_nested_levels.php.inc → ...Fixture/Nesting/two_nested_levels.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Rector\Tests\TypeDeclarationDocblocks\Rector\ClassMethod\DocblockReturnArrayFromDirectArrayInstanceRector\Fixture;
namespace Rector\Tests\TypeDeclarationDocblocks\Rector\ClassMethod\DocblockReturnArrayFromDirectArrayInstanceRector\Fixture\Nesting;

final class TwoNestedLevels
{
Expand All @@ -23,7 +23,7 @@ final class TwoNestedLevels
-----
<?php

namespace Rector\Tests\TypeDeclarationDocblocks\Rector\ClassMethod\DocblockReturnArrayFromDirectArrayInstanceRector\Fixture;
namespace Rector\Tests\TypeDeclarationDocblocks\Rector\ClassMethod\DocblockReturnArrayFromDirectArrayInstanceRector\Fixture\Nesting;

final class TwoNestedLevels
{
Expand Down
198 changes: 198 additions & 0 deletions ...ethod/DocblockReturnArrayFromDirectArrayInstanceRector/Fixture/Nesting/union_nest.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,198 @@
<?php

namespace Rector\Tests\TypeDeclarationDocblocks\Rector\ClassMethod\DocblockReturnArrayFromDirectArrayInstanceRector\Fixture\Nesting;

final class UnionNest
{
public function getData(): array
{
return [
'field1' => 1111,
'field2' => 22,
'field3' => [
'field1' => 'value1',
],
'field4' => 9,
'field5' => '50/50',
'field6' => true,
'field7' => 'value2',
'field8' => [
0 => [
'field1' => [
'field1' => 123.4,
'field2' => 200.0,
'field3' => 200.0,
'field4' => 10.0,
'field5' => 9.0,
'field6' => 210.0,
'field7' => 209.0,
'field8' => 3.0,
'field9' => 0.0,
'field10' => 123.4,
],
'field2' => [
0 => [
'field1' => 3.0,
],
],
'field3' => [
0 => [
'field1' => 0.0,
],
],
'field4' => false,
'field5' => false,
'field6' => [
0 => [
'field1' => 'value3',
],
],
'field7' => [
'field1' => 'value4',
],
'field8' => [],
'field9' => [
0 => [
'field1' => 123.4,
'field2' => 200.0,
'field3' => 200.0,
'field4' => 10.0,
'field5' => 9.0,
'field6' => 210.0,
'field7' => 209.0,
'field8' => 3.0,
'field9' => 0.0,
'field10' => 123.4,
],
],
'field10' => [],
'field11' => [
'field1' => '2000-01-01T00:00:00+0000',
'field2' => '2000-01-01T00:00:00+0000',
'field3' => '2000-01-01T00:00:00+0000',
'field4' => '2000-01-01T00:00:00+0000',
'field5' => '2000-01-01T00:00:00+0000',
'field6' => '2000-01-01T00:00:00+0000',
'field7' => '2000-01-01T00:00:00+0000',
'field8' => '2000-01-01T00:00:00+0000',
],
'field12' => 'value5',
'field13' => [],
],
],
'field9' => [
'value6',
'value7',
],
'field10' => [
'value8',
'value9',
],
'field11' => true,
'field12' => 'value10',
];
}
}

?>
-----
<?php

namespace Rector\Tests\TypeDeclarationDocblocks\Rector\ClassMethod\DocblockReturnArrayFromDirectArrayInstanceRector\Fixture\Nesting;

final class UnionNest
{
/**
* @return array<string, mixed>
*/
public function getData(): array
{
return [
'field1' => 1111,
'field2' => 22,
'field3' => [
'field1' => 'value1',
],
'field4' => 9,
'field5' => '50/50',
'field6' => true,
'field7' => 'value2',
'field8' => [
0 => [
'field1' => [
'field1' => 123.4,
'field2' => 200.0,
'field3' => 200.0,
'field4' => 10.0,
'field5' => 9.0,
'field6' => 210.0,
'field7' => 209.0,
'field8' => 3.0,
'field9' => 0.0,
'field10' => 123.4,
],
'field2' => [
0 => [
'field1' => 3.0,
],
],
'field3' => [
0 => [
'field1' => 0.0,
],
],
'field4' => false,
'field5' => false,
'field6' => [
0 => [
'field1' => 'value3',
],
],
'field7' => [
'field1' => 'value4',
],
'field8' => [],
'field9' => [
0 => [
'field1' => 123.4,
'field2' => 200.0,
'field3' => 200.0,
'field4' => 10.0,
'field5' => 9.0,
'field6' => 210.0,
'field7' => 209.0,
'field8' => 3.0,
'field9' => 0.0,
'field10' => 123.4,
],
],
'field10' => [],
'field11' => [
'field1' => '2000-01-01T00:00:00+0000',
'field2' => '2000-01-01T00:00:00+0000',
'field3' => '2000-01-01T00:00:00+0000',
'field4' => '2000-01-01T00:00:00+0000',
'field5' => '2000-01-01T00:00:00+0000',
'field6' => '2000-01-01T00:00:00+0000',
'field7' => '2000-01-01T00:00:00+0000',
'field8' => '2000-01-01T00:00:00+0000',
],
'field12' => 'value5',
'field13' => [],
],
],
'field9' => [
'value6',
'value7',
],
'field10' => [
'value8',
'value9',
],
'field11' => true,
'field12' => 'value10',
];
}
}

?>
2 changes: 1 addition & 1 deletion ...thod/DocblockReturnArrayFromDirectArrayInstanceRector/Fixture/covert-implicit-key.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ namespace Rector\Tests\TypeDeclarationDocblocks\Rector\ClassMethod\DocblockRetur
final class CoverImplicitKey
{
/**
* @return array<int, array<string, string|int>>
* @return array<int, array<string, int|string>>
*/
private static function getExpectedAllOwners(): array
{
Expand Down
42 changes: 42 additions & 0 deletions ..._/ClassMethodArrayDocblockParamFromLocalCallsRector/Fixture/cover_mixex_and_known.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
<?php

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

final class CoverMixedAndKnown
{
public function go($mixed)
{
$this->run(['item1', 'item2']);

$this->run([$mixed, $mixed]);
}

private function run(array $items)
{
}
}

?>
-----
<?php

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

final class CoverMixedAndKnown
{
public function go($mixed)
{
$this->run(['item1', 'item2']);

$this->run([$mixed, $mixed]);
}

/**
* @param string[]|mixed[] $items
*/
private function run(array $items)
{
}
}

?>
17 changes: 0 additions & 17 deletions ...Class_/ClassMethodArrayDocblockParamFromLocalCallsRector/Fixture/skip_mixed_mixed.php.inc
View file
Open in desktop

This file was deleted.

Loading
Loading