Fix code style

Author: jaapio

packages/guides/src/Compiler/CompilerContext.php

@@ -16,11 +16,12 @@
 use Exception;
 use phpDocumentor\Guides\Compiler\ShadowTree\TreeNode;
 use phpDocumentor\Guides\Nodes\DocumentNode;
+use phpDocumentor\Guides\Nodes\Node;
 use phpDocumentor\Guides\Nodes\ProjectNode;
 
 class CompilerContext
 {
-    /** @var TreeNode<DocumentNode> */
+    /** @var TreeNode<Node> */
     private TreeNode $shadowTree;
 
     public function __construct(
@@ -50,6 +51,7 @@ public function withDocumentShadowTree(DocumentNode $documentNode): static
         return $that;
     }
 
+    /** @param TreeNode<Node> $shadowTree */
     public function withShadowTree(TreeNode $shadowTree): static
     {
         $that = clone $this;
@@ -58,7 +60,7 @@ public function withShadowTree(TreeNode $shadowTree): static
         return $that;
     }
 
-    /** @return TreeNode<DocumentNode> */
+    /** @return TreeNode<Node> */
     public function getShadowTree(): TreeNode
     {
         if (!isset($this->shadowTree)) {

packages/guides/src/Compiler/NodeTransformers/MoveAnchorTransformer.php

@@ -1,7 +1,10 @@
 <?php
 
+declare(strict_types=1);
+
 namespace phpDocumentor\Guides\Compiler\NodeTransformers;
 
+use ArrayIterator;
 use LogicException;
 use phpDocumentor\Guides\Compiler\CompilerContext;
 use phpDocumentor\Guides\Compiler\NodeTransformer;
@@ -10,8 +13,12 @@
 use phpDocumentor\Guides\Nodes\Node;
 use phpDocumentor\Guides\Nodes\SectionNode;
 
+use function spl_object_hash;
+
+/** @implements NodeTransformer<AnchorNode> */
 final class MoveAnchorTransformer implements NodeTransformer
 {
+    /** @var array<string, string> */
     private array $seen = [];
 
     public function enterNode(Node $node, CompilerContext $compilerContext): Node
@@ -46,7 +53,8 @@ public function getPriority(): int
         return 30000;
     }
 
-    private function attemptMoveToNeighbour(TreeNode $parent, int $position, Node $node): ?Node
+    /** @param TreeNode<Node> $parent */
+    private function attemptMoveToNeighbour(TreeNode $parent, int $position, AnchorNode $node): AnchorNode|null
     {
         $current = $this->findNextSection($parent, $position);
         if ($current === null) {
@@ -55,20 +63,30 @@ private function attemptMoveToNeighbour(TreeNode $parent, int $position, Node $n
             }
 
             $position = $parent->getParent()->findPosition($parent->getNode());
+            if ($position === null) {
+                throw new LogicException('Node not found in shadow tree');
+            }
+
             return $this->attemptMoveToNeighbour($parent->getParent(), $position, $node);
         }
 
         if ($current->getNode() instanceof SectionNode) {
             $current->pushChild($node);
+
             return null;
         }
 
         return $node;
     }
 
-    private function findNextSection($parent, $position): TreeNode|null
+    /**
+     * @param TreeNode<Node> $parent
+     *
+     * @return TreeNode<Node>|null
+     */
+    private function findNextSection(TreeNode $parent, int $position): TreeNode|null
     {
-        $children = new \ArrayIterator($parent->getChildren());
+        $children = new ArrayIterator($parent->getChildren());
         if ($children->count() <= $position + 1) {
             return null;
         }

packages/guides/src/Compiler/ShadowTree/TreeNode.php

@@ -9,9 +9,10 @@
 use phpDocumentor\Guides\Nodes\DocumentNode;
 use phpDocumentor\Guides\Nodes\Node;
 
+use function array_unshift;
 use function array_values;
 
-/** @template TNode of Node */
+/** @template-covariant TNode of Node */
 final class TreeNode
 {
     /** @var TreeNode<DocumentNode> */
@@ -178,7 +179,7 @@ public function replaceChild(Node $oldChildNode, Node $newChildNode): void
         }
     }
 
-    public function findPosition(Node $node): ?int
+    public function findPosition(Node $node): int|null
     {
         foreach ($this->children as $key => $child) {
             if ($child->getNode() === $node) {

packages/guides/src/Nodes/CompoundNode.php

@@ -13,6 +13,7 @@
 
 namespace phpDocumentor\Guides\Nodes;
 
+use function array_unshift;
 use function array_values;
 
 /**
@@ -39,7 +40,6 @@ public function addChildNode(Node $node): void
         $this->value[] = $node;
     }
 
-
     public function pushChildNode(Node $node): void
     {
         array_unshift($this->value, $node);

packages/guides/tests/unit/Compiler/NodeTransformers/MoveAnchorTransformerTest.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace phpDocumentor\Guides\Compiler\NodeTransformers;
 
 use phpDocumentor\Guides\Compiler\CompilerContext;
@@ -19,13 +21,13 @@ final class MoveAnchorTransformerTest extends TestCase
     protected function setUp(): void
     {
         $this->documentNodeTraverser = new DocumentNodeTraverser(new class implements NodeTransformerFactory {
+            /** @return iterable<MoveAnchorTransformer> */
             public function getTransformers(): iterable
             {
-                return [
-                    new MoveAnchorTransformer()
-                ];
+                yield new MoveAnchorTransformer();
             }
 
+            /** @return array<string, int> */
             public function getPriorities(): array
             {
                 return [];
@@ -142,7 +144,6 @@ public function testMoveAnchorsAtTheEndOfSectionToNextSection(): void
         self::assertCount(2, $context->getDocumentNode()->getChildren()[1]->getChildren());
     }
 
-
     public function testMoveAnchorsAtTheEndOfSectionToNextParentNeighbourSection(): void
     {
         $node1 = new AnchorNode('foo');

tests/Integration/IntegrationTest.php

@@ -7,7 +7,6 @@
 use phpDocumentor\Guides\ApplicationTestCase;
 use phpDocumentor\Guides\Cli\Command\Run;
 use PHPUnit\Framework\Attributes\DataProvider;
-use PHPUnit\Framework\Constraint\IsEqual;
 use PHPUnit\Framework\ExpectationFailedException;
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Output\BufferedOutput;