From 60f152a1a582946c2c8dd91bbec4c770cb555a95 Mon Sep 17 00:00:00 2001 From: Tomas Votruba Date: Fri, 4 Oct 2019 14:05:22 +0200 Subject: [PATCH] fix stinfy str needless for return strings --- .../src/Rector/Assign/UseIncrementAssignRector.php | 6 +----- .../Php73/src/Rector/FuncCall/StringifyStrNeedlesRector.php | 4 ++-- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/packages/CodingStyle/src/Rector/Assign/UseIncrementAssignRector.php b/packages/CodingStyle/src/Rector/Assign/UseIncrementAssignRector.php index 381ee630c9b..3f0cad0ad6a 100644 --- a/packages/CodingStyle/src/Rector/Assign/UseIncrementAssignRector.php +++ b/packages/CodingStyle/src/Rector/Assign/UseIncrementAssignRector.php @@ -3,7 +3,6 @@ namespace Rector\CodingStyle\Rector\Assign; use PhpParser\Node; -use PhpParser\Node\Expr\AssignOp; use PhpParser\Node\Expr\AssignOp\Minus; use PhpParser\Node\Expr\AssignOp\Plus; use PhpParser\Node\Expr\PreDec; @@ -53,10 +52,7 @@ PHP */ public function getNodeTypes(): array { - return [ - Plus::class, - Minus::class - ]; + return [Plus::class, Minus::class]; } /** diff --git a/packages/Php73/src/Rector/FuncCall/StringifyStrNeedlesRector.php b/packages/Php73/src/Rector/FuncCall/StringifyStrNeedlesRector.php index b98bdf5c467..dadefd78877 100644 --- a/packages/Php73/src/Rector/FuncCall/StringifyStrNeedlesRector.php +++ b/packages/Php73/src/Rector/FuncCall/StringifyStrNeedlesRector.php @@ -5,7 +5,7 @@ namespace Rector\Php73\Rector\FuncCall; use PhpParser\Node; use PhpParser\Node\Expr\Cast\String_; use PhpParser\Node\Expr\FuncCall; -use PHPStan\Type\Constant\ConstantStringType; +use PHPStan\Type\StringType; use Rector\Rector\AbstractRector; use Rector\RectorDefinition\CodeSample; use Rector\RectorDefinition\RectorDefinition; @@ -70,7 +70,7 @@ PHP $needleArgNode = $node->args[1]->value; $nodeStaticType = $this->getStaticType($needleArgNode); - if ($nodeStaticType instanceof ConstantStringType) { + if ($nodeStaticType instanceof StringType) { return null; }