[type-declaration-docblocks] Register DocblockReturnArrayFromDirectArrayInstanceRector to set (#7280)

Author: TomasVotruba

config/set/type-declaration-docblocks.php

@@ -12,19 +12,27 @@
 use Rector\TypeDeclarationDocblocks\Rector\ClassMethod\AddParamArrayDocblockFromDimFetchAccessRector;
 use Rector\TypeDeclarationDocblocks\Rector\ClassMethod\AddReturnDocblockForCommonObjectDenominatorRector;
 use Rector\TypeDeclarationDocblocks\Rector\ClassMethod\DocblockGetterReturnArrayFromPropertyDocblockVarRector;
+use Rector\TypeDeclarationDocblocks\Rector\ClassMethod\DocblockReturnArrayFromDirectArrayInstanceRector;
 
 /**
  * @experimental * 2025-09, experimental hidden set for type declaration in docblocks
  */
 return static function (RectorConfig $rectorConfig): void {
     $rectorConfig->rules([
-        AddReturnArrayDocblockBasedOnArrayMapRector::class,
-        AddReturnDocblockForScalarArrayFromAssignsRector::class,
+        // property var
         DocblockVarFromParamDocblockInConstructorRector::class,
-        DocblockGetterReturnArrayFromPropertyDocblockVarRector::class,
-        AddReturnDocblockForCommonObjectDenominatorRector::class,
+
+        // param
         AddParamArrayDocblockFromDimFetchAccessRector::class,
         ClassMethodArrayDocblockParamFromLocalCallsRector::class,
+
+        // return
+        DocblockGetterReturnArrayFromPropertyDocblockVarRector::class,
+        AddReturnDocblockForCommonObjectDenominatorRector::class,
+        AddReturnArrayDocblockBasedOnArrayMapRector::class,
+        AddReturnDocblockForScalarArrayFromAssignsRector::class,
+        DocblockReturnArrayFromDirectArrayInstanceRector::class,
+
         // tests
         AddParamArrayDocblockFromDataProviderRector::class,
         AddReturnDocblockDataProviderRector::class,

rules/CodeQuality/Rector/ClassMethod/InlineArrayReturnAssignRector.php

@@ -107,7 +107,7 @@ public function refactor(Node $node): ?Node
         }
 
         // init maybe from before if
-        if (!$emptyArrayAssign instanceof Assign && ! $node instanceof FunctionLike) {
+        if (! $emptyArrayAssign instanceof Assign && ! $node instanceof FunctionLike) {
             return null;
         }
 

rules/CodingStyle/Rector/Enum_/EnumCaseToPascalCaseRector.php

@@ -4,15 +4,15 @@
 
 namespace Rector\CodingStyle\Rector\Enum_;
 
-use PHPStan\BetterReflection\Reflector\DefaultReflector;
-use PHPStan\BetterReflection\Reflector\Exception\IdentifierNotFound;
-use PHPStan\Reflection\ClassReflection;
 use PhpParser\Node;
 use PhpParser\Node\Expr\ClassConstFetch;
 use PhpParser\Node\Identifier;
 use PhpParser\Node\Name;
 use PhpParser\Node\Stmt\Enum_;
 use PhpParser\Node\Stmt\EnumCase;
+use PHPStan\BetterReflection\Reflector\DefaultReflector;
+use PHPStan\BetterReflection\Reflector\Exception\IdentifierNotFound;
+use PHPStan\Reflection\ClassReflection;
 use Rector\Configuration\Option;
 use Rector\Configuration\Parameter\SimpleParameterProvider;
 use Rector\NodeTypeResolver\Reflection\BetterReflection\SourceLocatorProvider\DynamicSourceLocatorProvider;
@@ -192,7 +192,10 @@ private function isUsedOutsideOfProject(Name $name): bool
     private function isEnumCase(ClassReflection $classReflection, string $name, string $pascalName): bool
     {
         // the enum case might have already been renamed, need to check both
-        return $classReflection->hasEnumCase($name) || $classReflection->hasEnumCase($pascalName);
+        if ($classReflection->hasEnumCase($name)) {
+            return true;
+        }
+        return $classReflection->hasEnumCase($pascalName);
     }
 
     private function convertToPascalCase(string $name): string

src/PhpParser/Node/NodeFactory.php

@@ -4,7 +4,6 @@
 
 namespace Rector\PhpParser\Node;
 
-use PhpParser\Node\Expr\New_;
 use PhpParser\Builder\Method;
 use PhpParser\Builder\Param as ParamBuilder;
 use PhpParser\Builder\Property as PropertyBuilder;
@@ -27,6 +26,7 @@
 use PhpParser\Node\Expr\ConstFetch;
 use PhpParser\Node\Expr\FuncCall;
 use PhpParser\Node\Expr\MethodCall;
+use PhpParser\Node\Expr\New_;
 use PhpParser\Node\Expr\PropertyFetch;
 use PhpParser\Node\Expr\StaticCall;
 use PhpParser\Node\Expr\StaticPropertyFetch;