Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,9 @@ jobs:
with:
php: "8.2"

test81:
name: "Nette Tester"
uses: contributte/.github/.github/workflows/nette-tester.yml@master
with:
php: "8.1"

testlower:
name: "Nette Tester"
uses: contributte/.github/.github/workflows/nette-tester.yml@master
with:
php: "8.1"
php: "8.2"
composer: "composer update --no-interaction --no-progress --prefer-dist --prefer-stable --prefer-lowest"
2 changes: 1 addition & 1 deletion ruleset.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ruleset name="Contributte" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="vendor/squizlabs/php_codesniffer/phpcs.xsd">
<!-- Rulesets -->
<rule ref="./vendor/contributte/qa/ruleset-8.0.xml"/>
<rule ref="./vendor/contributte/qa/ruleset-8.2.xml"/>

<!-- Rules -->
<rule ref="SlevomatCodingStandard.Files.TypeNameMatchesFileName">
Expand Down
18 changes: 17 additions & 1 deletion src/LinkGenerator/NetteLinkGenerator.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

use Contributte\MenuControl\IMenuItem;
use Nette\Application\LinkGenerator;
use Nette\Application\UI\InvalidLinkException;
use Nette\Http\IRequest;

final class NetteLinkGenerator implements ILinkGenerator
Expand All @@ -23,7 +24,10 @@ public function link(IMenuItem $item): string
{
$action = $item->getActionTarget();
if ($action !== null) {
return $this->linkGenerator->link($action, $item->getActionParameters());
$generatedLink = $this->tryLink($action, $item->getActionParameters());
if ($generatedLink !== null) {
return $generatedLink;
}
}

$link = $item->getLink();
Expand All @@ -46,4 +50,16 @@ public function absoluteLink(IMenuItem $item): string
return $prefix . $this->link($item);
}

/**
* @param array<string, mixed> $parameters
*/
private function tryLink(string $action, array $parameters): ?string
{
try {
return $this->linkGenerator->link($action, $parameters);
} catch (InvalidLinkException) {
return null;
}
}

}
19 changes: 19 additions & 0 deletions tests/Cases/LinkGenerator/NetteLinkGeneratorTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

use Contributte\MenuControl\LinkGenerator\NetteLinkGenerator;
use Mockery\MockInterface;
use Nette\Application\UI\InvalidLinkException;
use Tester\Assert;
use Tests\Toolkit\AbstractTestCase;

Expand Down Expand Up @@ -71,6 +72,24 @@ public function testLinkLink(): void
Assert::same('/', $linkGenerator->link($item));
}

public function testLinkActionWithInvalidGeneratedLinkFallsBackToItemLink(): void
{
$request = $this->createMockHttpRequest();
$netteLinkGenerator = $this->createMockNetteLinkGenerator(function (MockInterface $netteLinkGenerator): void {
$netteLinkGenerator->shouldReceive('link')->andThrow(new InvalidLinkException());
});

$item = $this->createMockMenuItem(function (MockInterface $item): void {
$item->shouldReceive('getActionTarget')->andReturn('Home:default');
$item->shouldReceive('getActionParameters')->andReturn([]);
$item->shouldReceive('getLink')->andReturn('/fallback');
});

$linkGenerator = new NetteLinkGenerator($request, $netteLinkGenerator);

Assert::same('/fallback', $linkGenerator->link($item));
}

public function testLinkEmpty(): void
{
$request = $this->createMockHttpRequest();
Expand Down