Skip to content
/ rector-src Public

move 2 docblock rules to type-declaration-docblock set #7246

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TomasVotruba merged 1 commit into from
Sep 11, 2025
Merged

move 2 docblock rules to type-declaration-docblock set #7246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions config/set/type-declaration-docblocks.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
declare(strict_types=1);

use Rector\Config\RectorConfig;
use Rector\TypeDeclaration\Rector\ClassMethod\AddReturnArrayDocblockBasedOnArrayMapRector;
use Rector\TypeDeclaration\Rector\ClassMethod\AddReturnDocblockForScalarArrayFromAssignsRector;
use Rector\TypeDeclarationDocblocks\Rector\Class_\DocblockVarFromParamDocblockInConstructorRector;
use Rector\TypeDeclarationDocblocks\Rector\ClassMethod\DocblockGetterReturnArrayFromPropertyDocblockVarRector;

Expand All @@ -11,6 +13,8 @@
*/
return static function (RectorConfig $rectorConfig): void {
$rectorConfig->rules([
AddReturnArrayDocblockBasedOnArrayMapRector::class,
AddReturnDocblockForScalarArrayFromAssignsRector::class,
DocblockVarFromParamDocblockInConstructorRector::class,
DocblockVarFromParamDocblockInConstructorRector::class,
DocblockGetterReturnArrayFromPropertyDocblockVarRector::class,
Expand Down
8 changes: 3 additions & 5 deletions ...larationDocblocks/Rector/ClassMethod/DocblockReturnArrayFromDirectArrayInstanceRector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

namespace Rector\TypeDeclarationDocblocks\Rector\ClassMethod;

use PHPStan\Type\Type;
use PhpParser\Node;
use PhpParser\Node\Expr\Array_;
use PhpParser\Node\Stmt\ClassMethod;
Expand All @@ -18,6 +17,7 @@
use PHPStan\Type\IntegerType;
use PHPStan\Type\MixedType;
use PHPStan\Type\StringType;
use PHPStan\Type\Type;
use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
use Rector\Comments\NodeDocBlock\DocBlockUpdater;
use Rector\Rector\AbstractRector;
Expand Down Expand Up @@ -150,10 +150,8 @@ private function constantToGenericType(Type $type): Type
return new MixedType();
}

private function createArrayGenericTypeNode(
Type $keyType,
Type $itemType
): GenericTypeNode {
private function createArrayGenericTypeNode(Type $keyType, Type $itemType): GenericTypeNode
{
$keyDocTypeNode = $this->staticTypeMapper->mapPHPStanTypeToPHPStanPhpDocTypeNode($keyType);
$itemDocTypeNode = $this->staticTypeMapper->mapPHPStanTypeToPHPStanPhpDocTypeNode($itemType);

Expand Down
2 changes: 0 additions & 2 deletions src/Config/Level/TypeDeclarationLevel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
use Rector\TypeDeclaration\Rector\ClassMethod\AddMethodCallBasedStrictParamTypeRector;
use Rector\TypeDeclaration\Rector\ClassMethod\AddParamTypeBasedOnPHPUnitDataProviderRector;
use Rector\TypeDeclaration\Rector\ClassMethod\AddParamTypeFromPropertyTypeRector;
use Rector\TypeDeclaration\Rector\ClassMethod\AddReturnDocblockForScalarArrayFromAssignsRector;
use Rector\TypeDeclaration\Rector\ClassMethod\AddReturnTypeDeclarationBasedOnParentClassMethodRector;
use Rector\TypeDeclaration\Rector\ClassMethod\AddReturnTypeFromTryCatchTypeRector;
use Rector\TypeDeclaration\Rector\ClassMethod\AddVoidReturnTypeWhereNoReturnRector;
Expand Down Expand Up @@ -145,6 +144,5 @@ final class TypeDeclarationLevel
// possibly based on docblocks, but also helpful, intentionally last
AddArrayFunctionClosureParamTypeRector::class,
TypedPropertyFromDocblockSetUpDefinedRector::class,
AddReturnDocblockForScalarArrayFromAssignsRector::class,
];
}
Loading