Skip to content

Commit db61cfb

Browse files
committed
Updated Rector to commit ccfbef89ce29ef891bb3fd2a4c775a92b40c05cc
rectorphp/rector-src@ccfbef8 [DeadCode] Clean up useless union StmtsAwareInterface|ClassMethod on TerminatedNodeAnalyzer (#6969)
1 parent df07ca0 commit db61cfb

3 files changed

Lines changed: 5 additions & 9 deletions

File tree

rules/Php80/Rector/Class_/StringableForToStringRector.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
use PhpParser\Node\Identifier;
1111
use PhpParser\Node\Name\FullyQualified;
1212
use PhpParser\Node\Scalar\String_;
13+
use PhpParser\Node\Stmt;
1314
use PhpParser\Node\Stmt\Class_;
1415
use PhpParser\Node\Stmt\ClassMethod;
15-
use PhpParser\Node\Stmt\Expression;
1616
use PhpParser\Node\Stmt\Function_;
1717
use PhpParser\Node\Stmt\Return_;
1818
use PhpParser\NodeVisitor;
@@ -143,7 +143,7 @@ private function processNotStringType(ClassMethod $toStringClassMethod) : void
143143
if (!$hasReturn) {
144144
$emptyStringReturn = new Return_(new String_(''));
145145
$lastStmt = $toStringClassMethod->stmts[\count($toStringClassMethod->stmts) - 1] ?? null;
146-
if ($lastStmt instanceof Expression && $this->terminatedNodeAnalyzer->isAlwaysTerminated($toStringClassMethod, $lastStmt, $emptyStringReturn)) {
146+
if ($lastStmt instanceof Stmt && $this->terminatedNodeAnalyzer->isAlwaysTerminated($toStringClassMethod, $lastStmt, $emptyStringReturn)) {
147147
return;
148148
}
149149
$toStringClassMethod->stmts[] = $emptyStringReturn;

src/Application/VersionResolver.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ final class VersionResolver
1919
* @api
2020
* @var string
2121
*/
22-
public const PACKAGE_VERSION = 'a5395fc2837b19a76f9f98b4c5915341164afdac';
22+
public const PACKAGE_VERSION = 'ccfbef89ce29ef891bb3fd2a4c775a92b40c05cc';
2323
/**
2424
* @api
2525
* @var string
2626
*/
27-
public const RELEASE_DATE = '2025-06-09 20:46:01';
27+
public const RELEASE_DATE = '2025-06-10 01:40:46';
2828
/**
2929
* @var int
3030
*/

src/NodeAnalyzer/TerminatedNodeAnalyzer.php

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
use PhpParser\Node\Stmt;
1111
use PhpParser\Node\Stmt\Break_;
1212
use PhpParser\Node\Stmt\ClassLike;
13-
use PhpParser\Node\Stmt\ClassMethod;
1413
use PhpParser\Node\Stmt\Continue_;
1514
use PhpParser\Node\Stmt\Else_;
1615
use PhpParser\Node\Stmt\Expression;
@@ -41,10 +40,7 @@ final class TerminatedNodeAnalyzer
4140
* @var array<class-string<Node>>
4241
*/
4342
private const ALLOWED_CONTINUE_CURRENT_STMTS = [InlineHTML::class, Nop::class];
44-
/**
45-
* @param \Rector\Contract\PhpParser\Node\StmtsAwareInterface|\PhpParser\Node\Stmt\ClassMethod $stmtsAware
46-
*/
47-
public function isAlwaysTerminated($stmtsAware, Stmt $node, Stmt $currentStmt) : bool
43+
public function isAlwaysTerminated(StmtsAwareInterface $stmtsAware, Stmt $node, Stmt $currentStmt) : bool
4844
{
4945
if (\in_array(\get_class($currentStmt), self::ALLOWED_CONTINUE_CURRENT_STMTS, \true)) {
5046
return \false;

0 commit comments

Comments
 (0)