From 279e6b242e2f3de3675d9914360fd6b5cdf57318 Mon Sep 17 00:00:00 2001 From: Tomas Votruba Date: Sat, 16 Sep 2023 11:56:33 +0000 Subject: [PATCH] Updated Rector to commit 0acf4bd13469aff2ad461317d026234840aa8091 https://github.com/rectorphp/rector-src/commit/0acf4bd13469aff2ad461317d026234840aa8091 Simplify UseIdenticalOverEqualWithSameTypeRector (#5029) --- ...seIdenticalOverEqualWithSameTypeRector.php | 23 ++----------------- src/Application/VersionResolver.php | 4 ++-- vendor/autoload.php | 2 +- vendor/composer/autoload_real.php | 10 ++++---- vendor/composer/autoload_static.php | 8 +++---- 5 files changed, 14 insertions(+), 33 deletions(-) diff --git a/rules/CodeQuality/Rector/Equal/UseIdenticalOverEqualWithSameTypeRector.php b/rules/CodeQuality/Rector/Equal/UseIdenticalOverEqualWithSameTypeRector.php index eb91abd66ad..e7b724b0b24 100644 --- a/rules/CodeQuality/Rector/Equal/UseIdenticalOverEqualWithSameTypeRector.php +++ b/rules/CodeQuality/Rector/Equal/UseIdenticalOverEqualWithSameTypeRector.php @@ -20,15 +20,6 @@ use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; */ final class UseIdenticalOverEqualWithSameTypeRector extends AbstractRector { - /** - * @readonly - * @var \Rector\Core\NodeAnalyzer\ExprAnalyzer - */ - private $exprAnalyzer; - public function __construct(ExprAnalyzer $exprAnalyzer) - { - $this->exprAnalyzer = $exprAnalyzer; - } public function getRuleDefinition() : RuleDefinition { return new RuleDefinition('Use ===/!== over ==/!=, it values have the same type', [new CodeSample(<<<'CODE_SAMPLE' @@ -65,7 +56,7 @@ CODE_SAMPLE */ public function refactor(Node $node) : ?Node { - $leftStaticType = $this->getType($node->left); + $leftStaticType = $this->nodeTypeResolver->getNativeType($node->left); // objects can be different by content if ($leftStaticType instanceof ObjectType) { return null; @@ -73,7 +64,7 @@ CODE_SAMPLE if ($leftStaticType instanceof MixedType) { return null; } - $rightStaticType = $this->getType($node->right); + $rightStaticType = $this->nodeTypeResolver->getNativeType($node->right); if ($rightStaticType instanceof MixedType) { return null; } @@ -81,19 +72,9 @@ CODE_SAMPLE if (!$leftStaticType->equals($rightStaticType)) { return null; } - if ($this->areNonTypedFromParam($node->left, $node->right)) { - return null; - } if ($node instanceof Equal) { return new Identical($node->left, $node->right); } return new NotIdentical($node->left, $node->right); } - private function areNonTypedFromParam(Expr $left, Expr $right) : bool - { - if ($this->exprAnalyzer->isNonTypedFromParam($left)) { - return \true; - } - return $this->exprAnalyzer->isNonTypedFromParam($right); - } } diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php index 09f0992a0b6..0f9f0e8dc4d 100644 --- a/src/Application/VersionResolver.php +++ b/src/Application/VersionResolver.php @@ -19,12 +19,12 @@ final class VersionResolver * @api * @var string */ - public const PACKAGE_VERSION = 'c8ff683305a228aa2bfbe2c11eccc7a712c5db94'; + public const PACKAGE_VERSION = '0acf4bd13469aff2ad461317d026234840aa8091'; /** * @api * @var string */ - public const RELEASE_DATE = '2023-09-16 13:42:27'; + public const RELEASE_DATE = '2023-09-16 13:53:39'; /** * @var int */ diff --git a/vendor/autoload.php b/vendor/autoload.php index 79ec6f735cb..d0ecc17fe60 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -22,4 +22,4 @@ if (PHP_VERSION_ID < 50600) { require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInitf2f9f32ac35c78d31d1040c9deef4344::getLoader(); +return ComposerAutoloaderInit094d7b995b2bd66adbf9d22d39e15d69::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index bf77993aac9..c4eebb14d7d 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInitf2f9f32ac35c78d31d1040c9deef4344 +class ComposerAutoloaderInit094d7b995b2bd66adbf9d22d39e15d69 { private static $loader; @@ -22,17 +22,17 @@ class ComposerAutoloaderInitf2f9f32ac35c78d31d1040c9deef4344 return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInitf2f9f32ac35c78d31d1040c9deef4344', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInit094d7b995b2bd66adbf9d22d39e15d69', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__)); - spl_autoload_unregister(array('ComposerAutoloaderInitf2f9f32ac35c78d31d1040c9deef4344', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInit094d7b995b2bd66adbf9d22d39e15d69', 'loadClassLoader')); require __DIR__ . '/autoload_static.php'; - call_user_func(\Composer\Autoload\ComposerStaticInitf2f9f32ac35c78d31d1040c9deef4344::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInit094d7b995b2bd66adbf9d22d39e15d69::getInitializer($loader)); $loader->setClassMapAuthoritative(true); $loader->register(true); - $filesToLoad = \Composer\Autoload\ComposerStaticInitf2f9f32ac35c78d31d1040c9deef4344::$files; + $filesToLoad = \Composer\Autoload\ComposerStaticInit094d7b995b2bd66adbf9d22d39e15d69::$files; $requireFile = \Closure::bind(static function ($fileIdentifier, $file) { if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) { $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true; diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index 3ed7a49d8dd..b7363a4e747 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInitf2f9f32ac35c78d31d1040c9deef4344 +class ComposerStaticInit094d7b995b2bd66adbf9d22d39e15d69 { public static $files = array ( 'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php', @@ -2593,9 +2593,9 @@ class ComposerStaticInitf2f9f32ac35c78d31d1040c9deef4344 public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInitf2f9f32ac35c78d31d1040c9deef4344::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInitf2f9f32ac35c78d31d1040c9deef4344::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInitf2f9f32ac35c78d31d1040c9deef4344::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInit094d7b995b2bd66adbf9d22d39e15d69::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInit094d7b995b2bd66adbf9d22d39e15d69::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInit094d7b995b2bd66adbf9d22d39e15d69::$classMap; }, null, ClassLoader::class); }