mirror of
https://github.com/rectorphp/rector.git
synced 2024-05-29 07:20:52 +00:00
Updated Rector to commit 0f412e7961d9c00f47185bd8ed235db950f2d3eb
0f412e7961
handle nested ternary have last and start with () (#3981)
This commit is contained in:
parent
c9d2c84bc5
commit
d9bf6b5c97
|
@ -54,9 +54,6 @@ CODE_SAMPLE
|
|||
*/
|
||||
public function refactor(Node $node) : ?Node
|
||||
{
|
||||
if ($node->if instanceof Ternary && !$this->parenthesizedNestedTernaryAnalyzer->isParenthesized($this->file, $node) && $this->parenthesizedNestedTernaryAnalyzer->isParenthesized($this->file, $node->if)) {
|
||||
return null;
|
||||
}
|
||||
if ($node->cond instanceof Ternary || $node->else instanceof Ternary) {
|
||||
if ($this->parenthesizedNestedTernaryAnalyzer->isParenthesized($this->file, $node)) {
|
||||
return null;
|
||||
|
|
|
@ -14,11 +14,6 @@ final class ParenthesizedNestedTernaryAnalyzer
|
|||
$endTokenPos = $ternary->getEndTokenPos();
|
||||
$hasOpenParentheses = isset($oldTokens[$startTokenPos]) && $oldTokens[$startTokenPos] === '(';
|
||||
$hasCloseParentheses = isset($oldTokens[$endTokenPos]) && $oldTokens[$endTokenPos] === ')';
|
||||
if ($hasOpenParentheses || $hasCloseParentheses) {
|
||||
return \true;
|
||||
}
|
||||
$hasOpenParentheses = isset($oldTokens[$startTokenPos - 1]) && $oldTokens[$startTokenPos - 1] === '(';
|
||||
$hasCloseParentheses = isset($oldTokens[$endTokenPos + 1]) && $oldTokens[$endTokenPos + 1] === ')';
|
||||
return $hasOpenParentheses || $hasCloseParentheses;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -19,12 +19,12 @@ final class VersionResolver
|
|||
* @api
|
||||
* @var string
|
||||
*/
|
||||
public const PACKAGE_VERSION = '385a9cb5f1235808c7226c2efccdc10fc6de6542';
|
||||
public const PACKAGE_VERSION = '0f412e7961d9c00f47185bd8ed235db950f2d3eb';
|
||||
/**
|
||||
* @api
|
||||
* @var string
|
||||
*/
|
||||
public const RELEASE_DATE = '2023-05-27 06:51:20';
|
||||
public const RELEASE_DATE = '2023-05-27 03:03:10';
|
||||
/**
|
||||
* @var int
|
||||
*/
|
||||
|
|
2
vendor/autoload.php
vendored
2
vendor/autoload.php
vendored
|
@ -22,4 +22,4 @@ if (PHP_VERSION_ID < 50600) {
|
|||
|
||||
require_once __DIR__ . '/composer/autoload_real.php';
|
||||
|
||||
return ComposerAutoloaderInit9576e7fea326dfc1163ee0d8beba050d::getLoader();
|
||||
return ComposerAutoloaderInit71acb8fab42d4688a5d2e90018b0000d::getLoader();
|
||||
|
|
10
vendor/composer/autoload_real.php
vendored
10
vendor/composer/autoload_real.php
vendored
|
@ -2,7 +2,7 @@
|
|||
|
||||
// autoload_real.php @generated by Composer
|
||||
|
||||
class ComposerAutoloaderInit9576e7fea326dfc1163ee0d8beba050d
|
||||
class ComposerAutoloaderInit71acb8fab42d4688a5d2e90018b0000d
|
||||
{
|
||||
private static $loader;
|
||||
|
||||
|
@ -22,17 +22,17 @@ class ComposerAutoloaderInit9576e7fea326dfc1163ee0d8beba050d
|
|||
return self::$loader;
|
||||
}
|
||||
|
||||
spl_autoload_register(array('ComposerAutoloaderInit9576e7fea326dfc1163ee0d8beba050d', 'loadClassLoader'), true, true);
|
||||
spl_autoload_register(array('ComposerAutoloaderInit71acb8fab42d4688a5d2e90018b0000d', 'loadClassLoader'), true, true);
|
||||
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
|
||||
spl_autoload_unregister(array('ComposerAutoloaderInit9576e7fea326dfc1163ee0d8beba050d', 'loadClassLoader'));
|
||||
spl_autoload_unregister(array('ComposerAutoloaderInit71acb8fab42d4688a5d2e90018b0000d', 'loadClassLoader'));
|
||||
|
||||
require __DIR__ . '/autoload_static.php';
|
||||
call_user_func(\Composer\Autoload\ComposerStaticInit9576e7fea326dfc1163ee0d8beba050d::getInitializer($loader));
|
||||
call_user_func(\Composer\Autoload\ComposerStaticInit71acb8fab42d4688a5d2e90018b0000d::getInitializer($loader));
|
||||
|
||||
$loader->setClassMapAuthoritative(true);
|
||||
$loader->register(true);
|
||||
|
||||
$filesToLoad = \Composer\Autoload\ComposerStaticInit9576e7fea326dfc1163ee0d8beba050d::$files;
|
||||
$filesToLoad = \Composer\Autoload\ComposerStaticInit71acb8fab42d4688a5d2e90018b0000d::$files;
|
||||
$requireFile = \Closure::bind(static function ($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 ComposerStaticInit9576e7fea326dfc1163ee0d8beba050d
|
||||
class ComposerStaticInit71acb8fab42d4688a5d2e90018b0000d
|
||||
{
|
||||
public static $files = array (
|
||||
'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
|
||||
|
@ -3089,9 +3089,9 @@ class ComposerStaticInit9576e7fea326dfc1163ee0d8beba050d
|
|||
public static function getInitializer(ClassLoader $loader)
|
||||
{
|
||||
return \Closure::bind(function () use ($loader) {
|
||||
$loader->prefixLengthsPsr4 = ComposerStaticInit9576e7fea326dfc1163ee0d8beba050d::$prefixLengthsPsr4;
|
||||
$loader->prefixDirsPsr4 = ComposerStaticInit9576e7fea326dfc1163ee0d8beba050d::$prefixDirsPsr4;
|
||||
$loader->classMap = ComposerStaticInit9576e7fea326dfc1163ee0d8beba050d::$classMap;
|
||||
$loader->prefixLengthsPsr4 = ComposerStaticInit71acb8fab42d4688a5d2e90018b0000d::$prefixLengthsPsr4;
|
||||
$loader->prefixDirsPsr4 = ComposerStaticInit71acb8fab42d4688a5d2e90018b0000d::$prefixDirsPsr4;
|
||||
$loader->classMap = ComposerStaticInit71acb8fab42d4688a5d2e90018b0000d::$classMap;
|
||||
|
||||
}, null, ClassLoader::class);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user