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

Updated Rector to commit bba606c609

Browse Source 
bba606c609 Fix alias object imports (#480)
This commit is contained in:
Tomas Votruba 2021-07-21 14:23:45 +00:00
parent aae88d8c24
commit 8b47bb5ba9
9 changed files with 49 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/PostRector/Collector/UseNodesToAddCollector.php
View File

@ -67,10 +67,10 @@ final class UseNodesToAddCollector implements \Rector\PostRector\Contract\Collec
$useNodes = (array) $node->getAttribute(\Rector\NodeTypeResolver\Node\AttributeKey::USE_NODES);
foreach ($useNodes as $useNode) {
foreach ($useNode->uses as $useUse) {
if ($useUse->alias === null) {
$objectTypes[] = new \Rector\StaticTypeMapper\ValueObject\Type\FullyQualifiedObjectType((string) $useUse->name);
} else {
if ($useUse->alias !== null) {
$objectTypes[] = new \Rector\StaticTypeMapper\ValueObject\Type\AliasedObjectType($useUse->alias->toString(), (string) $useUse->name);
} else {
$objectTypes[] = new \Rector\StaticTypeMapper\ValueObject\Type\FullyQualifiedObjectType((string) $useUse->name);
}
}
}

10
packages/StaticTypeMapper/ValueObject/Type/AliasedObjectType.php
View File

@ -7,6 +7,7 @@ use PhpParser\Node\Name;
use PhpParser\Node\Stmt\Use_;
use PhpParser\Node\Stmt\UseUse;
use PHPStan\Type\ObjectType;
use Rector\NodeTypeResolver\Node\AttributeKey;
final class AliasedObjectType extends \PHPStan\Type\ObjectType
{
/**
@ -39,4 +40,13 @@ final class AliasedObjectType extends \PHPStan\Type\ObjectType
{
return $this->getShortName() === $comparedObjectType->getShortName();
}
public function getFunctionUseNode() : \PhpParser\Node\Stmt\Use_
{
$name = new \PhpParser\Node\Name($this->fullyQualifiedClass);
$useUse = new \PhpParser\Node\Stmt\UseUse($name, $this->getClassName());
$name->setAttribute(\Rector\NodeTypeResolver\Node\AttributeKey::PARENT_NODE, $useUse);
$use = new \PhpParser\Node\Stmt\Use_([$useUse]);
$use->type = \PhpParser\Node\Stmt\Use_::TYPE_FUNCTION;
return $use;
}
}

15
rules/CodingStyle/Application/UseImportsAdder.php
View File

@ -31,8 +31,8 @@ final class UseImportsAdder
}
/**
* @param Stmt[] $stmts
* @param FullyQualifiedObjectType[] $useImportTypes
* @param FullyQualifiedObjectType[] $functionUseImportTypes
* @param array<FullyQualifiedObjectType|AliasedObjectType> $useImportTypes
* @param array<FullyQualifiedObjectType|AliasedObjectType> $functionUseImportTypes
* @return Stmt[]
*/
public function addImportsToStmts(array $stmts, array $useImportTypes, array $functionUseImportTypes) : array
@ -70,15 +70,16 @@ final class UseImportsAdder
$namespaceName = $this->getNamespaceName($namespace);
$existingUseImportTypes = $this->usedImportsResolver->resolveForNode($namespace);
$existingFunctionUseImportTypes = $this->usedImportsResolver->resolveFunctionImportsForStmts($namespace->stmts);
$existingUseImportTypes = $this->typeFactory->uniquateTypes($existingUseImportTypes);
$useImportTypes = $this->diffFullyQualifiedObjectTypes($useImportTypes, $existingUseImportTypes);
$functionUseImportTypes = $this->diffFullyQualifiedObjectTypes($functionUseImportTypes, $existingFunctionUseImportTypes);
$newUses = $this->createUses($useImportTypes, $functionUseImportTypes, $namespaceName);
$namespace->stmts = \array_merge($newUses, $namespace->stmts);
}
/**
* @param FullyQualifiedObjectType[] $mainTypes
* @param FullyQualifiedObjectType[] $typesToRemove
* @return FullyQualifiedObjectType[]
* @param array<FullyQualifiedObjectType|AliasedObjectType> $mainTypes
* @param array<FullyQualifiedObjectType|AliasedObjectType> $typesToRemove
* @return array<FullyQualifiedObjectType|AliasedObjectType>
*/
private function diffFullyQualifiedObjectTypes(array $mainTypes, array $typesToRemove) : array
{
@ -92,8 +93,8 @@ final class UseImportsAdder
return \array_values($mainTypes);
}
/**
* @param AliasedObjectType[]|FullyQualifiedObjectType[] $useImportTypes
* @param FullyQualifiedObjectType[] $functionUseImportTypes
* @param array<AliasedObjectType|FullyQualifiedObjectType> $useImportTypes
* @param array<FullyQualifiedObjectType|AliasedObjectType> $functionUseImportTypes
* @return Use_[]
*/
private function createUses(array $useImportTypes, array $functionUseImportTypes, ?string $namespaceName) : array

13
rules/CodingStyle/ClassNameImport/UsedImportsResolver.php
View File

@ -10,6 +10,7 @@ use PhpParser\Node\Stmt\Namespace_;
use PhpParser\Node\Stmt\UseUse;
use Rector\Core\PhpParser\Node\BetterNodeFinder;
use Rector\NodeNameResolver\NodeNameResolver;
use Rector\StaticTypeMapper\ValueObject\Type\AliasedObjectType;
use Rector\StaticTypeMapper\ValueObject\Type\FullyQualifiedObjectType;
final class UsedImportsResolver
{
@ -32,7 +33,7 @@ final class UsedImportsResolver
$this->useImportsTraverser = $useImportsTraverser;
}
/**
* @return FullyQualifiedObjectType[]
* @return array<FullyQualifiedObjectType|AliasedObjectType>
*/
public function resolveForNode(\PhpParser\Node $node) : array
{
@ -48,7 +49,7 @@ final class UsedImportsResolver
}
/**
* @param Stmt[] $stmts
* @return FullyQualifiedObjectType[]
* @return array<FullyQualifiedObjectType|AliasedObjectType>
*/
public function resolveForStmts(array $stmts) : array
{
@ -63,7 +64,11 @@ final class UsedImportsResolver
}
}
$this->useImportsTraverser->traverserStmts($stmts, function (\PhpParser\Node\Stmt\UseUse $useUse, string $name) use(&$usedImports) : void {
$usedImports[] = new \Rector\StaticTypeMapper\ValueObject\Type\FullyQualifiedObjectType($name);
if ($useUse->alias !== null) {
$usedImports[] = new \Rector\StaticTypeMapper\ValueObject\Type\AliasedObjectType($useUse->alias->toString(), $name);
} else {
$usedImports[] = new \Rector\StaticTypeMapper\ValueObject\Type\FullyQualifiedObjectType($name);
}
});
return $usedImports;
}
@ -80,7 +85,7 @@ final class UsedImportsResolver
return $usedFunctionImports;
}
/**
* @return FullyQualifiedObjectType[]
* @return array<FullyQualifiedObjectType|AliasedObjectType>
*/
private function resolveForNamespace(\PhpParser\Node\Stmt\Namespace_ $namespace) : array
{

4
src/Application/VersionResolver.php
View File

@ -16,11 +16,11 @@ final class VersionResolver
/**
* @var string
*/
public const PACKAGE_VERSION = 'dc10595b7c60fef8de68ab6981264dff075a1b23';
public const PACKAGE_VERSION = 'bba606c609ede6368a7cd1a84c73b9d86b1480aa';
/**
* @var string
*/
public const RELEASE_DATE = '2021-07-21 13:42:20';
public const RELEASE_DATE = '2021-07-21 14:13:06';
public static function resolvePackageVersion() : string
{
$process = new \RectorPrefix20210721\Symfony\Component\Process\Process(['git', 'log', '--pretty="%H"', '-n1', 'HEAD'], __DIR__);

2
vendor/autoload.php vendored
View File

@ -4,4 +4,4 @@
require_once __DIR__ . '/composer/autoload_real.php';
return ComposerAutoloaderInit8e331d93d4a20f0090b3ca6eb7ae74a7::getLoader();
return ComposerAutoloaderInit876153d5b1783c0ef6fabf1d5a00f15e::getLoader();

14
vendor/composer/autoload_real.php vendored
View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInit8e331d93d4a20f0090b3ca6eb7ae74a7
class ComposerAutoloaderInit876153d5b1783c0ef6fabf1d5a00f15e
{
private static $loader;
@ -22,15 +22,15 @@ class ComposerAutoloaderInit8e331d93d4a20f0090b3ca6eb7ae74a7
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInit8e331d93d4a20f0090b3ca6eb7ae74a7', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInit876153d5b1783c0ef6fabf1d5a00f15e', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
spl_autoload_unregister(array('ComposerAutoloaderInit8e331d93d4a20f0090b3ca6eb7ae74a7', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInit876153d5b1783c0ef6fabf1d5a00f15e', 'loadClassLoader'));
$useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
if ($useStaticLoader) {
require __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInit8e331d93d4a20f0090b3ca6eb7ae74a7::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInit876153d5b1783c0ef6fabf1d5a00f15e::getInitializer($loader));
} else {
$classMap = require __DIR__ . '/autoload_classmap.php';
if ($classMap) {
@ -42,19 +42,19 @@ class ComposerAutoloaderInit8e331d93d4a20f0090b3ca6eb7ae74a7
$loader->register(true);
if ($useStaticLoader) {
$includeFiles = Composer\Autoload\ComposerStaticInit8e331d93d4a20f0090b3ca6eb7ae74a7::$files;
$includeFiles = Composer\Autoload\ComposerStaticInit876153d5b1783c0ef6fabf1d5a00f15e::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequire8e331d93d4a20f0090b3ca6eb7ae74a7($fileIdentifier, $file);
composerRequire876153d5b1783c0ef6fabf1d5a00f15e($fileIdentifier, $file);
}
return $loader;
}
}
function composerRequire8e331d93d4a20f0090b3ca6eb7ae74a7($fileIdentifier, $file)
function composerRequire876153d5b1783c0ef6fabf1d5a00f15e($fileIdentifier, $file)
{
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
require $file;

8
vendor/composer/autoload_static.php vendored
View File

@ -4,7 +4,7 @@
namespace Composer\Autoload;
class ComposerStaticInit8e331d93d4a20f0090b3ca6eb7ae74a7
class ComposerStaticInit876153d5b1783c0ef6fabf1d5a00f15e
{
public static $files = array (
'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php',
@ -3844,9 +3844,9 @@ class ComposerStaticInit8e331d93d4a20f0090b3ca6eb7ae74a7
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit8e331d93d4a20f0090b3ca6eb7ae74a7::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit8e331d93d4a20f0090b3ca6eb7ae74a7::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit8e331d93d4a20f0090b3ca6eb7ae74a7::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInit876153d5b1783c0ef6fabf1d5a00f15e::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit876153d5b1783c0ef6fabf1d5a00f15e::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit876153d5b1783c0ef6fabf1d5a00f15e::$classMap;
}, null, ClassLoader::class);
}

10
vendor/scoper-autoload.php vendored
View File

@ -9,8 +9,8 @@ $loader = require_once __DIR__.'/autoload.php';
if (!class_exists('AutoloadIncluder', false) && !interface_exists('AutoloadIncluder', false) && !trait_exists('AutoloadIncluder', false)) {
spl_autoload_call('RectorPrefix20210721\AutoloadIncluder');
}
if (!class_exists('ComposerAutoloaderInit8e331d93d4a20f0090b3ca6eb7ae74a7', false) && !interface_exists('ComposerAutoloaderInit8e331d93d4a20f0090b3ca6eb7ae74a7', false) && !trait_exists('ComposerAutoloaderInit8e331d93d4a20f0090b3ca6eb7ae74a7', false)) {
spl_autoload_call('RectorPrefix20210721\ComposerAutoloaderInit8e331d93d4a20f0090b3ca6eb7ae74a7');
if (!class_exists('ComposerAutoloaderInit876153d5b1783c0ef6fabf1d5a00f15e', false) && !interface_exists('ComposerAutoloaderInit876153d5b1783c0ef6fabf1d5a00f15e', false) && !trait_exists('ComposerAutoloaderInit876153d5b1783c0ef6fabf1d5a00f15e', false)) {
spl_autoload_call('RectorPrefix20210721\ComposerAutoloaderInit876153d5b1783c0ef6fabf1d5a00f15e');
}
if (!class_exists('Doctrine\Inflector\Inflector', false) && !interface_exists('Doctrine\Inflector\Inflector', false) && !trait_exists('Doctrine\Inflector\Inflector', false)) {
spl_autoload_call('RectorPrefix20210721\Doctrine\Inflector\Inflector');
@ -3308,9 +3308,9 @@ if (!function_exists('print_node')) {
return \RectorPrefix20210721\print_node(...func_get_args());
}
}
if (!function_exists('composerRequire8e331d93d4a20f0090b3ca6eb7ae74a7')) {
function composerRequire8e331d93d4a20f0090b3ca6eb7ae74a7() {
return \RectorPrefix20210721\composerRequire8e331d93d4a20f0090b3ca6eb7ae74a7(...func_get_args());
if (!function_exists('composerRequire876153d5b1783c0ef6fabf1d5a00f15e')) {
function composerRequire876153d5b1783c0ef6fabf1d5a00f15e() {
return \RectorPrefix20210721\composerRequire876153d5b1783c0ef6fabf1d5a00f15e(...func_get_args());
}
}
if (!function_exists('parseArgs')) {