Apply suggestions from review

Co-authored-by: Jaap van Otterdijk <[email protected]>

Author: linawolf

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

@@ -49,7 +49,7 @@ public function supports(Node $node): bool
 
     public function getPriority(): int
     {
-        // Before MenuNodeTransformer
+        // Before TocNodeWithDocumentEntryTransformer and SectionEntryRegistrationTransformer
         return 5000;
     }
 }

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

@@ -15,7 +15,6 @@
 
 use function array_pop;
 use function assert;
-use function count;
 use function explode;
 use function implode;
 use function preg_match;
@@ -52,13 +51,9 @@ public function leaveNode(Node $node, CompilerContext $compilerContext): Node|nu
 
                 $documentEntriesInTree[] = $documentEntry;
                 $menuEntry = new MenuEntryNode($documentEntry->getFile(), $documentEntry->getTitle(), [], false, 1);
-                if (!$node->hasOption('titlesonly') && count($documentEntry->getSections()) > 0) {
+                if (!$node->hasOption('titlesonly')) {
                     foreach ($documentEntry->getSections() as $section) {
                         // We do not add the main section as it repeats the document title
-                        if (count($section->getChildren()) <= 0) {
-                            continue;
-                        }
-
                         foreach ($section->getChildren() as $subSectionEntryNode) {
                             assert($subSectionEntryNode instanceof SectionEntryNode);
                             $currentLevel = $menuEntry->getLevel() + 1;
@@ -107,14 +102,7 @@ private function isEqualAbsolutePath(DocumentEntryNode $documentEntry, string $f
             return true;
         }
 
-        if ($glob && $documentEntry->getFile() !== $currentPath) {
-            $file = str_replace('*', '[a-zA-Z0-9]*', $file);
-            $pattern = '`^' . $file . '$`';
-
-            return preg_match($pattern, '/' . $documentEntry->getFile()) > 0;
-        }
-
-        return false;
+        return $this->isGlob($glob, $documentEntry->getFile(), $currentPath, $file, '/');
     }
 
     private function isEqualRelativePath(DocumentEntryNode $documentEntry, string $file, string $currentPath, bool $glob): bool
@@ -132,11 +120,16 @@ private function isEqualRelativePath(DocumentEntryNode $documentEntry, string $f
             return true;
         }
 
-        if ($glob && $documentEntry->getFile() !== $currentPath) {
+        return $this->isGlob($glob, $documentEntry->getFile(), $currentPath, $file, '');
+    }
+
+    private function isGlob(bool $glob, string $documentEntryFile, string $currentPath, string $file, string $prefix): bool
+    {
+        if ($glob && $documentEntryFile !== $currentPath) {
             $file = str_replace('*', '[a-zA-Z0-9]*', $file);
             $pattern = '`^' . $file . '$`';
 
-            return preg_match($pattern, $documentEntry->getFile()) > 0;
+            return preg_match($pattern, $prefix . $documentEntryFile) > 0;
         }
 
         return false;

packages/guides/src/Nodes/DocumentTree/DocumentEntryNode.php

@@ -9,7 +9,7 @@
 use phpDocumentor\Guides\Nodes\TitleNode;
 
 /** @extends AbstractNode<DocumentNode> */
-class DocumentEntryNode extends AbstractNode
+final class DocumentEntryNode extends AbstractNode
 {
     /** @var DocumentEntryNode[] */
     private array $entries = [];

packages/guides/src/Nodes/DocumentTree/SectionEntryNode.php

@@ -4,9 +4,12 @@
 
 namespace phpDocumentor\Guides\Nodes\DocumentTree;
 
+use phpDocumentor\Guides\Nodes\AbstractNode;
+use phpDocumentor\Guides\Nodes\DocumentNode;
 use phpDocumentor\Guides\Nodes\TitleNode;
 
-class SectionEntryNode
+/** @extends AbstractNode<DocumentNode> */
+final class SectionEntryNode extends AbstractNode
 {
     /** @var SectionEntryNode[] */
     private array $children = [];