mirror of
https://github.com/rectorphp/rector.git
synced 2024-05-31 08:20:53 +00:00
[DowngradePhp80] Handle both DowngradeTypedPropertyRector and DowngradeMixedTypeDeclarationRector Name parameter (#591)
* Demonstrate issue with DowngradeMixedTypeDeclarationRector * Closes #590 Fixes https://github.com/rectorphp/rector/issues/6611 * final touch: better check as already FullyQualified no need convert * final touch: clean up Co-authored-by: Brandon Olivares <programmer2188@gmail.com>
This commit is contained in:
parent
0a51a73ad6
commit
529eb40360
|
@ -6,9 +6,12 @@ namespace Rector\StaticTypeMapper\Mapper;
|
|||
|
||||
use PhpParser\Node;
|
||||
use PhpParser\Node\Expr;
|
||||
use PhpParser\Node\Name;
|
||||
use PhpParser\Node\Name\FullyQualified;
|
||||
use PhpParser\Node\Scalar\String_;
|
||||
use PHPStan\Type\Type;
|
||||
use Rector\Core\Exception\NotImplementedYetException;
|
||||
use Rector\NodeTypeResolver\Node\AttributeKey;
|
||||
use Rector\StaticTypeMapper\Contract\PhpParser\PhpParserNodeMapperInterface;
|
||||
|
||||
final class PhpParserNodeMapper
|
||||
|
@ -23,6 +26,10 @@ final class PhpParserNodeMapper
|
|||
|
||||
public function mapToPHPStanType(Node $node): Type
|
||||
{
|
||||
if ($node::class === Name::class && $node->hasAttribute(AttributeKey::NAMESPACED_NAME)) {
|
||||
$node = new FullyQualified($node->getAttribute(AttributeKey::NAMESPACED_NAME));
|
||||
}
|
||||
|
||||
foreach ($this->phpParserNodeMappers as $phpParserNodeMapper) {
|
||||
if (! is_a($node, $phpParserNodeMapper->getNodeType())) {
|
||||
continue;
|
||||
|
|
|
@ -0,0 +1,33 @@
|
|||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace Rector\Core\Tests\Issues\IssueDowngradeMixedType;
|
||||
|
||||
use Iterator;
|
||||
use Rector\Testing\PHPUnit\AbstractRectorTestCase;
|
||||
use Symplify\SmartFileSystem\SmartFileInfo;
|
||||
|
||||
final class DowngradeMixedTypeTest extends AbstractRectorTestCase
|
||||
{
|
||||
/**
|
||||
* @dataProvider provideData()
|
||||
*/
|
||||
public function test(SmartFileInfo $fileInfo): void
|
||||
{
|
||||
$this->doTestFileInfo($fileInfo);
|
||||
}
|
||||
|
||||
/**
|
||||
* @return Iterator<SmartFileInfo>
|
||||
*/
|
||||
public function provideData(): Iterator
|
||||
{
|
||||
return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture');
|
||||
}
|
||||
|
||||
public function provideConfigFilePath(): string
|
||||
{
|
||||
return __DIR__ . '/config/configured_rule.php';
|
||||
}
|
||||
}
|
40
tests/Issues/IssueDowngradeMixedType/Fixture/fixture.php.inc
Normal file
40
tests/Issues/IssueDowngradeMixedType/Fixture/fixture.php.inc
Normal file
|
@ -0,0 +1,40 @@
|
|||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace Rector\Core\Tests\Issues\IssueDowngradeMixedType\Fixture;
|
||||
|
||||
use Rector\Core\Tests\Issues\IssueDowngradeMixedType\Source\SomeClass;
|
||||
|
||||
class AnotherClass
|
||||
{
|
||||
private SomeClass $foo;
|
||||
|
||||
public function bar(SomeClass $baz)
|
||||
{
|
||||
}
|
||||
}
|
||||
|
||||
?>
|
||||
-----
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace Rector\Core\Tests\Issues\IssueDowngradeMixedType\Fixture;
|
||||
|
||||
use Rector\Core\Tests\Issues\IssueDowngradeMixedType\Source\SomeClass;
|
||||
|
||||
class AnotherClass
|
||||
{
|
||||
/**
|
||||
* @var SomeClass
|
||||
*/
|
||||
private $foo;
|
||||
|
||||
public function bar(SomeClass $baz)
|
||||
{
|
||||
}
|
||||
}
|
||||
|
||||
?>
|
|
@ -0,0 +1,9 @@
|
|||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace Rector\Core\Tests\Issues\IssueDowngradeMixedType\Source;
|
||||
|
||||
class SomeClass
|
||||
{
|
||||
}
|
|
@ -0,0 +1,17 @@
|
|||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
use Rector\Core\Configuration\Option;
|
||||
use Rector\DowngradePhp74\Rector\Property\DowngradeTypedPropertyRector;
|
||||
use Rector\DowngradePhp80\Rector\FunctionLike\DowngradeMixedTypeDeclarationRector;
|
||||
use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
|
||||
|
||||
return static function (ContainerConfigurator $containerConfigurator): void {
|
||||
$parameters = $containerConfigurator->parameters();
|
||||
$parameters->set(Option::AUTO_IMPORT_NAMES, true);
|
||||
|
||||
$services = $containerConfigurator->services();
|
||||
$services->set(DowngradeTypedPropertyRector::class);
|
||||
$services->set(DowngradeMixedTypeDeclarationRector::class);
|
||||
};
|
Loading…
Reference in New Issue
Block a user