diff --git a/rules/CodeQuality/Rector/FunctionLike/RemoveAlwaysTrueConditionSetInConstructorRector.php b/rules/CodeQuality/Rector/FunctionLike/RemoveAlwaysTrueConditionSetInConstructorRector.php index 1ddc628697b..93827547559 100644 --- a/rules/CodeQuality/Rector/FunctionLike/RemoveAlwaysTrueConditionSetInConstructorRector.php +++ b/rules/CodeQuality/Rector/FunctionLike/RemoveAlwaysTrueConditionSetInConstructorRector.php @@ -128,7 +128,7 @@ CODE_SAMPLE return \false; } // just one if - if ($node->elseifs !== []) { + if (\count($node->elseifs) !== 0) { return \false; } // there is some else diff --git a/rules/CodingStyle/Rector/FuncCall/CountArrayToEmptyArrayComparisonRector.php b/rules/CodingStyle/Rector/FuncCall/CountArrayToEmptyArrayComparisonRector.php index 7fe5044980f..277e34b330f 100644 --- a/rules/CodingStyle/Rector/FuncCall/CountArrayToEmptyArrayComparisonRector.php +++ b/rules/CodingStyle/Rector/FuncCall/CountArrayToEmptyArrayComparisonRector.php @@ -68,7 +68,7 @@ CODE_SAMPLE if (!$parent instanceof \PhpParser\Node) { return null; } - $processIdentical = $this->processIdenticalOrNotIdentical($parent, $node, $expr); + $processIdentical = $this->processIdentical($parent, $node, $expr); if ($processIdentical !== null) { return $processIdentical; } @@ -103,14 +103,14 @@ CODE_SAMPLE } return $scope->getType($expr) instanceof \PHPStan\Type\ArrayType; } - private function processIdenticalOrNotIdentical(\PhpParser\Node $node, \PhpParser\Node\Expr\FuncCall $funcCall, \PhpParser\Node\Expr $expr) : ?\PhpParser\Node\Expr + private function processIdentical(\PhpParser\Node $node, \PhpParser\Node\Expr\FuncCall $funcCall, \PhpParser\Node\Expr $expr) : ?\PhpParser\Node\Expr { - if (($node instanceof \PhpParser\Node\Expr\BinaryOp\Identical || $node instanceof \PhpParser\Node\Expr\BinaryOp\NotIdentical) && $node->right instanceof \PhpParser\Node\Scalar\LNumber && $node->right->value === 0) { + if ($node instanceof \PhpParser\Node\Expr\BinaryOp\Identical && $node->right instanceof \PhpParser\Node\Scalar\LNumber && $node->right->value === 0) { $this->removeNode($funcCall); $node->right = new \PhpParser\Node\Expr\Array_([]); return $expr; } - if (($node instanceof \PhpParser\Node\Expr\BinaryOp\Identical || $node instanceof \PhpParser\Node\Expr\BinaryOp\NotIdentical) && $node->left instanceof \PhpParser\Node\Scalar\LNumber && $node->left->value === 0) { + if ($node instanceof \PhpParser\Node\Expr\BinaryOp\Identical && $node->left instanceof \PhpParser\Node\Scalar\LNumber && $node->left->value === 0) { $this->removeNode($funcCall); $node->left = new \PhpParser\Node\Expr\Array_([]); return $expr; diff --git a/rules/DeadCode/Rector/If_/RemoveAlwaysTrueIfConditionRector.php b/rules/DeadCode/Rector/If_/RemoveAlwaysTrueIfConditionRector.php index b87ec56c965..10a32a81768 100644 --- a/rules/DeadCode/Rector/If_/RemoveAlwaysTrueIfConditionRector.php +++ b/rules/DeadCode/Rector/If_/RemoveAlwaysTrueIfConditionRector.php @@ -58,7 +58,7 @@ CODE_SAMPLE return null; } // just one if - if ($node->elseifs !== []) { + if (\count($node->elseifs) !== 0) { return null; } $conditionStaticType = $this->getStaticType($node->cond); diff --git a/rules/DeadCode/Rector/MethodCall/RemoveEmptyMethodCallRector.php b/rules/DeadCode/Rector/MethodCall/RemoveEmptyMethodCallRector.php index 16dc91783ea..58bf4e9dc73 100644 --- a/rules/DeadCode/Rector/MethodCall/RemoveEmptyMethodCallRector.php +++ b/rules/DeadCode/Rector/MethodCall/RemoveEmptyMethodCallRector.php @@ -115,7 +115,7 @@ CODE_SAMPLE if ($classMethod->isAbstract()) { return \true; } - return (array) $classMethod->stmts !== []; + return \count((array) $classMethod->stmts) !== 0; } private function processArrowFunction(\PhpParser\Node\Expr\ArrowFunction $arrowFunction, \PhpParser\Node\Expr\MethodCall $methodCall) : \PhpParser\Node\Expr { diff --git a/rules/DowngradePhp80/Rector/Class_/DowngradeAttributeToAnnotationRector.php b/rules/DowngradePhp80/Rector/Class_/DowngradeAttributeToAnnotationRector.php index 5f31e56f688..a4db52798ec 100644 --- a/rules/DowngradePhp80/Rector/Class_/DowngradeAttributeToAnnotationRector.php +++ b/rules/DowngradePhp80/Rector/Class_/DowngradeAttributeToAnnotationRector.php @@ -115,7 +115,7 @@ CODE_SAMPLE private function cleanupEmptyAttrGroups($node) : void { foreach ($node->attrGroups as $key => $attrGroup) { - if ($attrGroup->attrs !== []) { + if (\count($attrGroup->attrs) !== 0) { continue; } unset($node->attrGroups[$key]); diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php index b45c0a1693a..23d6f2970b2 100644 --- a/src/Application/VersionResolver.php +++ b/src/Application/VersionResolver.php @@ -16,11 +16,11 @@ final class VersionResolver /** * @var string */ - public const PACKAGE_VERSION = '1913747f014f5b4663dec6b32148a8d5046a74a5'; + public const PACKAGE_VERSION = '4fb6b2a88750b3467f9056ddcd4d32489f5267dd'; /** * @var string */ - public const RELEASE_DATE = '2021-06-03 10:19:47'; + public const RELEASE_DATE = '2021-06-03 10:19:11'; public static function resolvePackageVersion() : string { $process = new \RectorPrefix20210603\Symfony\Component\Process\Process(['git', 'log', '--pretty="%H"', '-n1', 'HEAD'], __DIR__); diff --git a/vendor/autoload.php b/vendor/autoload.php index 929bc1a0a7d..fdbd1439ddf 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -4,4 +4,4 @@ require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInit503b722da5709d387b7df681e685ac36::getLoader(); +return ComposerAutoloaderInit36a450b5190ce21ca1d0eda2158237c5::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index b80858dcfc0..58a3e4966ea 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInit503b722da5709d387b7df681e685ac36 +class ComposerAutoloaderInit36a450b5190ce21ca1d0eda2158237c5 { private static $loader; @@ -22,15 +22,15 @@ class ComposerAutoloaderInit503b722da5709d387b7df681e685ac36 return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInit503b722da5709d387b7df681e685ac36', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInit36a450b5190ce21ca1d0eda2158237c5', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__))); - spl_autoload_unregister(array('ComposerAutoloaderInit503b722da5709d387b7df681e685ac36', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInit36a450b5190ce21ca1d0eda2158237c5', '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\ComposerStaticInit503b722da5709d387b7df681e685ac36::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInit36a450b5190ce21ca1d0eda2158237c5::getInitializer($loader)); } else { $classMap = require __DIR__ . '/autoload_classmap.php'; if ($classMap) { @@ -42,19 +42,19 @@ class ComposerAutoloaderInit503b722da5709d387b7df681e685ac36 $loader->register(true); if ($useStaticLoader) { - $includeFiles = Composer\Autoload\ComposerStaticInit503b722da5709d387b7df681e685ac36::$files; + $includeFiles = Composer\Autoload\ComposerStaticInit36a450b5190ce21ca1d0eda2158237c5::$files; } else { $includeFiles = require __DIR__ . '/autoload_files.php'; } foreach ($includeFiles as $fileIdentifier => $file) { - composerRequire503b722da5709d387b7df681e685ac36($fileIdentifier, $file); + composerRequire36a450b5190ce21ca1d0eda2158237c5($fileIdentifier, $file); } return $loader; } } -function composerRequire503b722da5709d387b7df681e685ac36($fileIdentifier, $file) +function composerRequire36a450b5190ce21ca1d0eda2158237c5($fileIdentifier, $file) { if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) { require $file; diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index ab5ddfa5c60..bca05532b07 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInit503b722da5709d387b7df681e685ac36 +class ComposerStaticInit36a450b5190ce21ca1d0eda2158237c5 { public static $files = array ( 'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php', @@ -3869,9 +3869,9 @@ class ComposerStaticInit503b722da5709d387b7df681e685ac36 public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInit503b722da5709d387b7df681e685ac36::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInit503b722da5709d387b7df681e685ac36::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInit503b722da5709d387b7df681e685ac36::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInit36a450b5190ce21ca1d0eda2158237c5::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInit36a450b5190ce21ca1d0eda2158237c5::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInit36a450b5190ce21ca1d0eda2158237c5::$classMap; }, null, ClassLoader::class); } diff --git a/vendor/scoper-autoload.php b/vendor/scoper-autoload.php index 7f537252796..e4bae06f6f5 100644 --- a/vendor/scoper-autoload.php +++ b/vendor/scoper-autoload.php @@ -21,8 +21,8 @@ if (!class_exists('SomeTestCase', false) && !interface_exists('SomeTestCase', fa if (!class_exists('CheckoutEntityFactory', false) && !interface_exists('CheckoutEntityFactory', false) && !trait_exists('CheckoutEntityFactory', false)) { spl_autoload_call('RectorPrefix20210603\CheckoutEntityFactory'); } -if (!class_exists('ComposerAutoloaderInit503b722da5709d387b7df681e685ac36', false) && !interface_exists('ComposerAutoloaderInit503b722da5709d387b7df681e685ac36', false) && !trait_exists('ComposerAutoloaderInit503b722da5709d387b7df681e685ac36', false)) { - spl_autoload_call('RectorPrefix20210603\ComposerAutoloaderInit503b722da5709d387b7df681e685ac36'); +if (!class_exists('ComposerAutoloaderInit36a450b5190ce21ca1d0eda2158237c5', false) && !interface_exists('ComposerAutoloaderInit36a450b5190ce21ca1d0eda2158237c5', false) && !trait_exists('ComposerAutoloaderInit36a450b5190ce21ca1d0eda2158237c5', false)) { + spl_autoload_call('RectorPrefix20210603\ComposerAutoloaderInit36a450b5190ce21ca1d0eda2158237c5'); } if (!class_exists('Doctrine\Inflector\Inflector', false) && !interface_exists('Doctrine\Inflector\Inflector', false) && !trait_exists('Doctrine\Inflector\Inflector', false)) { spl_autoload_call('RectorPrefix20210603\Doctrine\Inflector\Inflector'); @@ -3323,9 +3323,9 @@ if (!function_exists('print_node')) { return \RectorPrefix20210603\print_node(...func_get_args()); } } -if (!function_exists('composerRequire503b722da5709d387b7df681e685ac36')) { - function composerRequire503b722da5709d387b7df681e685ac36() { - return \RectorPrefix20210603\composerRequire503b722da5709d387b7df681e685ac36(...func_get_args()); +if (!function_exists('composerRequire36a450b5190ce21ca1d0eda2158237c5')) { + function composerRequire36a450b5190ce21ca1d0eda2158237c5() { + return \RectorPrefix20210603\composerRequire36a450b5190ce21ca1d0eda2158237c5(...func_get_args()); } } if (!function_exists('parseArgs')) {