From 342dc6023092896bc49b74419609864d3b5b028e Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Mon, 1 Sep 2025 22:17:48 +0700 Subject: [PATCH 1/4] [CodeQuality] Skip docblock based type on AddReturnTypeToDependedRector --- .../CodeQuality/Rector/Class_/AddReturnTypeToDependedRector.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules/CodeQuality/Rector/Class_/AddReturnTypeToDependedRector.php b/rules/CodeQuality/Rector/Class_/AddReturnTypeToDependedRector.php index 54ceded1..4f357bb3 100644 --- a/rules/CodeQuality/Rector/Class_/AddReturnTypeToDependedRector.php +++ b/rules/CodeQuality/Rector/Class_/AddReturnTypeToDependedRector.php @@ -112,7 +112,7 @@ public function refactor(Node $node): ?Node $soleReturnExpr = $returns[0]->expr; // does return a type? - $returnedExprType = $this->getType($soleReturnExpr); + $returnedExprType = $this->nodeTypeResolver->getNativeType($soleReturnExpr); $returnType = $this->staticTypeMapper->mapPHPStanTypeToPhpParserNode($returnedExprType, TypeKind::RETURN); if (! $returnType instanceof Node) { From 8e4ca2deb46fe4903a6eddd6b54e2b583a79c35d Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Mon, 1 Sep 2025 22:20:30 +0700 Subject: [PATCH 2/4] add test --- .../Fixture/skip_docblock_based_type.php.inc | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 rules-tests/CodeQuality/Rector/Class_/AddReturnTypeToDependedRector/Fixture/skip_docblock_based_type.php.inc diff --git a/rules-tests/CodeQuality/Rector/Class_/AddReturnTypeToDependedRector/Fixture/skip_docblock_based_type.php.inc b/rules-tests/CodeQuality/Rector/Class_/AddReturnTypeToDependedRector/Fixture/skip_docblock_based_type.php.inc new file mode 100644 index 00000000..e080e500 --- /dev/null +++ b/rules-tests/CodeQuality/Rector/Class_/AddReturnTypeToDependedRector/Fixture/skip_docblock_based_type.php.inc @@ -0,0 +1,16 @@ + Date: Mon, 1 Sep 2025 22:25:32 +0700 Subject: [PATCH 3/4] try pin rector hash --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 48c53a35..b8c20498 100644 --- a/composer.json +++ b/composer.json @@ -13,7 +13,7 @@ "phpstan/phpstan-deprecation-rules": "^2.0", "phpstan/phpstan-webmozart-assert": "^2.0", "phpunit/phpunit": "^11.5", - "rector/rector-src": "dev-main", + "rector/rector-src": "dev-main#e16a45d828d5f28e1e9a4fd7ed49675f4a2fa07f", "rector/swiss-knife": "^1.0", "rector/type-perfect": "^2.0", "symplify/phpstan-extensions": "^12.0", From 06a31c18b7c019276cc80a8c936399a00649a301 Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Mon, 1 Sep 2025 22:26:37 +0700 Subject: [PATCH 4/4] rollback pin hash --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index b8c20498..48c53a35 100644 --- a/composer.json +++ b/composer.json @@ -13,7 +13,7 @@ "phpstan/phpstan-deprecation-rules": "^2.0", "phpstan/phpstan-webmozart-assert": "^2.0", "phpunit/phpunit": "^11.5", - "rector/rector-src": "dev-main#e16a45d828d5f28e1e9a4fd7ed49675f4a2fa07f", + "rector/rector-src": "dev-main", "rector/swiss-knife": "^1.0", "rector/type-perfect": "^2.0", "symplify/phpstan-extensions": "^12.0",