From 1d61ff87e47934dd6b960100e2a4fb51a6772af7 Mon Sep 17 00:00:00 2001
From: Dave Mc Nicoll <info@mcnd.ca>
Date: Tue, 29 Oct 2024 13:39:11 +0000
Subject: [PATCH] - ORM missed some 'use' statements, added a add() for routes
 middleware and Cookie var is now set into ControllerTrait

---
 meta/definitions/orm.php    | 2 --
 meta/definitions/routes.php | 6 +++---
 src/ControllerTrait.php     | 4 +++-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/meta/definitions/orm.php b/meta/definitions/orm.php
index 42fe3d1..a0be85e 100644
--- a/meta/definitions/orm.php
+++ b/meta/definitions/orm.php
@@ -1,9 +1,7 @@
 <?php
 
 use Ulmus\Container\AdapterProxy;
-
 use Psr\Container\ContainerInterface;
-
 use Ulmus\ConnectionAdapter;
 
 use function DI\autowire, DI\create, DI\get, DI\add;
diff --git a/meta/definitions/routes.php b/meta/definitions/routes.php
index 09b022d..a43ac68 100644
--- a/meta/definitions/routes.php
+++ b/meta/definitions/routes.php
@@ -1,6 +1,6 @@
 <?php
 
-use function DI\autowire, DI\create, DI\get;
+use function DI\autowire, DI\create, DI\get, DI\add;
 
 use League\Route\Strategy\ApplicationStrategy,
     League\Route\Router;
@@ -49,10 +49,10 @@ return [
         "dump", "errorHandler", SessionMiddleware::class, CronardMiddleware::class, Mcnd\Event\EventMiddleware::class, Mcnd\CLI\CliMiddleware::class,
     ],
 
-    'app.middlewares' => [
+    'app.middlewares' => add([
         # HeaderAuthenticationMiddleware::class,
         # PostRequestAuthenticationMiddleware::class,
-    ],
+    ]),
 
     Lean\Routing\RouteDefinitionInterface::class => function($c) {
         return function (ContainerInterface $container) {
diff --git a/src/ControllerTrait.php b/src/ControllerTrait.php
index e5b05cc..0a9fbd2 100644
--- a/src/ControllerTrait.php
+++ b/src/ControllerTrait.php
@@ -8,7 +8,7 @@ use Notes\Route\Attribute\Object\Route;
 use Notes\Security\Attribute\Security;
 use Picea, Picea\Ui\Method\FormContext;
 use TheBugs\Email\MailerInterface;
-use Storage\Session;
+use Storage\{ Cookie, Session };
 use League\CommonMark\CommonMarkConverter;
 
 use Psr\Http\Message\{ ServerRequestInterface, ResponseInterface };
@@ -22,6 +22,8 @@ trait ControllerTrait {
 
     public ? Session $session;
 
+    public ? Cookie $cookie;
+
     public ? Picea\Picea $picea;
 
     public ? MailerInterface $mailer;