Updated Rector to commit d2459d13d512d780cc22f7822bf630717d888969

d2459d13d5 [CodeQuality] Remove next node attribute usage on SimplifyIfNotNullReturnRector (#3517)

rules/CodeQuality/Rector/If_/SimplifyIfNotNullReturnRector.php

@@ -5,12 +5,11 @@ namespace Rector\CodeQuality\Rector\If_;
 
 use PhpParser\Node;
 use PhpParser\Node\Expr;
-use PhpParser\Node\Stmt;
 use PhpParser\Node\Stmt\If_;
 use PhpParser\Node\Stmt\Return_;
+use Rector\Core\Contract\PhpParser\Node\StmtsAwareInterface;
 use Rector\Core\NodeManipulator\IfManipulator;
 use Rector\Core\Rector\AbstractRector;
-use Rector\NodeTypeResolver\Node\AttributeKey;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 /**
@@ -48,28 +47,38 @@ CODE_SAMPLE
      */
     public function getNodeTypes() : array
     {
-        return [If_::class];
+        return [StmtsAwareInterface::class];
     }
     /**
-     * @param If_ $node
+     * @param StmtsAwareInterface $node
      */
-    public function refactor(Node $node) : ?Stmt
+    public function refactor(Node $node) : ?StmtsAwareInterface
     {
-        $expr = $this->ifManipulator->matchIfNotNullReturnValue($node);
-        if ($expr instanceof Expr) {
-            $insideIfNode = $node->stmts[0];
-            $nextNode = $node->getAttribute(AttributeKey::NEXT_NODE);
-            if (!$nextNode instanceof Return_) {
+        foreach ((array) $node->stmts as $key => $stmt) {
+            if (!$stmt instanceof If_) {
+                continue;
+            }
+            if (!isset($node->stmts[$key + 1])) {
                 return null;
             }
+            $nextNode = $node->stmts[$key + 1];
+            if (!$nextNode instanceof Return_) {
+                continue;
+            }
+            $expr = $this->ifManipulator->matchIfNotNullReturnValue($stmt);
+            if (!$expr instanceof Expr) {
+                continue;
+            }
+            $insideIfNode = $stmt->stmts[0];
             if (!$nextNode->expr instanceof Expr) {
-                return null;
+                continue;
             }
             if (!$this->valueResolver->isNull($nextNode->expr)) {
-                return null;
+                continue;
             }
-            $this->removeNode($nextNode);
-            return $insideIfNode;
+            unset($node->stmts[$key]);
+            $node->stmts[$key + 1] = $insideIfNode;
+            return $node;
         }
         return null;
     }

src/Application/VersionResolver.php

@@ -19,12 +19,12 @@ final class VersionResolver
      * @api
      * @var string
      */
-    public const PACKAGE_VERSION = 'da3eb400a7a88c180869590fc6cbbcf0ba30ce11';
+    public const PACKAGE_VERSION = 'd2459d13d512d780cc22f7822bf630717d888969';
     /**
      * @api
      * @var string
      */
-    public const RELEASE_DATE = '2023-03-24 08:04:18';
+    public const RELEASE_DATE = '2023-03-25 12:11:51';
     /**
      * @var int
      */

vendor/autoload.php

@@ -22,4 +22,4 @@ if (PHP_VERSION_ID < 50600) {
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInitcfc64ce27cb9dee1ff74afed2cee5d57::getLoader();
+return ComposerAutoloaderInit8ebb5e75f6329cc4bc62f8b010d9b326::getLoader();

vendor/composer/autoload_real.php

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInitcfc64ce27cb9dee1ff74afed2cee5d57
+class ComposerAutoloaderInit8ebb5e75f6329cc4bc62f8b010d9b326
 {
     private static $loader;
 
@@ -22,17 +22,17 @@ class ComposerAutoloaderInitcfc64ce27cb9dee1ff74afed2cee5d57
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInitcfc64ce27cb9dee1ff74afed2cee5d57', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit8ebb5e75f6329cc4bc62f8b010d9b326', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
-        spl_autoload_unregister(array('ComposerAutoloaderInitcfc64ce27cb9dee1ff74afed2cee5d57', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit8ebb5e75f6329cc4bc62f8b010d9b326', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        call_user_func(\Composer\Autoload\ComposerStaticInitcfc64ce27cb9dee1ff74afed2cee5d57::getInitializer($loader));
+        call_user_func(\Composer\Autoload\ComposerStaticInit8ebb5e75f6329cc4bc62f8b010d9b326::getInitializer($loader));
 
         $loader->setClassMapAuthoritative(true);
         $loader->register(true);
 
-        $filesToLoad = \Composer\Autoload\ComposerStaticInitcfc64ce27cb9dee1ff74afed2cee5d57::$files;
+        $filesToLoad = \Composer\Autoload\ComposerStaticInit8ebb5e75f6329cc4bc62f8b010d9b326::$files;
         $requireFile = \Closure::bind(static function ($fileIdentifier, $file) {
             if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
                 $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;

vendor/composer/autoload_static.php

@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInitcfc64ce27cb9dee1ff74afed2cee5d57
+class ComposerStaticInit8ebb5e75f6329cc4bc62f8b010d9b326
 {
     public static $files = array (
         'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
@@ -3127,9 +3127,9 @@ class ComposerStaticInitcfc64ce27cb9dee1ff74afed2cee5d57
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInitcfc64ce27cb9dee1ff74afed2cee5d57::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInitcfc64ce27cb9dee1ff74afed2cee5d57::$prefixDirsPsr4;
-            $loader->classMap = ComposerStaticInitcfc64ce27cb9dee1ff74afed2cee5d57::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInit8ebb5e75f6329cc4bc62f8b010d9b326::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInit8ebb5e75f6329cc4bc62f8b010d9b326::$prefixDirsPsr4;
+            $loader->classMap = ComposerStaticInit8ebb5e75f6329cc4bc62f8b010d9b326::$classMap;
 
         }, null, ClassLoader::class);
     }

vendor/composer/installed.json

@@ -869,17 +869,17 @@
         },
         {
             "name": "phpstan\/phpstan",
-            "version": "1.10.7",
-            "version_normalized": "1.10.7.0",
+            "version": "1.10.8",
+            "version_normalized": "1.10.8.0",
             "source": {
                 "type": "git",
                 "url": "https:\/\/github.com\/phpstan\/phpstan.git",
-                "reference": "b10ceb526d9607903c5b2673f1fc8775dbe48975"
+                "reference": "0166aef76e066f0dd2adc2799bdadfa1635711e9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https:\/\/api.github.com\/repos\/phpstan\/phpstan\/zipball\/b10ceb526d9607903c5b2673f1fc8775dbe48975",
-                "reference": "b10ceb526d9607903c5b2673f1fc8775dbe48975",
+                "url": "https:\/\/api.github.com\/repos\/phpstan\/phpstan\/zipball\/0166aef76e066f0dd2adc2799bdadfa1635711e9",
+                "reference": "0166aef76e066f0dd2adc2799bdadfa1635711e9",
                 "shasum": ""
             },
             "require": {
@@ -888,7 +888,7 @@
             "conflict": {
                 "phpstan\/phpstan-shim": "*"
             },
-            "time": "2023-03-16T15:24:20+00:00",
+            "time": "2023-03-24T10:28:16+00:00",
             "bin": [
                 "phpstan",
                 "phpstan.phar"

vendor/phpstan/phpstan/phpstan.phar.asc

@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNATURE-----
 
-iQIzBAABCgAdFiEEynwsejDI6OEnSoR2UcZzBf/C5cAFAmQTNIwACgkQUcZzBf/C
-5cAd6w/+Kl1H07bQZ8QT076zFPtXpotRz3t3/CSXcpbrKXKIELBVN5StS6jSCQFb
-Kt5ef5QBoTk368Da3dC97VwEmex4eJ9zgaRfT+yjc13fVaqhEOx0NXNydRW2rZ1a
-QEkIDOydqk8hQYvNOaIN6g/I0V9SjJ5yxwquCM8oL555ofP8O5YJIYrPKPuAZn1x
-UonxEfwDytN71nc9PjGQeDG7SAr2gngjB1mg8ZFzyfcoMWmi0OUzvVMfI+HzhxvW
-Tja3NOKk1b187Jxoa01xZDrb4y+1AQbRzWs74bjP/5xnMABowaBRQoVL8DxNdlis
-Cct0PXFbSAVXpk4nkSejhhln2XCvVy958qZzNSt3HwG+oRMmpucjU5syHKBkeP1l
-+OaEzGWFLjo4mH43mgH9aS12X4x4d78+mCiSA8ZRG8GkS6qMW21UDvosnfEwBoAD
-KOOkT8DKML45Q7+PEsGYzzeNnIMxerr44fmMIngu9EoQNqVZppMoruAGrTLvBj2F
-XFWj6PPemyE/xLXtcCBtSHfVxwSL+R3fNAPRVQcYfESmpBTddIFymqiUpARnGC4x
-AzWKoF8QKuQnxipXHDVXjz18xfQLnd6wQek1P8+mqQTmUb/+xEJnwKLwgMnC0A4f
-U48/+akJrcsw0vXqVxDQw1nzpd7HXEMXC5LFSGERJcmU3dTVIjU=
-=U3um
+iQIzBAABCgAdFiEEynwsejDI6OEnSoR2UcZzBf/C5cAFAmQdeygACgkQUcZzBf/C
+5cAe5Q//YDKPvVm4HlLT90M/Ov0IJ8brPP6LN0fbMV93TJlXFhh6Ph79YUwxRWve
+FPYr93HDCSOdlg3q3xRNgPcUim5+7U5xf5ze5RWIBR07IDY5+i9Os66CLRALlO4u
+ToXHCO2k0hw26sSskRXmF2IrNIibvPjVjR+ephFGFenWI0S7vq5cYGqOnzwdURyu
+ZNIswHWQsJSGLn4AXfDnushBCy3w5IsSgnENIWD7L9a37A45kek+iHETcX1OLTOd
+AlJOvQ0l2OAE4kMx8tailGYtJo9yLnjtSLw6xQbdw5mf47iapm1U09C52XvYsZg4
+oZNCJ8QFHR1YbbLpdMxPFcMQgbVLGKBwHYcpsi2VdMKdR+7altlF9govkvBLxxm7
+Polq9ya0fS7wAJP0vMESGeP6UJi68DMWH7hxJ7d9tyBieYJHSpm5q5QSYjj4RxM5
+LiTTv9ug8DFIsLJiw1CplE4pxtJ82arXBqggpqO15MRNxwzyJmY7XIHtEZI2dl+d
+BImd5bWl6nCkhKEYPs+6SEt/caXIz/XERap5gO9Q8UBx5jaKPHEKRbuvTgbW1Ods
+fFNDgIsQyg+56LzIxgp2a6IUVeeQSrL4kjeHYQDBMzG0P78ZXjXdUl3kYG3TJHmb
+QNWgYcz3jJJd/F5YSMPpAPT/gpcD4FBnHZ+mlLnGvXvuuGh+MyU=
+=vW1l
 -----END PGP SIGNATURE-----