From e07dcae5f54bf3805badd4535d70b613aafb7860 Mon Sep 17 00:00:00 2001 From: Dave Mc Nicoll Date: Thu, 30 Mar 2023 14:31:26 -0400 Subject: [PATCH] - Added Negundo definitions --- meta/definitions/negundo.php | 12 ++++++++++++ meta/definitions/routes.php | 1 + src/Lean.php | 1 + src/Routing.php | 2 ++ 4 files changed, 16 insertions(+) create mode 100644 meta/definitions/negundo.php diff --git a/meta/definitions/negundo.php b/meta/definitions/negundo.php new file mode 100644 index 0000000..3d61e5c --- /dev/null +++ b/meta/definitions/negundo.php @@ -0,0 +1,12 @@ + create(SoftwareConfig::class)->constructor(getenv('NEGUNDO_HASH'), getenv('NEGUNDO_SERVER')), + # NegundoMiddleware::class => create(NegundoMiddleware::class)->constructor(get(SoftwareConfig::class)), + Dump::class => create(Dump::class)->constructor(get(SoftwareConfig::class)), + Task::class => create(Task::class)->constructor(get(SoftwareConfig::class)), +]; diff --git a/meta/definitions/routes.php b/meta/definitions/routes.php index 0c9d3ae..07585c8 100644 --- a/meta/definitions/routes.php +++ b/meta/definitions/routes.php @@ -86,6 +86,7 @@ return [ 'routes.list' => function($c) { return function (ContainerInterface $container) { $router = $container->get(Router::class); + foreach($container->get('routes.middlewares') as $i => $middleware) { if ( $container->has($middleware) ) { $router->middleware($container->get($middleware)); diff --git a/src/Lean.php b/src/Lean.php index cfc3d83..84705d6 100644 --- a/src/Lean.php +++ b/src/Lean.php @@ -133,6 +133,7 @@ class Lean require($path . "event.php"), require($path . "http.php"), require($path . "language.php"), + require($path . "negundo.php"), require($path . "routes.php"), # require($path . "security.php"), require($path . "software.php"), diff --git a/src/Routing.php b/src/Routing.php index cd76d4f..6fa75ac 100644 --- a/src/Routing.php +++ b/src/Routing.php @@ -44,6 +44,8 @@ class Routing { protected Taxus $taxus; + protected Router $router; + public function __construct( Session $session, Cookie $cookie,