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

Updated Rector to commit 15c8106871

Browse Source 
15c8106871 [Order] Deprecate rather coding standard related set, use OrderedClassElementsFixer instead (#1910)
This commit is contained in:
Tomas Votruba 2022-03-07 12:13:17 +00:00
parent c91768f1b2
commit 4e57fb25dc
11 changed files with 19 additions and 314 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
config/set/order.php
View File

@ -1,11 +0,0 @@
<?php
declare (strict_types=1);
namespace RectorPrefix20220307;
use Rector\Order\Rector\Class_\OrderPrivateMethodsByUseRector;
use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
return static function (\Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator $containerConfigurator) : void {
$services = $containerConfigurator->services();
$services->set(\Rector\Order\Rector\Class_\OrderPrivateMethodsByUseRector::class);
};

4
packages/Set/ValueObject/SetList.php
View File

@ -54,10 +54,6 @@ final class SetList implements \Rector\Set\Contract\SetListInterface
* @var string
*/
public const NAMING = __DIR__ . '/../../../config/set/naming.php';
/**
* @var string
*/
public const ORDER = __DIR__ . '/../../../config/set/order.php';
/**
* @var string
*/

165
rules/Order/Rector/Class_/OrderPrivateMethodsByUseRector.php
View File

@ -1,165 +0,0 @@
<?php
declare (strict_types=1);
namespace Rector\Order\Rector\Class_;
use PhpParser\Node;
use PhpParser\Node\Expr\MethodCall;
use PhpParser\Node\Expr\Variable;
use PhpParser\Node\Stmt\Class_;
use PhpParser\Node\Stmt\ClassMethod;
use PhpParser\Node\Stmt\Trait_;
use Rector\Core\Rector\AbstractRector;
use Rector\Order\StmtOrder;
use Rector\Order\ValueObject\SortedClassMethodsAndOriginalClassMethods;
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
/**
* @see \Rector\Tests\Order\Rector\Class_\OrderPrivateMethodsByUseRector\OrderPrivateMethodsByUseRectorTest
*/
final class OrderPrivateMethodsByUseRector extends \Rector\Core\Rector\AbstractRector
{
/**
* @var int
*/
private const MAX_ATTEMPTS = 5;
/**
* @readonly
* @var \Rector\Order\StmtOrder
*/
private $stmtOrder;
public function __construct(\Rector\Order\StmtOrder $stmtOrder)
{
$this->stmtOrder = $stmtOrder;
}
public function getRuleDefinition() : \Symplify\RuleDocGenerator\ValueObject\RuleDefinition
{
return new \Symplify\RuleDocGenerator\ValueObject\RuleDefinition('Order private methods in order of their use', [new \Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample(<<<'CODE_SAMPLE'
class SomeClass
{
public function run()
{
$this->call1();
$this->call2();
}
private function call2()
{
}
private function call1()
{
}
}
CODE_SAMPLE
, <<<'CODE_SAMPLE'
class SomeClass
{
public function run()
{
$this->call1();
$this->call2();
}
private function call1()
{
}
private function call2()
{
}
}
CODE_SAMPLE
)]);
}
/**
* @return array<class-string<Node>>
*/
public function getNodeTypes() : array
{
return [\PhpParser\Node\Stmt\Class_::class, \PhpParser\Node\Stmt\Trait_::class];
}
/**
* @param Class_|Trait_ $node
*/
public function refactor(\PhpParser\Node $node) : ?\PhpParser\Node
{
$sortedAndOriginalClassMethods = $this->getSortedAndOriginalClassMethods($node);
// order is correct, nothing to change
if (!$sortedAndOriginalClassMethods->hasOrderChanged()) {
return null;
}
// different private method count, one of them is dead probably
$attempt = 0;
while (!$sortedAndOriginalClassMethods->hasOrderSame()) {
++$attempt;
if ($attempt >= self::MAX_ATTEMPTS) {
break;
}
$oldToNewKeys = $this->stmtOrder->createOldToNewKeys($sortedAndOriginalClassMethods->getSortedClassMethods(), $sortedAndOriginalClassMethods->getOriginalClassMethods());
$this->stmtOrder->reorderClassStmtsByOldToNewKeys($node, $oldToNewKeys);
$sortedAndOriginalClassMethods = $this->getSortedAndOriginalClassMethods($node);
}
return $node;
}
/**
* @param \PhpParser\Node\Stmt\Class_|\PhpParser\Node\Stmt\Trait_ $classLike
*/
private function getSortedAndOriginalClassMethods($classLike) : \Rector\Order\ValueObject\SortedClassMethodsAndOriginalClassMethods
{
return new \Rector\Order\ValueObject\SortedClassMethodsAndOriginalClassMethods($this->getLocalPrivateMethodCallOrder($classLike), $this->resolvePrivateClassMethods($classLike));
}
/**
* @return array<int, string>
* @param \PhpParser\Node\Stmt\Class_|\PhpParser\Node\Stmt\Trait_ $classLike
*/
private function getLocalPrivateMethodCallOrder($classLike) : array
{
$localPrivateMethodCallInOrder = [];
$this->traverseNodesWithCallable($classLike->getMethods(), function (\PhpParser\Node $node) use(&$localPrivateMethodCallInOrder, $classLike) {
if (!$node instanceof \PhpParser\Node\Expr\MethodCall) {
return null;
}
if (!$node->var instanceof \PhpParser\Node\Expr\Variable) {
return null;
}
if (!$this->nodeNameResolver->isName($node->var, 'this')) {
return null;
}
$methodName = $this->getName($node->name);
if ($methodName === null) {
return null;
}
$classMethod = $classLike->getMethod($methodName);
if (!$classMethod instanceof \PhpParser\Node\Stmt\ClassMethod) {
return null;
}
if ($classMethod->isPrivate()) {
$localPrivateMethodCallInOrder[] = $methodName;
}
return null;
});
return \array_unique($localPrivateMethodCallInOrder);
}
/**
* @return array<int, string>
* @param \PhpParser\Node\Stmt\Class_|\PhpParser\Node\Stmt\Trait_ $classLike
*/
private function resolvePrivateClassMethods($classLike) : array
{
/** @var array<int, string> $privateClassMethodNames */
$privateClassMethodNames = [];
foreach ($classLike->stmts as $key => $classStmt) {
if (!$classStmt instanceof \PhpParser\Node\Stmt\ClassMethod) {
continue;
}
if (!$classStmt->isPrivate()) {
continue;
}
/** @var string $classMethodName */
$classMethodName = $this->getName($classStmt);
$privateClassMethodNames[$key] = $classMethodName;
}
return $privateClassMethodNames;
}
}

58
rules/Order/StmtOrder.php
View File

@ -1,58 +0,0 @@
<?php
declare (strict_types=1);
namespace Rector\Order;
use PhpParser\Node;
use PhpParser\Node\Stmt\ClassLike;
/**
* @see \Rector\Tests\Order\StmtOrderTest
*/
final class StmtOrder
{
/**
* @param array<int, string> $desiredStmtOrder
* @param array<int, string> $currentStmtOrder
* @return array<int, int>
*/
public function createOldToNewKeys(array $desiredStmtOrder, array $currentStmtOrder) : array
{
$newKeys = [];
foreach ($desiredStmtOrder as $singleDesiredStmtOrder) {
foreach ($currentStmtOrder as $currentKey => $classMethodName) {
if ($classMethodName === $singleDesiredStmtOrder) {
$newKeys[] = $currentKey;
}
}
}
$oldKeys = \array_values($newKeys);
\sort($oldKeys);
/** @var array<int, int> $oldToNewKeys */
$oldToNewKeys = \array_combine($oldKeys, $newKeys);
return $oldToNewKeys;
}
/**
* @param array<int, int> $oldToNewKeys
*/
public function reorderClassStmtsByOldToNewKeys(\PhpParser\Node\Stmt\ClassLike $classLike, array $oldToNewKeys) : void
{
/** @var array<int, Node\Stmt> $reorderedStmts */
$reorderedStmts = [];
$stmtCount = \count($classLike->stmts);
foreach ($classLike->stmts as $key => $stmt) {
if (!\array_key_exists($key, $oldToNewKeys)) {
$reorderedStmts[$key] = $stmt;
continue;
}
// reorder here
$newKey = $oldToNewKeys[$key];
$reorderedStmts[$key] = $classLike->stmts[$newKey];
}
for ($i = 0; $i < $stmtCount; ++$i) {
if (!\array_key_exists($i, $reorderedStmts)) {
continue;
}
$classLike->stmts[$i] = $reorderedStmts[$i];
}
}
}

51
rules/Order/ValueObject/SortedClassMethodsAndOriginalClassMethods.php
View File

@ -1,51 +0,0 @@
<?php
declare (strict_types=1);
namespace Rector\Order\ValueObject;
final class SortedClassMethodsAndOriginalClassMethods
{
/**
* @var array<int, string>
* @readonly
*/
private $sortedClassMethods;
/**
* @var array<int, string>
* @readonly
*/
private $originalClassMethods;
/**
* @param array<int, string> $sortedClassMethods
* @param array<int, string> $originalClassMethods
*/
public function __construct(array $sortedClassMethods, array $originalClassMethods)
{
$this->sortedClassMethods = $sortedClassMethods;
$this->originalClassMethods = $originalClassMethods;
}
/**
* @return array<int, string>
*/
public function getSortedClassMethods() : array
{
return $this->sortedClassMethods;
}
/**
* @return array<int, string>
*/
public function getOriginalClassMethods() : array
{
return $this->originalClassMethods;
}
public function hasOrderChanged() : bool
{
return $this->sortedClassMethods !== $this->originalClassMethods;
}
public function hasOrderSame() : bool
{
$sortedClassMethodValues = \array_values($this->sortedClassMethods);
$originalClassMethodValues = \array_values($this->originalClassMethods);
return $sortedClassMethodValues === $originalClassMethodValues;
}
}

4
src/Application/VersionResolver.php
View File

@ -16,11 +16,11 @@ final class VersionResolver
/**
* @var string
*/
public const PACKAGE_VERSION = '96601889449e4ff8b8090ed7d6f90480dd5593e1';
public const PACKAGE_VERSION = '15c81068713a06138dd99103da8321a386998137';
/**
* @var string
*/
public const RELEASE_DATE = '2022-03-07 12:45:26';
public const RELEASE_DATE = '2022-03-07 13:07:18';
public static function resolvePackageVersion() : string
{
$process = new \RectorPrefix20220307\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 ComposerAutoloaderInitd618a636d51fa2348a8e23afcef5c663::getLoader();
return ComposerAutoloaderInit0483ff6d507191b1cc67ca4bb7d064d1::getLoader();

3
vendor/composer/autoload_classmap.php vendored
View File

@ -2413,9 +2413,6 @@ return array(
'Rector\\NodeTypeResolver\\TypeComparator\\ScalarTypeComparator' => $baseDir . '/packages/NodeTypeResolver/TypeComparator/ScalarTypeComparator.php',
'Rector\\NodeTypeResolver\\TypeComparator\\TypeComparator' => $baseDir . '/packages/NodeTypeResolver/TypeComparator/TypeComparator.php',
'Rector\\NodeTypeResolver\\ValueObject\\OldToNewType' => $baseDir . '/packages/NodeTypeResolver/ValueObject/OldToNewType.php',
'Rector\\Order\\Rector\\Class_\\OrderPrivateMethodsByUseRector' => $baseDir . '/rules/Order/Rector/Class_/OrderPrivateMethodsByUseRector.php',
'Rector\\Order\\StmtOrder' => $baseDir . '/rules/Order/StmtOrder.php',
'Rector\\Order\\ValueObject\\SortedClassMethodsAndOriginalClassMethods' => $baseDir . '/rules/Order/ValueObject/SortedClassMethodsAndOriginalClassMethods.php',
'Rector\\PHPOffice\\Rector\\MethodCall\\ChangeConditionalGetConditionRector' => $vendorDir . '/rector/rector-phpoffice/src/Rector/MethodCall/ChangeConditionalGetConditionRector.php',
'Rector\\PHPOffice\\Rector\\MethodCall\\ChangeConditionalReturnedCellRector' => $vendorDir . '/rector/rector-phpoffice/src/Rector/MethodCall/ChangeConditionalReturnedCellRector.php',
'Rector\\PHPOffice\\Rector\\MethodCall\\ChangeConditionalSetConditionRector' => $vendorDir . '/rector/rector-phpoffice/src/Rector/MethodCall/ChangeConditionalSetConditionRector.php',

14
vendor/composer/autoload_real.php vendored
View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInitd618a636d51fa2348a8e23afcef5c663
class ComposerAutoloaderInit0483ff6d507191b1cc67ca4bb7d064d1
{
private static $loader;
@ -22,15 +22,15 @@ class ComposerAutoloaderInitd618a636d51fa2348a8e23afcef5c663
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInitd618a636d51fa2348a8e23afcef5c663', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInit0483ff6d507191b1cc67ca4bb7d064d1', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
spl_autoload_unregister(array('ComposerAutoloaderInitd618a636d51fa2348a8e23afcef5c663', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInit0483ff6d507191b1cc67ca4bb7d064d1', '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\ComposerStaticInitd618a636d51fa2348a8e23afcef5c663::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInit0483ff6d507191b1cc67ca4bb7d064d1::getInitializer($loader));
} else {
$classMap = require __DIR__ . '/autoload_classmap.php';
if ($classMap) {
@ -42,12 +42,12 @@ class ComposerAutoloaderInitd618a636d51fa2348a8e23afcef5c663
$loader->register(true);
if ($useStaticLoader) {
$includeFiles = Composer\Autoload\ComposerStaticInitd618a636d51fa2348a8e23afcef5c663::$files;
$includeFiles = Composer\Autoload\ComposerStaticInit0483ff6d507191b1cc67ca4bb7d064d1::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequired618a636d51fa2348a8e23afcef5c663($fileIdentifier, $file);
composerRequire0483ff6d507191b1cc67ca4bb7d064d1($fileIdentifier, $file);
}
return $loader;
@ -59,7 +59,7 @@ class ComposerAutoloaderInitd618a636d51fa2348a8e23afcef5c663
* @param string $file
* @return void
*/
function composerRequired618a636d51fa2348a8e23afcef5c663($fileIdentifier, $file)
function composerRequire0483ff6d507191b1cc67ca4bb7d064d1($fileIdentifier, $file)
{
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;

11
vendor/composer/autoload_static.php vendored
View File

@ -4,7 +4,7 @@
namespace Composer\Autoload;
class ComposerStaticInitd618a636d51fa2348a8e23afcef5c663
class ComposerStaticInit0483ff6d507191b1cc67ca4bb7d064d1
{
public static $files = array (
'320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php',
@ -2787,9 +2787,6 @@ class ComposerStaticInitd618a636d51fa2348a8e23afcef5c663
'Rector\\NodeTypeResolver\\TypeComparator\\ScalarTypeComparator' => __DIR__ . '/../..' . '/packages/NodeTypeResolver/TypeComparator/ScalarTypeComparator.php',
'Rector\\NodeTypeResolver\\TypeComparator\\TypeComparator' => __DIR__ . '/../..' . '/packages/NodeTypeResolver/TypeComparator/TypeComparator.php',
'Rector\\NodeTypeResolver\\ValueObject\\OldToNewType' => __DIR__ . '/../..' . '/packages/NodeTypeResolver/ValueObject/OldToNewType.php',
'Rector\\Order\\Rector\\Class_\\OrderPrivateMethodsByUseRector' => __DIR__ . '/../..' . '/rules/Order/Rector/Class_/OrderPrivateMethodsByUseRector.php',
'Rector\\Order\\StmtOrder' => __DIR__ . '/../..' . '/rules/Order/StmtOrder.php',
'Rector\\Order\\ValueObject\\SortedClassMethodsAndOriginalClassMethods' => __DIR__ . '/../..' . '/rules/Order/ValueObject/SortedClassMethodsAndOriginalClassMethods.php',
'Rector\\PHPOffice\\Rector\\MethodCall\\ChangeConditionalGetConditionRector' => __DIR__ . '/..' . '/rector/rector-phpoffice/src/Rector/MethodCall/ChangeConditionalGetConditionRector.php',
'Rector\\PHPOffice\\Rector\\MethodCall\\ChangeConditionalReturnedCellRector' => __DIR__ . '/..' . '/rector/rector-phpoffice/src/Rector/MethodCall/ChangeConditionalReturnedCellRector.php',
'Rector\\PHPOffice\\Rector\\MethodCall\\ChangeConditionalSetConditionRector' => __DIR__ . '/..' . '/rector/rector-phpoffice/src/Rector/MethodCall/ChangeConditionalSetConditionRector.php',
@ -3839,9 +3836,9 @@ class ComposerStaticInitd618a636d51fa2348a8e23afcef5c663
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInitd618a636d51fa2348a8e23afcef5c663::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInitd618a636d51fa2348a8e23afcef5c663::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInitd618a636d51fa2348a8e23afcef5c663::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInit0483ff6d507191b1cc67ca4bb7d064d1::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit0483ff6d507191b1cc67ca4bb7d064d1::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit0483ff6d507191b1cc67ca4bb7d064d1::$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('RectorPrefix20220307\AutoloadIncluder');
}
if (!class_exists('ComposerAutoloaderInitd618a636d51fa2348a8e23afcef5c663', false) && !interface_exists('ComposerAutoloaderInitd618a636d51fa2348a8e23afcef5c663', false) && !trait_exists('ComposerAutoloaderInitd618a636d51fa2348a8e23afcef5c663', false)) {
spl_autoload_call('RectorPrefix20220307\ComposerAutoloaderInitd618a636d51fa2348a8e23afcef5c663');
if (!class_exists('ComposerAutoloaderInit0483ff6d507191b1cc67ca4bb7d064d1', false) && !interface_exists('ComposerAutoloaderInit0483ff6d507191b1cc67ca4bb7d064d1', false) && !trait_exists('ComposerAutoloaderInit0483ff6d507191b1cc67ca4bb7d064d1', false)) {
spl_autoload_call('RectorPrefix20220307\ComposerAutoloaderInit0483ff6d507191b1cc67ca4bb7d064d1');
}
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('RectorPrefix20220307\Helmich\TypoScriptParser\Parser\AST\Statement');
@ -59,9 +59,9 @@ if (!function_exists('print_node')) {
return \RectorPrefix20220307\print_node(...func_get_args());
}
}
if (!function_exists('composerRequired618a636d51fa2348a8e23afcef5c663')) {
function composerRequired618a636d51fa2348a8e23afcef5c663() {
return \RectorPrefix20220307\composerRequired618a636d51fa2348a8e23afcef5c663(...func_get_args());
if (!function_exists('composerRequire0483ff6d507191b1cc67ca4bb7d064d1')) {
function composerRequire0483ff6d507191b1cc67ca4bb7d064d1() {
return \RectorPrefix20220307\composerRequire0483ff6d507191b1cc67ca4bb7d064d1(...func_get_args());
}
}
if (!function_exists('scanPath')) {