mirror of
https://github.com/rectorphp/rector.git
synced 2024-06-03 18:00:50 +00:00
Updated Rector to commit 27476c0909
27476c0909
add few fixtures (#2279)
This commit is contained in:
parent
9306ff041a
commit
5a70fb04b1
|
@ -1341,7 +1341,7 @@ Changes compared to value and return of expr to direct return
|
|||
```diff
|
||||
$value = 'something';
|
||||
-if ($value === 52) {
|
||||
- return $value;
|
||||
- return 52;
|
||||
-}
|
||||
-
|
||||
return $value;
|
||||
|
|
|
@ -4,6 +4,7 @@ declare (strict_types=1);
|
|||
namespace Rector\CodeQuality\Rector\If_;
|
||||
|
||||
use PhpParser\Node;
|
||||
use PhpParser\Node\Expr;
|
||||
use PhpParser\Node\Stmt\If_;
|
||||
use PhpParser\Node\Stmt\Return_;
|
||||
use Rector\Core\NodeManipulator\IfManipulator;
|
||||
|
@ -30,7 +31,7 @@ final class SimplifyIfExactValueReturnValueRector extends \Rector\Core\Rector\Ab
|
|||
return new \Symplify\RuleDocGenerator\ValueObject\RuleDefinition('Changes compared to value and return of expr to direct return', [new \Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample(<<<'CODE_SAMPLE'
|
||||
$value = 'something';
|
||||
if ($value === 52) {
|
||||
return $value;
|
||||
return 52;
|
||||
}
|
||||
|
||||
return $value;
|
||||
|
@ -53,18 +54,18 @@ CODE_SAMPLE
|
|||
*/
|
||||
public function refactor(\PhpParser\Node $node) : ?\PhpParser\Node\Stmt\Return_
|
||||
{
|
||||
$comparedNode = $this->ifManipulator->matchIfValueReturnValue($node);
|
||||
if ($comparedNode !== null) {
|
||||
$nextNode = $node->getAttribute(\Rector\NodeTypeResolver\Node\AttributeKey::NEXT_NODE);
|
||||
if (!$nextNode instanceof \PhpParser\Node\Stmt\Return_) {
|
||||
return null;
|
||||
}
|
||||
if (!$this->nodeComparator->areNodesEqual($comparedNode, $nextNode->expr)) {
|
||||
return null;
|
||||
}
|
||||
$this->removeNode($nextNode);
|
||||
return clone $nextNode;
|
||||
$nextNode = $node->getAttribute(\Rector\NodeTypeResolver\Node\AttributeKey::NEXT_NODE);
|
||||
if (!$nextNode instanceof \PhpParser\Node\Stmt\Return_) {
|
||||
return null;
|
||||
}
|
||||
return null;
|
||||
$comparedNode = $this->ifManipulator->matchIfValueReturnValue($node);
|
||||
if (!$comparedNode instanceof \PhpParser\Node\Expr) {
|
||||
return null;
|
||||
}
|
||||
if (!$this->nodeComparator->areNodesEqual($comparedNode, $nextNode->expr)) {
|
||||
return null;
|
||||
}
|
||||
$this->removeNode($nextNode);
|
||||
return clone $nextNode;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -16,11 +16,11 @@ final class VersionResolver
|
|||
/**
|
||||
* @var string
|
||||
*/
|
||||
public const PACKAGE_VERSION = 'fa073d440863d477d2ee844c1dfb6bf481a2ff1f';
|
||||
public const PACKAGE_VERSION = '27476c0909954feb7681318c66626408f0b9f396';
|
||||
/**
|
||||
* @var string
|
||||
*/
|
||||
public const RELEASE_DATE = '2022-05-10 18:08:30';
|
||||
public const RELEASE_DATE = '2022-05-10 16:25:25';
|
||||
/**
|
||||
* @var string
|
||||
*/
|
||||
|
|
|
@ -100,17 +100,17 @@ final class IfManipulator
|
|||
if (\count($stmts) !== 1) {
|
||||
return null;
|
||||
}
|
||||
$insideIfNode = $stmts[0];
|
||||
if (!$insideIfNode instanceof \PhpParser\Node\Stmt\Return_) {
|
||||
$insideIfStmt = $stmts[0];
|
||||
if (!$insideIfStmt instanceof \PhpParser\Node\Stmt\Return_) {
|
||||
return null;
|
||||
}
|
||||
if (!$if->cond instanceof \PhpParser\Node\Expr\BinaryOp\Identical) {
|
||||
return null;
|
||||
}
|
||||
if ($this->nodeComparator->areNodesEqual($if->cond->left, $insideIfNode->expr)) {
|
||||
if ($this->nodeComparator->areNodesEqual($if->cond->left, $insideIfStmt->expr)) {
|
||||
return $if->cond->right;
|
||||
}
|
||||
if ($this->nodeComparator->areNodesEqual($if->cond->right, $insideIfNode->expr)) {
|
||||
if ($this->nodeComparator->areNodesEqual($if->cond->right, $insideIfStmt->expr)) {
|
||||
return $if->cond->left;
|
||||
}
|
||||
return null;
|
||||
|
|
2
vendor/autoload.php
vendored
2
vendor/autoload.php
vendored
|
@ -9,4 +9,4 @@ if (PHP_VERSION_ID < 50600) {
|
|||
|
||||
require_once __DIR__ . '/composer/autoload_real.php';
|
||||
|
||||
return ComposerAutoloaderInit278accc5d485536ec8986e1a90eefdc6::getLoader();
|
||||
return ComposerAutoloaderInitc8b7e28468ba5c034337353b19833901::getLoader();
|
||||
|
|
14
vendor/composer/autoload_real.php
vendored
14
vendor/composer/autoload_real.php
vendored
|
@ -2,7 +2,7 @@
|
|||
|
||||
// autoload_real.php @generated by Composer
|
||||
|
||||
class ComposerAutoloaderInit278accc5d485536ec8986e1a90eefdc6
|
||||
class ComposerAutoloaderInitc8b7e28468ba5c034337353b19833901
|
||||
{
|
||||
private static $loader;
|
||||
|
||||
|
@ -22,19 +22,19 @@ class ComposerAutoloaderInit278accc5d485536ec8986e1a90eefdc6
|
|||
return self::$loader;
|
||||
}
|
||||
|
||||
spl_autoload_register(array('ComposerAutoloaderInit278accc5d485536ec8986e1a90eefdc6', 'loadClassLoader'), true, true);
|
||||
spl_autoload_register(array('ComposerAutoloaderInitc8b7e28468ba5c034337353b19833901', 'loadClassLoader'), true, true);
|
||||
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
|
||||
spl_autoload_unregister(array('ComposerAutoloaderInit278accc5d485536ec8986e1a90eefdc6', 'loadClassLoader'));
|
||||
spl_autoload_unregister(array('ComposerAutoloaderInitc8b7e28468ba5c034337353b19833901', 'loadClassLoader'));
|
||||
|
||||
require __DIR__ . '/autoload_static.php';
|
||||
call_user_func(\Composer\Autoload\ComposerStaticInit278accc5d485536ec8986e1a90eefdc6::getInitializer($loader));
|
||||
call_user_func(\Composer\Autoload\ComposerStaticInitc8b7e28468ba5c034337353b19833901::getInitializer($loader));
|
||||
|
||||
$loader->setClassMapAuthoritative(true);
|
||||
$loader->register(true);
|
||||
|
||||
$includeFiles = \Composer\Autoload\ComposerStaticInit278accc5d485536ec8986e1a90eefdc6::$files;
|
||||
$includeFiles = \Composer\Autoload\ComposerStaticInitc8b7e28468ba5c034337353b19833901::$files;
|
||||
foreach ($includeFiles as $fileIdentifier => $file) {
|
||||
composerRequire278accc5d485536ec8986e1a90eefdc6($fileIdentifier, $file);
|
||||
composerRequirec8b7e28468ba5c034337353b19833901($fileIdentifier, $file);
|
||||
}
|
||||
|
||||
return $loader;
|
||||
|
@ -46,7 +46,7 @@ class ComposerAutoloaderInit278accc5d485536ec8986e1a90eefdc6
|
|||
* @param string $file
|
||||
* @return void
|
||||
*/
|
||||
function composerRequire278accc5d485536ec8986e1a90eefdc6($fileIdentifier, $file)
|
||||
function composerRequirec8b7e28468ba5c034337353b19833901($fileIdentifier, $file)
|
||||
{
|
||||
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
|
||||
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
|
||||
|
|
8
vendor/composer/autoload_static.php
vendored
8
vendor/composer/autoload_static.php
vendored
|
@ -4,7 +4,7 @@
|
|||
|
||||
namespace Composer\Autoload;
|
||||
|
||||
class ComposerStaticInit278accc5d485536ec8986e1a90eefdc6
|
||||
class ComposerStaticInitc8b7e28468ba5c034337353b19833901
|
||||
{
|
||||
public static $files = array (
|
||||
'320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php',
|
||||
|
@ -3887,9 +3887,9 @@ class ComposerStaticInit278accc5d485536ec8986e1a90eefdc6
|
|||
public static function getInitializer(ClassLoader $loader)
|
||||
{
|
||||
return \Closure::bind(function () use ($loader) {
|
||||
$loader->prefixLengthsPsr4 = ComposerStaticInit278accc5d485536ec8986e1a90eefdc6::$prefixLengthsPsr4;
|
||||
$loader->prefixDirsPsr4 = ComposerStaticInit278accc5d485536ec8986e1a90eefdc6::$prefixDirsPsr4;
|
||||
$loader->classMap = ComposerStaticInit278accc5d485536ec8986e1a90eefdc6::$classMap;
|
||||
$loader->prefixLengthsPsr4 = ComposerStaticInitc8b7e28468ba5c034337353b19833901::$prefixLengthsPsr4;
|
||||
$loader->prefixDirsPsr4 = ComposerStaticInitc8b7e28468ba5c034337353b19833901::$prefixDirsPsr4;
|
||||
$loader->classMap = ComposerStaticInitc8b7e28468ba5c034337353b19833901::$classMap;
|
||||
|
||||
}, null, ClassLoader::class);
|
||||
}
|
||||
|
|
10
vendor/scoper-autoload.php
vendored
10
vendor/scoper-autoload.php
vendored
|
@ -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('RectorPrefix20220510\AutoloadIncluder');
|
||||
}
|
||||
if (!class_exists('ComposerAutoloaderInit278accc5d485536ec8986e1a90eefdc6', false) && !interface_exists('ComposerAutoloaderInit278accc5d485536ec8986e1a90eefdc6', false) && !trait_exists('ComposerAutoloaderInit278accc5d485536ec8986e1a90eefdc6', false)) {
|
||||
spl_autoload_call('RectorPrefix20220510\ComposerAutoloaderInit278accc5d485536ec8986e1a90eefdc6');
|
||||
if (!class_exists('ComposerAutoloaderInitc8b7e28468ba5c034337353b19833901', false) && !interface_exists('ComposerAutoloaderInitc8b7e28468ba5c034337353b19833901', false) && !trait_exists('ComposerAutoloaderInitc8b7e28468ba5c034337353b19833901', false)) {
|
||||
spl_autoload_call('RectorPrefix20220510\ComposerAutoloaderInitc8b7e28468ba5c034337353b19833901');
|
||||
}
|
||||
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('RectorPrefix20220510\Helmich\TypoScriptParser\Parser\AST\Statement');
|
||||
|
@ -59,9 +59,9 @@ if (!function_exists('print_node')) {
|
|||
return \RectorPrefix20220510\print_node(...func_get_args());
|
||||
}
|
||||
}
|
||||
if (!function_exists('composerRequire278accc5d485536ec8986e1a90eefdc6')) {
|
||||
function composerRequire278accc5d485536ec8986e1a90eefdc6() {
|
||||
return \RectorPrefix20220510\composerRequire278accc5d485536ec8986e1a90eefdc6(...func_get_args());
|
||||
if (!function_exists('composerRequirec8b7e28468ba5c034337353b19833901')) {
|
||||
function composerRequirec8b7e28468ba5c034337353b19833901() {
|
||||
return \RectorPrefix20220510\composerRequirec8b7e28468ba5c034337353b19833901(...func_get_args());
|
||||
}
|
||||
}
|
||||
if (!function_exists('scanPath')) {
|
||||
|
|
Loading…
Reference in New Issue
Block a user