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

Updated Rector to commit a454c7ae38

Browse Source 
a454c7ae38 Fix missing class report (#294)
This commit is contained in:
Tomas Votruba 2021-06-25 17:38:41 +00:00
parent ee74a781ed
commit bd2ccc1d93
6 changed files with 49 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
packages/NodeTypeResolver/PHPStan/Scope/PHPStanNodeScopeResolver.php
View File

@ -13,11 +13,13 @@ use PHPStan\AnalysedCodeException;
use PHPStan\Analyser\MutatingScope;
use PHPStan\Analyser\NodeScopeResolver;
use PHPStan\Analyser\Scope;
use PHPStan\BetterReflection\Reflector\Exception\IdentifierNotFound;
use PHPStan\Node\UnreachableStatementNode;
use PHPStan\Reflection\ClassReflection;
use PHPStan\Reflection\ReflectionProvider;
use Rector\Caching\Detector\ChangedFilesDetector;
use Rector\Caching\FileSystem\DependencyResolver;
use Rector\Core\Configuration\RenamedClassesDataCollector;
use Rector\Core\Exception\ShouldNotHappenException;
use Rector\NodeTypeResolver\Node\AttributeKey;
use Rector\NodeTypeResolver\PHPStan\Collector\TraitNodeScopeCollector;
@ -62,7 +64,11 @@ final class PHPStanNodeScopeResolver
* @var \Rector\NodeTypeResolver\PHPStan\Collector\TraitNodeScopeCollector
*/
private $traitNodeScopeCollector;
public function __construct(\Rector\Caching\Detector\ChangedFilesDetector $changedFilesDetector, \Rector\Caching\FileSystem\DependencyResolver $dependencyResolver, \PHPStan\Analyser\NodeScopeResolver $nodeScopeResolver, \PHPStan\Reflection\ReflectionProvider $reflectionProvider, \Rector\NodeTypeResolver\PHPStan\Scope\NodeVisitor\RemoveDeepChainMethodCallNodeVisitor $removeDeepChainMethodCallNodeVisitor, \Rector\NodeTypeResolver\PHPStan\Scope\ScopeFactory $scopeFactory, \Rector\NodeTypeResolver\PHPStan\Collector\TraitNodeScopeCollector $traitNodeScopeCollector)
/**
* @var \Rector\Core\Configuration\RenamedClassesDataCollector
*/
private $renamedClassesDataCollector;
public function __construct(\Rector\Caching\Detector\ChangedFilesDetector $changedFilesDetector, \Rector\Caching\FileSystem\DependencyResolver $dependencyResolver, \PHPStan\Analyser\NodeScopeResolver $nodeScopeResolver, \PHPStan\Reflection\ReflectionProvider $reflectionProvider, \Rector\NodeTypeResolver\PHPStan\Scope\NodeVisitor\RemoveDeepChainMethodCallNodeVisitor $removeDeepChainMethodCallNodeVisitor, \Rector\NodeTypeResolver\PHPStan\Scope\ScopeFactory $scopeFactory, \Rector\NodeTypeResolver\PHPStan\Collector\TraitNodeScopeCollector $traitNodeScopeCollector, \Rector\Core\Configuration\RenamedClassesDataCollector $renamedClassesDataCollector)
{
$this->changedFilesDetector = $changedFilesDetector;
$this->dependencyResolver = $dependencyResolver;
@ -71,6 +77,7 @@ final class PHPStanNodeScopeResolver
$this->removeDeepChainMethodCallNodeVisitor = $removeDeepChainMethodCallNodeVisitor;
$this->scopeFactory = $scopeFactory;
$this->traitNodeScopeCollector = $traitNodeScopeCollector;
$this->renamedClassesDataCollector = $renamedClassesDataCollector;
}
/**
* @param Stmt[] $nodes
@ -105,8 +112,12 @@ final class PHPStanNodeScopeResolver
$node->setAttribute(\Rector\NodeTypeResolver\Node\AttributeKey::SCOPE, $scope);
}
};
/** @var MutatingScope $scope */
$this->nodeScopeResolver->processNodes($nodes, $scope, $nodeCallback);
try {
/** @var MutatingScope $scope */
$this->nodeScopeResolver->processNodes($nodes, $scope, $nodeCallback);
} catch (\PHPStan\BetterReflection\Reflector\Exception\IdentifierNotFound $identifierNotFound) {
$this->reportOrSkip($identifierNotFound);
}
$this->resolveAndSaveDependentFiles($nodes, $scope, $smartFileInfo);
return $nodes;
}
@ -165,4 +176,20 @@ final class PHPStanNodeScopeResolver
}
$this->changedFilesDetector->addFileWithDependencies($smartFileInfo, $dependentFiles);
}
/**
* In case PHPStan tried to parse a file with missing class, it fails.
* But sometimes we want to rename old class that is missing with Rector..
*
* That's why we have to skip fatal errors of PHPStan caused by missing class,
* so Rector can fix it first. Then run Rector again to refactor code with new classes.
*/
private function reportOrSkip(\PHPStan\BetterReflection\Reflector\Exception\IdentifierNotFound $identifierNotFound) : void
{
foreach ($this->renamedClassesDataCollector->getOldClasses() as $oldClass) {
if (\strpos($identifierNotFound->getMessage(), $oldClass) !== \false) {
return;
}
}
throw $identifierNotFound;
}
}

4
src/Application/VersionResolver.php
View File

