mcndave/lean
1
0
Fork 0
Code Issues 2 Pull Requests Projects 1 Releases Wiki Activity

Merge branch 'master' of https://git.mcnd.ca/mcndave/lean

Browse Source
This commit is contained in:
Dave M. 2025-02-04 08:46:58 -05:00
commit 583580e068
4 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meta/definitions/authorize.php
View File

@ -29,8 +29,8 @@ return [
return function(array $errorData) { return function(array $errorData) {
return HttpFactory::createJsonResponse($errorData + [ return HttpFactory::createJsonResponse($errorData + [
'api.error' => "Authorization failed", 'api.error' => "Authorization failed",
'api.datetime' => (new \DateTime)->format(\DateTime::ATOM), 'api.datetime' => (new \DateTime)->format(\DateTime::ISO8601),
], 401); ], 403);
}; };
}, },

16
skeleton/meta/definitions/definitions.php
View File

@ -4,7 +4,7 @@ use Taxus\Privilege;
use function DI\{ autowire, add, create, get }; use function DI\{ autowire, add, create, get };
$dir = getenv("META_PATH") . "/definitions"; $dir = dirname(__DIR__, 2);
return [ return [
'%APPKEY%' => [ '%APPKEY%' => [
@ -15,23 +15,23 @@ return [
], ],
'ulmus' => [ 'ulmus' => [
'entities' => [ '%ESCAPED_NAMESPACE%\\Entity' => getenv("PROJECT_PATH") . '/src/Entity/' ], 'entities' => [ '%ESCAPED_NAMESPACE%\\Entity' => implode(DIRECTORY_SEPARATOR, [ $dir, 'src', 'Entity', '' ]) ],
], ],
'routes' => [ 'routes' => [
'%ESCAPED_NAMESPACE%\\Controller' => getenv("PROJECT_PATH") . '/src/Controller/', '%ESCAPED_NAMESPACE%\\Controller' => implode(DIRECTORY_SEPARATOR, [ $dir, 'src', 'Controller', '' ]),
], ],
'events' => [ 'events' => [
'%ESCAPED_NAMESPACE%\\Controller' => implode(DIRECTORY_SEPARATOR, [ getenv("PROJECT_PATH"), 'src', 'Controller', '' ]), '%ESCAPED_NAMESPACE%\\Controller' => implode(DIRECTORY_SEPARATOR, [ $dir, 'src', 'Controller', '' ]),
], ],
'cronard' => [ 'cronard' => [
'%ESCAPED_NAMESPACE%\\Controller' => implode(DIRECTORY_SEPARATOR, [ getenv("PROJECT_PATH"), 'src', 'Controller', '' ]), '%ESCAPED_NAMESPACE%\\Controller' => implode(DIRECTORY_SEPARATOR, [ $dir, 'src', 'Controller', '' ]),
], ],
'cli' => [ 'cli' => [
'%ESCAPED_NAMESPACE%\\Controller' => implode(DIRECTORY_SEPARATOR, [ getenv("PROJECT_PATH"), 'src', 'Controller', '' ]), '%ESCAPED_NAMESPACE%\\Controller' => implode(DIRECTORY_SEPARATOR, [ $dir, 'src', 'Controller', '' ]),
], ],
'taxus' => [ 'taxus' => [
@ -43,5 +43,7 @@ return [
] ]
], ],
'app.middlewares' => add([]), 'app.middlewares' => \DI\add([
Ulmus\User\Middleware\RememberMeMiddleware::class,
]),
]; ];

8
src/ControllerTrait.php
View File

@ -226,12 +226,6 @@ trait ControllerTrait {
#[Ignore] #[Ignore]
public function isRoute(mixed $name, ServerRequestInterface $request) : bool public function isRoute(mixed $name, ServerRequestInterface $request) : bool
{ {
foreach((array) $name as $item) { return $request->getAttribute('lean.route')->match($name);
if ( fnmatch($item, $request->getAttribute('lean.route')->name) ) {
return true;
}
}
return false;
} }
} }

1
src/Lean.php
View File

@ -1,6 +1,5 @@
<?php <?php
namespace Lean; namespace Lean;
use Psr\Container\ContainerInterface; use Psr\Container\ContainerInterface;