Updated Rector to commit ca36485a2e8abbdb36873d55a59676080be306ed

ca36485a2e Defer type-resolving in SimplifyBoolIdenticalTrueRector (#3757)
This commit is contained in:
Tomas Votruba 2023-05-07 18:57:49 +00:00
parent df93022ac5
commit 2f18a080f8
5 changed files with 16 additions and 19 deletions

View File

@ -53,15 +53,13 @@ CODE_SAMPLE
*/
public function refactor(Node $node) : ?Node
{
$leftType = $this->getType($node->left);
if ($leftType->isBoolean()->yes() && !$this->valueResolver->isTrueOrFalse($node->left)) {
if (!$this->valueResolver->isTrueOrFalse($node->left) && $this->getType($node->left)->isBoolean()->yes()) {
return $this->processBoolTypeToNotBool($node, $node->left, $node->right);
}
$rightType = $this->getType($node->right);
if (!$rightType->isBoolean()->yes()) {
if ($this->valueResolver->isTrueOrFalse($node->right)) {
return null;
}
if ($this->valueResolver->isTrueOrFalse($node->right)) {
if (!$this->getType($node->right)->isBoolean()->yes()) {
return null;
}
return $this->processBoolTypeToNotBool($node, $node->right, $node->left);
@ -86,9 +84,8 @@ CODE_SAMPLE
if ($leftExpr instanceof BooleanNot) {
return $leftExpr->expr;
}
$leftExprType = $this->getType($leftExpr);
// keep as it is, readable enough
if ($leftExpr instanceof Variable && $leftExprType->isBoolean()->yes()) {
if ($leftExpr instanceof Variable && $this->getType($leftExpr)->isBoolean()->yes()) {
return null;
}
return new BooleanNot($leftExpr);

View File

@ -19,12 +19,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = '3e5c7ba11e79c8d30a2136f63f2ec9e4996faa8e';
public const PACKAGE_VERSION = 'ca36485a2e8abbdb36873d55a59676080be306ed';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2023-05-07 13:08:37';
public const RELEASE_DATE = '2023-05-07 19:54:00';
/**
* @var int
*/

2
vendor/autoload.php vendored
View File

@ -22,4 +22,4 @@ if (PHP_VERSION_ID < 50600) {
require_once __DIR__ . '/composer/autoload_real.php';
return ComposerAutoloaderInit77eee02673b88178a2e482edd198cad6::getLoader();
return ComposerAutoloaderInitec87518324a0c48ba55281ffc52c4022::getLoader();

View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInit77eee02673b88178a2e482edd198cad6
class ComposerAutoloaderInitec87518324a0c48ba55281ffc52c4022
{
private static $loader;
@ -22,17 +22,17 @@ class ComposerAutoloaderInit77eee02673b88178a2e482edd198cad6
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInit77eee02673b88178a2e482edd198cad6', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInitec87518324a0c48ba55281ffc52c4022', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
spl_autoload_unregister(array('ComposerAutoloaderInit77eee02673b88178a2e482edd198cad6', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInitec87518324a0c48ba55281ffc52c4022', 'loadClassLoader'));
require __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInit77eee02673b88178a2e482edd198cad6::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInitec87518324a0c48ba55281ffc52c4022::getInitializer($loader));
$loader->setClassMapAuthoritative(true);
$loader->register(true);
$filesToLoad = \Composer\Autoload\ComposerStaticInit77eee02673b88178a2e482edd198cad6::$files;
$filesToLoad = \Composer\Autoload\ComposerStaticInitec87518324a0c48ba55281ffc52c4022::$files;
$requireFile = \Closure::bind(static function ($fileIdentifier, $file) {
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;

View File

@ -4,7 +4,7 @@
namespace Composer\Autoload;
class ComposerStaticInit77eee02673b88178a2e482edd198cad6
class ComposerStaticInitec87518324a0c48ba55281ffc52c4022
{
public static $files = array (
'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
@ -3124,9 +3124,9 @@ class ComposerStaticInit77eee02673b88178a2e482edd198cad6
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit77eee02673b88178a2e482edd198cad6::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit77eee02673b88178a2e482edd198cad6::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit77eee02673b88178a2e482edd198cad6::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInitec87518324a0c48ba55281ffc52c4022::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInitec87518324a0c48ba55281ffc52c4022::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInitec87518324a0c48ba55281ffc52c4022::$classMap;
}, null, ClassLoader::class);
}