- Fixes made on route querying and filtering
This commit is contained in:
parent
3f8f24a35f
commit
56a5c45588
src
@ -41,9 +41,9 @@ class Route implements \Notes\Annotation {
|
|||||||
|
|
||||||
public function getRoute() : string
|
public function getRoute() : string
|
||||||
{
|
{
|
||||||
return "/" . trim(isset($this->base) ?
|
return rtrim("/" . trim(isset($this->base) ?
|
||||||
"/" . trim($this->base, "/") . "/" . ltrim($this->route, "/")
|
"/" . trim($this->base, "/") . "/" . ltrim($this->route, "/")
|
||||||
:
|
:
|
||||||
"/" . ltrim($this->route, "/"), "/");
|
"/" . ltrim($this->route, "/"), "/"), '/');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -80,9 +80,8 @@ class RouteFetcher {
|
|||||||
}
|
}
|
||||||
|
|
||||||
$routeList = $objectResolver->getAnnotationListFromClassname( $this->annotations['method'] );
|
$routeList = $objectResolver->getAnnotationListFromClassname( $this->annotations['method'] );
|
||||||
|
foreach($routeList as $func => $routes) {
|
||||||
foreach($routeList as $func => $route) {
|
foreach($routes as $route) {
|
||||||
|
|
||||||
$route->base = $base;
|
$route->base = $base;
|
||||||
$route->class = $class;
|
$route->class = $class;
|
||||||
$route->classMethod = $func;
|
$route->classMethod = $func;
|
||||||
@ -99,6 +98,7 @@ class RouteFetcher {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
protected function generateClassname($file, $namespace)
|
protected function generateClassname($file, $namespace)
|
||||||
{
|
{
|
||||||
|
Reference in New Issue
Block a user