Updated Rector to commit 24187781db

24187781db [EarlyReturn] Handle mirror comments before elseif on RemoveAlwaysElseRector (#234)

rules/EarlyReturn/Rector/If_/RemoveAlwaysElseRector.php

@@ -6,6 +6,7 @@ namespace Rector\EarlyReturn\Rector\If_;
 use PhpParser\Node;
 use PhpParser\Node\Expr\Exit_;
 use PhpParser\Node\Stmt\Continue_;
+use PhpParser\Node\Stmt\Else_;
 use PhpParser\Node\Stmt\ElseIf_;
 use PhpParser\Node\Stmt\Expression;
 use PhpParser\Node\Stmt\If_;
@@ -65,14 +66,24 @@ CODE_SAMPLE
             return null;
         }
         if ($node->elseifs !== []) {
+            $originalNode = clone $node;
             $if = new \PhpParser\Node\Stmt\If_($node->cond);
             $if->stmts = $node->stmts;
             $this->addNodeBeforeNode($if, $node);
+            $this->mirrorComments($if, $node);
             /** @var ElseIf_ $firstElseIf */
             $firstElseIf = \array_shift($node->elseifs);
             $node->cond = $firstElseIf->cond;
             $node->stmts = $firstElseIf->stmts;
             $this->mirrorComments($node, $firstElseIf);
+            $statements = $this->getStatementsElseIfs($node);
+            if ($statements !== []) {
+                $this->addNodesAfterNode($statements, $node);
+            }
+            if ($originalNode->else instanceof \PhpParser\Node\Stmt\Else_) {
+                $node->else = null;
+                $this->addNodeAfterNode($originalNode->else, $node);
+            }
             return $node;
         }
         if ($node->else !== null) {
@@ -82,9 +93,27 @@ CODE_SAMPLE
         }
         return null;
     }
-    private function doesLastStatementBreakFlow(\PhpParser\Node\Stmt\If_ $if) : bool
+    /**
+     * @return ElseIf_[]
+     */
+    private function getStatementsElseIfs(\PhpParser\Node\Stmt\If_ $if) : array
     {
-        $lastStmt = \end($if->stmts);
+        $statements = [];
+        foreach ($if->elseifs as $key => $elseif) {
+            if ($this->doesLastStatementBreakFlow($elseif) && $elseif->stmts !== []) {
+                continue;
+            }
+            $statements[] = $elseif;
+            unset($if->elseifs[$key]);
+        }
+        return $statements;
+    }
+    /**
+     * @param If_|ElseIf_ $node
+     */
+    private function doesLastStatementBreakFlow(\PhpParser\Node $node) : bool
+    {
+        $lastStmt = \end($node->stmts);
         return !($lastStmt instanceof \PhpParser\Node\Stmt\Return_ || $lastStmt instanceof \PhpParser\Node\Stmt\Throw_ || $lastStmt instanceof \PhpParser\Node\Stmt\Continue_ || $lastStmt instanceof \PhpParser\Node\Stmt\Expression && $lastStmt->expr instanceof \PhpParser\Node\Expr\Exit_);
     }
 }

src/Application/VersionResolver.php

@@ -16,11 +16,11 @@ final class VersionResolver
     /**
      * @var string
      */
-    public const PACKAGE_VERSION = '6311c8b5c95f79e5127038003d2ccdab8a6e285c';
+    public const PACKAGE_VERSION = '24187781dbfc49fc45628f546a586c6227e00f92';
     /**
      * @var string
      */
