Benzine/Core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix error in Router; implement new annotation lookup in App.

Browse source
This commit is contained in:
Buster "Silver Eagle" Neece 2020-09-07 05:10:21 -05:00
parent 710a291950
commit c4d22bbe7d
No known key found for this signature in database
GPG key ID: 6D9E12FF03411F4E
2 changed files with 16 additions and 95 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

98
src/App.php
View file

@ -490,7 +490,6 @@ class App
}
}
// @todo MB: This entire function is refactor-bait.
protected function interrogateControllers(): void
{
if ($this->interrogateControllersComplete) {
@ -505,96 +504,13 @@ class App
return;
}
$controllerPaths = [
APP_ROOT.'/src/Controllers',
];
foreach ($controllerPaths as $controllerPath) {
if ((new Filesystem())->exists($controllerPath)) {
foreach (new \DirectoryIterator($controllerPath) as $controllerFile) {
if (!$controllerFile->isDot() && $controllerFile->isFile() && $controllerFile->isReadable()) {
$appClass = new \ReflectionClass(get_called_class());
$expectedClasses = [
$appClass->getNamespaceName().'\\Controllers\\'.str_replace('.php', '', $controllerFile->getFilename()),
'Benzine\\Controllers\\'.str_replace('.php', '', $controllerFile->getFilename()),
];
foreach ($expectedClasses as $expectedClass) {
if (class_exists($expectedClass)) {
$rc = new \ReflectionClass($expectedClass);
if (!$rc->isAbstract()) {
foreach ($rc->getMethods() as $method) {
/** @var \ReflectionMethod $method */
if (true || ResponseInterface::class == ($method->getReturnType() instanceof \ReflectionType ? $method->getReturnType()->getName() : null)) {
$docBlock = $method->getDocComment();
$newRoute = new Route($this->logger);
foreach (explode("\n", $docBlock) as $docBlockRow) {
if (false !== stripos($docBlockRow, '@route')) {
$route = trim(substr(
$docBlockRow,
(stripos($docBlockRow, '@route') + strlen('@route'))
));
@list($httpMethods, $path, $extra) = explode(' ', $route, 3);
$httpMethods = explode(',', strtoupper($httpMethods));
$options = [];
$defaultOptions = [
'access' => Route::ACCESS_PUBLIC,
'weight' => 100,
];
// @todo MB: The following if-statement in its entirity needs rewriting
// because only god and me knew what I was thinking when I wrote it.
// And now god only knows.
if (isset($extra)) {
foreach (explode(' ', $extra) as $item) {
@list($extraK, $extraV) = explode('=', $item, 2);
if (!isset($extraV)) {
$extraV = true;
}
$options[$extraK] = $extraV;
}
}
$options = array_merge($defaultOptions, $options);
foreach ($httpMethods as $httpMethod) {
$newRoute
->setHttpMethod($httpMethod)
->setRouterPattern('/'.ltrim($path, '/'))
->setCallback($method->class.':'.$method->name)
;
foreach ($options as $key => $value) {
$keyMethod = 'set'.ucfirst($key);
if (method_exists($newRoute, $keyMethod)) {
$newRoute->{$keyMethod}($value);
} else {
$newRoute->setArgument($key, $value);
}
}
$this->router->addRoute($newRoute);
}
} elseif (false !== stripos($docBlockRow, '@domains')) {
$domains = explode(' ', trim(substr(
$docBlockRow,
(stripos($docBlockRow, '@domains') + strlen('@domains'))
)));
foreach ($domains as $domain) {
$newRoute->addValidDomain($domain);
}
$newRoute->setWeight($newRoute->getWeight() - 10);
}
}
}
}
}
}
}
}
}
}
}
$appClass = new \ReflectionClass(get_called_class());
$this->router->loadRoutesFromAnnotations(
[
APP_ROOT.'/src/Controllers',
],
$appClass->getNamespaceName()
);
$this->router
->weighRoutes()

13
src/Router/Router.php
View file

@ -33,11 +33,16 @@ class Router
$reader = new AnnotationReader();
foreach ($controllerPaths as $controllerPath) {
foreach (new \RecursiveDirectoryIterator($controllerPath) as $controllerFile) {
if ($controllerFile->isDot() || !$controllerFile->isFile() || !$controllerFile->isReadable()) {
continue;
}
if (!is_dir($controllerPath)) {
continue;
}
$dirIterator = new \RecursiveDirectoryIterator($controllerPath);
$iteratorIterator = new \RecursiveIteratorIterator($dirIterator);
$phpFiles = new \RegexIterator($iteratorIterator, '/^.+\.php$/i', \RecursiveRegexIterator::GET_MATCH);
foreach ($phpFiles as $controllerFile) {
/** @var \SplFileInfo $controllerFile */
$fileClassName = str_replace('.php', '', $controllerFile->getFilename());
$expectedClasses = [
$baseNamespace . '\\Controllers\\' . $fileClassName,