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

meta/definitions/cronard.php

@@ -0,0 +1,32 @@
+<?php
+
+use function DI\autowire, DI\create, DI\get;
+
+use Laminas\Diactoros\Response\HtmlResponse;
+
+use Cronard\CronardMiddleware,
+    Notes\Cronard\TaskFetcher;
+
+use Psr\Http\Message\ResponseInterface;
+
+use Lean\Lean;
+
+return [
+    CronardMiddleware::class => function($c) {
+        $cronardMiddleware = new CronardMiddleware($c, getenv('CRON_KEY'), function() : ResponseInterface {
+            return new HtmlResponse(sprintf("%s - cron task begin...", date('Y-m-d H:i:s')));
+        }, [], $c->get(TaskFetcher::class));
+
+        return $cronardMiddleware->fromFile(getenv("META_PATH")."/crontab.php")->fromAnnotations($c->get(TaskFetcher::class));
+    },
+
+    TaskFetcher::class => function($c) {
+        $fetcher = new TaskFetcher(null, null, $c->get('cronard.caching'));
+
+        $fetcher->setFolderList(array_map(function($item) {
+            return $item;
+        }, $c->get(Lean::class)->getCronard()));
+
+        return $fetcher;
+    },
+];

meta/definitions/event.php

@@ -0,0 +1,26 @@
+<?php
+
+use function DI\autowire, DI\create, DI\get;
+
+use Lean\Lean;
+use Mcnd\Event;
+
+return [
+    Event\EventManager::class => autowire(Event\EventManager::class),
+
+    Event\EventMiddleware::class => function($c) {
+        $mw = new Event\EventMiddleware($c, $c->get(Event\EventManager::class));
+
+        return $mw->fromAttributes($c->get(Notes\Event\EventFetcher::class));
+    },
+
+    Notes\Event\EventFetcher::class => function($c) {
+        $fetcher = new Notes\Event\EventFetcher(null, null, $c->get('events.caching'));
+
+        $fetcher->setFolderList(array_map(function($item) {
+            return $item;
+        }, $c->get(Lean::class)->getEvents()));
+
+        return $fetcher;
+    },
+];

meta/definitions/routes.php

@@ -81,7 +81,7 @@ return [
         };
     },
 
-    'routes.middlewares'  => [ "dump", "errorHandler", SessionMiddleware::class, CronardMiddleware::class, HttpBasicAuthentication::class ],
+    'routes.middlewares'  => [ "dump", "errorHandler", SessionMiddleware::class, CronardMiddleware::class, Mcnd\Event\EventMiddleware::class, HttpBasicAuthentication::class ],
 
     'routes.list' => function($c) {
         return function (ContainerInterface $container) {

meta/definitions/software.php

@@ -66,24 +66,6 @@ return [
 
     Lean::class => autowire(Lean::class),
 
-    CronardMiddleware::class => function($c) {
-        $cronardMiddleware = new CronardMiddleware($c, getenv('CRON_KEY'), function() : ResponseInterface {
-            return new HtmlResponse(sprintf("%s - cron task begin...", date('Y-m-d H:i:s')));
-        }, [], $c->get(TaskFetcher::class));
-
-        return $cronardMiddleware->fromFile(getenv("META_PATH")."/crontab.php")->fromAnnotations($c->get(TaskFetcher::class));
-    },
-
-    TaskFetcher::class => function($c) {
-        $fetcher = new TaskFetcher(null, null, $c->get('cronard.caching'));
-
-        $fetcher->setFolderList(array_map(function($item) {
-            return $item;
-        }, $c->get(Lean::class)->getCronard()));
-
-        return $fetcher;
-    },
-
     JavascriptMiddleware::class => create(JavascriptMiddleware::class),
 
     Cookie::class => create(Cookie::class)->constructor([ 'secure' => true, 'path' => getenv('URL_BASE') ?: '/',  ], getenv("LEAN_RANDOM")),