Updated Rector to commit b43b958840405f3a896acfafb81c389ed4018920

rectorphp/rector-src@b43b958 Rectify (#6973)

Author: TomasVotruba

src/Application/VersionResolver.php

@@ -19,12 +19,12 @@ final class VersionResolver
      * @api
      * @var string
      */
-    public const PACKAGE_VERSION = '2.0.18';
+    public const PACKAGE_VERSION = 'b43b958840405f3a896acfafb81c389ed4018920';
     /**
      * @api
      * @var string
      */
-    public const RELEASE_DATE = '2025-06-10 19:22:47';
+    public const RELEASE_DATE = '2025-06-11 11:34:34';
     /**
      * @var int
      */

vendor/composer/installed.json

@@ -1687,12 +1687,12 @@
             "source": {
                 "type": "git",
                 "url": "https:\/\/github.com\/rectorphp\/rector-doctrine.git",
-                "reference": "cea5e6617d0296b59b904bf95f950700ea12c36f"
+                "reference": "8389f0d9e5ca30932fb8682ad404af552960b031"
             },
             "dist": {
                 "type": "zip",
-                "url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-doctrine\/zipball\/cea5e6617d0296b59b904bf95f950700ea12c36f",
-                "reference": "cea5e6617d0296b59b904bf95f950700ea12c36f",
+                "url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-doctrine\/zipball\/8389f0d9e5ca30932fb8682ad404af552960b031",
+                "reference": "8389f0d9e5ca30932fb8682ad404af552960b031",
                 "shasum": ""
             },
             "require": {
@@ -1715,7 +1715,7 @@
                 "tomasvotruba\/class-leak": "^2.0",
                 "tracy\/tracy": "^2.10"
             },
-            "time": "2025-06-11T10:41:42+00:00",
+            "time": "2025-06-11T11:31:18+00:00",
             "default-branch": true,
             "type": "rector-extension",
             "extra": {

vendor/composer/installed.php

@@ -9,7 +9,7 @@
  */
 final class GeneratedConfig
 {
-    public const EXTENSIONS = array('rector/rector-doctrine' => array('install_path' => '/home/runner/work/rector-src/rector-src/rector-build/vendor/rector/rector-doctrine', 'relative_install_path' => '../../rector-doctrine', 'extra' => NULL, 'version' => 'dev-main cea5e66'), 'rector/rector-downgrade-php' => array('install_path' => '/home/runner/work/rector-src/rector-src/rector-build/vendor/rector/rector-downgrade-php', 'relative_install_path' => '../../rector-downgrade-php', 'extra' => NULL, 'version' => 'dev-main 1454a52'), 'rector/rector-phpunit' => array('install_path' => '/home/runner/work/rector-src/rector-src/rector-build/vendor/rector/rector-phpunit', 'relative_install_path' => '../../rector-phpunit', 'extra' => NULL, 'version' => 'dev-main 3bc079d'), 'rector/rector-symfony' => array('install_path' => '/home/runner/work/rector-src/rector-src/rector-build/vendor/rector/rector-symfony', 'relative_install_path' => '../../rector-symfony', 'extra' => NULL, 'version' => 'dev-main 1a199fc'));
+    public const EXTENSIONS = array('rector/rector-doctrine' => array('install_path' => '/home/runner/work/rector-src/rector-src/rector-build/vendor/rector/rector-doctrine', 'relative_install_path' => '../../rector-doctrine', 'extra' => NULL, 'version' => 'dev-main 8389f0d'), 'rector/rector-downgrade-php' => array('install_path' => '/home/runner/work/rector-src/rector-src/rector-build/vendor/rector/rector-downgrade-php', 'relative_install_path' => '../../rector-downgrade-php', 'extra' => NULL, 'version' => 'dev-main 1454a52'), 'rector/rector-phpunit' => array('install_path' => '/home/runner/work/rector-src/rector-src/rector-build/vendor/rector/rector-phpunit', 'relative_install_path' => '../../rector-phpunit', 'extra' => NULL, 'version' => 'dev-main 3bc079d'), 'rector/rector-symfony' => array('install_path' => '/home/runner/work/rector-src/rector-src/rector-build/vendor/rector/rector-symfony', 'relative_install_path' => '../../rector-symfony', 'extra' => NULL, 'version' => 'dev-main 1a199fc'));
     private function __construct()
     {
     }

vendor/rector/extension-installer/src/GeneratedConfig.php

@@ -9,7 +9,9 @@
 use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\Node\Stmt\Property;
 use PHPStan\PhpDocParser\Ast\PhpDoc\VarTagValueNode;
+use PHPStan\PhpDocParser\Ast\Type\IdentifierTypeNode;
 use PHPStan\PhpDocParser\Ast\Type\NullableTypeNode;
+use PHPStan\PhpDocParser\Ast\Type\UnionTypeNode;
 use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo;
 use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
 use Rector\Comments\NodeDocBlock\DocBlockUpdater;
@@ -124,15 +126,32 @@ private function refactorProperty(Property $property) : ?Property
         if (!$varTagValueNode instanceof VarTagValueNode) {
             return null;
         }
+        if ($varTagValueNode->type instanceof UnionTypeNode) {
+            $hasChanged = \false;
+            $unionTypeNode = $varTagValueNode->type;
+            foreach ($unionTypeNode->types as $key => $unionedType) {
+                if ($unionedType instanceof IdentifierTypeNode && $unionedType->name === 'null') {
+                    unset($unionTypeNode->types[$key]);
+                    $hasChanged = \true;
+                }
+            }
+            if ($hasChanged) {
+                // only one type left, lets use it directly
+                if (\count($unionTypeNode->types) === 1) {
+                    $onlyType = \array_pop($unionTypeNode->types);
+                    $varTagValueNode->type = $onlyType;
+                }
+                $this->updateVarTagValueNode($phpDocInfo, $varTagValueNode, $property);
+                return $property;
+            }
+        }
         // remove nullable if has one
         if (!$varTagValueNode->type instanceof NullableTypeNode) {
             return null;
         }
         // unwrap nullable type
         $varTagValueNode->type = $varTagValueNode->type->type;
-        $phpDocInfo->removeByType(VarTagValueNode::class);
-        $phpDocInfo->addTagValueNode($varTagValueNode);
-        $this->docBlockUpdater->updateRefactoredNodeWithPhpDocInfo($property);
+        $this->updateVarTagValueNode($phpDocInfo, $varTagValueNode, $property);
         return $property;
     }
     private function hasNativeCollectionType(Property $property) : bool
@@ -142,4 +161,10 @@ private function hasNativeCollectionType(Property $property) : bool
         }
         return $this->isName($property->type, DoctrineClass::COLLECTION);
     }
+    private function updateVarTagValueNode(PhpDocInfo $phpDocInfo, VarTagValueNode $varTagValueNode, Property $property) : void
+    {
+        $phpDocInfo->removeByType(VarTagValueNode::class);
+        $phpDocInfo->addTagValueNode($varTagValueNode);
+        $this->docBlockUpdater->updateRefactoredNodeWithPhpDocInfo($property);
+    }
 }