Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[php 8.1] skip nullable property without null default in NewInInitializerRector #7546

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
merged 3 commits into from
Oct 23, 2025
Merged

[php 8.1] skip nullable property without null default in NewInInitializerRector #7546

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
79a385f
tidy up similar fixtures to make tests more readble
TomasVotruba Oct 23, 2025
e0a05cb
skip nullable property without null default, as null is always passed…
TomasVotruba Oct 23, 2025
f331c0e
[ci-review] Rector Rectify
actions-user Oct 23, 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
4 changes: 2 additions & 2 deletions ...ests/Php81/Rector/ClassMethod/NewInInitializerRector/Fixture/pass_non_dynamic_arg.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ namespace Rector\Tests\Php81\Rector\ClassMethod\NewInInitializerRector\Fixture;
use DateTime;
use DateTimeZone;

class PassNonDynamicArg
final class PassNonDynamicArg
{
private DateTime $dateTime;

Expand All @@ -25,7 +25,7 @@ namespace Rector\Tests\Php81\Rector\ClassMethod\NewInInitializerRector\Fixture;
use DateTime;
use DateTimeZone;

class PassNonDynamicArg
final class PassNonDynamicArg
{
public function __construct(private ?DateTime $dateTime = new DateTime('now', new DateTimeZone('Asia/Jakarta')))
{
Expand Down
4 changes: 2 additions & 2 deletions ...sts/Php81/Rector/ClassMethod/NewInInitializerRector/Fixture/pass_non_dynamic_arg2.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace Rector\Tests\Php81\Rector\ClassMethod\NewInInitializerRector\Fixture;

class SomeClass
final class PassNonDynamicArg2
{
private Logger $logger;

Expand All @@ -19,7 +19,7 @@ class SomeClass

namespace Rector\Tests\Php81\Rector\ClassMethod\NewInInitializerRector\Fixture;

class SomeClass
final class PassNonDynamicArg2
{
public function __construct(private ?Logger $logger = new NullLogger(['a' => 'b']))
{
Expand Down
29 changes: 0 additions & 29 deletions ...sts/Php81/Rector/ClassMethod/NewInInitializerRector/Fixture/pass_non_dynamic_arg3.php.inc
View file
Open in desktop

This file was deleted.

33 changes: 0 additions & 33 deletions ...sts/Php81/Rector/ClassMethod/NewInInitializerRector/Fixture/pass_non_dynamic_arg4.php.inc
View file
Open in desktop

This file was deleted.

29 changes: 0 additions & 29 deletions ...sts/Php81/Rector/ClassMethod/NewInInitializerRector/Fixture/pass_non_dynamic_arg5.php.inc
View file
Open in desktop

This file was deleted.

29 changes: 0 additions & 29 deletions ...sts/Php81/Rector/ClassMethod/NewInInitializerRector/Fixture/pass_non_dynamic_arg6.php.inc
View file
Open in desktop

This file was deleted.

17 changes: 17 additions & 0 deletions ...s/Php81/Rector/ClassMethod/NewInInitializerRector/Fixture/skip_if_no_default_null.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?php

namespace Rector\Tests\Php81\Rector\ClassMethod\NewInInitializerRector\Fixture;

use Php81\Rector\ClassMethod\NewInInitializerRector\Source\Logger\DefaultLogger;
use Php81\Rector\ClassMethod\NewInInitializerRector\Source\Logger\NullLogger;

final class SkipIfNoDefaultNull
{
private DefaultLogger $logger;

public function __construct(
?DefaultLogger $logger,
) {
$this->logger = $logger ?? new NullLogger();
}
}
Copy link
Member Author

@TomasVotruba TomasVotruba Oct 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@samsonasik This is one of cases that would always throw error if upgraded.

Here, without null default, the null is always passed from outside to trigger:

new SkipIfNoDefaultNull(null); // only way to create NullLogger

10 changes: 0 additions & 10 deletions ...s/Php81/Rector/ClassMethod/NewInInitializerRector/Fixture/skip_no_param_construct.php.inc
View file
Open in desktop

This file was deleted.

17 changes: 0 additions & 17 deletions ...sts/Php81/Rector/ClassMethod/NewInInitializerRector/Fixture/skip_pass_dynamic_arg.php.inc
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions ...ts/Php81/Rector/ClassMethod/NewInInitializerRector/Fixture/skip_pass_dynamic_arg4.php.inc
View file
Open in desktop

This file was deleted.

8 changes: 8 additions & 0 deletions rules-tests/Php81/Rector/ClassMethod/NewInInitializerRector/Source/Logger/DefaultLogger.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?php

namespace Php81\Rector\ClassMethod\NewInInitializerRector\Source\Logger;

class DefaultLogger
{

}
8 changes: 8 additions & 0 deletions rules-tests/Php81/Rector/ClassMethod/NewInInitializerRector/Source/Logger/NullLogger.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?php

namespace Php81\Rector\ClassMethod\NewInInitializerRector\Source\Logger;

class NullLogger
{

}
23 changes: 18 additions & 5 deletions rules/Php81/Rector/ClassMethod/NewInInitializerRector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,7 @@ public function getNodeTypes(): array
*/
public function refactor(Node $node): ?Node
{
if ($node->stmts === null || $node->stmts === []) {
return null;
}

if ($node->isAbstract() || $node->isAnonymous()) {
if ($this->shouldSkipClass($node)) {
return null;
}

Expand All @@ -104,6 +100,10 @@ public function refactor(Node $node): ?Node
foreach ($params as $param) {
$paramName = $this->getName($param);

if ($param->type instanceof NullableType && $param->default === null) {
continue;
}

$coalesce = $this->coalescePropertyAssignMatcher->matchCoalesceAssignsToLocalPropertyNamed(
$stmt,
$paramName
Expand Down Expand Up @@ -215,4 +215,17 @@ private function matchConstructorParams(ClassMethod $classMethod): array

return $params;
}

private function shouldSkipClass(Class_ $class): bool
{
if ($class->stmts === []) {
return true;
}

if ($class->isAbstract()) {
return true;
}

return $class->isAnonymous();
}
}