mcndave
/
notes
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- Latest work on route base fallbacks

This commit is contained in:
Dave M. 2023-11-17 22:38:26 -05:00
parent 0fcff83eac
commit 124bddb238
2 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Route/Attribute/Object/Route.php
View File

@ -6,6 +6,7 @@ namespace Notes\Route\Attribute\Object;
class Route implements \Notes\Attribute {
public function __construct(
public string|array $method = [ "GET", "POST" ],
public string $base = "",
# NULL will fallback on nearest base
public null|string $base = null,
){}
}

47
src/Route/RouteFetcher.php
View File

@ -20,9 +20,9 @@ class RouteFetcher {
public array $defaultMethods = [ 'GET', 'POST' ];
protected array $annotations;
protected array $attributes;
public function __construct(?Closure $callback = null, ? array $folderList = null, ? array $annotations = null, ? CacheInterface $cache = null)
public function __construct(?Closure $callback = null, ? array $folderList = null, ? array $attributes = null, ? CacheInterface $cache = null)
{
$this->cache = $cache;
@ -34,11 +34,11 @@ class RouteFetcher {
$this->folderList = $folderList;
}
if ($annotations !== null) {
$this->annotations = $annotations;
if ($attributes !== null) {
$this->attributes = $attributes;
}
else {
$this->annotations = [
$this->attributes = [
'object' => [ Attribute\Object\Route::class ],
'method' => [ Attribute\Method\Route::class ],
];
@ -77,11 +77,11 @@ class RouteFetcher {
}
}
public function compile(null|array $annotations = null) : array
public function compile(null|array $attributes = null) : array
{
$annotations ??= $this->annotations;
$attributes ??= $this->attributes;
return $this->handleCaching(substr(md5(serialize($annotations)), 0, 7), function() use ($annotations) : array {
return $this->handleCaching(substr(md5(serialize($attributes)), 0, 7), function() use ($attributes) : array {
$list = [];
foreach($this->scan() as $namespace => $file) {
@ -89,39 +89,40 @@ class RouteFetcher {
continue;
}
$base = "";
$base = null;
$class = $this->generateClassname($file->getBasename(".php"), $namespace);
$methods = $this->defaultMethods;
$methods = null;
$objectResolver = new ObjectResolver($class, true, true, false, true, $this->cache);
if ( isset($annotations['object']) ) {
$object = $objectResolver->getAttributeFromClassname($annotations['object'], false) ?: $objectResolver->getAnnotationFromClassname($annotations['object'], false);
if ( isset($attributes['object']) ) {
if ($object) {
if ( $object->methods ?? false ) {
$methods = $object->methods;
}
elseif ($object->method ?? false ) {
$methods = (array) $object->method;
$objects = $objectResolver->getAttributeListFromClassname($attributes['object'], false);
foreach(array_reverse($objects) as $object) {
if ($object->method ?? false ) {
$methods ??= (array) $object->method;
}
$base = $object->base ?? "";
$base ??= $object->base ?? null;
}
}
if ( isset($annotations['method']) ) {
$routeList = $objectResolver->getAttributeListFromClassname( $annotations['method'], false );
if ( isset($attributes['method']) ) {
$routeList = $objectResolver->getAttributeListFromClassname( $attributes['method'], false );
foreach($routeList as $func => $routes) {
if (is_array($routes)) {
foreach ($routes as $route) {
$route->base = $base;
if ($route instanceof \Notes\Route\Attribute\Method\Route) {
$route->base = $route->base ?: $base;
}
$route->class = $class;
$route->classMethod = $func;
if (false === ($route->methods ?? false)) {
$route->methods = $methods;
$route->methods = $methods ?? $this->defaultMethods;
}
if (false !== ($this->callback ?? false)) {