Skip to content

Commit d503e1e

Browse files
committed
Fixes for PHPStan
1 parent 3d29ac0 commit d503e1e

1 file changed

Lines changed: 16 additions & 19 deletions

File tree

rules/TypeDeclaration/Rector/ClassMethod/AddReturnDocblockForScalarArrayFromAssignsRector.php

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,29 +5,30 @@
55
namespace Rector\TypeDeclaration\Rector\ClassMethod;
66

77
use PhpParser\Node;
8+
use PHPStan\Type\Type;
9+
use PhpParser\Node\Expr;
10+
use PHPStan\Type\ArrayType;
11+
use PHPStan\Type\FloatType;
12+
use PHPStan\Type\MixedType;
13+
use PHPStan\Type\StringType;
14+
use PHPStan\Type\IntegerType;
815
use PhpParser\Node\Expr\Array_;
9-
use PhpParser\Node\Expr\ArrayDimFetch;
1016
use PhpParser\Node\Expr\Assign;
17+
use PhpParser\Node\Scalar\Int_;
18+
use PhpParser\Node\Stmt\Return_;
1119
use PhpParser\Node\Expr\Variable;
20+
use Rector\Rector\AbstractRector;
1221
use PhpParser\Node\Scalar\DNumber;
13-
use PhpParser\Node\Scalar\Int_;
1422
use PhpParser\Node\Scalar\String_;
15-
use PhpParser\Node\Stmt\ClassMethod;
1623
use PhpParser\Node\Stmt\Function_;
17-
use PhpParser\Node\Stmt\Return_;
18-
use PHPStan\Type\ArrayType;
19-
use PHPStan\Type\FloatType;
20-
use PHPStan\Type\IntegerType;
21-
use PHPStan\Type\MixedType;
22-
use PHPStan\Type\StringType;
23-
use PHPStan\Type\Type;
24-
use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
25-
use Rector\BetterPhpDocParser\PhpDocManipulator\PhpDocTypeChanger;
24+
use PhpParser\Node\Stmt\ClassMethod;
25+
use PhpParser\Node\Expr\ArrayDimFetch;
2626
use Rector\PhpParser\Node\BetterNodeFinder;
27-
use Rector\Rector\AbstractRector;
2827
use Rector\TypeDeclaration\NodeAnalyzer\ReturnAnalyzer;
29-
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
3028
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
29+
use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
30+
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
31+
use Rector\BetterPhpDocParser\PhpDocManipulator\PhpDocTypeChanger;
3132

3233
/**
3334
* @see \Rector\Tests\TypeDeclaration\Rector\ClassMethod\AddReturnDocblockForScalarArrayFromAssignsRector\AddReturnDocblockForScalarArrayFromAssignsRectorTest
@@ -145,10 +146,6 @@ public function refactor(Node $node): ?Node
145146
}
146147
}
147148

148-
if ($scalarArrayTypes === []) {
149-
return null;
150-
}
151-
152149
$firstScalarType = $scalarArrayTypes[0];
153150
foreach ($scalarArrayTypes as $scalarArrayType) {
154151
if (! $firstScalarType->equals($scalarArrayType)) {
@@ -250,7 +247,7 @@ private function resolveScalarArrayTypeForVariable(ClassMethod|Function_ $node,
250247
return $firstType;
251248
}
252249

253-
private function resolveScalarType(Node $expr): ?Type
250+
private function resolveScalarType(Expr $expr): ?Type
254251
{
255252
if ($expr instanceof String_) {
256253
return new StringType();

0 commit comments

Comments
 (0)