diff --git a/composer.json b/composer.json index 9a67dcf5de1..6b1e041e84f 100644 --- a/composer.json +++ b/composer.json @@ -63,7 +63,6 @@ }, "replace": { "rector/rector": "self.version", - "symfony/string": "*", "symfony/polyfill-ctype": "*", "symfony/polyfill-intl-grapheme": "*" }, diff --git a/rules/Transform/Rector/ArrayDimFetch/ArrayDimFetchToMethodCallRector.php b/rules/Transform/Rector/ArrayDimFetch/ArrayDimFetchToMethodCallRector.php index 5a949d5f9da..2b55d7f2061 100644 --- a/rules/Transform/Rector/ArrayDimFetch/ArrayDimFetchToMethodCallRector.php +++ b/rules/Transform/Rector/ArrayDimFetch/ArrayDimFetchToMethodCallRector.php @@ -5,7 +5,6 @@ namespace Rector\Transform\Rector\ArrayDimFetch; use PhpParser\Node; -use PhpParser\NodeVisitor; use PhpParser\Node\Arg; use PhpParser\Node\Expr; use PhpParser\Node\Expr\ArrayDimFetch; @@ -14,10 +13,11 @@ use PhpParser\Node\Expr\BinaryOp\BooleanAnd; use PhpParser\Node\Expr\Isset_; use PhpParser\Node\Expr\MethodCall; -use PHPStan\Type\ObjectType; use PhpParser\Node\Stmt; use PhpParser\Node\Stmt\Expression; use PhpParser\Node\Stmt\Unset_; +use PhpParser\NodeVisitor; +use PHPStan\Type\ObjectType; use Rector\Contract\Rector\ConfigurableRectorInterface; use Rector\Rector\AbstractRector; use Rector\Transform\ValueObject\ArrayDimFetchToMethodCall; @@ -83,7 +83,7 @@ public function refactor(Node $node): array|Expr|null|int } if ($node instanceof Assign) { - if (!$node->var instanceof ArrayDimFetch) { + if (! $node->var instanceof ArrayDimFetch) { return null; } @@ -130,7 +130,10 @@ private function handleIsset(Isset_ $isset): Expr|int|null return array_reduce( $exprs, - fn (?Expr $carry, Expr $expr): Isset_|MethodCall|BooleanAnd => $carry instanceof Expr ? new BooleanAnd($carry, $expr) : $expr, + fn (?Expr $carry, Expr $expr): Isset_|MethodCall|BooleanAnd => $carry instanceof Expr ? new BooleanAnd( + $carry, + $expr + ) : $expr, null, ); } @@ -173,12 +176,12 @@ private function handleUnset(Unset_ $unset): array|int */ private function getMethodCall(ArrayDimFetch $arrayDimFetch, string $action, ?Expr $expr = null): ?MethodCall { - if (!$arrayDimFetch->dim instanceof Node) { + if (! $arrayDimFetch->dim instanceof Node) { return null; } foreach ($this->arrayDimFetchToMethodCalls as $arrayDimFetchToMethodCall) { - if (!$this->isObjectType($arrayDimFetch->var, $arrayDimFetchToMethodCall->getObjectType())) { + if (! $this->isObjectType($arrayDimFetch->var, $arrayDimFetchToMethodCall->getObjectType())) { continue; } diff --git a/src/NodeTypeResolver/NodeTypeResolver/ScalarTypeResolver.php b/src/NodeTypeResolver/NodeTypeResolver/ScalarTypeResolver.php index dc877fe5cc2..e0359fcae56 100644 --- a/src/NodeTypeResolver/NodeTypeResolver/ScalarTypeResolver.php +++ b/src/NodeTypeResolver/NodeTypeResolver/ScalarTypeResolver.php @@ -21,7 +21,7 @@ use Rector\NodeTypeResolver\Contract\NodeTypeResolverInterface; /** - * @implements NodeTypeResolverInterface + * @implements NodeTypeResolverInterface */ final class ScalarTypeResolver implements NodeTypeResolverInterface {