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

Updated Rector to commit 5c32bd09e7

Browse Source 
5c32bd09e7 Remove FileNodeVisitor, available in AbstractRector (#1145)
This commit is contained in:
Tomas Votruba 2021-11-04 19:17:47 +00:00
parent 504a41770d
commit c6e32aa319
12 changed files with 22 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config/services-packages.php
View File

@ -14,7 +14,6 @@ return static function (\Symfony\Component\DependencyInjection\Loader\Configurat
__DIR__ . '/../packages/BetterPhpDocParser/PhpDoc',
__DIR__ . '/../packages/PHPStanStaticTypeMapper/Enum',
__DIR__ . '/../packages/Caching/Cache.php',
__DIR__ . '/../packages/NodeTypeResolver/NodeVisitor/FileNodeVisitor.php',
// used in PHPStan
__DIR__ . '/../packages/NodeTypeResolver/Reflection/BetterReflection/RectorBetterReflectionSourceLocatorFactory.php',
__DIR__ . '/../packages/NodeTypeResolver/Reflection/BetterReflection/SourceLocatorProvider/DynamicSourceLocatorProvider.php',

3
packages/NodeTypeResolver/NodeScopeAndMetadataDecorator.php
View File

@ -9,7 +9,6 @@ use PhpParser\NodeVisitor\CloningVisitor;
use PhpParser\NodeVisitor\NameResolver;
use PhpParser\NodeVisitor\NodeConnectingVisitor;
use Rector\Core\ValueObject\Application\File;
use Rector\NodeTypeResolver\NodeVisitor\FileNodeVisitor;
use Rector\NodeTypeResolver\NodeVisitor\FunctionLikeParamArgPositionNodeVisitor;
use Rector\NodeTypeResolver\NodeVisitor\FunctionMethodAndClassNodeVisitor;
use Rector\NodeTypeResolver\NodeVisitor\NamespaceNodeVisitor;
@ -94,8 +93,6 @@ final class NodeScopeAndMetadataDecorator
$nodeTraverserForFormatPreservePrinting->addVisitor($this->functionMethodAndClassNodeVisitor);
$nodeTraverserForFormatPreservePrinting->addVisitor($this->namespaceNodeVisitor);
$nodeTraverserForFormatPreservePrinting->addVisitor($this->functionLikeParamArgPositionNodeVisitor);
$fileNodeVisitor = new \Rector\NodeTypeResolver\NodeVisitor\FileNodeVisitor($file);
$nodeTraverserForFormatPreservePrinting->addVisitor($fileNodeVisitor);
$stmts = $nodeTraverserForFormatPreservePrinting->traverse($stmts);
// this split is needed, so nodes have names, classes and namespaces
$nodeTraverserForStmtNodeVisitor = new \PhpParser\NodeTraverser();

31
packages/NodeTypeResolver/NodeVisitor/FileNodeVisitor.php
View File

@ -1,31 +0,0 @@
<?php
declare (strict_types=1);
namespace Rector\NodeTypeResolver\NodeVisitor;
use PhpParser\Node;
use PhpParser\NodeVisitorAbstract;
use Rector\Core\ValueObject\Application\File;
use Rector\NodeTypeResolver\Node\AttributeKey;
/**
* Useful for modification of class outside current node tree
*/
final class FileNodeVisitor extends \PhpParser\NodeVisitorAbstract
{
/**
* @var \Rector\Core\ValueObject\Application\File
*/
private $file;
public function __construct(\Rector\Core\ValueObject\Application\File $file)
{
$this->file = $file;
}
/**
* @return Node
*/
public function enterNode(\PhpParser\Node $node) : ?\PhpParser\Node
{
$node->setAttribute(\Rector\NodeTypeResolver\Node\AttributeKey::FILE, $this->file);
return $node;
}
}

8
rules/Php74/Rector/LNumber/AddLiteralSeparatorToNumberRector.php
View File

@ -9,7 +9,6 @@ use PhpParser\Node\Scalar\DNumber;
use PhpParser\Node\Scalar\LNumber;
use Rector\Core\Contract\Rector\ConfigurableRectorInterface;
use Rector\Core\Rector\AbstractRector;
use Rector\Core\ValueObject\Application\File;
use Rector\Core\ValueObject\PhpVersionFeature;
use Rector\NodeTypeResolver\Node\AttributeKey;
use Rector\VersionBonding\Contract\MinPhpVersionInterface;
@ -119,12 +118,7 @@ CODE_SAMPLE
{
/** @var int $startToken */
$startToken = $node->getAttribute(\Rector\NodeTypeResolver\Node\AttributeKey::START_TOKEN_POSITION);
$file = $node->getAttribute(\Rector\NodeTypeResolver\Node\AttributeKey::FILE);
// new node
if (!$file instanceof \Rector\Core\ValueObject\Application\File) {
return \true;
}
$oldTokens = $file->getOldTokens();
$oldTokens = $this->file->getOldTokens();
foreach ($oldTokens[$startToken] as $token) {
if (!\is_string($token)) {
continue;

4
rules/PhpSpecToPHPUnit/Rector/Class_/RenameSpecFileToTestFileRector.php
View File

@ -7,7 +7,6 @@ use RectorPrefix20211104\Nette\Utils\Strings;
use PhpParser\Node;
use PhpParser\Node\Stmt\Class_;
use Rector\Core\Rector\AbstractRector;
use Rector\NodeTypeResolver\Node\AttributeKey;
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
/**
@ -56,8 +55,7 @@ CODE_SAMPLE
return null;
}
$newPathName = $this->createPathName($oldPathname);
$file = $node->getAttribute(\Rector\NodeTypeResolver\Node\AttributeKey::FILE);
$this->removedAndAddedFilesCollector->addMovedFile($file, $newPathName);
$this->removedAndAddedFilesCollector->addMovedFile($this->file, $newPathName);
return null;
}
private function createPathName(string $oldRealPath) : string

7
rules/Restoration/Rector/ClassLike/UpdateFileNameByClassNameFileSystemRector.php
View File

@ -7,7 +7,6 @@ use PhpParser\Node;
use PhpParser\Node\Stmt\ClassLike;
use Rector\Core\Rector\AbstractRector;
use Rector\Core\ValueObject\Application\File;
use Rector\NodeTypeResolver\Node\AttributeKey;
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
/**
@ -53,13 +52,9 @@ CODE_SAMPLE
if ($classShortName === $smartFileInfo->getBasenameWithoutSuffix()) {
return null;
}
$file = $node->getAttribute(\Rector\NodeTypeResolver\Node\AttributeKey::FILE);
if (!$file instanceof \Rector\Core\ValueObject\Application\File) {
return null;
}
// no match → rename file
$newFileLocation = $smartFileInfo->getPath() . \DIRECTORY_SEPARATOR . $classShortName . '.php';
$this->removedAndAddedFilesCollector->addMovedFile($file, $newFileLocation);
$this->removedAndAddedFilesCollector->addMovedFile($this->file, $newFileLocation);
return null;
}
}

4
src/Application/VersionResolver.php
View File

@ -16,11 +16,11 @@ final class VersionResolver
/**
* @var string
*/
public const PACKAGE_VERSION = 'f8e04774ad93d0979b0a9eee8fd2e2c555ff19ad';
public const PACKAGE_VERSION = '5c32bd09e7a3436116186fa3ff2d65f560b5fe04';
/**
* @var string
*/
public const RELEASE_DATE = '2021-11-04 15:10:58';
public const RELEASE_DATE = '2021-11-04 20:02:26';
public static function resolvePackageVersion() : string
{
$process = new \RectorPrefix20211104\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 ComposerAutoloaderInit8606adfb58c31a5828314bde797c880e::getLoader();
return ComposerAutoloaderInita1959cb0b2b596a647288ac471503642::getLoader();

1
vendor/composer/autoload_classmap.php vendored
View File

@ -2170,7 +2170,6 @@ return array(
'Rector\\NodeTypeResolver\\NodeTypeResolver\\StaticCallMethodCallTypeResolver' => $baseDir . '/packages/NodeTypeResolver/NodeTypeResolver/StaticCallMethodCallTypeResolver.php',
'Rector\\NodeTypeResolver\\NodeTypeResolver\\TraitTypeResolver' => $baseDir . '/packages/NodeTypeResolver/NodeTypeResolver/TraitTypeResolver.php',
'Rector\\NodeTypeResolver\\NodeTypeResolver\\VariableTypeResolver' => $baseDir . '/packages/NodeTypeResolver/NodeTypeResolver/VariableTypeResolver.php',
'Rector\\NodeTypeResolver\\NodeVisitor\\FileNodeVisitor' => $baseDir . '/packages/NodeTypeResolver/NodeVisitor/FileNodeVisitor.php',
'Rector\\NodeTypeResolver\\NodeVisitor\\FunctionLikeParamArgPositionNodeVisitor' => $baseDir . '/packages/NodeTypeResolver/NodeVisitor/FunctionLikeParamArgPositionNodeVisitor.php',
'Rector\\NodeTypeResolver\\NodeVisitor\\FunctionMethodAndClassNodeVisitor' => $baseDir . '/packages/NodeTypeResolver/NodeVisitor/FunctionMethodAndClassNodeVisitor.php',
'Rector\\NodeTypeResolver\\NodeVisitor\\NamespaceNodeVisitor' => $baseDir . '/packages/NodeTypeResolver/NodeVisitor/NamespaceNodeVisitor.php',

14
vendor/composer/autoload_real.php vendored
View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInit8606adfb58c31a5828314bde797c880e
class ComposerAutoloaderInita1959cb0b2b596a647288ac471503642
{
private static $loader;
@ -22,15 +22,15 @@ class ComposerAutoloaderInit8606adfb58c31a5828314bde797c880e
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInit8606adfb58c31a5828314bde797c880e', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInita1959cb0b2b596a647288ac471503642', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
spl_autoload_unregister(array('ComposerAutoloaderInit8606adfb58c31a5828314bde797c880e', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInita1959cb0b2b596a647288ac471503642', '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\ComposerStaticInit8606adfb58c31a5828314bde797c880e::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInita1959cb0b2b596a647288ac471503642::getInitializer($loader));
} else {
$classMap = require __DIR__ . '/autoload_classmap.php';
if ($classMap) {
@ -42,19 +42,19 @@ class ComposerAutoloaderInit8606adfb58c31a5828314bde797c880e
$loader->register(true);
if ($useStaticLoader) {
$includeFiles = Composer\Autoload\ComposerStaticInit8606adfb58c31a5828314bde797c880e::$files;
$includeFiles = Composer\Autoload\ComposerStaticInita1959cb0b2b596a647288ac471503642::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequire8606adfb58c31a5828314bde797c880e($fileIdentifier, $file);
composerRequirea1959cb0b2b596a647288ac471503642($fileIdentifier, $file);
}
return $loader;
}
}
function composerRequire8606adfb58c31a5828314bde797c880e($fileIdentifier, $file)
function composerRequirea1959cb0b2b596a647288ac471503642($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 ComposerStaticInit8606adfb58c31a5828314bde797c880e
class ComposerStaticInita1959cb0b2b596a647288ac471503642
{
public static $files = array (
'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php',
@ -2500,7 +2500,6 @@ class ComposerStaticInit8606adfb58c31a5828314bde797c880e
'Rector\\NodeTypeResolver\\NodeTypeResolver\\StaticCallMethodCallTypeResolver' => __DIR__ . '/../..' . '/packages/NodeTypeResolver/NodeTypeResolver/StaticCallMethodCallTypeResolver.php',
'Rector\\NodeTypeResolver\\NodeTypeResolver\\TraitTypeResolver' => __DIR__ . '/../..' . '/packages/NodeTypeResolver/NodeTypeResolver/TraitTypeResolver.php',
'Rector\\NodeTypeResolver\\NodeTypeResolver\\VariableTypeResolver' => __DIR__ . '/../..' . '/packages/NodeTypeResolver/NodeTypeResolver/VariableTypeResolver.php',
'Rector\\NodeTypeResolver\\NodeVisitor\\FileNodeVisitor' => __DIR__ . '/../..' . '/packages/NodeTypeResolver/NodeVisitor/FileNodeVisitor.php',
'Rector\\NodeTypeResolver\\NodeVisitor\\FunctionLikeParamArgPositionNodeVisitor' => __DIR__ . '/../..' . '/packages/NodeTypeResolver/NodeVisitor/FunctionLikeParamArgPositionNodeVisitor.php',
'Rector\\NodeTypeResolver\\NodeVisitor\\FunctionMethodAndClassNodeVisitor' => __DIR__ . '/../..' . '/packages/NodeTypeResolver/NodeVisitor/FunctionMethodAndClassNodeVisitor.php',
'Rector\\NodeTypeResolver\\NodeVisitor\\NamespaceNodeVisitor' => __DIR__ . '/../..' . '/packages/NodeTypeResolver/NodeVisitor/NamespaceNodeVisitor.php',
@ -3530,9 +3529,9 @@ class ComposerStaticInit8606adfb58c31a5828314bde797c880e
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit8606adfb58c31a5828314bde797c880e::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit8606adfb58c31a5828314bde797c880e::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit8606adfb58c31a5828314bde797c880e::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInita1959cb0b2b596a647288ac471503642::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInita1959cb0b2b596a647288ac471503642::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInita1959cb0b2b596a647288ac471503642::$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('RectorPrefix20211104\AutoloadIncluder');
}
if (!class_exists('ComposerAutoloaderInit8606adfb58c31a5828314bde797c880e', false) && !interface_exists('ComposerAutoloaderInit8606adfb58c31a5828314bde797c880e', false) && !trait_exists('ComposerAutoloaderInit8606adfb58c31a5828314bde797c880e', false)) {
spl_autoload_call('RectorPrefix20211104\ComposerAutoloaderInit8606adfb58c31a5828314bde797c880e');
if (!class_exists('ComposerAutoloaderInita1959cb0b2b596a647288ac471503642', false) && !interface_exists('ComposerAutoloaderInita1959cb0b2b596a647288ac471503642', false) && !trait_exists('ComposerAutoloaderInita1959cb0b2b596a647288ac471503642', false)) {
spl_autoload_call('RectorPrefix20211104\ComposerAutoloaderInita1959cb0b2b596a647288ac471503642');
}
if (!class_exists('Helmich\TypoScriptParser\Parser\AST\Statement', false) && !interface_exists('Helmich\TypoScriptParser\Parser\AST\Statement', false) && !trait_exists('Helmich\TypoScriptParser\Parser\AST\Statement', false)) {
spl_autoload_call('RectorPrefix20211104\Helmich\TypoScriptParser\Parser\AST\Statement');
@ -3306,9 +3306,9 @@ if (!function_exists('print_node')) {
return \RectorPrefix20211104\print_node(...func_get_args());
}
}
if (!function_exists('composerRequire8606adfb58c31a5828314bde797c880e')) {
function composerRequire8606adfb58c31a5828314bde797c880e() {
return \RectorPrefix20211104\composerRequire8606adfb58c31a5828314bde797c880e(...func_get_args());
if (!function_exists('composerRequirea1959cb0b2b596a647288ac471503642')) {
function composerRequirea1959cb0b2b596a647288ac471503642() {
return \RectorPrefix20211104\composerRequirea1959cb0b2b596a647288ac471503642(...func_get_args());
}
}
if (!function_exists('parseArgs')) {