@ -16,11 +16,11 @@ final class VersionResolver
/**
* @var string
*/
public const PACKAGE_VERSION = 'b6ddc63137b01d2aa4086de62c7b7630c03213cd';
public const PACKAGE_VERSION = 'a454c7ae38655b0edaebbc8f78338eac5a4029c5';
/**
* @var string
*/
public const RELEASE_DATE = '2021-06-25 19:01:30';
public const RELEASE_DATE = '2021-06-25 19:24:20';
public static function resolvePackageVersion() : string
{
$process = new \RectorPrefix20210625\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 ComposerAutoloaderInitd327e0b61b7bf704f8f54aa9f462bc8a::getLoader();
return ComposerAutoloaderInit179d80d9a8b8f6b75f4dde1f784ee75a::getLoader();

14
vendor/composer/autoload_real.php vendored
View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInitd327e0b61b7bf704f8f54aa9f462bc8a
class ComposerAutoloaderInit179d80d9a8b8f6b75f4dde1f784ee75a
{
private static $loader;
@ -22,15 +22,15 @@ class ComposerAutoloaderInitd327e0b61b7bf704f8f54aa9f462bc8a
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInitd327e0b61b7bf704f8f54aa9f462bc8a', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInit179d80d9a8b8f6b75f4dde1f784ee75a', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
spl_autoload_unregister(array('ComposerAutoloaderInitd327e0b61b7bf704f8f54aa9f462bc8a', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInit179d80d9a8b8f6b75f4dde1f784ee75a', '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\ComposerStaticInitd327e0b61b7bf704f8f54aa9f462bc8a::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInit179d80d9a8b8f6b75f4dde1f784ee75a::getInitializer($loader));
} else {
$classMap = require __DIR__ . '/autoload_classmap.php';
if ($classMap) {
@ -42,19 +42,19 @@ class ComposerAutoloaderInitd327e0b61b7bf704f8f54aa9f462bc8a
$loader->register(true);
if ($useStaticLoader) {
$includeFiles = Composer\Autoload\ComposerStaticInitd327e0b61b7bf704f8f54aa9f462bc8a::$files;
$includeFiles = Composer\Autoload\ComposerStaticInit179d80d9a8b8f6b75f4dde1f784ee75a::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequired327e0b61b7bf704f8f54aa9f462bc8a($fileIdentifier, $file);
composerRequire179d80d9a8b8f6b75f4dde1f784ee75a($fileIdentifier, $file);
}
return $loader;
}
}
function composerRequired327e0b61b7bf704f8f54aa9f462bc8a($fileIdentifier, $file)
function composerRequire179d80d9a8b8f6b75f4dde1f784ee75a($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 ComposerStaticInitd327e0b61b7bf704f8f54aa9f462bc8a
class ComposerStaticInit179d80d9a8b8f6b75f4dde1f784ee75a
{
public static $files = array (
'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php',
@ -3838,9 +3838,9 @@ class ComposerStaticInitd327e0b61b7bf704f8f54aa9f462bc8a
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInitd327e0b61b7bf704f8f54aa9f462bc8a::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInitd327e0b61b7bf704f8f54aa9f462bc8a::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInitd327e0b61b7bf704f8f54aa9f462bc8a::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInit179d80d9a8b8f6b75f4dde1f784ee75a::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit179d80d9a8b8f6b75f4dde1f784ee75a::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit179d80d9a8b8f6b75f4dde1f784ee75a::$classMap;
}, null, ClassLoader::class);
}

10
vendor/scoper-autoload.php vendored
View File

@ -21,8 +21,8 @@ if (!class_exists('SomeTestCase', false) && !interface_exists('SomeTestCase', fa
if (!class_exists('CheckoutEntityFactory', false) && !interface_exists('CheckoutEntityFactory', false) && !trait_exists('CheckoutEntityFactory', false)) {
spl_autoload_call('RectorPrefix20210625\CheckoutEntityFactory');
}
if (!class_exists('ComposerAutoloaderInitd327e0b61b7bf704f8f54aa9f462bc8a', false) && !interface_exists('ComposerAutoloaderInitd327e0b61b7bf704f8f54aa9f462bc8a', false) && !trait_exists('ComposerAutoloaderInitd327e0b61b7bf704f8f54aa9f462bc8a', false)) {
spl_autoload_call('RectorPrefix20210625\ComposerAutoloaderInitd327e0b61b7bf704f8f54aa9f462bc8a');
if (!class_exists('ComposerAutoloaderInit179d80d9a8b8f6b75f4dde1f784ee75a', false) && !interface_exists('ComposerAutoloaderInit179d80d9a8b8f6b75f4dde1f784ee75a', false) && !trait_exists('ComposerAutoloaderInit179d80d9a8b8f6b75f4dde1f784ee75a', false)) {
spl_autoload_call('RectorPrefix20210625\ComposerAutoloaderInit179d80d9a8b8f6b75f4dde1f784ee75a');
}
if (!class_exists('Doctrine\Inflector\Inflector', false) && !interface_exists('Doctrine\Inflector\Inflector', false) && !trait_exists('Doctrine\Inflector\Inflector', false)) {
spl_autoload_call('RectorPrefix20210625\Doctrine\Inflector\Inflector');
@ -3320,9 +3320,9 @@ if (!function_exists('print_node')) {
return \RectorPrefix20210625\print_node(...func_get_args());
}
}
if (!function_exists('composerRequired327e0b61b7bf704f8f54aa9f462bc8a')) {
function composerRequired327e0b61b7bf704f8f54aa9f462bc8a() {
return \RectorPrefix20210625\composerRequired327e0b61b7bf704f8f54aa9f462bc8a(...func_get_args());
if (!function_exists('composerRequire179d80d9a8b8f6b75f4dde1f784ee75a')) {
function composerRequire179d80d9a8b8f6b75f4dde1f784ee75a() {
return \RectorPrefix20210625\composerRequire179d80d9a8b8f6b75f4dde1f784ee75a(...func_get_args());
}
}
if (!function_exists('parseArgs')) {