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

Updated Rector to commit e155e52f090698bf5f313681a23c8a097a0b6774

Browse Source 
e155e52f09 [AutoImport] Handle auto import crash on docblock @SuppressWarnings(PHPMD.ElseExpression) inside anonymous class (#2808)
This commit is contained in:
Tomas Votruba 2022-08-20 09:50:50 +00:00
parent 3d2ac73661
commit 0be9fe2551
6 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,6 +16,7 @@ use PHPStan\Reflection\ReflectionProvider;
use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo;
use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
use Rector\CodingStyle\NodeAnalyzer\UseImportNameMatcher;
use Rector\Core\NodeAnalyzer\ClassAnalyzer;
use Rector\Core\PhpParser\Node\BetterNodeFinder;
use Rector\Core\Util\StringUtils;
use Rector\Core\ValueObject\Application\File;
@ -68,13 +69,19 @@ final class ShortNameResolver
* @var \Rector\CodingStyle\NodeAnalyzer\UseImportNameMatcher
*/
private $useImportNameMatcher;
public function __construct(SimpleCallableNodeTraverser $simpleCallableNodeTraverser, NodeNameResolver $nodeNameResolver, ReflectionProvider $reflectionProvider, BetterNodeFinder $betterNodeFinder, UseImportNameMatcher $useImportNameMatcher)
/**
* @readonly
* @var \Rector\Core\NodeAnalyzer\ClassAnalyzer
*/
private $classAnalyzer;
public function __construct(SimpleCallableNodeTraverser $simpleCallableNodeTraverser, NodeNameResolver $nodeNameResolver, ReflectionProvider $reflectionProvider, BetterNodeFinder $betterNodeFinder, UseImportNameMatcher $useImportNameMatcher, ClassAnalyzer $classAnalyzer)
{
$this->simpleCallableNodeTraverser = $simpleCallableNodeTraverser;
$this->nodeNameResolver = $nodeNameResolver;
$this->reflectionProvider = $reflectionProvider;
$this->betterNodeFinder = $betterNodeFinder;
$this->useImportNameMatcher = $useImportNameMatcher;
$this->classAnalyzer = $classAnalyzer;
}
// Avoids circular reference
/**
@ -210,7 +217,7 @@ final class ShortNameResolver
$shortNamesToFullyQualifiedNames = [];
foreach ($shortNames as $shortName) {
$stmtsMatchedName = $this->useImportNameMatcher->matchNameWithStmts($shortName, $stmts);
if ($reflectionClass instanceof ReflectionClass) {
if ($reflectionClass instanceof ReflectionClass && !$this->classAnalyzer->isAnonymousClassName($reflectionClass->getShortName())) {
$fullyQualifiedName = Reflection::expandClassName($shortName, $reflectionClass);
} elseif (\is_string($stmtsMatchedName)) {
$fullyQualifiedName = $stmtsMatchedName;

4
src/Application/VersionResolver.php
View File

@ -17,12 +17,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = '0ecf88aa469af79d7965bfc5efe57888d56cf88e';
public const PACKAGE_VERSION = 'e155e52f090698bf5f313681a23c8a097a0b6774';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2022-08-19 14:00:56';
public const RELEASE_DATE = '2022-08-20 11:46:47';
/**
* @var int
*/

4
src/NodeAnalyzer/ClassAnalyzer.php
View File

@ -25,6 +25,10 @@ final class ClassAnalyzer
{
$this->nodeNameResolver = $nodeNameResolver;
}
public function isAnonymousClassName(string $className) : bool
{
return StringUtils::isMatch($className, self::ANONYMOUS_CLASS_REGEX);
}
public function isAnonymousClass(Node $node) : bool
{
if (!$node instanceof Class_) {

2
vendor/autoload.php vendored
View File

@ -9,4 +9,4 @@ if (PHP_VERSION_ID < 50600) {
require_once __DIR__ . '/composer/autoload_real.php';
return ComposerAutoloaderInit236ae775483cc63b8aa6d40765321a66::getLoader();
return ComposerAutoloaderInit3dbd5509e4d2e672d332354b21c69566::getLoader();

14
vendor/composer/autoload_real.php vendored
View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInit236ae775483cc63b8aa6d40765321a66
class ComposerAutoloaderInit3dbd5509e4d2e672d332354b21c69566
{
private static $loader;
@ -22,19 +22,19 @@ class ComposerAutoloaderInit236ae775483cc63b8aa6d40765321a66
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInit236ae775483cc63b8aa6d40765321a66', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInit3dbd5509e4d2e672d332354b21c69566', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
spl_autoload_unregister(array('ComposerAutoloaderInit236ae775483cc63b8aa6d40765321a66', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInit3dbd5509e4d2e672d332354b21c69566', 'loadClassLoader'));
require __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInit236ae775483cc63b8aa6d40765321a66::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInit3dbd5509e4d2e672d332354b21c69566::getInitializer($loader));
$loader->setClassMapAuthoritative(true);
$loader->register(true);
$includeFiles = \Composer\Autoload\ComposerStaticInit236ae775483cc63b8aa6d40765321a66::$files;
$includeFiles = \Composer\Autoload\ComposerStaticInit3dbd5509e4d2e672d332354b21c69566::$files;
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequire236ae775483cc63b8aa6d40765321a66($fileIdentifier, $file);
composerRequire3dbd5509e4d2e672d332354b21c69566($fileIdentifier, $file);
}
return $loader;
@ -46,7 +46,7 @@ class ComposerAutoloaderInit236ae775483cc63b8aa6d40765321a66
* @param string $file
* @return void
*/
function composerRequire236ae775483cc63b8aa6d40765321a66($fileIdentifier, $file)
function composerRequire3dbd5509e4d2e672d332354b21c69566($fileIdentifier, $file)
{
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;

8
vendor/composer/autoload_static.php vendored
View File

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