Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"phpstan/phpstan": "^2.1.32",
"phpstan/phpstan-webmozart-assert": "^2.0",
"phpunit/phpunit": "^11.5",
"rector/rector-src": "dev-tv-traverse-optimize",
"rector/rector-src": "dev-main",
"rector/type-perfect": "^2.1",
"symplify/easy-coding-standard": "^12.3",
"symplify/phpstan-extensions": "^12.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ final class GetNullable
{
public function run($value)
{
return ($nullsafeVariable6 = $this->extractArrayItemByKey($value)) ? $nullsafeVariable6->value : null;
return ($nullsafeVariable1 = $this->extractArrayItemByKey($value)) ? $nullsafeVariable1->value : null;
}

protected function extractArrayItemByKey($value): ?ArrayItem
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ trait GetNullableInTrait
{
public function run($value)
{
return ($nullsafeVariable7 = $this->extractArrayItemByKey($value)) ? $nullsafeVariable7->value : null;
return ($nullsafeVariable1 = $this->extractArrayItemByKey($value)) ? $nullsafeVariable1->value : null;
}

protected function extractArrayItemByKey($value): ?ArrayItem
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ class MultipleCall
{
public function run($object)
{
$result = ($nullsafeVariable8 = ($nullsafeVariable10 = $object->multiple($args1)) ? $nullsafeVariable10->call($args2) : null) ? $nullsafeVariable8->otherCall($args3) : null;
$result = ($nullsafeVariable9 = ($nullsafeVariable11 = ($nullsafeVariable12 = $object->multiple($args1)) ? $nullsafeVariable12->call($args2) : null) ? $nullsafeVariable11->otherCall($args3) : null) ? $nullsafeVariable9->anotherCall($args4) : null;
$result = ($nullsafeVariable1 = ($nullsafeVariable3 = $object->multiple($args1)) ? $nullsafeVariable3->call($args2) : null) ? $nullsafeVariable1->otherCall($args3) : null;
$result = ($nullsafeVariable2 = ($nullsafeVariable4 = ($nullsafeVariable5 = $object->multiple($args1)) ? $nullsafeVariable5->call($args2) : null) ? $nullsafeVariable4->otherCall($args3) : null) ? $nullsafeVariable2->anotherCall($args4) : null;
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ final class ShortCircuit
{
public function run(bool $param)
{
return ($nullsafeVariable13 = $this->clock) ? $nullsafeVariable13->now()->format('U.u') : null;
return ($nullsafeVariable1 = $this->clock) ? $nullsafeVariable1->now()->format('U.u') : null;
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ final class ShortCircuit3
{
public function run(bool $param)
{
return ($nullsafeVariable14 = $this->clock) ? $nullsafeVariable14->now->format : null;
return ($nullsafeVariable1 = $this->clock) ? $nullsafeVariable1->now->format : null;
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ final class ShortCircuit4
{
public function run(bool $param)
{
return ($nullsafeVariable15 = $this->clock) ? $nullsafeVariable15->now->format('U.u') : null;
return ($nullsafeVariable1 = $this->clock) ? $nullsafeVariable1->now->format('U.u') : null;
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ final class ShortCircuit5
{
public function run(bool $param)
{
return ($nullsafeVariable16 = $this->clock) ? $nullsafeVariable16->now()->format : null;
return ($nullsafeVariable1 = $this->clock) ? $nullsafeVariable1->now()->format : null;
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,13 @@ public function getNodeTypes(): array
*/
public function refactor(Node $node): ?Ternary
{
static $currentFile = null;

if ($currentFile !== $this->file->getFilePath()) {
$this->counter = 0;
$currentFile = $this->file->getFilePath();
}
Copy link
Member

Choose a reason for hiding this comment

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

Could you add a simple comment on "why" is this needed? Just for future reference

Copy link
Member Author

Choose a reason for hiding this comment

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


if ($node instanceof MethodCall || $node instanceof PropertyFetch) {
if ($node->var instanceof NullsafeMethodCall || $node->var instanceof NullsafePropertyFetch) {
$nullsafeVariable = $this->createNullsafeVariable();
Expand Down