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

Updated Rector to commit 1f17cbafe7

Browse Source 
1f17cbafe7 use traversing directly
This commit is contained in:
Tomas Votruba 2021-07-01 23:51:20 +00:00
parent 834b7561a3
commit 08dc46e6d9
8 changed files with 38 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
rules/Php80/PhpDocNodeVisitor/AnnotationToAttributePhpDocNodeVisitor.php
View File

@ -1,69 +0,0 @@
<?php
declare (strict_types=1);
namespace Rector\Php80\PhpDocNodeVisitor;
use PHPStan\PhpDocParser\Ast\Node;
use Rector\BetterPhpDocParser\PhpDoc\DoctrineAnnotationTagValueNode;
use Rector\BetterPhpDocParser\ValueObject\PhpDocAttributeKey;
use Rector\Core\Exception\ShouldNotHappenException;
use Rector\Php80\ValueObject\AnnotationToAttribute;
use Rector\Php80\ValueObject\DoctrineTagAndAnnotationToAttribute;
use RectorPrefix20210701\Symplify\SimplePhpDocParser\PhpDocNodeTraverser;
use RectorPrefix20210701\Symplify\SimplePhpDocParser\PhpDocNodeVisitor\AbstractPhpDocNodeVisitor;
final class AnnotationToAttributePhpDocNodeVisitor extends \RectorPrefix20210701\Symplify\SimplePhpDocParser\PhpDocNodeVisitor\AbstractPhpDocNodeVisitor
{
/**
* @var AnnotationToAttribute[]
*/
private $annotationsToAttributes = [];
/**
* @var DoctrineTagAndAnnotationToAttribute[]
*/
private $doctrineTagAndAnnotationToAttributes = [];
/**
* @param AnnotationToAttribute[] $annotationsToAttributes
*/
public function configureAnnotationsToAttributes(array $annotationsToAttributes) : void
{
$this->annotationsToAttributes = $annotationsToAttributes;
}
public function beforeTraverse(\PHPStan\PhpDocParser\Ast\Node $node) : void
{
$this->doctrineTagAndAnnotationToAttributes = [];
if ($this->annotationsToAttributes !== []) {
return;
}
throw new \Rector\Core\Exception\ShouldNotHappenException('Configure annotations to attributes via "configureAnnotationsToAttributes()" method first');
}
/**
* @return int|\PHPStan\PhpDocParser\Ast\Node|null
*/
public function enterNode(\PHPStan\PhpDocParser\Ast\Node $node)
{
if (!$node instanceof \Rector\BetterPhpDocParser\PhpDoc\DoctrineAnnotationTagValueNode) {
return $node;
}
foreach ($this->annotationsToAttributes as $annotationToAttribute) {
if (!$node->hasClassName($annotationToAttribute->getTag())) {
continue;
}
$this->doctrineTagAndAnnotationToAttributes[] = new \Rector\Php80\ValueObject\DoctrineTagAndAnnotationToAttribute($node, $annotationToAttribute);
$parentNode = $node->getAttribute(\Rector\BetterPhpDocParser\ValueObject\PhpDocAttributeKey::PARENT);
if ($parentNode instanceof \PHPStan\PhpDocParser\Ast\Node) {
// invoke re-print
$parentNode->setAttribute(\Rector\BetterPhpDocParser\ValueObject\PhpDocAttributeKey::ORIG_NODE, null);
}
// remove the original doctrine annotation, it becomes an attribute
return \RectorPrefix20210701\Symplify\SimplePhpDocParser\PhpDocNodeTraverser::NODE_REMOVE;
}
return $node;
}
/**
* @return DoctrineTagAndAnnotationToAttribute[]
*/
public function provideFound() : array
{
return $this->doctrineTagAndAnnotationToAttributes;
}
}

38
rules/Php80/Rector/Class_/AnnotationToAttributeRector.php
View File

