Updated Rector to commit b7b3a1dc2ea5c141aa1c48e626af10a31f832b77

rectorphp/rector-src@b7b3a1d [CodeQuality] Handle deep comments merged on ShortenElseIfRector (#3419)
rectorphp · Feb 26, 2023 · f44d4bb · f44d4bb
1 parent 1317535
commit f44d4bb
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 23 deletions.
diff --git a/rules/CodeQuality/Rector/If_/ShortenElseIfRector.php b/rules/CodeQuality/Rector/If_/ShortenElseIfRector.php
@@ -8,7 +8,6 @@
 use PhpParser\Node\Stmt\ElseIf_;
 use PhpParser\Node\Stmt\If_;
 use PhpParser\Node\Stmt\Nop;
-use Rector\BetterPhpDocParser\Comment\CommentsMerger;
 use Rector\Core\Rector\AbstractRector;
 use Rector\NodeTypeResolver\Node\AttributeKey;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
@@ -18,15 +17,6 @@
  */
 final class ShortenElseIfRector extends AbstractRector
 {
-    /**
-     * @readonly
-     * @var \Rector\BetterPhpDocParser\Comment\CommentsMerger
-     */
-    private $commentsMerger;
-    public function __construct(CommentsMerger $commentsMerger)
-    {
-        $this->commentsMerger = $commentsMerger;
-    }
     public function getRuleDefinition() : RuleDefinition
     {
         return new RuleDefinition('Shortens else/if to elseif', [new CodeSample(<<<'CODE_SAMPLE'
@@ -97,7 +87,8 @@ private function shortenElseIf(If_ $node) : ?If_
             $if->stmts[] = $nop;
         } else {
             $currentStmt = \current($if->stmts);
-            $this->commentsMerger->keepChildren($currentStmt, $if);
+            $mergedComments = \array_merge($if->getComments(), $currentStmt->getComments());
+            $currentStmt->setAttribute(AttributeKey::COMMENTS, $mergedComments);
         }
         $node->elseifs[] = new ElseIf_($if->cond, $if->stmts);
         $node->else = $if->else;

diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php
@@ -19,12 +19,12 @@ final class VersionResolver
      * @api
      * @var string
      */
-    public const PACKAGE_VERSION = '8d9ff0a35673fc8c4566b92f464ce36bbbe03ba4';
+    public const PACKAGE_VERSION = 'b7b3a1dc2ea5c141aa1c48e626af10a31f832b77';
     /**
      * @api
      * @var string
      */
-    public const RELEASE_DATE = '2023-02-26 18:32:36';
+    public const RELEASE_DATE = '2023-02-26 19:39:41';
     /**
      * @var int
      */

diff --git a/vendor/autoload.php b/vendor/autoload.php
@@ -22,4 +22,4 @@
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInit56e9e875ac384a387945b948970ad4f6::getLoader();
+return ComposerAutoloaderInitd658c3a965d615efa3975118556723c5::getLoader();
diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit56e9e875ac384a387945b948970ad4f6
+class ComposerAutoloaderInitd658c3a965d615efa3975118556723c5
 {
     private static $loader;
 
@@ -22,17 +22,17 @@ public static function getLoader()
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInit56e9e875ac384a387945b948970ad4f6', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInitd658c3a965d615efa3975118556723c5', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
-        spl_autoload_unregister(array('ComposerAutoloaderInit56e9e875ac384a387945b948970ad4f6', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInitd658c3a965d615efa3975118556723c5', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        call_user_func(\Composer\Autoload\ComposerStaticInit56e9e875ac384a387945b948970ad4f6::getInitializer($loader));
+        call_user_func(\Composer\Autoload\ComposerStaticInitd658c3a965d615efa3975118556723c5::getInitializer($loader));
 
         $loader->setClassMapAuthoritative(true);
         $loader->register(true);
 
-        $filesToLoad = \Composer\Autoload\ComposerStaticInit56e9e875ac384a387945b948970ad4f6::$files;
+        $filesToLoad = \Composer\Autoload\ComposerStaticInitd658c3a965d615efa3975118556723c5::$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
@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInit56e9e875ac384a387945b948970ad4f6
+class ComposerStaticInitd658c3a965d615efa3975118556723c5
 {
     public static $files = array (
         'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
@@ -3125,9 +3125,9 @@ class ComposerStaticInit56e9e875ac384a387945b948970ad4f6
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInit56e9e875ac384a387945b948970ad4f6::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInit56e9e875ac384a387945b948970ad4f6::$prefixDirsPsr4;
-            $loader->classMap = ComposerStaticInit56e9e875ac384a387945b948970ad4f6::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInitd658c3a965d615efa3975118556723c5::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInitd658c3a965d615efa3975118556723c5::$prefixDirsPsr4;
+            $loader->classMap = ComposerStaticInitd658c3a965d615efa3975118556723c5::$classMap;
 
         }, null, ClassLoader::class);
     }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -22,4 +22,4 @@

		require_once __DIR__ . '/composer/autoload_real.php';

		return ComposerAutoloaderInit56e9e875ac384a387945b948970ad4f6::getLoader();
		return ComposerAutoloaderInitd658c3a965d615efa3975118556723c5::getLoader();