octoleo/rector
1
1
Fork 0
mirror of https://github.com/rectorphp/rector.git synced 2024-05-28 23:10:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated Rector to commit 0293296974

Browse Source 
0293296974 extract UseImportNameMatcher (#407)
This commit is contained in:
Tomas Votruba 2021-07-08 15:57:28 +00:00
parent 4f5c3f4a02
commit 4e9b6ff030
10 changed files with 108 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
packages/BetterPhpDocParser/PhpDocParser/ClassAnnotationMatcher.php
View File

@ -3,12 +3,11 @@
declare (strict_types=1);
namespace Rector\BetterPhpDocParser\PhpDocParser;
use RectorPrefix20210708\Nette\Utils\Strings;
use PhpParser\Node;
use PhpParser\Node\Stmt\Use_;
use PhpParser\Node\Stmt\UseUse;
use PHPStan\Analyser\Scope;
use PHPStan\Reflection\ReflectionProvider;
use Rector\CodingStyle\NodeAnalyzer\UseImportNameMatcher;
use Rector\NodeTypeResolver\Node\AttributeKey;
/**
* Matches "@ORM\Entity" to FQN names based on use imports in the file
@ -19,12 +18,17 @@ final class ClassAnnotationMatcher
* @var array<string, string>
*/
private $fullyQualifiedNameByHash = [];
/**
* @var \Rector\CodingStyle\NodeAnalyzer\UseImportNameMatcher
*/
private $useImportNameMatcher;
/**
* @var \PHPStan\Reflection\ReflectionProvider
*/
private $reflectionProvider;
public function __construct(\PHPStan\Reflection\ReflectionProvider $reflectionProvider)
public function __construct(\Rector\CodingStyle\NodeAnalyzer\UseImportNameMatcher $useImportNameMatcher, \PHPStan\Reflection\ReflectionProvider $reflectionProvider)
{
$this->useImportNameMatcher = $useImportNameMatcher;
$this->reflectionProvider = $reflectionProvider;
}
public function resolveTagFullyQualifiedName(string $tag, \PhpParser\Node $node) : string
@ -55,38 +59,6 @@ final class ClassAnnotationMatcher
}
}
}
return $this->matchFullAnnotationClassWithUses($tag, $uses) ?? $tag;
}
/**
* @param Use_[] $uses
*/
private function matchFullAnnotationClassWithUses(string $tag, array $uses) : ?string
{
foreach ($uses as $use) {
foreach ($use->uses as $useUse) {
if (!$this->isUseMatchingName($tag, $useUse)) {
continue;
}
return $this->resolveName($tag, $useUse);
}
}
return null;
}
private function isUseMatchingName(string $tag, \PhpParser\Node\Stmt\UseUse $useUse) : bool
{
$shortName = $useUse->alias !== null ? $useUse->alias->name : $useUse->name->getLast();
$shortNamePattern = \preg_quote($shortName, '#');
return (bool) \RectorPrefix20210708\Nette\Utils\Strings::match($tag, '#' . $shortNamePattern . '(\\\\[\\w]+)?$#i');
}
private function resolveName(string $tag, \PhpParser\Node\Stmt\UseUse $useUse) : string
{
if ($useUse->alias === null) {
return $useUse->name->toString();
}
$unaliasedShortClass = \RectorPrefix20210708\Nette\Utils\Strings::substring($tag, \RectorPrefix20210708\Nette\Utils\Strings::length($useUse->alias->toString()));
if (\strncmp($unaliasedShortClass, '\\', \strlen('\\')) === 0) {
return $useUse->name . $unaliasedShortClass;
}
return $useUse->name . '\\' . $unaliasedShortClass;
return $this->useImportNameMatcher->matchNameWithUses($tag, $uses) ?? $tag;
}
}

20
rules/CodingStyle/ClassNameImport/ShortNameResolver.php
View File

