misc

rectorphp · Jun 4, 2022 · 6b30001 · 6b30001
1 parent d2d9e83
commit 6b30001
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 19 deletions.
diff --git a/packages/BetterPhpDocParser/PhpDocManipulator/PhpDocTagRemover.php b/packages/BetterPhpDocParser/PhpDocManipulator/PhpDocTagRemover.php
@@ -27,9 +27,7 @@ public function removeByName(PhpDocInfo $phpDocInfo, string $name): void
             }
 
             if ($phpDocChildNode->value instanceof DoctrineAnnotationTagValueNode) {
-                $doctrineAnnotationTagValueNode = $phpDocChildNode->value;
-
-                if ($doctrineAnnotationTagValueNode->hasClassName($name)) {
+                if ($phpDocChildNode->value->hasClassName($name)) {
                     unset($phpDocNode->children[$key]);
                     $phpDocInfo->markAsChanged();
                 }

diff --git a/packages/BetterPhpDocParser/PhpDocParser/ClassAnnotationMatcher.php b/packages/BetterPhpDocParser/PhpDocParser/ClassAnnotationMatcher.php
@@ -81,15 +81,13 @@ private function resolveAsAliased(array $uses, string $tag): string
             $prefix = $use instanceof GroupUse
                 ? $use->prefix . '\\'
                 : '';
-            $useUses = $use->uses;
 
-            foreach ($useUses as $useUse) {
+            foreach ($use->uses as $useUse) {
                 if (! $useUse->alias instanceof Identifier) {
                     continue;
                 }
 
-                $alias = $useUse->alias;
-                if ($alias->toString() === $tag) {
+                if ($useUse->alias->toString() === $tag) {
                     return $prefix . $useUse->name->toString();
                 }
             }

diff --git a/packages/BetterPhpDocParser/PhpDocParser/DoctrineAnnotationDecorator.php b/packages/BetterPhpDocParser/PhpDocParser/DoctrineAnnotationDecorator.php
@@ -242,11 +242,10 @@ private function createSpacelessPhpDocTagNode(
         GenericTagValueNode $genericTagValueNode,
         string $fullyQualifiedAnnotationClass
     ): SpacelessPhpDocTagNode {
-        $annotationContent = $genericTagValueNode->value;
         $formerStartEnd = $genericTagValueNode->getAttribute(PhpDocAttributeKey::START_AND_END);
 
         return $this->createDoctrineSpacelessPhpDocTagNode(
-            $annotationContent,
+            $genericTagValueNode->value,
             $tagName,
             $fullyQualifiedAnnotationClass,
             $formerStartEnd

diff --git a/...r/StmtsAwareInterface/RemoveJustPropertyFetchRector/Fixture/skip_dim_fetch_assign.php.inc b/...r/StmtsAwareInterface/RemoveJustPropertyFetchRector/Fixture/skip_dim_fetch_assign.php.inc
@@ -7,17 +7,9 @@ use PhpParser\Node\Expr\ArrayItem;
 
 final class SkipDimFetchAssign
 {
-<<<<<<< HEAD
     private $items;
 
-<<<<<<< HEAD
-    public function run()
-=======
     public function run(Array_ $array)
->>>>>>> 4ffc47e32b... fixup! add skipped assign dim
-=======
-    public function run(Array_ $array)
->>>>>>> 1464b13fdb... add skipped assign dim
     {
         /** @var ArrayItem[] $items */
         $items = $array->items;

diff --git a/rules/Naming/Naming/AliasNameResolver.php b/rules/Naming/Naming/AliasNameResolver.php
@@ -24,8 +24,8 @@ public function resolveByName(Name $name): ?string
             $prefix = $use instanceof GroupUse
                 ? $use->prefix . '\\'
                 : '';
-            $useUses = $use->uses;
-            foreach ($useUses as $useUse) {
+
+            foreach ($use->uses as $useUse) {
                 if (! $useUse->alias instanceof Identifier) {
                     continue;
                 }