octoleo/rector
1
1
Fork 0
mirror of https://github.com/rectorphp/rector.git synced 2024-06-16 08:02:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated Rector to commit ad41e8a6cf9c319bc25ef3d6b6b47643edc76499

Browse Source 
ad41e8a6cf [CodeQuality][Performance] Reduce repetitive NodeTypeResolver->getType() on ExprBoolCaster (#4279)
This commit is contained in:
Tomas Votruba 2023-06-18 14:30:25 +00:00
parent 09e844dec2
commit 852d73ba40
5 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
rules/CodeQuality/NodeManipulator/ExprBoolCaster.php
View File

@ -8,6 +8,8 @@ use PhpParser\Node\Expr\BinaryOp;
use PhpParser\Node\Expr\BinaryOp\NotIdentical;
use PhpParser\Node\Expr\BooleanNot;
use PhpParser\Node\Expr\Cast\Bool_;
use PHPStan\Type\Type;
use PHPStan\Type\TypeCombinator;
use PHPStan\Type\UnionType;
use Rector\Core\PhpParser\Node\NodeFactory;
use Rector\NodeTypeResolver\NodeTypeResolver;
@ -44,13 +46,13 @@ final class ExprBoolCaster
}
public function boolCastOrNullCompareIfNeeded(Expr $expr) : Expr
{
if (!$this->nodeTypeResolver->isNullableType($expr)) {
if (!$this->isBoolCastNeeded($expr)) {
$exprStaticType = $this->nodeTypeResolver->getType($expr);
if (!TypeCombinator::containsNull($exprStaticType)) {
if (!$this->isBoolCastNeeded($expr, $exprStaticType)) {
return $expr;
}
return new Bool_($expr);
}
$exprStaticType = $this->nodeTypeResolver->getType($expr);
// if we remove null type, still has to be trueable
if ($exprStaticType instanceof UnionType) {
$unionTypeWithoutNullType = $this->typeUnwrapper->removeNullTypeFromUnionType($exprStaticType);
@ -60,17 +62,16 @@ final class ExprBoolCaster
} elseif ($this->staticTypeAnalyzer->isAlwaysTruableType($exprStaticType)) {
return new NotIdentical($expr, $this->nodeFactory->createNull());
}
if (!$this->isBoolCastNeeded($expr)) {
if (!$this->isBoolCastNeeded($expr, $exprStaticType)) {
return $expr;
}
return new Bool_($expr);
}
private function isBoolCastNeeded(Expr $expr) : bool
private function isBoolCastNeeded(Expr $expr, Type $exprType) : bool
{
if ($expr instanceof BooleanNot) {
return \false;
}
$exprType = $this->nodeTypeResolver->getType($expr);
if ($exprType->isBoolean()->yes()) {
return \false;
}

4
src/Application/VersionResolver.php
View File

@ -19,12 +19,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = 'c8e7963c048c61053f98c2aaa5690891cecc884e';
public const PACKAGE_VERSION = 'ad41e8a6cf9c319bc25ef3d6b6b47643edc76499';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2023-06-18 14:00:17';
public const RELEASE_DATE = '2023-06-18 21:24:46';
/**
* @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 ComposerAutoloaderInitf6a111c9029b0e34cc1fc0802a8670be::getLoader();
return ComposerAutoloaderInita23263c676bf46f912b30aa811ee8082::getLoader();

10
vendor/composer/autoload_real.php vendored
View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInitf6a111c9029b0e34cc1fc0802a8670be
class ComposerAutoloaderInita23263c676bf46f912b30aa811ee8082
{
private static $loader;
@ -22,17 +22,17 @@ class ComposerAutoloaderInitf6a111c9029b0e34cc1fc0802a8670be
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInitf6a111c9029b0e34cc1fc0802a8670be', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInita23263c676bf46f912b30aa811ee8082', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
spl_autoload_unregister(array('ComposerAutoloaderInitf6a111c9029b0e34cc1fc0802a8670be', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInita23263c676bf46f912b30aa811ee8082', 'loadClassLoader'));
require __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInitf6a111c9029b0e34cc1fc0802a8670be::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInita23263c676bf46f912b30aa811ee8082::getInitializer($loader));
$loader->setClassMapAuthoritative(true);
$loader->register(true);
$filesToLoad = \Composer\Autoload\ComposerStaticInitf6a111c9029b0e34cc1fc0802a8670be::$files;
$filesToLoad = \Composer\Autoload\ComposerStaticInita23263c676bf46f912b30aa811ee8082::$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
View File

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