Skip to content
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

[CodeQuality] Handle crash on return array constant on ExplicitReturnNullRector #6458

Merged
merged 2 commits into from
Nov 20, 2024
Merged

[CodeQuality] Handle crash on return array constant on ExplicitReturnNullRector #6458

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
2c548d0
[CodeQuality] Handle crash on return array constant on ExplicitReturn…
samsonasik Nov 20, 2024
c3aa3a9
fix
samsonasik Nov 20, 2024
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
14 changes: 14 additions & 0 deletions ...ts/CodeQuality/Rector/ClassMethod/ExplicitReturnNullRector/Fixture/array_constant.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?php

namespace Rector\Tests\CodeQuality\Rector\ClassMethod\ExplicitReturnNullRector\Fixture;

class SkipReturnArrayConstant
{
public static function provideClearSession()
{
return [
['Default', ['Foo' => ['foo' => 'fooValue']]],
[null, []],
];
}
}
4 changes: 2 additions & 2 deletions rules/TypeDeclaration/TypeNormalizer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,9 @@ public function normalizeArrayTypeAndArrayNever(Type $type): Type
assert($traversedType instanceof ConstantArrayType);

// not sure why, but with direct new node everything gets nulled to MixedType
$this->privatesAccessor->setPrivateProperty($traversedType, 'keyType', new MixedType());
$this->privatesAccessor->setPrivateProperty($traversedType, 'keyTypes', [new MixedType()]);

$this->privatesAccessor->setPrivateProperty($traversedType, 'itemType', new MixedType());
$this->privatesAccessor->setPrivateProperty($traversedType, 'valueTypes', [new MixedType()]);

return $traversedType;
}
Expand Down