From 591ba18912aed5266254c2b26e3f1c1386b5a9bd Mon Sep 17 00:00:00 2001
From: Dave Mc Nicoll <dave.mcnicoll@cslsj.qc.ca>
Date: Thu, 26 Jan 2023 18:48:49 +0000
Subject: [PATCH] - WIP on attributes

---
 meta/definitions/routes.php            | 9 ++++-----
 meta/definitions/software.php          | 2 +-
 skeleton/meta/definitions/env/dev.php  | 2 +-
 skeleton/meta/definitions/env/prod.php | 1 +
 src/Kernel.php                         | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/meta/definitions/routes.php b/meta/definitions/routes.php
index 083e7ed..9bfde7f 100644
--- a/meta/definitions/routes.php
+++ b/meta/definitions/routes.php
@@ -32,7 +32,7 @@ return [
     Lean\Routing::class => autowire(Lean\Routing::class),
 
     RouteFetcher::class => function($c) {
-        $fetcher = new RouteFetcher(null, [], null, $c->get('routes.caching'), getenv('DEBUG'));
+        $fetcher = new RouteFetcher(null, [], null, $c->get('routes.caching'));
 
         $fetcher->setFolderList(array_map(function($item) {
             return $item;
@@ -42,7 +42,7 @@ return [
     },
 
     Breadcrumb::class => function($c) {
-        $breadcrumb = new Breadcrumb(null, [], null, $c->get('breadcrumbs.caching'), getenv('DEBUG'));
+        $breadcrumb = new Breadcrumb(null, [], null, $c->get('breadcrumbs.caching'));
 
         $breadcrumb->setFolderList(array_map(function($item) {
             return $item;
@@ -81,13 +81,12 @@ return [
         };
     },
 
-    'routes.middlewares'  => [ "dump", "errorHandler", SessionMiddleware::class, CronardMiddleware::class, HttpBasicAuthentication::class, JavascriptMiddleware::class ],
+    'routes.middlewares'  => [ "dump", "errorHandler", SessionMiddleware::class, CronardMiddleware::class, HttpBasicAuthentication::class ],
 
     'routes.list' => function($c) {
         return function (ContainerInterface $container) {
             $router = $container->get(Router::class);
-
-            foreach($container->get('routes.middlewares') as $middleware) {
+            foreach($container->get('routes.middlewares') as $i => $middleware) {
                 if ( $container->has($middleware) ) {
                     $router->middleware($container->get($middleware));
                 }
diff --git a/meta/definitions/software.php b/meta/definitions/software.php
index fac69ab..0e05207 100644
--- a/meta/definitions/software.php
+++ b/meta/definitions/software.php
@@ -75,7 +75,7 @@ return [
     },
 
     TaskFetcher::class => function($c) {
-        $fetcher = new TaskFetcher();
+        $fetcher = new TaskFetcher(null, null, $c->get('cronard.caching'));
 
         $fetcher->setFolderList(array_map(function($item) {
             return $item;
diff --git a/skeleton/meta/definitions/env/dev.php b/skeleton/meta/definitions/env/dev.php
index aebac13..2452418 100644
--- a/skeleton/meta/definitions/env/dev.php
+++ b/skeleton/meta/definitions/env/dev.php
@@ -14,5 +14,5 @@ return [
     'routes.caching' => create(Kash\ArrayCache::class)->constructor(get(Kash\CacheInvalidator::class), "lean.routes", 30),
     'breadcrumbs.caching' => create(Kash\ArrayCache::class)->constructor( get(Kash\CacheInvalidator::class), "lean.breadcrumbs", 30),
     'ulmus.caching' => create(Kash\ArrayCache::class)->constructor( get(Kash\CacheInvalidator::class), "ulmus.entities", 30),
-
+    'cronard.caching' => create(Kash\ArrayCache::class)->constructor( get(Kash\CacheInvalidator::class), "ulmus.entities", 30),
 ];
diff --git a/skeleton/meta/definitions/env/prod.php b/skeleton/meta/definitions/env/prod.php
index 8b6d3bc..7c457d6 100644
--- a/skeleton/meta/definitions/env/prod.php
+++ b/skeleton/meta/definitions/env/prod.php
@@ -43,4 +43,5 @@ return [
     'routes.caching' => create(Kash\ApcuCache::class)->constructor(get(Kash\CacheInvalidator::class), "lean.routes", random_int(3600, 7200)),
     'breadcrumbs.caching' => create(Kash\ApcuCache::class)->constructor(get(Kash\CacheInvalidator::class), "lean.breadcrumbs", random_int(3600, 7200)),
     'ulmus.caching' => create(Kash\ApcuCache::class)->constructor( get(Kash\CacheInvalidator::class), "ulmus.entities", random_int(3600, 7200)),
+    'cronard.caching' => create(Kash\ApcuCache::class)->constructor( get(Kash\CacheInvalidator::class), "ulmus.entities", random_int(3600, 7200)),
 ];
\ No newline at end of file
diff --git a/src/Kernel.php b/src/Kernel.php
index 84096da..a970f3f 100644
--- a/src/Kernel.php
+++ b/src/Kernel.php
@@ -115,7 +115,7 @@ class Kernel {
             }
         }
 
-        $containerBuilder->useAnnotations(false);
+        $containerBuilder->useAttributes(false);
 
         if ($this->definitionFilePath ?? false) {
             $containerBuilder->addDefinitions(require($this->definitionFilePath));