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

meta/definitions/negundo.php

@@ -0,0 +1,12 @@
+<?php
+
+use function DI\autowire, DI\create, DI\get;
+
+use Negundo\Client\{ SoftwareConfig, Dump, Task, NegundoMiddleware };
+
+return [
+    SoftwareConfig::class => 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)),
+];

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));

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"),

src/Routing.php

@@ -44,6 +44,8 @@ class Routing {
 
     protected Taxus $taxus;
 
+    protected Router $router;
+
     public function __construct(
         Session $session,
         Cookie $cookie,