octoleo/rector
1
1
Fork 0
mirror of https://github.com/rectorphp/rector.git synced 2024-06-30 06:33:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

[PHP 5.6] Fix foreach unset variable default

Browse Source
This commit is contained in:
TomasVotruba 2020-07-31 00:40:12 +02:00
parent bd7394e80e
commit 0178e9cadd
3 changed files with 41 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
rules/php56/src/Rector/FunctionLike/AddDefaultValueForUndefinedVariableRector.php
View File

@ -32,6 +32,7 @@ use Rector\NodeTypeResolver\Node\AttributeKey;
/**
* @see https://github.com/vimeo/psalm/blob/29b70442b11e3e66113935a2ee22e165a70c74a4/docs/fixing_code.md#possiblyundefinedvariable
* @see https://3v4l.org/MZFel
*
* @see \Rector\Php56\Tests\Rector\FunctionLike\AddDefaultValueForUndefinedVariableRector\AddDefaultValueForUndefinedVariableRectorTest
*/
final class AddDefaultValueForUndefinedVariableRector extends AbstractRector
@ -116,13 +117,18 @@ PHP
private function collectUndefinedVariableScope(Node $node): array
{
$undefinedVariables = [];
$this->traverseNodesWithCallable((array) $node->stmts, function (Node $node) use (&$undefinedVariables): ?int {
// entering new scope - break!
if ($node instanceof FunctionLike && ! $node instanceof ArrowFunction) {
return NodeTraverser::STOP_TRAVERSAL;
}
$this->collectDefinedVariablesFromForeach($node);
if ($node instanceof Foreach_) {
// handled above
$this->collectDefinedVariablesFromForeach($node);
return NodeTraverser::DONT_TRAVERSE_CURRENT_AND_CHILDREN;
}
if (! $node instanceof Variable) {
return null;
@ -150,13 +156,9 @@ PHP
return array_unique($undefinedVariables);
}
private function collectDefinedVariablesFromForeach(Node $node): void
private function collectDefinedVariablesFromForeach(Foreach_ $foreach): void
{
if (! $node instanceof Foreach_) {
return;
}
$this->traverseNodesWithCallable($node->stmts, function (Node $node): void {
$this->traverseNodesWithCallable((array) $foreach->stmts, function (Node $node): void {
if ($node instanceof Assign || $node instanceof AssignRef) {
if (! $node->var instanceof Variable) {
return;

14
rules/php56/tests/Rector/FunctionLike/AddDefaultValueForUndefinedVariableRector/AddDefaultValueForUndefinedVariableRectorTest.php
View File

@ -24,20 +24,6 @@ final class AddDefaultValueForUndefinedVariableRectorTest extends AbstractRector
return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture');
}
/**
* @dataProvider provideDataPhp74()
* @requires PHP >= 7.4
*/
public function testPhp74(SmartFileInfo $fileInfo): void
{
$this->doTestFileInfo($fileInfo);
}
public function provideDataPhp74(): Iterator
{
return $this->yieldFilesFromDirectory(__DIR__ . '/FixturePhp74');
}
protected function getRectorClass(): string
{
return AddDefaultValueForUndefinedVariableRector::class;

32
rules/php56/tests/Rector/FunctionLike/AddDefaultValueForUndefinedVariableRector/Php74Test.php Normal file
View File

@ -0,0 +1,32 @@
<?php
declare(strict_types=1);
namespace Rector\Php56\Tests\Rector\FunctionLike\AddDefaultValueForUndefinedVariableRector;
use Iterator;
use Rector\Core\Testing\PHPUnit\AbstractRectorTestCase;
use Rector\Php56\Rector\FunctionLike\AddDefaultValueForUndefinedVariableRector;
use Symplify\SmartFileSystem\SmartFileInfo;
final class Php74Test extends AbstractRectorTestCase
{
/**
* @dataProvider provideData()
* @requires PHP >= 7.4
*/
public function test(SmartFileInfo $fileInfo): void
{
$this->doTestFileInfo($fileInfo);
}
public function provideData(): Iterator
{
return $this->yieldFilesFromDirectory(__DIR__ . '/FixturePhp74');
}
protected function getRectorClass(): string
{
return AddDefaultValueForUndefinedVariableRector::class;
}
}