Skip to content

Fix nullable param in ClassPropertyAssignToConstructorPromotionRector #3842

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 3 commits into from
May 14, 2023
Merged

Fix nullable param in ClassPropertyAssignToConstructorPromotionRector #3842

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e31bf22
add default of null
TomasVotruba May 14, 2023
ea45acf
add nullable param type
TomasVotruba May 14, 2023
3c93489
[ci-review] Rector Rectify
actions-user May 14, 2023
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
28 changes: 28 additions & 0 deletions ...ass_/ClassPropertyAssignToConstructorPromotionRector/Fixture/add_default_nullable.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<?php declare(strict_types = 1);

namespace Rector\Tests\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector\Fixture;

final class AddDefaultNullable
{
public $name;

public function __construct(string $name = null)
{
$this->name = $name;
}
}

?>
-----
<?php declare(strict_types = 1);

namespace Rector\Tests\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector\Fixture;

final class AddDefaultNullable
{
public function __construct(public ?string $name = null)
{
}
}

?>
7 changes: 7 additions & 0 deletions rules/Php80/Rector/Class_/ClassPropertyAssignToConstructorPromotionRector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

namespace Rector\Php80\Rector\Class_;

use PhpParser\Node\Expr;
use PhpParser\Node;
use PhpParser\Node\Identifier;
use PhpParser\Node\NullableType;
Expand Down Expand Up @@ -150,6 +151,7 @@ public function refactor(Node $node): ?Node

// rename also following calls
$propertyName = $this->getName($property->props[0]);

/** @var string $oldName */
$oldName = $this->getName($param->var);
$this->variableRenamer->renameVariableInFunctionLike($constructClassMethod, $oldName, $propertyName, null);
Expand Down Expand Up @@ -188,6 +190,11 @@ private function processNullableType(Property $property, Param $param): void
$objectType = $this->getType($property);
$param->type = $this->staticTypeMapper->mapPHPStanTypeToPhpParserNode($objectType, TypeKind::PARAM);
}

if ($param->default instanceof Expr && $this->valueResolver->isNull($param->default)) {
$paramType = $this->getType($param);
$param->type = $this->staticTypeMapper->mapPHPStanTypeToPhpParserNode($paramType, TypeKind::PARAM);
}
}

private function decorateParamWithPropertyPhpDocInfo(
Expand Down