diff --git a/packages/BetterPhpDocParser/PhpDocParser/ConstExprClassNameDecorator.php b/packages/BetterPhpDocParser/PhpDocParser/ConstExprClassNameDecorator.php index be775a01480..7c4c5c18554 100644 --- a/packages/BetterPhpDocParser/PhpDocParser/ConstExprClassNameDecorator.php +++ b/packages/BetterPhpDocParser/PhpDocParser/ConstExprClassNameDecorator.php @@ -4,7 +4,6 @@ declare (strict_types=1); namespace Rector\BetterPhpDocParser\PhpDocParser; use PhpParser\Node as PhpNode; -use PHPStan\PhpDocParser\Ast\ConstExpr\ConstExprNode; use PHPStan\PhpDocParser\Ast\ConstExpr\ConstFetchNode; use PHPStan\PhpDocParser\Ast\Node; use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocNode; diff --git a/rules/EarlyReturn/Rector/If_/ChangeIfElseValueAssignToEarlyReturnRector.php b/rules/EarlyReturn/Rector/If_/ChangeIfElseValueAssignToEarlyReturnRector.php index 325a895be2c..c548d337395 100644 --- a/rules/EarlyReturn/Rector/If_/ChangeIfElseValueAssignToEarlyReturnRector.php +++ b/rules/EarlyReturn/Rector/If_/ChangeIfElseValueAssignToEarlyReturnRector.php @@ -115,6 +115,9 @@ CODE_SAMPLE $this->mirrorComments($stmt, $assign); $if->else = null; $stmt->expr = $assign->expr; + $lastStmt = \array_pop($node->stmts); + $elseStmtsExceptLast = \array_slice($elseStmts, 0, -1); + $node->stmts = \array_merge($node->stmts, $elseStmtsExceptLast, [$lastStmt]); return $node; } return null; diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php index 612ada03bc7..105b99b6622 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 = 'c94645b3ab7debe9c00531597c1b896080a2cf9d'; + public const PACKAGE_VERSION = 'a7cd7eda65894aea11ca012cac8ea4a29fb0a051'; /** * @api * @var string */ - public const RELEASE_DATE = '2023-07-22 17:51:58'; + public const RELEASE_DATE = '2023-07-22 14:06:03'; /** * @var int */ diff --git a/vendor/autoload.php b/vendor/autoload.php index 94f333eb609..2ea9afd4a4e 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 ComposerAutoloaderInita99de4062acb80aa9520b1a6f5be2373::getLoader(); +return ComposerAutoloaderInit6f2dabd27ad2dcf04ce3efd4f1c5e824::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index 440ae59741c..e903e54a1a5 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInita99de4062acb80aa9520b1a6f5be2373 +class ComposerAutoloaderInit6f2dabd27ad2dcf04ce3efd4f1c5e824 { private static $loader; @@ -22,17 +22,17 @@ class ComposerAutoloaderInita99de4062acb80aa9520b1a6f5be2373 return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInita99de4062acb80aa9520b1a6f5be2373', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInit6f2dabd27ad2dcf04ce3efd4f1c5e824', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__)); - spl_autoload_unregister(array('ComposerAutoloaderInita99de4062acb80aa9520b1a6f5be2373', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInit6f2dabd27ad2dcf04ce3efd4f1c5e824', 'loadClassLoader')); require __DIR__ . '/autoload_static.php'; - call_user_func(\Composer\Autoload\ComposerStaticInita99de4062acb80aa9520b1a6f5be2373::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInit6f2dabd27ad2dcf04ce3efd4f1c5e824::getInitializer($loader)); $loader->setClassMapAuthoritative(true); $loader->register(true); - $filesToLoad = \Composer\Autoload\ComposerStaticInita99de4062acb80aa9520b1a6f5be2373::$files; + $filesToLoad = \Composer\Autoload\ComposerStaticInit6f2dabd27ad2dcf04ce3efd4f1c5e824::$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 142360ed320..fdd4ee02e6b 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInita99de4062acb80aa9520b1a6f5be2373 +class ComposerStaticInit6f2dabd27ad2dcf04ce3efd4f1c5e824 { public static $files = array ( 'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php', @@ -3020,9 +3020,9 @@ class ComposerStaticInita99de4062acb80aa9520b1a6f5be2373 public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInita99de4062acb80aa9520b1a6f5be2373::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInita99de4062acb80aa9520b1a6f5be2373::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInita99de4062acb80aa9520b1a6f5be2373::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInit6f2dabd27ad2dcf04ce3efd4f1c5e824::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInit6f2dabd27ad2dcf04ce3efd4f1c5e824::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInit6f2dabd27ad2dcf04ce3efd4f1c5e824::$classMap; }, null, ClassLoader::class); }