@ -8,6 +8,7 @@ use RectorPrefix20210708\Nette\Utils\Strings;
use PhpParser\Node;
use PhpParser\Node\Identifier;
use PhpParser\Node\Name;
use PhpParser\Node\Stmt;
use PhpParser\Node\Stmt\ClassLike;
use PhpParser\Node\Stmt\Namespace_;
use PhpParser\NodeFinder;
@ -16,6 +17,7 @@ use PHPStan\PhpDocParser\Ast\Type\IdentifierTypeNode;
use PHPStan\Reflection\ReflectionProvider;
use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo;
use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
use Rector\CodingStyle\NodeAnalyzer\UseImportNameMatcher;
use Rector\Core\PhpParser\Node\BetterNodeFinder;
use Rector\Core\ValueObject\Application\File;
use Rector\NodeNameResolver\NodeNameResolver;
@ -59,13 +61,18 @@ final class ShortNameResolver
* @var \Rector\Core\PhpParser\Node\BetterNodeFinder
*/
private $betterNodeFinder;
public function __construct(\RectorPrefix20210708\Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser $simpleCallableNodeTraverser, \Rector\NodeNameResolver\NodeNameResolver $nodeNameResolver, \PhpParser\NodeFinder $nodeFinder, \PHPStan\Reflection\ReflectionProvider $reflectionProvider, \Rector\Core\PhpParser\Node\BetterNodeFinder $betterNodeFinder)
/**
* @var \Rector\CodingStyle\NodeAnalyzer\UseImportNameMatcher
*/
private $useImportNameMatcher;
public function __construct(\RectorPrefix20210708\Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser $simpleCallableNodeTraverser, \Rector\NodeNameResolver\NodeNameResolver $nodeNameResolver, \PhpParser\NodeFinder $nodeFinder, \PHPStan\Reflection\ReflectionProvider $reflectionProvider, \Rector\Core\PhpParser\Node\BetterNodeFinder $betterNodeFinder, \Rector\CodingStyle\NodeAnalyzer\UseImportNameMatcher $useImportNameMatcher)
{
$this->simpleCallableNodeTraverser = $simpleCallableNodeTraverser;
$this->nodeNameResolver = $nodeNameResolver;
$this->nodeFinder = $nodeFinder;
$this->reflectionProvider = $reflectionProvider;
$this->betterNodeFinder = $betterNodeFinder;
$this->useImportNameMatcher = $useImportNameMatcher;
}
// Avoids circular reference
/**
@ -109,7 +116,7 @@ final class ShortNameResolver
return \array_unique($shortClassLikeNames);
}
/**
* @param Node[] $stmts
* @param Stmt[] $stmts
* @return array<string, string>
*/
private function resolveForStmts(array $stmts) : array
@ -143,7 +150,7 @@ final class ShortNameResolver
return \array_merge($shortNamesToFullyQualifiedNames, $docBlockShortNamesToFullyQualifiedNames);
}
/**
* @param Node[] $stmts
* @param Stmt[] $stmts
* @return array<string, string>
*/
private function resolveFromStmtsDocBlocks(array $stmts) : array
@ -171,7 +178,7 @@ final class ShortNameResolver
return null;
});
});
return $this->fqnizeShortNames($shortNames, $reflectionClass);
return $this->fqnizeShortNames($shortNames, $reflectionClass, $stmts);
}
/**
* @param Node[] $stmts
@ -194,16 +201,17 @@ final class ShortNameResolver
}
/**
* @param string[] $shortNames
* @param Stmt[] $stmts
* @return array<string, string>
*/
private function fqnizeShortNames(array $shortNames, ?\ReflectionClass $reflectionClass) : array
private function fqnizeShortNames(array $shortNames, ?\ReflectionClass $reflectionClass, array $stmts) : array
{
$shortNamesToFullyQualifiedNames = [];
foreach ($shortNames as $shortName) {
if ($reflectionClass instanceof \ReflectionClass) {
$fullyQualifiedName = \RectorPrefix20210708\Nette\Utils\Reflection::expandClassName($shortName, $reflectionClass);
} else {
$fullyQualifiedName = $shortName;
$fullyQualifiedName = $this->useImportNameMatcher->matchNameWithStmts($shortName, $stmts) ?: $shortName;
}
$shortNamesToFullyQualifiedNames[$shortName] = $fullyQualifiedName;
}

62
rules/CodingStyle/NodeAnalyzer/UseImportNameMatcher.php Normal file
View File

@ -0,0 +1,62 @@
<?php
declare (strict_types=1);
namespace Rector\CodingStyle\NodeAnalyzer;
use RectorPrefix20210708\Nette\Utils\Strings;
use PhpParser\Node\Stmt;
use PhpParser\Node\Stmt\Use_;
use PhpParser\Node\Stmt\UseUse;
use Rector\Core\PhpParser\Node\BetterNodeFinder;
final class UseImportNameMatcher
{
/**
* @var \Rector\Core\PhpParser\Node\BetterNodeFinder
*/
private $betterNodeFinder;
public function __construct(\Rector\Core\PhpParser\Node\BetterNodeFinder $betterNodeFinder)
{
$this->betterNodeFinder = $betterNodeFinder;
}
/**
* @param Stmt[] $stmts
*/
public function matchNameWithStmts(string $tag, array $stmts) : ?string
{
/** @var Use_[] $uses */
$uses = $this->betterNodeFinder->findInstanceOf($stmts, \PhpParser\Node\Stmt\Use_::class);
return $this->matchNameWithUses($tag, $uses);
}
/**
* @param Use_[] $uses
*/
public function matchNameWithUses(string $tag, array $uses) : ?string
{
foreach ($uses as $use) {
foreach ($use->uses as $useUse) {
if (!$this->isUseMatchingName($tag, $useUse)) {
continue;
}
return $this->resolveName($tag, $useUse);
}
}
return null;
}
private function isUseMatchingName(string $tag, \PhpParser\Node\Stmt\UseUse $useUse) : bool
{
$shortName = $useUse->alias !== null ? $useUse->alias->name : $useUse->name->getLast();
$shortNamePattern = \preg_quote($shortName, '#');
return (bool) \RectorPrefix20210708\Nette\Utils\Strings::match($tag, '#' . $shortNamePattern . '(\\\\[\\w]+)?$#i');
}
private function resolveName(string $tag, \PhpParser\Node\Stmt\UseUse $useUse) : string
{
if ($useUse->alias === null) {
return $useUse->name->toString();
}
$unaliasedShortClass = \RectorPrefix20210708\Nette\Utils\Strings::substring($tag, \RectorPrefix20210708\Nette\Utils\Strings::length($useUse->alias->toString()));
if (\strncmp($unaliasedShortClass, '\\', \strlen('\\')) === 0) {
return $useUse->name . $unaliasedShortClass;
}
return $useUse->name . '\\' . $unaliasedShortClass;
}
}

3
rules/Php80/Rector/FunctionLike/UnionTypesRector.php
View File

@ -131,6 +131,9 @@ CODE_SAMPLE
if (!$phpParserUnionType instanceof \PhpParser\Node\UnionType) {
continue;
}
if ($param->type instanceof \PhpParser\Node\UnionType) {
continue;
}
$param->type = $phpParserUnionType;
}
}

