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

Updated Rector to commit fa9b4ef615

Browse Source 
fa9b4ef615 [Transform] Remove unused ClassConstFetchToValueRector (#1332)
This commit is contained in:
Tomas Votruba 2021-11-28 17:29:16 +00:00
parent 0d05a7606d
commit 8573f613c5
9 changed files with 38 additions and 169 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
docs/rector_rules_overview.md
View File

@ -18,7 +18,7 @@
- [Composer](#composer) (6)
- [DeadCode](#deadcode) (49)
- [DeadCode](#deadcode) (50)
- [DependencyInjection](#dependencyinjection) (2)
@ -98,7 +98,7 @@
- [Strict](#strict) (5)
- [Transform](#transform) (36)
- [Transform](#transform) (35)
- [TypeDeclaration](#typedeclaration) (22)
@ -3104,6 +3104,21 @@ Remove empty constructor
<br>
### RemoveDeadContinueRector
Remove useless continue at the end of loops
- class: [`Rector\DeadCode\Rector\For_\RemoveDeadContinueRector`](../rules/DeadCode/Rector/For_/RemoveDeadContinueRector.php)
```diff
while ($i < 10) {
++$i;
- continue;
}
```
<br>
### RemoveDeadIfForeachForRector
Remove if, foreach and for that does not do anything
@ -10451,41 +10466,6 @@ Change singleton class to normal class that can be registered as a service
<br>
### ClassConstFetchToValueRector
Replaces constant by value
:wrench: **configure it!**
- class: [`Rector\Transform\Rector\ClassConstFetch\ClassConstFetchToValueRector`](../rules/Transform/Rector/ClassConstFetch/ClassConstFetchToValueRector.php)
```php
use Rector\Transform\Rector\ClassConstFetch\ClassConstFetchToValueRector;
use Rector\Transform\ValueObject\ClassConstFetchToValue;
use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
use Symplify\SymfonyPhpConfig\ValueObjectInliner;
return static function (ContainerConfigurator $containerConfigurator): void {
$services = $containerConfigurator->services();
$services->set(ClassConstFetchToValueRector::class)
->call('configure', [[
ClassConstFetchToValueRector::CLASS_CONST_FETCHES_TO_VALUES => ValueObjectInliner::inline([
new ClassConstFetchToValue('Nette\Configurator', 'PRODUCTION', 'production'),
]),
]]);
};
```
↓
```diff
-$value === Nette\Configurator::DEVELOPMENT
+$value === "development"
```
<br>
### DimFetchAssignToMethodCallRector
Change magic array access add to `$list[],` to explicit `$list->addMethod(...)`
@ -11543,8 +11523,8 @@ return static function (ContainerConfigurator $containerConfigurator): void {
{
public function run()
{
- $dotenv = JsonResponse::create(true);
+ $dotenv = new JsonResponse();
- $dotenv = JsonResponse::create(['foo' => 'bar'], Response::HTTP_OK);
+ $dotenv = new JsonResponse(['foo' => 'bar'], Response::HTTP_OK);
}
}
```

65
rules/Transform/Rector/ClassConstFetch/ClassConstFetchToValueRector.php
View File

@ -1,65 +0,0 @@
<?php
declare (strict_types=1);
namespace Rector\Transform\Rector\ClassConstFetch;
use PhpParser\BuilderHelpers;
use PhpParser\Node;
use PhpParser\Node\Expr\ClassConstFetch;
use Rector\Core\Contract\Rector\ConfigurableRectorInterface;
use Rector\Core\Rector\AbstractRector;
use Rector\Transform\ValueObject\ClassConstFetchToValue;
use Symplify\RuleDocGenerator\ValueObject\CodeSample\ConfiguredCodeSample;
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
use RectorPrefix20211128\Webmozart\Assert\Assert;
/**
* @see \Rector\Tests\Transform\Rector\ClassConstFetch\ClassConstFetchToValueRector\ClassConstFetchToValueRectorTest
*/
final class ClassConstFetchToValueRector extends \Rector\Core\Rector\AbstractRector implements \Rector\Core\Contract\Rector\ConfigurableRectorInterface
{
/**
* @var string
*/
public const CLASS_CONST_FETCHES_TO_VALUES = 'old_constants_to_new_valuesByType';
/**
* @var ClassConstFetchToValue[]
*/
private $classConstFetchesToValues = [];
public function getRuleDefinition() : \Symplify\RuleDocGenerator\ValueObject\RuleDefinition
{
$configuration = [self::CLASS_CONST_FETCHES_TO_VALUES => [new \Rector\Transform\ValueObject\ClassConstFetchToValue('Nette\\Configurator', 'DEVELOPMENT', 'development'), new \Rector\Transform\ValueObject\ClassConstFetchToValue('Nette\\Configurator', 'PRODUCTION', 'production')]];
return new \Symplify\RuleDocGenerator\ValueObject\RuleDefinition('Replaces constant by value', [new \Symplify\RuleDocGenerator\ValueObject\CodeSample\ConfiguredCodeSample('$value === Nette\\Configurator::DEVELOPMENT', '$value === "development"', $configuration)]);
}
/**
* @return array<class-string<Node>>
*/
public function getNodeTypes() : array
{
return [\PhpParser\Node\Expr\ClassConstFetch::class];
}
/**
* @param ClassConstFetch $node
*/
public function refactor(\PhpParser\Node $node) : ?\PhpParser\Node
{
foreach ($this->classConstFetchesToValues as $classConstFetchToValue) {
if (!$this->isObjectType($node->class, $classConstFetchToValue->getObjectType())) {
continue;
}
if (!$this->isName($node->name, $classConstFetchToValue->getConstant())) {
continue;
}
return \PhpParser\BuilderHelpers::normalizeValue($classConstFetchToValue->getValue());
}
return $node;
}
/**
* @param mixed[] $configuration
*/
public function configure(array $configuration) : void
{
$classConstFetchesToValues = $configuration[self::CLASS_CONST_FETCHES_TO_VALUES] ?? $configuration;
\RectorPrefix20211128\Webmozart\Assert\Assert::allIsAOf($classConstFetchesToValues, \Rector\Transform\ValueObject\ClassConstFetchToValue::class);
$this->classConstFetchesToValues = $classConstFetchesToValues;
}
}

42
rules/Transform/ValueObject/ClassConstFetchToValue.php
View File

@ -1,42 +0,0 @@
<?php
declare (strict_types=1);
namespace Rector\Transform\ValueObject;
use PHPStan\Type\ObjectType;
final class ClassConstFetchToValue
{
/**
* @var string
*/
private $class;
/**
* @var string
*/
private $constant;
private $value;
/**
* @param mixed $value
*/
public function __construct(string $class, string $constant, $value)
{
$this->class = $class;
$this->constant = $constant;
$this->value = $value;
}
public function getObjectType() : \PHPStan\Type\ObjectType
{
return new \PHPStan\Type\ObjectType($this->class);
}
public function getConstant() : string
{
return $this->constant;
}
/**
* @return mixed
*/
public function getValue()
{
return $this->value;
}
}

4
src/Application/VersionResolver.php
View File

@ -16,11 +16,11 @@ final class VersionResolver
/**
* @var string
*/
public const PACKAGE_VERSION = '00dd0eb4ca6672cf8856aaec0ae3211c13078397';
public const PACKAGE_VERSION = 'fa9b4ef615053e85db71605707967b3c2329a378';
/**
* @var string
*/
public const RELEASE_DATE = '2021-11-28 17:59:11';
public const RELEASE_DATE = '2021-11-28 17:13:06';
public static function resolvePackageVersion() : string
{
$process = new \RectorPrefix20211128\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 ComposerAutoloaderInitb59f8cb8d17ba6f6ba55e8ad5b82bbad::getLoader();
return ComposerAutoloaderInit300226a58498268023ea81ceeb59a2b8::getLoader();

2
vendor/composer/autoload_classmap.php vendored
View File

@ -2912,7 +2912,6 @@ return array(
'Rector\\Transform\\Rector\\Assign\\PropertyAssignToMethodCallRector' => $baseDir . '/rules/Transform/Rector/Assign/PropertyAssignToMethodCallRector.php',
'Rector\\Transform\\Rector\\Assign\\PropertyFetchToMethodCallRector' => $baseDir . '/rules/Transform/Rector/Assign/PropertyFetchToMethodCallRector.php',
'Rector\\Transform\\Rector\\Attribute\\AttributeKeyToClassConstFetchRector' => $baseDir . '/rules/Transform/Rector/Attribute/AttributeKeyToClassConstFetchRector.php',
'Rector\\Transform\\Rector\\ClassConstFetch\\ClassConstFetchToValueRector' => $baseDir . '/rules/Transform/Rector/ClassConstFetch/ClassConstFetchToValueRector.php',
'Rector\\Transform\\Rector\\ClassMethod\\SingleToManyMethodRector' => $baseDir . '/rules/Transform/Rector/ClassMethod/SingleToManyMethodRector.php',
'Rector\\Transform\\Rector\\ClassMethod\\WrapReturnRector' => $baseDir . '/rules/Transform/Rector/ClassMethod/WrapReturnRector.php',
'Rector\\Transform\\Rector\\Class_\\AddAllowDynamicPropertiesAttributeRector' => $baseDir . '/rules/Transform/Rector/Class_/AddAllowDynamicPropertiesAttributeRector.php',
@ -2947,7 +2946,6 @@ return array(
'Rector\\Transform\\ValueObject\\ArrayFuncCallToMethodCall' => $baseDir . '/rules/Transform/ValueObject/ArrayFuncCallToMethodCall.php',
'Rector\\Transform\\ValueObject\\AttributeKeyToClassConstFetch' => $baseDir . '/rules/Transform/ValueObject/AttributeKeyToClassConstFetch.php',
'Rector\\Transform\\ValueObject\\CallableInMethodCallToVariable' => $baseDir . '/rules/Transform/ValueObject/CallableInMethodCallToVariable.php',
'Rector\\Transform\\ValueObject\\ClassConstFetchToValue' => $baseDir . '/rules/Transform/ValueObject/ClassConstFetchToValue.php',
'Rector\\Transform\\ValueObject\\DimFetchAssignToMethodCall' => $baseDir . '/rules/Transform/ValueObject/DimFetchAssignToMethodCall.php',
'Rector\\Transform\\ValueObject\\FuncCallToMethodCall' => $baseDir . '/rules/Transform/ValueObject/FuncCallToMethodCall.php',
'Rector\\Transform\\ValueObject\\FuncCallToStaticCall' => $baseDir . '/rules/Transform/ValueObject/FuncCallToStaticCall.php',

14
vendor/composer/autoload_real.php vendored
View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInitb59f8cb8d17ba6f6ba55e8ad5b82bbad
class ComposerAutoloaderInit300226a58498268023ea81ceeb59a2b8
{
private static $loader;
@ -22,15 +22,15 @@ class ComposerAutoloaderInitb59f8cb8d17ba6f6ba55e8ad5b82bbad
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInitb59f8cb8d17ba6f6ba55e8ad5b82bbad', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInit300226a58498268023ea81ceeb59a2b8', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
spl_autoload_unregister(array('ComposerAutoloaderInitb59f8cb8d17ba6f6ba55e8ad5b82bbad', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInit300226a58498268023ea81ceeb59a2b8', '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\ComposerStaticInitb59f8cb8d17ba6f6ba55e8ad5b82bbad::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInit300226a58498268023ea81ceeb59a2b8::getInitializer($loader));
} else {
$classMap = require __DIR__ . '/autoload_classmap.php';
if ($classMap) {
@ -42,19 +42,19 @@ class ComposerAutoloaderInitb59f8cb8d17ba6f6ba55e8ad5b82bbad
$loader->register(true);
if ($useStaticLoader) {
$includeFiles = Composer\Autoload\ComposerStaticInitb59f8cb8d17ba6f6ba55e8ad5b82bbad::$files;
$includeFiles = Composer\Autoload\ComposerStaticInit300226a58498268023ea81ceeb59a2b8::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequireb59f8cb8d17ba6f6ba55e8ad5b82bbad($fileIdentifier, $file);
composerRequire300226a58498268023ea81ceeb59a2b8($fileIdentifier, $file);
}
return $loader;
}
}
function composerRequireb59f8cb8d17ba6f6ba55e8ad5b82bbad($fileIdentifier, $file)
function composerRequire300226a58498268023ea81ceeb59a2b8($fileIdentifier, $file)
{
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
require $file;

10
vendor/composer/autoload_static.php vendored
View File

@ -4,7 +4,7 @@
namespace Composer\Autoload;
class ComposerStaticInitb59f8cb8d17ba6f6ba55e8ad5b82bbad
class ComposerStaticInit300226a58498268023ea81ceeb59a2b8
{
public static $files = array (
'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php',
@ -3309,7 +3309,6 @@ class ComposerStaticInitb59f8cb8d17ba6f6ba55e8ad5b82bbad
'Rector\\Transform\\Rector\\Assign\\PropertyAssignToMethodCallRector' => __DIR__ . '/../..' . '/rules/Transform/Rector/Assign/PropertyAssignToMethodCallRector.php',
'Rector\\Transform\\Rector\\Assign\\PropertyFetchToMethodCallRector' => __DIR__ . '/../..' . '/rules/Transform/Rector/Assign/PropertyFetchToMethodCallRector.php',
'Rector\\Transform\\Rector\\Attribute\\AttributeKeyToClassConstFetchRector' => __DIR__ . '/../..' . '/rules/Transform/Rector/Attribute/AttributeKeyToClassConstFetchRector.php',
'Rector\\Transform\\Rector\\ClassConstFetch\\ClassConstFetchToValueRector' => __DIR__ . '/../..' . '/rules/Transform/Rector/ClassConstFetch/ClassConstFetchToValueRector.php',
'Rector\\Transform\\Rector\\ClassMethod\\SingleToManyMethodRector' => __DIR__ . '/../..' . '/rules/Transform/Rector/ClassMethod/SingleToManyMethodRector.php',
'Rector\\Transform\\Rector\\ClassMethod\\WrapReturnRector' => __DIR__ . '/../..' . '/rules/Transform/Rector/ClassMethod/WrapReturnRector.php',
'Rector\\Transform\\Rector\\Class_\\AddAllowDynamicPropertiesAttributeRector' => __DIR__ . '/../..' . '/rules/Transform/Rector/Class_/AddAllowDynamicPropertiesAttributeRector.php',
@ -3344,7 +3343,6 @@ class ComposerStaticInitb59f8cb8d17ba6f6ba55e8ad5b82bbad
'Rector\\Transform\\ValueObject\\ArrayFuncCallToMethodCall' => __DIR__ . '/../..' . '/rules/Transform/ValueObject/ArrayFuncCallToMethodCall.php',
'Rector\\Transform\\ValueObject\\AttributeKeyToClassConstFetch' => __DIR__ . '/../..' . '/rules/Transform/ValueObject/AttributeKeyToClassConstFetch.php',
'Rector\\Transform\\ValueObject\\CallableInMethodCallToVariable' => __DIR__ . '/../..' . '/rules/Transform/ValueObject/CallableInMethodCallToVariable.php',
'Rector\\Transform\\ValueObject\\ClassConstFetchToValue' => __DIR__ . '/../..' . '/rules/Transform/ValueObject/ClassConstFetchToValue.php',
'Rector\\Transform\\ValueObject\\DimFetchAssignToMethodCall' => __DIR__ . '/../..' . '/rules/Transform/ValueObject/DimFetchAssignToMethodCall.php',
'Rector\\Transform\\ValueObject\\FuncCallToMethodCall' => __DIR__ . '/../..' . '/rules/Transform/ValueObject/FuncCallToMethodCall.php',
'Rector\\Transform\\ValueObject\\FuncCallToStaticCall' => __DIR__ . '/../..' . '/rules/Transform/ValueObject/FuncCallToStaticCall.php',
@ -3771,9 +3769,9 @@ class ComposerStaticInitb59f8cb8d17ba6f6ba55e8ad5b82bbad
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInitb59f8cb8d17ba6f6ba55e8ad5b82bbad::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInitb59f8cb8d17ba6f6ba55e8ad5b82bbad::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInitb59f8cb8d17ba6f6ba55e8ad5b82bbad::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInit300226a58498268023ea81ceeb59a2b8::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit300226a58498268023ea81ceeb59a2b8::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit300226a58498268023ea81ceeb59a2b8::$classMap;
}, null, ClassLoader::class);
}

10
vendor/scoper-autoload.php vendored
View File

@ -12,8 +12,8 @@ if (!class_exists('GenerateChangelogCommand', false) && !interface_exists('Gener
if (!class_exists('AutoloadIncluder', false) && !interface_exists('AutoloadIncluder', false) && !trait_exists('AutoloadIncluder', false)) {
spl_autoload_call('RectorPrefix20211128\AutoloadIncluder');
}
if (!class_exists('ComposerAutoloaderInitb59f8cb8d17ba6f6ba55e8ad5b82bbad', false) && !interface_exists('ComposerAutoloaderInitb59f8cb8d17ba6f6ba55e8ad5b82bbad', false) && !trait_exists('ComposerAutoloaderInitb59f8cb8d17ba6f6ba55e8ad5b82bbad', false)) {
spl_autoload_call('RectorPrefix20211128\ComposerAutoloaderInitb59f8cb8d17ba6f6ba55e8ad5b82bbad');
if (!class_exists('ComposerAutoloaderInit300226a58498268023ea81ceeb59a2b8', false) && !interface_exists('ComposerAutoloaderInit300226a58498268023ea81ceeb59a2b8', false) && !trait_exists('ComposerAutoloaderInit300226a58498268023ea81ceeb59a2b8', false)) {
spl_autoload_call('RectorPrefix20211128\ComposerAutoloaderInit300226a58498268023ea81ceeb59a2b8');
}
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('RectorPrefix20211128\Helmich\TypoScriptParser\Parser\AST\Statement');
@ -81,9 +81,9 @@ if (!function_exists('print_node')) {
return \RectorPrefix20211128\print_node(...func_get_args());
}
}
if (!function_exists('composerRequireb59f8cb8d17ba6f6ba55e8ad5b82bbad')) {
function composerRequireb59f8cb8d17ba6f6ba55e8ad5b82bbad() {
return \RectorPrefix20211128\composerRequireb59f8cb8d17ba6f6ba55e8ad5b82bbad(...func_get_args());
if (!function_exists('composerRequire300226a58498268023ea81ceeb59a2b8')) {
function composerRequire300226a58498268023ea81ceeb59a2b8() {
return \RectorPrefix20211128\composerRequire300226a58498268023ea81ceeb59a2b8(...func_get_args());
}
}
if (!function_exists('scanPath')) {