Skip to content
Open
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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<p align=center>
<a href="https://github.com/contributte/console-extra/actions"><img src="https://badgen.net/github/checks/contributte/console-extra/master?cache=300"></a>
<a href="https://coveralls.io/r/contributte/console-extra"><img src="https://badgen.net/coveralls/c/github/contributte/console-extra?cache=300"></a>
<a href="https://codecov.io/gh/contributte/console-extra"><img src="https://badgen.net/codecov/c/github/contributte/console-extra"></a>
<a href="https://packagist.org/packages/contributte/console-extra"><img src="https://badgen.net/packagist/dm/contributte/console-extra"></a>
<a href="https://packagist.org/packages/contributte/console-extra"><img src="https://badgen.net/packagist/v/contributte/console-extra"></a>
</p>
Expand Down
23 changes: 18 additions & 5 deletions src/Command/Router/RouterDumpCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -103,31 +103,31 @@ protected function analyseRoute(Route $router, ?string $module = null): object
}

/**
* @param string[] $defaults
* @param array<string, mixed> $defaults
*/
protected function analyseDefaults(array $defaults): string
{
$primary = [];

if (isset($defaults['presenter'])) {
$primary[] = $defaults['presenter'];
$primary[] = $this->stringifyDefault($defaults['presenter']);
unset($defaults['presenter']);
}

if (isset($defaults['action'])) {
$primary[] = $defaults['action'];
$primary[] = $this->stringifyDefault($defaults['action']);
unset($defaults['action']);
}

if (isset($defaults['id'])) {
$primary[] = $defaults['id'];
$primary[] = $this->stringifyDefault($defaults['id']);
unset($defaults['id']);
}

$secondary = [];

foreach ($defaults as $key => $value) {
$secondary[] = sprintf('%s=>%s', $key, $value);
$secondary[] = sprintf('%s=>%s', $key, $this->stringifyDefault($value));
}

if ($secondary !== []) {
Expand All @@ -137,4 +137,17 @@ protected function analyseDefaults(array $defaults): string
return implode(':', $primary);
}

protected function stringifyDefault(mixed $value): string
{
if (is_string($value)) {
return $value;
}

if (is_scalar($value) || $value === null) {
return var_export($value, true);
}

return get_debug_type($value);
}

}
58 changes: 58 additions & 0 deletions tests/Cases/Command/Router/RouterDumpCommand.phpt
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
<?php declare(strict_types = 1);

namespace Tests\Cases\Command\Router;

use Contributte\Console\Extra\Command\Router\RouterDumpCommand;
use Contributte\Tester\Toolkit;
use Nette\Application\Routers\RouteList;
use Symfony\Component\Console\Application;
use Symfony\Component\Console\Tester\CommandTester;
use Tester\Assert;

require_once __DIR__ . '/../../../bootstrap.php';

Toolkit::test(function (): void {
$router = new RouteList();
$router->addRoute('api/<presenter>/<action>', [
'presenter' => 'Api:Dashboard',
'action' => 'default',
]);

$admin = $router->withModule('Admin');
$admin->addRoute('admin/<presenter>/<action>[/<id>]', [
'presenter' => 'Dashboard',
'action' => 'default',
'id' => 1,
'lang' => 'cs',
'secured' => true,
'meta' => ['role' => 'admin'],
]);

$application = new Application();
$application->addCommand(new RouterDumpCommand($router));

$command = $application->find('nette:router:dump');
$commandTester = new CommandTester($command);
$commandTester->execute([]);

$display = $commandTester->getDisplay();
$analyseDefaults = \Closure::bind(
fn (array $defaults): string => $this->analyseDefaults($defaults),
$command,
RouterDumpCommand::class,
);

Assert::true(str_contains($display, 'api/<presenter>/<action>'));
Assert::true(str_contains($display, 'Api:Dashboard:default'));
Assert::true(str_contains($display, 'admin/<presenter>/<action>[/<id>]'));
Assert::true(str_contains($display, 'Admin'));
Assert::true(str_contains($display, 'Dashboard:default:1 [lang=>cs,secured=>1]'));
Assert::same('Dashboard:default:1 [lang=>cs,secured=>true,meta=>array]', $analyseDefaults([
'presenter' => 'Dashboard',
'action' => 'default',
'id' => 1,
'lang' => 'cs',
'secured' => true,
'meta' => ['role' => 'admin'],
]));
});