Updated Rector to commit 224e316578ee891cb715eb864899a3bbbf0c5bcc

rectorphp/rector-src@224e316 add object support to DocblockReturnArrayFromDirectArrayInstanceRector (#7795)

Author: TomasVotruba

rules/Privatization/TypeManipulator/TypeNormalizer.php

@@ -3,6 +3,7 @@
 declare (strict_types=1);
 namespace Rector\Privatization\TypeManipulator;
 
+use PHPStan\PhpDocParser\Ast\Type\TypeNode;
 use PHPStan\Type\Accessory\AccessoryLiteralStringType;
 use PHPStan\Type\Accessory\AccessoryNonEmptyStringType;
 use PHPStan\Type\Accessory\AccessoryNonFalsyStringType;
@@ -17,13 +18,15 @@
 use PHPStan\Type\IntegerType;
 use PHPStan\Type\MixedType;
 use PHPStan\Type\NeverType;
+use PHPStan\Type\ObjectType;
 use PHPStan\Type\StringType;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeTraverser;
 use PHPStan\Type\UnionType;
 use Rector\NodeTypeResolver\PHPStan\Type\TypeFactory;
 use Rector\NodeTypeResolver\PHPStan\TypeHasher;
 use Rector\StaticTypeMapper\StaticTypeMapper;
+use Rector\StaticTypeMapper\ValueObject\Type\ShortenedObjectType;
 final class TypeNormalizer
 {
     /**
@@ -121,10 +124,8 @@ public function generalizeConstantTypes(Type $type): Type
                 $uniqueGeneralizedUnionTypes = $this->typeFactory->uniquateTypes($generalizedUnionedTypes);
                 if (count($uniqueGeneralizedUnionTypes) > 1) {
                     $generalizedUnionType = new UnionType($uniqueGeneralizedUnionTypes);
-                    // avoid too huge print in docblock
-                    $unionedDocType = $this->staticTypeMapper->mapPHPStanTypeToPHPStanPhpDocTypeNode($generalizedUnionType);
-                    // too long
-                    if (strlen((string) $unionedDocType) > self::MAX_PRINTED_UNION_DOC_LENGTH && $this->avoidPrintedDocblockTrimming($generalizedUnionType) === \false) {
+                    $shortUnionedDocType = $this->resolveNameShortDocTypeNode($generalizedUnionType);
+                    if (strlen((string) $shortUnionedDocType) > self::MAX_PRINTED_UNION_DOC_LENGTH && $this->avoidPrintedDocblockTrimming($generalizedUnionType) === \false) {
                         $alwaysKnownArrayType = $this->narrowToAlwaysKnownArrayType($generalizedUnionType);
                         if ($alwaysKnownArrayType instanceof ArrayType) {
                             return $alwaysKnownArrayType;
@@ -180,4 +181,17 @@ private function avoidPrintedDocblockTrimming(UnionType $unionType): bool
         }
         return $unionType->getObjectClassNames() !== [];
     }
+    private function resolveNameShortDocTypeNode(UnionType $unionType): TypeNode
+    {
+        // we have to converet name to short here, to make sure the not FQN, but short name is counted to the full length
+        $objectShortGeneralizedUnionType = TypeTraverser::map($unionType, function (Type $type, callable $traverseCallback): Type {
+            if ($type instanceof ObjectType && strpos($type->getClassName(), '\\') !== \false) {
+                // after last "\\"
+                $shortClassName = (string) substr($type->getClassName(), strrpos($type->getClassName(), '\\') + 1);
+                return new ShortenedObjectType($shortClassName, $type->getClassName());
+            }
+            return $traverseCallback($type, $traverseCallback);
+        });
+        return $this->staticTypeMapper->mapPHPStanTypeToPHPStanPhpDocTypeNode($objectShortGeneralizedUnionType);
+    }
 }

rules/TypeDeclarationDocblocks/Rector/ClassMethod/DocblockReturnArrayFromDirectArrayInstanceRector.php

@@ -113,8 +113,8 @@ public function refactor(Node $node): ?Node
         if (!$returnedType instanceof ConstantArrayType) {
             return null;
         }
-        if ($returnedType->getReferencedClasses() !== []) {
-            // better handled by shared-interface/class rule, to avoid turning objects to mixed
+        // better handled by shared-interface/class rule, to avoid turning objects to mixed
+        if ($returnedType->getReferencedClasses() !== [] && count($returnedType->getReferencedClasses()) === count($returnedType->getValueTypes())) {
             return null;
         }
         $genericTypeNode = $this->constantArrayTypeGeneralizer->generalize($returnedType);

src/Application/VersionResolver.php

@@ -19,12 +19,12 @@ final class VersionResolver
      * @api
      * @var string
      */
-    public const PACKAGE_VERSION = '566b3beb53e71df7d271a38ea5f97bef767c2ec8';
+    public const PACKAGE_VERSION = '224e316578ee891cb715eb864899a3bbbf0c5bcc';
     /**
      * @api
      * @var string
      */
-    public const RELEASE_DATE = '2026-01-02 16:47:30';
+    public const RELEASE_DATE = '2026-01-02 16:21:39';
     /**
      * @var int
      */