diff --git a/rules/Strict/Rector/Empty_/DisallowedEmptyRuleFixerRector.php b/rules/Strict/Rector/Empty_/DisallowedEmptyRuleFixerRector.php index f6003367a79..1ca7456ab02 100644 --- a/rules/Strict/Rector/Empty_/DisallowedEmptyRuleFixerRector.php +++ b/rules/Strict/Rector/Empty_/DisallowedEmptyRuleFixerRector.php @@ -92,7 +92,7 @@ CODE_SAMPLE if ($this->exprAnalyzer->isNonTypedFromParam($empty->expr)) { return null; } - $emptyExprType = $scope->getType($empty->expr); + $emptyExprType = $scope->getNativeType($empty->expr); return $this->exactCompareFactory->createNotIdenticalFalsyCompare($emptyExprType, $empty->expr, $this->treatAsNonEmpty); } private function refactorEmpty(Empty_ $empty, Scope $scope, bool $treatAsNonEmpty) : ?\PhpParser\Node\Expr @@ -100,7 +100,7 @@ CODE_SAMPLE if ($this->exprAnalyzer->isNonTypedFromParam($empty->expr)) { return null; } - $exprType = $scope->getType($empty->expr); + $exprType = $scope->getNativeType($empty->expr); return $this->exactCompareFactory->createIdenticalFalsyCompare($exprType, $empty->expr, $treatAsNonEmpty); } private function createDimFetchBooleanAnd(Empty_ $empty) : ?BooleanAnd diff --git a/rules/TypeDeclaration/Rector/Class_/ReturnTypeFromStrictTernaryRector.php b/rules/TypeDeclaration/Rector/Class_/ReturnTypeFromStrictTernaryRector.php index 22c62a5d62d..bd58e9baa6b 100644 --- a/rules/TypeDeclaration/Rector/Class_/ReturnTypeFromStrictTernaryRector.php +++ b/rules/TypeDeclaration/Rector/Class_/ReturnTypeFromStrictTernaryRector.php @@ -92,7 +92,7 @@ CODE_SAMPLE } $ternary = $return->expr; $returnScope = $return->expr->getAttribute(AttributeKey::SCOPE); - if ($returnScope === null) { + if (!$returnScope instanceof Scope) { return null; } $nativeTernaryType = $returnScope->getNativeType($ternary); diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php index b467603e242..2f686b938cc 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 = 'c01925aad05a9baf0a44701a069a989ca3c0edc8'; + public const PACKAGE_VERSION = '65e6caedb37c1d447a4da1992a14b82c5aa41871'; /** * @api * @var string */ - public const RELEASE_DATE = '2023-07-26 12:27:21'; + public const RELEASE_DATE = '2023-07-26 21:40:26'; /** * @var int */ diff --git a/vendor/autoload.php b/vendor/autoload.php index e101120d4e9..7d7c5d6e5d5 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 ComposerAutoloaderInit8f22c058fe3b976c909bb1a233c9c18e::getLoader(); +return ComposerAutoloaderInitc3ad04fcaf291bdfa1710de93fd08971::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index ab8573f37a6..964a0ad7e3c 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInit8f22c058fe3b976c909bb1a233c9c18e +class ComposerAutoloaderInitc3ad04fcaf291bdfa1710de93fd08971 { private static $loader; @@ -22,17 +22,17 @@ class ComposerAutoloaderInit8f22c058fe3b976c909bb1a233c9c18e return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInit8f22c058fe3b976c909bb1a233c9c18e', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInitc3ad04fcaf291bdfa1710de93fd08971', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__)); - spl_autoload_unregister(array('ComposerAutoloaderInit8f22c058fe3b976c909bb1a233c9c18e', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInitc3ad04fcaf291bdfa1710de93fd08971', 'loadClassLoader')); require __DIR__ . '/autoload_static.php'; - call_user_func(\Composer\Autoload\ComposerStaticInit8f22c058fe3b976c909bb1a233c9c18e::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInitc3ad04fcaf291bdfa1710de93fd08971::getInitializer($loader)); $loader->setClassMapAuthoritative(true); $loader->register(true); - $filesToLoad = \Composer\Autoload\ComposerStaticInit8f22c058fe3b976c909bb1a233c9c18e::$files; + $filesToLoad = \Composer\Autoload\ComposerStaticInitc3ad04fcaf291bdfa1710de93fd08971::$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 ffd714922b4..b8c0e9471f7 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInit8f22c058fe3b976c909bb1a233c9c18e +class ComposerStaticInitc3ad04fcaf291bdfa1710de93fd08971 { public static $files = array ( 'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php', @@ -3023,9 +3023,9 @@ class ComposerStaticInit8f22c058fe3b976c909bb1a233c9c18e public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInit8f22c058fe3b976c909bb1a233c9c18e::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInit8f22c058fe3b976c909bb1a233c9c18e::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInit8f22c058fe3b976c909bb1a233c9c18e::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInitc3ad04fcaf291bdfa1710de93fd08971::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInitc3ad04fcaf291bdfa1710de93fd08971::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInitc3ad04fcaf291bdfa1710de93fd08971::$classMap; }, null, ClassLoader::class); }