Updated Rector to commit 0f9e4f8360

0f9e4f8360 [CodeQuality] Handle recursive on LogicalToBooleanRector (#808)
This commit is contained in:
Tomas Votruba 2021-09-01 04:09:40 +00:00
parent 8fbb6d4a84
commit 1b59a1d474
6 changed files with 33 additions and 19 deletions

View File

@ -44,6 +44,20 @@ CODE_SAMPLE
*/
public function refactor(\PhpParser\Node $node) : ?\PhpParser\Node
{
return $this->refactorLogicalToBoolean($node);
}
/**
* @param \PhpParser\Node\Expr\BinaryOp\LogicalOr|\PhpParser\Node\Expr\BinaryOp\LogicalAnd $node
* @return \PhpParser\Node\Expr\BinaryOp\BooleanAnd|\PhpParser\Node\Expr\BinaryOp\BooleanOr
*/
private function refactorLogicalToBoolean($node)
{
if ($node->left instanceof \PhpParser\Node\Expr\BinaryOp\LogicalOr || $node->left instanceof \PhpParser\Node\Expr\BinaryOp\LogicalAnd) {
$node->left = $this->refactorLogicalToBoolean($node->left);
}
if ($node->right instanceof \PhpParser\Node\Expr\BinaryOp\LogicalOr || $node->right instanceof \PhpParser\Node\Expr\BinaryOp\LogicalAnd) {
$node->right = $this->refactorLogicalToBoolean($node->right);
}
if ($node instanceof \PhpParser\Node\Expr\BinaryOp\LogicalOr) {
return new \PhpParser\Node\Expr\BinaryOp\BooleanOr($node->left, $node->right);
}

View File

@ -16,11 +16,11 @@ final class VersionResolver
/**
* @var string
*/
public const PACKAGE_VERSION = '511a076211be7d2387961bddd75f88f5d33a0bd9';
public const PACKAGE_VERSION = '0f9e4f8360316848609929e6702cc074352ddb7c';
/**
* @var string
*/
public const RELEASE_DATE = '2021-09-01 01:59:09';
public const RELEASE_DATE = '2021-09-01 03:57:06';
public static function resolvePackageVersion() : string
{
$process = new \RectorPrefix20210901\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 ComposerAutoloaderInit7fed282450b4f4ae37f8336f4c074c29::getLoader();
return ComposerAutoloaderInit8c99b0e2b3a8bb2985046a71ea89ebe6::getLoader();

View File

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

View File

@ -4,7 +4,7 @@
namespace Composer\Autoload;
class ComposerStaticInit7fed282450b4f4ae37f8336f4c074c29
class ComposerStaticInit8c99b0e2b3a8bb2985046a71ea89ebe6
{
public static $files = array (
'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php',
@ -3855,9 +3855,9 @@ class ComposerStaticInit7fed282450b4f4ae37f8336f4c074c29
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit7fed282450b4f4ae37f8336f4c074c29::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit7fed282450b4f4ae37f8336f4c074c29::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit7fed282450b4f4ae37f8336f4c074c29::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInit8c99b0e2b3a8bb2985046a71ea89ebe6::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit8c99b0e2b3a8bb2985046a71ea89ebe6::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit8c99b0e2b3a8bb2985046a71ea89ebe6::$classMap;
}, null, ClassLoader::class);
}

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('RectorPrefix20210901\AutoloadIncluder');
}
if (!class_exists('ComposerAutoloaderInit7fed282450b4f4ae37f8336f4c074c29', false) && !interface_exists('ComposerAutoloaderInit7fed282450b4f4ae37f8336f4c074c29', false) && !trait_exists('ComposerAutoloaderInit7fed282450b4f4ae37f8336f4c074c29', false)) {
spl_autoload_call('RectorPrefix20210901\ComposerAutoloaderInit7fed282450b4f4ae37f8336f4c074c29');
if (!class_exists('ComposerAutoloaderInit8c99b0e2b3a8bb2985046a71ea89ebe6', false) && !interface_exists('ComposerAutoloaderInit8c99b0e2b3a8bb2985046a71ea89ebe6', false) && !trait_exists('ComposerAutoloaderInit8c99b0e2b3a8bb2985046a71ea89ebe6', false)) {
spl_autoload_call('RectorPrefix20210901\ComposerAutoloaderInit8c99b0e2b3a8bb2985046a71ea89ebe6');
}
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('RectorPrefix20210901\Helmich\TypoScriptParser\Parser\AST\Statement');
@ -3311,9 +3311,9 @@ if (!function_exists('print_node')) {
return \RectorPrefix20210901\print_node(...func_get_args());
}
}
if (!function_exists('composerRequire7fed282450b4f4ae37f8336f4c074c29')) {
function composerRequire7fed282450b4f4ae37f8336f4c074c29() {
return \RectorPrefix20210901\composerRequire7fed282450b4f4ae37f8336f4c074c29(...func_get_args());
if (!function_exists('composerRequire8c99b0e2b3a8bb2985046a71ea89ebe6')) {
function composerRequire8c99b0e2b3a8bb2985046a71ea89ebe6() {
return \RectorPrefix20210901\composerRequire8c99b0e2b3a8bb2985046a71ea89ebe6(...func_get_args());
}
}
if (!function_exists('parseArgs')) {