Skip to content

Commit f26861f

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

File tree

2 files changed

+8
-21
lines changed

2 files changed

+8
-21
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ final public function enterNode(Node $node, CompilerContext $compilerContext): N
4040
return $node;
4141
}
4242

43-
public final function leaveNode(Node $node, CompilerContext $compilerContext): Node|null
43+
final public function leaveNode(Node $node, CompilerContext $compilerContext): Node|null
4444
{
4545
if ($node instanceof MenuNode) {
4646
$this->currentMenu = null;

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

Lines changed: 7 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@ protected function handleMenuEntry(MenuNode $currentMenu, MenuEntryNode $node, C
3838
$menuEntries = [];
3939
foreach ($documentEntries as $documentEntry) {
4040
if (
41-
!self::isEqualAbsolutePath($documentEntry->getFile(), $node, $currentPath, $globExclude)
42-
&& !self::isEqualRelativePath($documentEntry->getFile(), $node, $currentPath, $globExclude)
41+
!self::matches($documentEntry->getFile(), $node, $currentPath, $globExclude)
4342
) {
4443
continue;
4544
}
@@ -92,27 +91,15 @@ public function getPriority(): int
9291
return 4500;
9392
}
9493

95-
/** @param String[] $globExclude */
96-
private static function isEqualAbsolutePath(string $actualFile, GlobMenuEntryNode $parsedMenuEntryNode, string $currentFile, array $globExclude): bool
94+
private static function matches(string $actualFile, GlobMenuEntryNode $parsedMenuEntryNode, string $currentFile, array $globExclude): bool
9795
{
9896
$expectedFile = $parsedMenuEntryNode->getUrl();
99-
if (!self::isAbsoluteFile($expectedFile)) {
100-
return false;
101-
}
102-
103-
if ($expectedFile === '/' . $actualFile) {
104-
return true;
105-
}
106-
107-
return self::isGlob($actualFile, $currentFile, $expectedFile, '/', $globExclude);
108-
}
109-
110-
/** @param String[] $globExclude */
111-
private static function isEqualRelativePath(string $actualFile, GlobMenuEntryNode $menuEntryNode, string $currentFile, array $globExclude): bool
112-
{
113-
$expectedFile = $menuEntryNode->getUrl();
11497
if (self::isAbsoluteFile($expectedFile)) {
115-
return false;
98+
if ($expectedFile === '/' . $actualFile) {
99+
return true;
100+
}
101+
102+
return self::isGlob($actualFile, $currentFile, $expectedFile, '/', $globExclude);
116103
}
117104

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

0 commit comments

Comments
 (0)