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 .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@ jobs:
coverage: none
ini-values: zend.assertions=1

- uses: "ramsey/composer-install@v1"
- uses: "ramsey/composer-install@v2"

- run: vendor/bin/phpunit
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<?php

namespace Rector\Tests\DowngradePhp80\Rector\Expression\DowngradeThrowExprRector\Fixture;

class MultipleCoalesce
{
public function run($content)
{
$contentId = $content->getInternalId() ?? $content->getId() ?? throw new \LogicException('content id is required for ackVersion');
}
}

?>
-----
<?php

namespace Rector\Tests\DowngradePhp80\Rector\Expression\DowngradeThrowExprRector\Fixture;

class MultipleCoalesce
{
public function run($content)
{
$contentId = $content->getInternalId() ?? $content->getId();
if ($contentId === null) {
throw new \LogicException('content id is required for ackVersion');
}
}
}

?>
Original file line number Diff line number Diff line change
Expand Up @@ -180,9 +180,30 @@ private function refactorTernary(Ternary $ternary, ?Assign $assign): If_|null|ar
private function refactorCoalesce(Coalesce $coalesce, ?Assign $assign): If_|null|array
{
if (! $coalesce->right instanceof Throw_) {
$rightCoalesce = $coalesce->right;
$leftCoalesce = $coalesce->left;

while ($rightCoalesce instanceof Coalesce) {
$leftCoalesce = new Coalesce($leftCoalesce, $rightCoalesce->left);
$rightCoalesce = $rightCoalesce->right;
}

if ($rightCoalesce instanceof Throw_) {
$coalesce = new Coalesce($leftCoalesce, $rightCoalesce);
return $this->processCoalesce($coalesce, $assign, true);
}

return null;
}

return $this->processCoalesce($coalesce, $assign);
}

/**
* @return If_|Stmt[]|null
*/
private function processCoalesce(Coalesce $coalesce, ?Assign $assign, bool $assignEarly = false): If_|null|array
{
if (! $this->coalesceAnalyzer->hasIssetableLeft($coalesce)) {
return null;
}
Expand All @@ -198,6 +219,13 @@ private function refactorCoalesce(Coalesce $coalesce, ?Assign $assign): If_|null

$assign->expr = $coalesce->left;

if ($assignEarly && $if->cond instanceof Identical) {
$expression = new Expression(new Assign($assign->var, $if->cond->left));
$if->cond->left = $assign->var;

return [$expression, $if];
}

return [$if, new Expression($assign)];
}

Expand Down
4 changes: 4 additions & 0 deletions src/NodeAnalyzer/CoalesceAnalyzer.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ final class CoalesceAnalyzer

public function hasIssetableLeft(Coalesce $coalesce): bool
{
if ($coalesce->left instanceof Coalesce) {
return true;
}

$leftClass = $coalesce->left::class;
return in_array($leftClass, self::ISSETABLE_EXPR, true);
}
Expand Down