Skip to content

Commit 32dd079

Browse files
committed
[TASK] Refactor isEqualAbsolutePath and isEqualRelativePath into matches
1 parent f26861f commit 32dd079

File tree

2 files changed

+4
-14
lines changed

2 files changed

+4
-14
lines changed

packages/guides/src/Compiler/NodeTransformers/MenuNodeTransformers/GlobMenuEntryNodeTransformer.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ public function getPriority(): int
9191
return 4500;
9292
}
9393

94+
/** @param String[] $globExclude */
9495
private static function matches(string $actualFile, GlobMenuEntryNode $parsedMenuEntryNode, string $currentFile, array $globExclude): bool
9596
{
9697
$expectedFile = $parsedMenuEntryNode->getUrl();

packages/guides/src/Compiler/NodeTransformers/MenuNodeTransformers/InternalMenuEntryNodeTransformer.php

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,7 @@ protected function handleMenuEntry(MenuNode $currentMenu, MenuEntryNode $node, C
4242
$maxDepth = (int) $currentMenu->getOption('maxdepth', self::DEFAULT_MAX_LEVELS);
4343
foreach ($documentEntries as $documentEntry) {
4444
if (
45-
!self::isEqualAbsolutePath($documentEntry->getFile(), $node, $currentPath)
46-
&& !self::isEqualRelativePath($documentEntry->getFile(), $node, $currentPath)
45+
!self::matches($documentEntry->getFile(), $node, $currentPath)
4746
) {
4847
continue;
4948
}
@@ -73,21 +72,11 @@ protected function handleMenuEntry(MenuNode $currentMenu, MenuEntryNode $node, C
7372
return [$node];
7473
}
7574

76-
private static function isEqualAbsolutePath(string $actualFile, InternalMenuEntryNode $parsedMenuEntryNode, string $currentFile): bool
75+
private static function matches(string $actualFile, InternalMenuEntryNode $parsedMenuEntryNode, string $currentFile): bool
7776
{
7877
$expectedFile = $parsedMenuEntryNode->getUrl();
79-
if (!self::isAbsoluteFile($expectedFile)) {
80-
return false;
81-
}
82-
83-
return $expectedFile === '/' . $actualFile;
84-
}
85-
86-
private static function isEqualRelativePath(string $actualFile, InternalMenuEntryNode $menuEntryNode, string $currentFile): bool
87-
{
88-
$expectedFile = $menuEntryNode->getUrl();
8978
if (self::isAbsoluteFile($expectedFile)) {
90-
return false;
79+
return $expectedFile === '/' . $actualFile;
9180
}
9281

9382
$current = explode('/', $currentFile);

0 commit comments

Comments
 (0)