@ -11,8 +11,8 @@ use PhpParser\Node\Stmt\ClassMethod;
use PhpParser\Node\Stmt\Function_;
use PhpParser\Node\Stmt\Property;
use PHPStan\PhpDocParser\Ast\PhpDoc\GenericTagValueNode;
use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocNode;
use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTagValueNode;
use Rector\BetterPhpDocParser\PhpDoc\DoctrineAnnotationTagValueNode;
use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo;
use Rector\BetterPhpDocParser\PhpDocManipulator\PhpDocTagRemover;
use Rector\Core\Contract\Rector\ConfigurableRectorInterface;
@ -49,15 +49,10 @@ final class AnnotationToAttributeRector extends \Rector\Core\Rector\AbstractRect
* @var \Rector\BetterPhpDocParser\PhpDocManipulator\PhpDocTagRemover
*/
private $phpDocTagRemover;
/**
* @var \Rector\Php80\PhpDocNodeVisitor\AnnotationToAttributePhpDocNodeVisitor
*/
private $annotationToAttributePhpDocNodeVisitor;
public function __construct(\Rector\PhpAttribute\Printer\PhpAttributeGroupFactory $phpAttributeGroupFactory, \Rector\BetterPhpDocParser\PhpDocManipulator\PhpDocTagRemover $phpDocTagRemover, \Rector\Php80\PhpDocNodeVisitor\AnnotationToAttributePhpDocNodeVisitor $annotationToAttributePhpDocNodeVisitor)
public function __construct(\Rector\PhpAttribute\Printer\PhpAttributeGroupFactory $phpAttributeGroupFactory, \Rector\BetterPhpDocParser\PhpDocManipulator\PhpDocTagRemover $phpDocTagRemover)
{
$this->phpAttributeGroupFactory = $phpAttributeGroupFactory;
$this->phpDocTagRemover = $phpDocTagRemover;
$this->annotationToAttributePhpDocNodeVisitor = $annotationToAttributePhpDocNodeVisitor;
}
public function getRuleDefinition() : \Symplify\RuleDocGenerator\ValueObject\RuleDefinition
{
@ -161,7 +156,23 @@ CODE_SAMPLE
*/
private function processDoctrineAnnotationClasses(\Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo $phpDocInfo, $node) : void
{
$doctrineTagAndAnnotationToAttributes = $this->collectDoctrineTagAndAnnotationToAttribute($phpDocInfo->getPhpDocNode());
$doctrineTagAndAnnotationToAttributes = [];
$phpDocNodeTraverser = new \RectorPrefix20210701\Symplify\SimplePhpDocParser\PhpDocNodeTraverser();
$phpDocNodeTraverser->traverseWithCallable($phpDocInfo->getPhpDocNode(), '', function ($node) use(&$doctrineTagAndAnnotationToAttributes, $phpDocInfo) {
if (!$node instanceof \Rector\BetterPhpDocParser\PhpDoc\DoctrineAnnotationTagValueNode) {
return $node;
}
foreach ($this->annotationsToAttributes as $annotationToAttribute) {
if (!$node->hasClassName($annotationToAttribute->getTag())) {
continue;
}
$doctrineTagAndAnnotationToAttributes[] = new \Rector\Php80\ValueObject\DoctrineTagAndAnnotationToAttribute($node, $annotationToAttribute);
$phpDocInfo->markAsChanged();
// remove the original doctrine annotation, it becomes an attribute
return \RectorPrefix20210701\Symplify\SimplePhpDocParser\PhpDocNodeTraverser::NODE_REMOVE;
}
return $node;
});
foreach ($doctrineTagAndAnnotationToAttributes as $doctrineTagAndAnnotationToAttribute) {
$doctrineAnnotationTagValueNode = $doctrineTagAndAnnotationToAttribute->getDoctrineAnnotationTagValueNode();
// 1. remove php-doc tag
@ -170,15 +181,4 @@ CODE_SAMPLE
$node->attrGroups[] = $this->phpAttributeGroupFactory->create($doctrineAnnotationTagValueNode, $doctrineTagAndAnnotationToAttribute->getAnnotationToAttribute());
}
}
/**
* @return DoctrineTagAndAnnotationToAttribute[]
*/
private function collectDoctrineTagAndAnnotationToAttribute(\PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocNode $phpDocNode) : array
{
$phpDocNodeTraverser = new \RectorPrefix20210701\Symplify\SimplePhpDocParser\PhpDocNodeTraverser();
$this->annotationToAttributePhpDocNodeVisitor->configureAnnotationsToAttributes($this->annotationsToAttributes);
$phpDocNodeTraverser->addPhpDocNodeVisitor($this->annotationToAttributePhpDocNodeVisitor);
$phpDocNodeTraverser->traverse($phpDocNode);
return $this->annotationToAttributePhpDocNodeVisitor->provideFound();
}
}

4
src/Application/VersionResolver.php
View File