-    public const RELEASE_DATE = '2021-06-16 12:30:01';
+    public const RELEASE_DATE = '2021-06-16 19:37:24';
     public static function resolvePackageVersion() : string
     {
         $process = new \RectorPrefix20210616\Symfony\Component\Process\Process(['git', 'log', '--pretty="%H"', '-n1', 'HEAD'], __DIR__);

vendor/autoload.php

@@ -4,4 +4,4 @@
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInit447e9c62c2bab1fa155c0992627c7a9c::getLoader();
+return ComposerAutoloaderInitcdb9684b680abe710cabaf2a084ad1e0::getLoader();

vendor/composer/autoload_real.php

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit447e9c62c2bab1fa155c0992627c7a9c
+class ComposerAutoloaderInitcdb9684b680abe710cabaf2a084ad1e0
 {
     private static $loader;
 
@@ -22,15 +22,15 @@ class ComposerAutoloaderInit447e9c62c2bab1fa155c0992627c7a9c
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInit447e9c62c2bab1fa155c0992627c7a9c', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInitcdb9684b680abe710cabaf2a084ad1e0', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
-        spl_autoload_unregister(array('ComposerAutoloaderInit447e9c62c2bab1fa155c0992627c7a9c', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInitcdb9684b680abe710cabaf2a084ad1e0', '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\ComposerStaticInit447e9c62c2bab1fa155c0992627c7a9c::getInitializer($loader));
+            call_user_func(\Composer\Autoload\ComposerStaticInitcdb9684b680abe710cabaf2a084ad1e0::getInitializer($loader));
         } else {
             $classMap = require __DIR__ . '/autoload_classmap.php';
             if ($classMap) {
@@ -42,19 +42,19 @@ class ComposerAutoloaderInit447e9c62c2bab1fa155c0992627c7a9c
         $loader->register(true);
 
         if ($useStaticLoader) {
-            $includeFiles = Composer\Autoload\ComposerStaticInit447e9c62c2bab1fa155c0992627c7a9c::$files;
+            $includeFiles = Composer\Autoload\ComposerStaticInitcdb9684b680abe710cabaf2a084ad1e0::$files;
         } else {
             $includeFiles = require __DIR__ . '/autoload_files.php';
         }
         foreach ($includeFiles as $fileIdentifier => $file) {
-            composerRequire447e9c62c2bab1fa155c0992627c7a9c($fileIdentifier, $file);
+            composerRequirecdb9684b680abe710cabaf2a084ad1e0($fileIdentifier, $file);
         }
 
         return $loader;
     }
 }
 
-function composerRequire447e9c62c2bab1fa155c0992627c7a9c($fileIdentifier, $file)
+function composerRequirecdb9684b680abe710cabaf2a084ad1e0($fileIdentifier, $file)
 {
     if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
         require $file;

vendor/composer/autoload_static.php

@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInit447e9c62c2bab1fa155c0992627c7a9c
+class ComposerStaticInitcdb9684b680abe710cabaf2a084ad1e0
 {
     public static $files = array (
         'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php',
@@ -3874,9 +3874,9 @@ class ComposerStaticInit447e9c62c2bab1fa155c0992627c7a9c
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInit447e9c62c2bab1fa155c0992627c7a9c::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInit447e9c62c2bab1fa155c0992627c7a9c::$prefixDirsPsr4;
-            $loader->classMap = ComposerStaticInit447e9c62c2bab1fa155c0992627c7a9c::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInitcdb9684b680abe710cabaf2a084ad1e0::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInitcdb9684b680abe710cabaf2a084ad1e0::$prefixDirsPsr4;
+            $loader->classMap = ComposerStaticInitcdb9684b680abe710cabaf2a084ad1e0::$classMap;
 
         }, null, ClassLoader::class);
     }

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('RectorPrefix20210616\CheckoutEntityFactory');
 }
-if (!class_exists('ComposerAutoloaderInit447e9c62c2bab1fa155c0992627c7a9c', false) && !interface_exists('ComposerAutoloaderInit447e9c62c2bab1fa155c0992627c7a9c', false) && !trait_exists('ComposerAutoloaderInit447e9c62c2bab1fa155c0992627c7a9c', false)) {
-    spl_autoload_call('RectorPrefix20210616\ComposerAutoloaderInit447e9c62c2bab1fa155c0992627c7a9c');
+if (!class_exists('ComposerAutoloaderInitcdb9684b680abe710cabaf2a084ad1e0', false) && !interface_exists('ComposerAutoloaderInitcdb9684b680abe710cabaf2a084ad1e0', false) && !trait_exists('ComposerAutoloaderInitcdb9684b680abe710cabaf2a084ad1e0', false)) {
+    spl_autoload_call('RectorPrefix20210616\ComposerAutoloaderInitcdb9684b680abe710cabaf2a084ad1e0');
 }
 if (!class_exists('Doctrine\Inflector\Inflector', false) && !interface_exists('Doctrine\Inflector\Inflector', false) && !trait_exists('Doctrine\Inflector\Inflector', false)) {
     spl_autoload_call('RectorPrefix20210616\Doctrine\Inflector\Inflector');
@@ -3323,9 +3323,9 @@ if (!function_exists('print_node')) {
         return \RectorPrefix20210616\print_node(...func_get_args());
     }
 }
-if (!function_exists('composerRequire447e9c62c2bab1fa155c0992627c7a9c')) {
-    function composerRequire447e9c62c2bab1fa155c0992627c7a9c() {
-        return \RectorPrefix20210616\composerRequire447e9c62c2bab1fa155c0992627c7a9c(...func_get_args());
+if (!function_exists('composerRequirecdb9684b680abe710cabaf2a084ad1e0')) {
+    function composerRequirecdb9684b680abe710cabaf2a084ad1e0() {
+        return \RectorPrefix20210616\composerRequirecdb9684b680abe710cabaf2a084ad1e0(...func_get_args());
     }
 }
 if (!function_exists('parseArgs')) {