Cleanup (#1054)

rectorphp · Oct 24, 2021 · 8e2908c · 8e2908c
1 parent 06ea31c
commit 8e2908c
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 35 deletions.
diff --git a/packages/NodeTypeResolver/PhpDocNodeVisitor/NameImportingPhpDocNodeVisitor.php b/packages/NodeTypeResolver/PhpDocNodeVisitor/NameImportingPhpDocNodeVisitor.php
@@ -129,11 +129,6 @@ private function processFqnNameImport(
         }
 
         if ($this->shouldImport($newNode, $identifierTypeNode, $fullyQualifiedObjectType)) {
-            // do not import twice
-            if ($this->useNodesToAddCollector->isShortImported($file, $fullyQualifiedObjectType)) {
-                return null;
-            }
-
             $this->useNodesToAddCollector->addUseImport($fullyQualifiedObjectType);
             return $newNode;
         }

diff --git a/packages/ReadWrite/NodeAnalyzer/ReadWritePropertyAnalyzer.php b/packages/ReadWrite/NodeAnalyzer/ReadWritePropertyAnalyzer.php
@@ -87,10 +87,6 @@ private function isArrayDimFetchRead(ArrayDimFetch $arrayDimFetch): bool
         }
 
         // the array dim fetch is assing here only; but the variable might be used later
-        if ($this->readExprAnalyzer->isExprRead($arrayDimFetch->var)) {
-            return true;
-        }
-
-        return ! $this->assignManipulator->isLeftPartOfAssign($arrayDimFetch);
+        return $this->readExprAnalyzer->isExprRead($arrayDimFetch->var);
     }
 }
diff --git a/rules/DowngradePhp80/Reflection/DefaultParameterValueResolver.php b/rules/DowngradePhp80/Reflection/DefaultParameterValueResolver.php
@@ -16,7 +16,7 @@
 use PHPStan\Type\Constant\ConstantBooleanType;
 use PHPStan\Type\ConstantType;
 use PHPStan\Type\Type;
-use Rector\Core\Exception\NotImplementedYetException;
+use PHPStan\Type\VerbosityLevel;
 use Rector\Core\Exception\ShouldNotHappenException;
 
 final class DefaultParameterValueResolver
@@ -76,13 +76,8 @@ private function resolveValueFromType(ConstantType $constantType): ConstFetch |
 
     private function resolveConstantBooleanType(ConstantBooleanType $constantBooleanType): ConstFetch
     {
-        if (! $constantBooleanType->getValue()) {
-            $name = new Name('false');
-        } elseif ($constantBooleanType->getValue()) {
-            $name = new Name('true');
-        } else {
-            throw new NotImplementedYetException();
-        }
+        $value = $constantBooleanType->describe(VerbosityLevel::value());
+        $name = new Name($value);
 
         return new ConstFetch($name);
     }

diff --git a/rules/Php70/Rector/FuncCall/EregToPregMatchRector.php b/rules/Php70/Rector/FuncCall/EregToPregMatchRector.php
@@ -171,10 +171,6 @@ private function processSplitLimitArgument(FuncCall $funcCall, string $functionN
         }
 
         // 3rd argument - $limit, 0 → 1
-        if (! isset($funcCall->args[2])) {
-            return;
-        }
-
         if (! $funcCall->args[2]->value instanceof LNumber) {
             return;
         }

diff --git a/rules/Php70/Rector/Ternary/TernaryToNullCoalescingRector.php b/rules/Php70/Rector/Ternary/TernaryToNullCoalescingRector.php
@@ -47,7 +47,7 @@ public function getNodeTypes(): array
     public function refactor(Node $node): ?Node
     {
         if ($node->cond instanceof Isset_) {
-            return $this->processTernaryWithIsset($node);
+            return $this->processTernaryWithIsset($node, $node->cond);
         }
 
         if ($node->cond instanceof Identical) {
@@ -87,24 +87,22 @@ public function provideMinPhpVersion(): int
         return PhpVersionFeature::NULL_COALESCE;
     }
 
-    private function processTernaryWithIsset(Ternary $ternary): ?Coalesce
+    private function processTernaryWithIsset(Ternary $ternary, Isset_ $isset): ?Coalesce
     {
         if ($ternary->if === null) {
             return null;
         }
 
-        /** @var Isset_ $issetNode */
-        $issetNode = $ternary->cond;
         // none or multiple isset values cannot be handled here
-        if (! isset($issetNode->vars[0])) {
+        if (! isset($isset->vars[0])) {
             return null;
         }
 
-        if (count($issetNode->vars) > 1) {
+        if (count($isset->vars) > 1) {
             return null;
         }
 
-        if ($this->nodeComparator->areNodesEqual($ternary->if, $issetNode->vars[0])) {
+        if ($this->nodeComparator->areNodesEqual($ternary->if, $isset->vars[0])) {
             return new Coalesce($ternary->if, $ternary->else);
         }
 

diff --git a/rules/Transform/Rector/Class_/AddInterfaceByParentRector.php b/rules/Transform/Rector/Class_/AddInterfaceByParentRector.php
@@ -79,7 +79,7 @@ public function refactor(Node $node): ?Node
         }
 
         $parentClassReflection = $classReflection->getParentClass();
-        if (! $parentClassReflection) {
+        if (! $parentClassReflection instanceof ClassReflection) {
             return null;
         }
 

diff --git a/rules/Transform/ValueObject/AttributeKeyToClassConstFetch.php b/rules/Transform/ValueObject/AttributeKeyToClassConstFetch.php
@@ -7,7 +7,7 @@
 final class AttributeKeyToClassConstFetch
 {
     /**
-     * @param array<mixed, string> $valuesToConstantsMap
+     * @param array<string, string> $valuesToConstantsMap
      */
     public function __construct(
         private string $attributeClass,

diff --git a/src/NodeManipulator/ClassMethodAssignManipulator.php b/src/NodeManipulator/ClassMethodAssignManipulator.php
@@ -219,10 +219,6 @@ private function findParentForeach(Assign $assign): ?Foreach_
 
     private function isExplicitlyReferenced(Node $node): bool
     {
-        if (! property_exists($node, 'byRef')) {
-            return false;
-        }
-
         if ($node instanceof Arg || $node instanceof ClosureUse || $node instanceof Param) {
             return $node->byRef;
         }