Skip to content

Rectify #7973

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
samsonasik merged 1 commit into from
Apr 27, 2026
Merged

Rectify #7973

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 8 additions & 10 deletions rules/Php80/Rector/Class_/ClassPropertyAssignToConstructorPromotionRector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
use PhpParser\Node\Expr\Variable;
use PhpParser\Node\FunctionLike;
use PhpParser\Node\Identifier;
use PhpParser\Node\Name;
use PhpParser\Node\NullableType;
use PhpParser\Node\Param;
use PhpParser\Node\Stmt\Class_;
Expand All @@ -21,7 +20,6 @@
use PHPStan\PhpDocParser\Ast\PhpDoc\ParamTagValueNode;
use PHPStan\Reflection\ClassReflection;
use PHPStan\Type\MixedType;
use PHPStan\Type\Type;
use PHPStan\Type\TypeCombinator;
use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
use Rector\Contract\Rector\ConfigurableRectorInterface;
Expand Down Expand Up @@ -389,18 +387,18 @@ private function shouldSkipPropertyOrParam(Property $property, Param $param): bo

private function shouldRemoveNullFromForPromotedParamType(Property $property, Param $param): bool
{
if ($property->type === null || $param->type === null) {
if (! $property->type instanceof Node || ! $param->type instanceof Node) {
return false;
}

if ($param->default !== null && $this->valueResolver->isNull($param->default)) {
if ($param->default instanceof Expr && $this->valueResolver->isNull($param->default)) {
return false;
}

$propertyType = $this->staticTypeMapper->mapPhpParserNodePHPStanType($property->type);
$propertyTypeWithoutNull = TypeCombinator::removeNull($propertyType);
$type = TypeCombinator::removeNull($propertyType);

if (! $this->typeComparator->areTypesEqual($propertyTypeWithoutNull, $propertyType)) {
if (! $this->typeComparator->areTypesEqual($type, $propertyType)) {
return false;
}

Expand All @@ -412,20 +410,20 @@ private function shouldRemoveNullFromForPromotedParamType(Property $property, Pa

private function shouldUsePropertyTypeForPromotedParam(Property $property, Param $param): bool
{
if ($property->type === null) {
if (! $property->type instanceof Node) {
return false;
}

if ($param->type === null) {
if (! $param->type instanceof Node) {
return true;
}

$propertyType = $this->staticTypeMapper->mapPhpParserNodePHPStanType($property->type);
$propertyTypeWithoutNull = TypeCombinator::removeNull($propertyType);
$type = TypeCombinator::removeNull($propertyType);

$paramType = $this->staticTypeMapper->mapPhpParserNodePHPStanType($param->type);
$paramTypeWithoutNull = TypeCombinator::removeNull($paramType);

return $this->typeComparator->areTypesEqual($propertyTypeWithoutNull, $paramTypeWithoutNull);
return $this->typeComparator->areTypesEqual($type, $paramTypeWithoutNull);
}
}
Loading