4
src/Application/VersionResolver.php
View File

@ -16,11 +16,11 @@ final class VersionResolver
/**
* @var string
*/
public const PACKAGE_VERSION = '0c709dfac727d7ea9b8d121a20daec17ebc0b1cb';
public const PACKAGE_VERSION = '0293296974e49555d5f6f28d65d0df704f5d6706';
/**
* @var string
*/
public const RELEASE_DATE = '2021-07-08 15:28:06';
public const RELEASE_DATE = '2021-07-08 15:49:48';
public static function resolvePackageVersion() : string
{
$process = new \RectorPrefix20210708\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 ComposerAutoloaderInitfea99aed40b8b9b57974b89e41cb0f3c::getLoader();
return ComposerAutoloaderInitc8fa1fa309dc9bd33487c691b894e16c::getLoader();

1
vendor/composer/autoload_classmap.php vendored
View File

@ -1704,6 +1704,7 @@ return array(
'Rector\\CodingStyle\\Naming\\NameRenamer' => $baseDir . '/rules/CodingStyle/Naming/NameRenamer.php',
'Rector\\CodingStyle\\NodeAnalyzer\\ImplodeAnalyzer' => $baseDir . '/rules/CodingStyle/NodeAnalyzer/ImplodeAnalyzer.php',
'Rector\\CodingStyle\\NodeAnalyzer\\SpreadVariablesCollector' => $baseDir . '/rules/CodingStyle/NodeAnalyzer/SpreadVariablesCollector.php',
'Rector\\CodingStyle\\NodeAnalyzer\\UseImportNameMatcher' => $baseDir . '/rules/CodingStyle/NodeAnalyzer/UseImportNameMatcher.php',
'Rector\\CodingStyle\\NodeFactory\\ArrayCallableToMethodCallFactory' => $baseDir . '/rules/CodingStyle/NodeFactory/ArrayCallableToMethodCallFactory.php',
'Rector\\CodingStyle\\NodeFactory\\JsonArrayFactory' => $baseDir . '/rules/CodingStyle/NodeFactory/JsonArrayFactory.php',
'Rector\\CodingStyle\\NodeFactory\\JsonEncodeStaticCallFactory' => $baseDir . '/rules/CodingStyle/NodeFactory/JsonEncodeStaticCallFactory.php',

14
vendor/composer/autoload_real.php vendored
View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInitfea99aed40b8b9b57974b89e41cb0f3c
class ComposerAutoloaderInitc8fa1fa309dc9bd33487c691b894e16c
{
private static $loader;
@ -22,15 +22,15 @@ class ComposerAutoloaderInitfea99aed40b8b9b57974b89e41cb0f3c
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInitfea99aed40b8b9b57974b89e41cb0f3c', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInitc8fa1fa309dc9bd33487c691b894e16c', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
spl_autoload_unregister(array('ComposerAutoloaderInitfea99aed40b8b9b57974b89e41cb0f3c', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInitc8fa1fa309dc9bd33487c691b894e16c', '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\ComposerStaticInitfea99aed40b8b9b57974b89e41cb0f3c::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInitc8fa1fa309dc9bd33487c691b894e16c::getInitializer($loader));
} else {
$classMap = require __DIR__ . '/autoload_classmap.php';
if ($classMap) {
@ -42,19 +42,19 @@ class ComposerAutoloaderInitfea99aed40b8b9b57974b89e41cb0f3c
$loader->register(true);
if ($useStaticLoader) {
$includeFiles = Composer\Autoload\ComposerStaticInitfea99aed40b8b9b57974b89e41cb0f3c::$files;
$includeFiles = Composer\Autoload\ComposerStaticInitc8fa1fa309dc9bd33487c691b894e16c::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequirefea99aed40b8b9b57974b89e41cb0f3c($fileIdentifier, $file);
composerRequirec8fa1fa309dc9bd33487c691b894e16c($fileIdentifier, $file);
}
return $loader;
}
}
function composerRequirefea99aed40b8b9b57974b89e41cb0f3c($fileIdentifier, $file)
function composerRequirec8fa1fa309dc9bd33487c691b894e16c($fileIdentifier, $file)
{
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
require $file;

9
vendor/composer/autoload_static.php vendored
View File

@ -4,7 +4,7 @@
namespace Composer\Autoload;
class ComposerStaticInitfea99aed40b8b9b57974b89e41cb0f3c
class ComposerStaticInitc8fa1fa309dc9bd33487c691b894e16c
{
public static $files = array (
'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php',
@ -2059,6 +2059,7 @@ class ComposerStaticInitfea99aed40b8b9b57974b89e41cb0f3c
'Rector\\CodingStyle\\Naming\\NameRenamer' => __DIR__ . '/../..' . '/rules/CodingStyle/Naming/NameRenamer.php',
'Rector\\CodingStyle\\NodeAnalyzer\\ImplodeAnalyzer' => __DIR__ . '/../..' . '/rules/CodingStyle/NodeAnalyzer/ImplodeAnalyzer.php',
'Rector\\CodingStyle\\NodeAnalyzer\\SpreadVariablesCollector' => __DIR__ . '/../..' . '/rules/CodingStyle/NodeAnalyzer/SpreadVariablesCollector.php',
'Rector\\CodingStyle\\NodeAnalyzer\\UseImportNameMatcher' => __DIR__ . '/../..' . '/rules/CodingStyle/NodeAnalyzer/UseImportNameMatcher.php',
'Rector\\CodingStyle\\NodeFactory\\ArrayCallableToMethodCallFactory' => __DIR__ . '/../..' . '/rules/CodingStyle/NodeFactory/ArrayCallableToMethodCallFactory.php',
'Rector\\CodingStyle\\NodeFactory\\JsonArrayFactory' => __DIR__ . '/../..' . '/rules/CodingStyle/NodeFactory/JsonArrayFactory.php',
'Rector\\CodingStyle\\NodeFactory\\JsonEncodeStaticCallFactory' => __DIR__ . '/../..' . '/rules/CodingStyle/NodeFactory/JsonEncodeStaticCallFactory.php',
@ -3845,9 +3846,9 @@ class ComposerStaticInitfea99aed40b8b9b57974b89e41cb0f3c
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInitfea99aed40b8b9b57974b89e41cb0f3c::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInitfea99aed40b8b9b57974b89e41cb0f3c::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInitfea99aed40b8b9b57974b89e41cb0f3c::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInitc8fa1fa309dc9bd33487c691b894e16c::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInitc8fa1fa309dc9bd33487c691b894e16c::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInitc8fa1fa309dc9bd33487c691b894e16c::$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('RectorPrefix20210708\AutoloadIncluder');
}
if (!class_exists('ComposerAutoloaderInitfea99aed40b8b9b57974b89e41cb0f3c', false) && !interface_exists('ComposerAutoloaderInitfea99aed40b8b9b57974b89e41cb0f3c', false) && !trait_exists('ComposerAutoloaderInitfea99aed40b8b9b57974b89e41cb0f3c', false)) {
spl_autoload_call('RectorPrefix20210708\ComposerAutoloaderInitfea99aed40b8b9b57974b89e41cb0f3c');
if (!class_exists('ComposerAutoloaderInitc8fa1fa309dc9bd33487c691b894e16c', false) && !interface_exists('ComposerAutoloaderInitc8fa1fa309dc9bd33487c691b894e16c', false) && !trait_exists('ComposerAutoloaderInitc8fa1fa309dc9bd33487c691b894e16c', false)) {
spl_autoload_call('RectorPrefix20210708\ComposerAutoloaderInitc8fa1fa309dc9bd33487c691b894e16c');
}
if (!class_exists('Doctrine\Inflector\Inflector', false) && !interface_exists('Doctrine\Inflector\Inflector', false) && !trait_exists('Doctrine\Inflector\Inflector', false)) {
spl_autoload_call('RectorPrefix20210708\Doctrine\Inflector\Inflector');
@ -3308,9 +3308,9 @@ if (!function_exists('print_node')) {
return \RectorPrefix20210708\print_node(...func_get_args());
}
}
if (!function_exists('composerRequirefea99aed40b8b9b57974b89e41cb0f3c')) {
function composerRequirefea99aed40b8b9b57974b89e41cb0f3c() {
return \RectorPrefix20210708\composerRequirefea99aed40b8b9b57974b89e41cb0f3c(...func_get_args());
if (!function_exists('composerRequirec8fa1fa309dc9bd33487c691b894e16c')) {
function composerRequirec8fa1fa309dc9bd33487c691b894e16c() {
return \RectorPrefix20210708\composerRequirec8fa1fa309dc9bd33487c691b894e16c(...func_get_args());
}
}
if (!function_exists('parseArgs')) {