@ -16,11 +16,11 @@ final class VersionResolver
/**
* @var string
*/
public const PACKAGE_VERSION = '26d09da027e267138fb3a56a45153a5b17e33457';
public const PACKAGE_VERSION = '1f17cbafe73911b47d6efc6ad4b1e5ab6b5a0413';
/**
* @var string
*/
public const RELEASE_DATE = '2021-07-02 01:09:32';
public const RELEASE_DATE = '2021-07-02 01:40:13';
public static function resolvePackageVersion() : string
{
$process = new \RectorPrefix20210701\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 ComposerAutoloaderInitefee17aa1ce0aa8772a4efdc1a8cedbd::getLoader();
return ComposerAutoloaderInited43e0ffc90eb1a247ae92ed3beab5b9::getLoader();

1
vendor/composer/autoload_classmap.php vendored
View File

@ -2733,7 +2733,6 @@ return array(
'Rector\\Php80\\NodeResolver\\ArgumentSorter' => $baseDir . '/rules/Php80/NodeResolver/ArgumentSorter.php',
'Rector\\Php80\\NodeResolver\\RequireOptionalParamResolver' => $baseDir . '/rules/Php80/NodeResolver/RequireOptionalParamResolver.php',
'Rector\\Php80\\NodeResolver\\SwitchExprsResolver' => $baseDir . '/rules/Php80/NodeResolver/SwitchExprsResolver.php',
'Rector\\Php80\\PhpDocNodeVisitor\\AnnotationToAttributePhpDocNodeVisitor' => $baseDir . '/rules/Php80/PhpDocNodeVisitor/AnnotationToAttributePhpDocNodeVisitor.php',
'Rector\\Php80\\Rector\\Catch_\\RemoveUnusedVariableInCatchRector' => $baseDir . '/rules/Php80/Rector/Catch_/RemoveUnusedVariableInCatchRector.php',
'Rector\\Php80\\Rector\\ClassMethod\\FinalPrivateToPrivateVisibilityRector' => $baseDir . '/rules/Php80/Rector/ClassMethod/FinalPrivateToPrivateVisibilityRector.php',
'Rector\\Php80\\Rector\\ClassMethod\\OptionalParametersAfterRequiredRector' => $baseDir . '/rules/Php80/Rector/ClassMethod/OptionalParametersAfterRequiredRector.php',

14
vendor/composer/autoload_real.php vendored
View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInitefee17aa1ce0aa8772a4efdc1a8cedbd
class ComposerAutoloaderInited43e0ffc90eb1a247ae92ed3beab5b9
{
private static $loader;
@ -22,15 +22,15 @@ class ComposerAutoloaderInitefee17aa1ce0aa8772a4efdc1a8cedbd
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInitefee17aa1ce0aa8772a4efdc1a8cedbd', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInited43e0ffc90eb1a247ae92ed3beab5b9', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
spl_autoload_unregister(array('ComposerAutoloaderInitefee17aa1ce0aa8772a4efdc1a8cedbd', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInited43e0ffc90eb1a247ae92ed3beab5b9', '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\ComposerStaticInitefee17aa1ce0aa8772a4efdc1a8cedbd::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInited43e0ffc90eb1a247ae92ed3beab5b9::getInitializer($loader));
} else {
$classMap = require __DIR__ . '/autoload_classmap.php';
if ($classMap) {
@ -42,19 +42,19 @@ class ComposerAutoloaderInitefee17aa1ce0aa8772a4efdc1a8cedbd
$loader->register(true);
if ($useStaticLoader) {
$includeFiles = Composer\Autoload\ComposerStaticInitefee17aa1ce0aa8772a4efdc1a8cedbd::$files;
$includeFiles = Composer\Autoload\ComposerStaticInited43e0ffc90eb1a247ae92ed3beab5b9::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequireefee17aa1ce0aa8772a4efdc1a8cedbd($fileIdentifier, $file);
composerRequireed43e0ffc90eb1a247ae92ed3beab5b9($fileIdentifier, $file);
}
return $loader;
}
}
function composerRequireefee17aa1ce0aa8772a4efdc1a8cedbd($fileIdentifier, $file)
function composerRequireed43e0ffc90eb1a247ae92ed3beab5b9($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 ComposerStaticInitefee17aa1ce0aa8772a4efdc1a8cedbd
class ComposerStaticInited43e0ffc90eb1a247ae92ed3beab5b9
{
public static $files = array (
'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php',
@ -3088,7 +3088,6 @@ class ComposerStaticInitefee17aa1ce0aa8772a4efdc1a8cedbd
'Rector\\Php80\\NodeResolver\\ArgumentSorter' => __DIR__ . '/../..' . '/rules/Php80/NodeResolver/ArgumentSorter.php',
'Rector\\Php80\\NodeResolver\\RequireOptionalParamResolver' => __DIR__ . '/../..' . '/rules/Php80/NodeResolver/RequireOptionalParamResolver.php',
'Rector\\Php80\\NodeResolver\\SwitchExprsResolver' => __DIR__ . '/../..' . '/rules/Php80/NodeResolver/SwitchExprsResolver.php',
'Rector\\Php80\\PhpDocNodeVisitor\\AnnotationToAttributePhpDocNodeVisitor' => __DIR__ . '/../..' . '/rules/Php80/PhpDocNodeVisitor/AnnotationToAttributePhpDocNodeVisitor.php',
'Rector\\Php80\\Rector\\Catch_\\RemoveUnusedVariableInCatchRector' => __DIR__ . '/../..' . '/rules/Php80/Rector/Catch_/RemoveUnusedVariableInCatchRector.php',
'Rector\\Php80\\Rector\\ClassMethod\\FinalPrivateToPrivateVisibilityRector' => __DIR__ . '/../..' . '/rules/Php80/Rector/ClassMethod/FinalPrivateToPrivateVisibilityRector.php',
'Rector\\Php80\\Rector\\ClassMethod\\OptionalParametersAfterRequiredRector' => __DIR__ . '/../..' . '/rules/Php80/Rector/ClassMethod/OptionalParametersAfterRequiredRector.php',
@ -3845,9 +3844,9 @@ class ComposerStaticInitefee17aa1ce0aa8772a4efdc1a8cedbd
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInitefee17aa1ce0aa8772a4efdc1a8cedbd::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInitefee17aa1ce0aa8772a4efdc1a8cedbd::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInitefee17aa1ce0aa8772a4efdc1a8cedbd::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInited43e0ffc90eb1a247ae92ed3beab5b9::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInited43e0ffc90eb1a247ae92ed3beab5b9::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInited43e0ffc90eb1a247ae92ed3beab5b9::$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('RectorPrefix20210701\CheckoutEntityFactory');
}
if (!class_exists('ComposerAutoloaderInitefee17aa1ce0aa8772a4efdc1a8cedbd', false) && !interface_exists('ComposerAutoloaderInitefee17aa1ce0aa8772a4efdc1a8cedbd', false) && !trait_exists('ComposerAutoloaderInitefee17aa1ce0aa8772a4efdc1a8cedbd', false)) {
spl_autoload_call('RectorPrefix20210701\ComposerAutoloaderInitefee17aa1ce0aa8772a4efdc1a8cedbd');
if (!class_exists('ComposerAutoloaderInited43e0ffc90eb1a247ae92ed3beab5b9', false) && !interface_exists('ComposerAutoloaderInited43e0ffc90eb1a247ae92ed3beab5b9', false) && !trait_exists('ComposerAutoloaderInited43e0ffc90eb1a247ae92ed3beab5b9', false)) {
spl_autoload_call('RectorPrefix20210701\ComposerAutoloaderInited43e0ffc90eb1a247ae92ed3beab5b9');
}
if (!class_exists('Doctrine\Inflector\Inflector', false) && !interface_exists('Doctrine\Inflector\Inflector', false) && !trait_exists('Doctrine\Inflector\Inflector', false)) {
spl_autoload_call('RectorPrefix20210701\Doctrine\Inflector\Inflector');
@ -3320,9 +3320,9 @@ if (!function_exists('print_node')) {
return \RectorPrefix20210701\print_node(...func_get_args());
}
}
if (!function_exists('composerRequireefee17aa1ce0aa8772a4efdc1a8cedbd')) {
function composerRequireefee17aa1ce0aa8772a4efdc1a8cedbd() {
return \RectorPrefix20210701\composerRequireefee17aa1ce0aa8772a4efdc1a8cedbd(...func_get_args());
if (!function_exists('composerRequireed43e0ffc90eb1a247ae92ed3beab5b9')) {
function composerRequireed43e0ffc90eb1a247ae92ed3beab5b9() {
return \RectorPrefix20210701\composerRequireed43e0ffc90eb1a247ae92ed3beab5b9(...func_get_args());
}
}
if (!function_exists('parseArgs')) {