Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: [Auto Routing Improved] fallback to default controller's default method #7406

Merged
merged 14 commits into from
Jun 1, 2023
Merged

feat: [Auto Routing Improved] fallback to default controller's default method #7406

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
9575724
refactor: extract method
kenjis Apr 3, 2023
ddc6e99
feat: fallback to default controller
kenjis Apr 4, 2023
dde702f
test: add tests for fallback to default controller
kenjis Apr 4, 2023
488c42c
refactor: extract method
kenjis Apr 4, 2023
941a258
feat: parameter info for default controller
kenjis Apr 4, 2023
b6e93ad
docs: add docs
kenjis Apr 4, 2023
57fea4d
refactor: by rector
kenjis Apr 4, 2023
fce8923
fix: directory is not correct
kenjis Apr 4, 2023
4772589
feat: improve error message
kenjis Apr 11, 2023
ff1e958
feat: prevent access to default controller's method
kenjis Apr 11, 2023
edbedc1
docs: update docs
kenjis Apr 11, 2023
d96f0ad
docs: move section up
kenjis Apr 12, 2023
cc6b2d9
docs: add section title
kenjis Apr 12, 2023
15ee8d6
fix: Fatal error
kenjis Apr 13, 2023
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
75 changes: 37 additions & 38 deletions system/Commands/Utilities/Routes/AutoRouterImproved/ControllerMethodReader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,8 @@ public function read(string $class, string $defaultController = 'Home', string $
$classInUri,
$classname,
$methodName,
$httpVerb
$httpVerb,
$method
);

if ($routeForDefaultController !== []) {
Expand All @@ -85,23 +86,7 @@ public function read(string $class, string $defaultController = 'Home', string $
continue;
}

$params = [];
$routeParams = '';
$refParams = $method->getParameters();

foreach ($refParams as $param) {
$required = true;
if ($param->isOptional()) {
$required = false;

$routeParams .= '[/..]';
} else {
$routeParams .= '/..';
}

// [variable_name => required?]
$params[$param->getName()] = $required;
}
[$params, $routeParams] = $this->getParameters($method);

// Route for the default method.
$output[] = [
Expand All @@ -117,23 +102,7 @@ public function read(string $class, string $defaultController = 'Home', string $

$route = $classInUri . '/' . $methodInUri;

$params = [];
$routeParams = '';
$refParams = $method->getParameters();

foreach ($refParams as $param) {
$required = true;
if ($param->isOptional()) {
$required = false;

$routeParams .= '[/..]';
} else {
$routeParams .= '/..';
}

// [variable_name => required?]
$params[$param->getName()] = $required;
}
[$params, $routeParams] = $this->getParameters($method);

// If it is the default controller, the method will not be
// routed.
Expand All @@ -155,6 +124,29 @@ public function read(string $class, string $defaultController = 'Home', string $
return $output;
}

private function getParameters(ReflectionMethod $method): array
{
$params = [];
$routeParams = '';
$refParams = $method->getParameters();

foreach ($refParams as $param) {
$required = true;
if ($param->isOptional()) {
$required = false;

$routeParams .= '[/..]';
} else {
$routeParams .= '/..';
}

// [variable_name => required?]
$params[$param->getName()] = $required;
}

return [$params, $routeParams];
}

/**
* @phpstan-param class-string $classname
*
Expand Down Expand Up @@ -189,7 +181,8 @@ private function getRouteForDefaultController(
string $uriByClass,
string $classname,
string $methodName,
string $httpVerb
string $httpVerb,
ReflectionMethod $method
): array {
$output = [];

Expand All @@ -198,12 +191,18 @@ private function getRouteForDefaultController(
$routeWithoutController = rtrim(preg_replace($pattern, '', $uriByClass), '/');
$routeWithoutController = $routeWithoutController ?: '/';

[$params, $routeParams] = $this->getParameters($method);

if ($routeWithoutController === '/' && $routeParams !== '') {
$routeWithoutController = '';
}

$output[] = [
'method' => $httpVerb,
'route' => $routeWithoutController,
'route_params' => '',
'route_params' => $routeParams,
'handler' => '\\' . $classname . '::' . $methodName,
'params' => [],
'params' => $params,
];
}

Expand Down
Loading