- Added missing Picea using

- Fixed some minor bugs

composer.json

@@ -16,54 +16,26 @@
         "ext-posix": "*",
         "ext-xmlreader": "*",
         "ext-fileinfo": "*",
-        "league/route": "^5.0.0-dev",
+        "league/route": "^7.0.0-dev",
-        "laminas/laminas-diactoros": "2.24.x-dev",
+        "laminas/laminas-diactoros": "3.9.x-dev",
-        "laminas/laminas-httphandlerrunner": "2.5.x-dev",
+        "laminas/laminas-httphandlerrunner": "2.14.x-dev",
         "vlucas/phpdotenv": "^3.4@dev",
         "middlewares/whoops": "dev-master",
-        "mcnd/storage": "dev-master",
+        "mcnd/dump": "~1.0.0",
-        "mcnd/lean-console": "dev-master",
+        "mcnd/storage": "~1.0.0",
-        "mcnd/ulmus": "dev-master",
+        "mcnd/event": "~1.0.0",
-        "mcnd/tell": "dev-master",
+        "mcnd/tell": "~1.0.0",
-        "mcnd/dump": "dev-master",
+        "mcnd/ulmus": "^1.0 || ^2.0",
-        "mcnd/event": "dev-master",
+        "mcnd/kash": "~1.0.0",
-        "mcnd/thebugs": "dev-master",
+        "mcnd/taxus": "1.1.0",
-        "mcnd/taxus": "dev-master",
+        "mcnd/notes": "^2.1.1",
-        "mcnd/notes": "dev-master",
+        "mcnd/thebugs": "^1.0.0",
         "psr/simple-cache": "*"
     },
     "repositories": [
         {
-            "type": "vcs",
+            "type": "composer",
-            "url": "https://git.mcnd.ca/mcndave/event.git"
+            "url": "https://git.mcnd.ca/api/packages/mcndave/composer"
-        },
-        {
-            "type": "vcs",
-            "url": "https://git.mcnd.ca/mcndave/the-bugs.git"
-        },
-        {
-            "type": "vcs",
-            "url": "https://git.mcnd.ca/mcndave/storage.git"
-        },
-        {
-            "type": "vcs",
-            "url": "https://git.mcnd.ca/mcndave/ulmus.git"
-        },
-        {
-            "type": "vcs",
-            "url": "https://git.mcnd.ca/mcndave/notes.git"
-        },
-        {
-            "type": "vcs",
-            "url": "https://git.mcnd.ca/mcndave/tell.git"
-        },
-        {
-            "type": "vcs",
-            "url": "https://git.mcnd.ca/mcndave/lean-console.git"
-        },
-        {
-            "type": "vcs",
-            "url": "https://git.mcnd.ca/mcndave/dump.git"
         }
     ],
     "autoload": {

meta/definitions/authorize.php

@@ -1,42 +1,67 @@
 <?php
 
-use Lean\Factory\HttpFactory;
+use Lean\Factory\HttpFactoryInterface;
+
+use Ulmus\User\{
+    Authorize\CookieAuthentication,
+    Authorize\HeaderAuthentication,
+    Entity,
 
-use Ulmus\User\{Entity,
     Lib\Authenticate,
+    Lib\Authorize,
+    Middleware\AuthenticationMiddleware,
     Middleware\HeaderAuthenticationMiddleware,
+    Middleware\CookieAuthenticationMiddleware,
     Middleware\PostRequestAuthenticationMiddleware,
+    Middleware\LocalMacAddressMiddleware,
+    Authorize\MacAddressAuthentication,
     Authorize\PostRequestAuthentication};
 
 use Picea\Picea;
 
 use Storage\{ Cookie, Session };
 
+use Psr\Container\ContainerInterface;
 use function DI\{get, autowire, create};
 
 return [
+    Authorize::class => create(Authorize::class)->constructor(get(Entity\UserInterface::class), get(Session::class), get(Cookie::class), get('authentication.method')),
+
     Authenticate::class => create(Authenticate::class)->constructor(get(Entity\UserInterface::class), get(Session::class), get(Cookie::class), get('authentication.method')),
 
-    HeaderAuthenticationMiddleware::class => create(HeaderAuthenticationMiddleware::class)->constructor(get(Entity\UserInterface::class), get('authorize.error')),
+    AuthenticationMiddleware::class => create(AuthenticationMiddleware::class)->constructor(get(Authorize::class), get('authorize.error')),
 
-    PostRequestAuthentication::class => create(PostRequestAuthentication::class)->constructor(get(\Ulmus\User\Lib\Authenticate::class), "email", "email", "password"),
+    HeaderAuthentication::class => autowire(HeaderAuthentication::class),
 
-    PostRequestAuthenticationMiddleware::class => create(PostRequestAuthenticationMiddleware::class)->constructor(get(Entity\UserInterface::class), get('authentication.error'), get(PostRequestAuthentication::class)),
+    HeaderAuthenticationMiddleware::class => create(HeaderAuthenticationMiddleware::class)->constructor(get(HeaderAuthentication::class)),
+
+    CookieAuthentication::class => autowire(CookieAuthentication::class),
+
+    CookieAuthenticationMiddleware::class => create(CookieAuthenticationMiddleware::class)->constructor(get(CookieAuthentication::class), get(Cookie::class)),
+
+    PostRequestAuthentication::class => create(PostRequestAuthentication::class)->constructor("email", "email", "password"),
+
+    PostRequestAuthenticationMiddleware::class => create(PostRequestAuthenticationMiddleware::class)->constructor(get(PostRequestAuthentication::class)),
+
+    MacAddressAuthentication::class => create(MacAddressAuthentication::class)->constructor(get(Authenticate::class), "mac"),
+
+    LocalMacAddressMiddleware::class => create(LocalMacAddressMiddleware::class)->constructor(get(Entity\UserInterface::class), get('authentication.error'), get(MacAddressAuthentication::class)),
 
     'authentication.method' => null,
 
-    'authorize.error' => function($c) {
+    'authorize.error' => function(ContainerInterface $c) {
-        return function(array $errorData) {
+        return function(array $errorData) use ($c) {
-            return HttpFactory::createJsonResponse($errorData + [
+            return $c->get(HttpFactoryInterface::class)::createJsonResponse($errorData + [
                     'api.error' => "Authorization failed",
-                'api.datetime' => (new \DateTime)->format(\DateTime::ISO8601),
+                    'api.datetime' => (new \DateTime)->format(\DateTime::ATOM),
                 ], 403);
         };
     },
 
     'authentication.error' => function($c, Picea $picea) {
-        return function($message) use ($picea) {
+        return function($message) use ($c, $picea) {
-            return HttpFactory::createHtmlResponse($picea->renderHtml('lean/error/500', [
+            return $c->get(HttpFactoryInterface::class)::createHtmlResponse($picea->renderHtml('lean/error/500', [
+
                 'title' => "Authentication failed",
                 'subtitle' => "",
                 'message' => $message,

meta/definitions/event.php

@@ -1,8 +1,6 @@
 <?php
 
 use Picea\Picea;
-use function DI\autowire, DI\create, DI\get;
-
 use Lean\{ Lean, Routing, Event\RoutingCompileRoutes, Event\RoutingMapRoutes };
 use Mcnd\Event;
 use Taxus\Taxus;
@@ -11,6 +9,9 @@ use Notes\Route\Attribute\Method\Route;
 use Notes\Security\SecurityHandler;
 use Psr\Container\ContainerInterface;
 use Psr\Http\Message\{ ResponseInterface, ServerRequestInterface };
+use Ulmus\User\Entity\UserInterface;
+
+use function DI\autowire, DI\create, DI\get;
 
 return [
     Event\EventManager::class => autowire(Event\EventManager::class),
@@ -25,6 +26,7 @@ return [
 
     Event\EventDefinition::class => function($c) {
         $extension = $c->has(\Picea\Extension\UrlExtension::class) ? $c->get(\Picea\Extension\UrlExtension::class) : null;
+        $user = $c->get(UserInterface::class);
 
         return new Event\EventDefinition([
             new class($extension) implements RoutingCompileRoutes {
@@ -35,17 +37,21 @@ return [
                 public function execute(Routing $routing, Route $attribute) : void
                 {
                     if (null !== ($name = $attribute->name ?? null)) {
-                        $this->extension->registerRoute($name, $attribute->getRoute(), $attribute->class, $attribute->classMethod, (array) ( $attribute->method ?? $attribute->methods ));
+                        $this->extension->registerRoute($name, $attribute->getRoute(), $attribute->class, $attribute->classMethod, (array) ( $attribute->method ));
                     }
                 }
             },
 
-            new class() implements RoutingMapRoutes {
+            new class($user) implements RoutingMapRoutes {
+
+                public function __construct(
+                    protected UserInterface $user
+                ) {}
+
                 public function execute(Routing $routing, ContainerInterface $container, ServerRequestInterface & $request, Route $attribute) : void
                 {
                     $class = $attribute->class;
                     $method = $attribute->classMethod;
-                    $object = $container->get($class);
 
                     $request = $request->withAttribute('lean.route', $attribute);
 
@@ -54,7 +60,7 @@ return [
                         $securityHandler = $container->get(SecurityHandler::class);
 
                         if ( $redirect = $securityHandler->verify($class, $method) ) {
-                            if ( empty($object->user) || ! $object->user->logged ) {
+                            if (! $this->user->loggedIn() ) {
                                 if ($container->has(Session::class)) {
                                     $container->get(Session::class)->set('redirectedFrom', (string)$request->getUri());
                                 }
@@ -64,8 +70,8 @@ return [
                             }
                         }
 
-                        if ( $securityHandler->isLocked($class, $method) && $container->has(Taxus::class) && $container->has(SecurityHandler::class) ) {
+                        if ( $securityHandler->isLocked($class, $method) && $container->has(Taxus::class)) {
-                            if ( $forbidden = $container->get(SecurityHandler::class)->taxus($class, $method, $object->user ?? null) ) {
+                            if ( $forbidden = $securityHandler->taxus($class, $method, $this->user) ) {
                                 $routing->response = $forbidden;
 
                                 return;

meta/definitions/http.php

@@ -1,10 +1,18 @@
 <?php
 
-use function DI\autowire, DI\create, DI\get;
+use Lean\ApplicationStrategy\{ ThrowableHandler, ThrowableHandlerInterface, NotFoundDecoratorInterface, NotFoundDecorator, MethodNotAllowedInterface,  };
 
+use Psr\Container\ContainerInterface;
 use Psr\Http\Message\ServerRequestInterface;
 
 use Laminas\{ Diactoros\ServerRequestFactory, HttpHandlerRunner\Emitter\EmitterInterface, HttpHandlerRunner\Emitter\SapiEmitter };
+use Lean\Factory\{ HttpFactory, HttpFactoryInterface };
+use Picea\Picea;
+use Storage\Cookie,
+    Storage\Session,
+    Storage\SessionMiddleware;
+
+use function DI\{ autowire, create, get };
 
 return [
     ServerRequestInterface::class => function ($c) {
@@ -14,4 +22,37 @@ return [
     },
 
     EmitterInterface::class => create(SapiEmitter::class),
+    ThrowableHandlerInterface::class => autowire(ThrowableHandler::class),
+    NotFoundDecoratorInterface::class => autowire(NotFoundDecorator::class),
+    # MethodNotAllowedInterface::class => autowire(MethodNotAllowedDecorator::class),
+
+    HttpFactoryInterface::class => create(HttpFactory::class),
+
+    Cookie::class => create(Cookie::class)->constructor([
+        'secure' => true,
+        'path' => getenv('URL_BASE') ?: '/',
+        'httponly' => true,
+        'samesite'=> "Lax",
+    ], getenv("LEAN_RANDOM")),
+
+    Session::class => create(Session::class)->constructor(get(Cookie::class), [ 'path' => getenv('URL_BASE') ?: '/',  ]),
+
+    SessionMiddleware::class => create(SessionMiddleware::class)->constructor(get(Cookie::class), [
+        'name' => "lean_sess_" . substr(md5(getenv("LEAN_RANDOM")), 0, 12),
+        'path' => getenv('URL_BASE') ?: '/',
+        'samesite' => getenv("LEAN_COOKIE_SAMESITE") ?? "Lax",
+        'secure' => (bool) getenv('LEAN_COOKIE_SECURE') ?? false
+    ]),
+
+    'error.401' => function(ContainerInterface $c, Picea $picea) {
+        return $c->get(HttpFactoryInterface::class)::createHtmlResponse($picea->renderHtml("lean/error/401", []), 401);
+    },
+
+    'error.404' => function(ContainerInterface $c, Picea $picea) {
+        return $c->get(HttpFactoryInterface::class)::createHtmlResponse($picea->renderHtml("lean/error/404", []), 404);
+    },
+
+    'error.500' => function(ContainerInterface $c, Picea $picea) {
+        return $c->get(HttpFactoryInterface::class)::createHtmlResponse($picea->renderHtml("lean/error/500", []), 500);
+    },
 ];

meta/definitions/language.php

@@ -2,7 +2,6 @@
 
 use Tell\I18n;
 use Psr\Container\ContainerInterface;
-use Notes\Tell\LanguageHandler;
 
 use function DI\autowire, DI\create, DI\get, DI\add;
 

meta/definitions/orm.php

@@ -11,8 +11,12 @@ return [
     ]),
 
     AdapterProxy::class => function (Psr\Container\ContainerInterface $c) {
-        return new AdapterProxy(
+        $proxy = new AdapterProxy();
-            $c->get(ConnectionAdapter::class),
+        
-        );
+        $autoload = $c->get(\Lean\Lean::class)->getConnectionAdapters();
+
+        $proxy->push($autoload);
+
+        return $proxy;
     },
 ];

meta/definitions/routes.php

@@ -20,6 +20,8 @@ use Ulmus\User\Middleware\{
     PostRequestAuthenticationMiddleware
 };
 
+use Psr\Http\Message\{ ResponseInterface, ServerRequestInterface };
+
 return [
     Lean\Routing::class => autowire(Lean\Routing::class),
 
@@ -59,7 +61,7 @@ return [
             $router = $container->get(Router::class);
 
             foreach([ 'routes.middlewares', 'app.middlewares' ] as $key) {
-                if ( $container->has($key) ) {
+                if ($container->has($key)) {
                     foreach ($container->get($key) as $i => $middleware) {
                         if ($container->has($middleware)) {
                             $router->middleware($container->get($middleware));
@@ -68,7 +70,8 @@ return [
                 }
             }
 
-            $router->addPatternMatcher('email', '[^@ \t\r\n]+@[^@ \t\r\n]+\.[^@ \t\r\n]+');
+            $router->addPatternMatcher('email', '[^@ \t\r\n/]+@[^@ \t\r\n/]+\.[^@ \t\r\n/]+');
+            $router->addPatternMatcher('ids', '\b\d[\d,]*\b');
 
             $routing = $container->get(Lean\Routing::class);
             $routing->registerRoute($container, getenv('URL_BASE'));

meta/definitions/software.php

@@ -6,9 +6,6 @@ use TheBugs\JavascriptMiddleware;
 
 use Lean\Lean;
 
-use Storage\Cookie,
-    Storage\Session,
-    Storage\SessionMiddleware;
 
 use function DI\autowire, DI\create, DI\get, DI\add;
 
@@ -26,7 +23,7 @@ return [
                 ],
                 [
                     'path' => implode(DIRECTORY_SEPARATOR, [ $dir, "view", '' ]),
-                    'order' => 99,
+                    'order' => 1000,
                 ],
             ],
 
@@ -66,30 +63,18 @@ return [
         'routes' => [],
 
         'cronard' => [],
-
-        'taxus' => [
-            'is_dev' => [ ' dev' => "Is a developper of this application or has the same rights" ],
-            'is_admin' => [ 'admin' => "Can manage almost everything in this application."],
-            'is_moderator' => [ 'moderator' => "Can moderate this application."],
-            'is_user' => [ 'user' => "Is an authenticated user."],
-            'is_anonymous' => [ 'anonymous' => "Is an anonymous user."],
-        ],
     ],
 
     'lean.autoload' => add([
         Lean::class,
     ]),
 
+    \Lean\Factory\HttpFactoryInterface::class => autowire(\Lean\Factory\HttpFactory::class),
+
     Lean::class => autowire(Lean::class),
 
     JavascriptMiddleware::class => create(JavascriptMiddleware::class),
 
-    Cookie::class => create(Cookie::class)->constructor([ 'secure' => true, 'path' => getenv('URL_BASE') ?: '/',  ], getenv("LEAN_RANDOM")),
-
-    Session::class => create(Session::class)->constructor(get(Cookie::class), [ 'path' => getenv('URL_BASE') ?: '/',  ]),
-
-    SessionMiddleware::class => create(SessionMiddleware::class)->constructor(get(Cookie::class), [ 'name' => "lean_sess_" . substr(md5(getenv("LEAN_RANDOM")), 0, 12), 'path' => getenv('URL_BASE') ?: '/' ]),
-
     'git.commit' => function($c) {
         if ( getenv("DEBUG") ) {
             return uniqid("debug_");

meta/i18n/en/lean.date.json

@@ -5,6 +5,15 @@
     "week": "week"
   },
 
+  "interval": {
+    "years": "{$years} year(s)",
+    "months": "{$months} month(s)",
+    "days": "{$days} day(s)",
+    "hours": "{$hours} hour(s)",
+    "minutes": "{$minutes} minutes(s)",
+    "seconds": "{$seconds} second(s)"
+  },
+
   "month": {
     "list": [
       "January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "Décember"

meta/i18n/fr/lean.date.json

@@ -4,6 +4,15 @@
     "week": "semaine"
   },
 
+  "interval": {
+    "years": "{$years} années(s)",
+    "months": "{$months} mois",
+    "days": "{$days} jour(s)",
+    "hours": "{$hours} heure(s)",
+    "minutes": "{$minutes} minutes(s)",
+    "seconds": "{$seconds} seconde(s)"
+  },
+
   "month": {
     "list": [
       "Janvier", "Février", "Mars", "Avril", "Mai", "Juin", "Juillet", "Août", "Septembre", "Octobre", "Novembre", "Décembre"

skeleton/.env

@@ -5,7 +5,8 @@ CRON_KEY = dev
 
 # Route
 URL_BASE = ""
-APP_URL = "dev.mcnd.ca"
+APP_URL = "myapp.ca"
+ASSET_PATH = "static/"
 
 # Path
 CACHE_DIR = "var/cache"
@@ -23,19 +24,18 @@ DEFAULT_TIME = "fr.UTF-8"
 DEFAULT_TIME_FALLBACK = "french.UTF-8"
 
 # Database
-#SQLITE_PATH = "var/home.sqlite3"
+SQLITE_PATH = "var/myapp.sqlite3"
-#SQLITE_ADAPTER = "SQLite"
+SQLITE_ADAPTER = "SQLite"
-#SQLITE_PRAGMA_BEGIN = "foreign_keys=ON,synchronous=NORMAL"
+SQLITE_PRAGMA_BEGIN = "foreign_keys=ON,synchronous=NORMAL"
-#SQLITE_PRAGMA_DEBUG_BEGIN = "journal_mode=WAL"
+SQLITE_PRAGMA_DEBUG_BEGIN = "journal_mode=WAL"
-#SQLITE_PRAGMA_CLOSE = "analysis_limit=500,optimize"
+SQLITE_PRAGMA_CLOSE = "analysis_limit=500,optimize"
 
-DATABASE_PORT = ""
+#DATABASE_PORT = ""
-DATABASE_HOST = ""
+#DATABASE_HOST = ""
-DATABASE_NAME = ""
+#DATABASE_NAME = ""
-DATABASE_USERNAME = ""
+#DATABASE_USERNAME = ""
-DATABASE_PASSWORD = ""
+#DATABASE_PASSWORD = ""
-DATABASE_CHARSET = "utf8"
+#DATABASE_CHARSET = "utf8"
-DATABASE_ADAPTER = "MariaDB"
+#DATABASE_ADAPTER = "MariaDB"
 
 LEAN_RANDOM = "%RAND64%"
-

skeleton/composer.json.dist

@@ -8,26 +8,36 @@
     ],
     "minimum-stability": "dev",
     "require": {
-        "php": "^8.2",
+        "php": "^8.4",
         "ext-apcu": "*",
+        "ext-sodium": "*",
+        "ext-bcmath": "*",
         "ext-json": "*",
+        "ext-readline": "*",
         "league/route": "^5.0.0-dev",
         "laminas/laminas-diactoros": "2.24.x-dev",
         "laminas/laminas-httphandlerrunner": "2.5.x-dev",
         "vlucas/phpdotenv": "^3.4@dev",
         "middlewares/whoops": "dev-master",
-        "ralouphie/getallheaders": "dev-master",
+        "ralouphie/getallheaders": "3.x",
+        "guzzlehttp/guzzle": "7.9.x-dev",
+        "symfony/mailer": "6.3.x-dev",
+        "league/oauth2-client": "dev-master",
+        "php-di/php-di": "dev-master",
+        "league/commonmark": "^2.7@dev",
+        "assets-package/ace": "1.0.0",
         "mcnd/dump": "dev-master",
         "mcnd/storage": "dev-master",
+        "mcnd/cli": "dev-master",
         "mcnd/event": "dev-master",
-        "mcnd/ulmus": "dev-master",
+        "mcnd/ulmus": "^1.0 || ^2.0",
-        "mcnd/ulmus-api": "dev-master",
+        "mcnd/ulmus-api": "^1.3.0",
-        "mcnd/ulmus-user": "dev-master",
+        "mcnd/ulmus-user": "~1.1.2",
         "mcnd/picea": "dev-master",
         "mcnd/picea-ui": "dev-master",
-        "mcnd/picea-asset": "dev-master",
+        "mcnd/picea-asset": "~1.0.2",
         "mcnd/cronard": "dev-master",
-        "mcnd/lean-console": "dev-master",
+        "mcnd/lean-console": "~1.3.2",
         "mcnd/kash": "dev-master",
         "mcnd/taxus": "dev-master",
         "mcnd/notes": "dev-master",
@@ -36,88 +46,12 @@
     },
     "repositories": [
         {
-            "type": "vcs",
+            "type": "composer",
-            "url": "https://git.mcnd.ca/mcndave/cronard.git"
+            "url": "https://git.mcnd.ca/api/packages/mcndave/composer"
         },
          {
-            "type": "vcs",
+             "type": "composer",
-            "url": "https://git.mcnd.ca/mcndave/dump.git"
+             "url": "https://git.mcnd.ca/api/packages/assets-package/composer"
-        },
-        {
-            "type": "vcs",
-            "url": "https://git.mcnd.ca/mcndave/storage.git"
-        },
-        {
-            "type": "vcs",
-            "url": "https://git.mcnd.ca/mcndave/lean.git"
-        },
-        {
-            "type": "vcs",
-            "url": "https://git.mcnd.ca/mcndave/lean-console.git"
-        },
-        {
-            "type": "vcs",
-            "url": "https://git.mcnd.ca/mcndave/ulmus.git"
-        },
-        {
-            "type": "vcs",
-            "url": "https://git.mcnd.ca/mcndave/ulmus-api.git"
-        },
-        {
-            "type": "vcs",
-            "url": "https://git.mcnd.ca/mcndave/ulmus-user.git"
-        },
-        {
-            "type": "vcs",
-            "url": "https://git.mcnd.ca/mcndave/ulmus-api-gitea.git"
-        },
-        {
-            "type": "vcs",
-            "url": "https://git.mcnd.ca/mcndave/picea.git"
-        },
-        {
-            "type": "vcs",
-            "url": "https://git.mcnd.ca/mcndave/storage.git"
-        },
-        {
-            "type": "vcs",
-            "url": "https://git.mcnd.ca/mcndave/picea-ui.git"
-        },
-        {
-            "type": "vcs",
-            "url": "https://git.mcnd.ca/mcndave/picea-asset.git"
-        },
-        {
-            "type": "vcs",
-            "url": "https://git.mcnd.ca/mcndave/notes.git"
-        },
-        {
-            "type": "vcs",
-            "url": "https://git.mcnd.ca/mcndave/the-bugs.git"
-        },
-        {
-            "type": "vcs",
-            "url": "https://git.mcnd.ca/mcndave/tell.git"
-        },
-        {
-            "type": "vcs",
-            "url": "https://git.mcnd.ca/mcndave/taxus.git"
-        },
-        {
-            "type": "vcs",
-            "url": "https://git.mcnd.ca/mcndave/dump.git"
-        },
-        {
-            "type": "vcs",
-            "url": "https://git.mcnd.ca/mcndave/kash.git"
-        },
-        {
-            "type": "vcs",
-            "url": "https://git.mcnd.ca/mcndave/event.git"
-        },
-        {
-            "type": "vcs",
-            "url": "https://git.mcnd.ca/mcndave/negundo-client.git"
          }
     ],
     "autoload": {
@@ -136,6 +70,7 @@
     "extra" : {
         "lean" : {
             "autoload": {
+                "order": 1000,
                 "definitions" : [
                     "meta/definitions/definitions.php",
                     "meta/definitions/storage.php",

skeleton/meta/config.php

@@ -10,7 +10,7 @@ return [
     ],
 
     'keys' => (function() {
-        return explode(',', getenv('KEYS') ?? "") ;
+        return explode(',', getenvonce('KEYS') ?? "") ;
     })(),
 
     'meta' => [
@@ -19,7 +19,7 @@ return [
 
     'ulmus' => [
         'connections' => [
-            'default' => [
+            /*'default' => [
                 'adapter'  => getenv("DATABASE_ADAPTER"),
                 'host'     => getenv("DATABASE_HOST"),
                 'port'     => getenv("DATABASE_PORT"),
@@ -29,9 +29,9 @@ return [
                 'settings' => [
                     'charset' => getenv("DATABASE_CHARSET"),
                 ],
-            ],
+            ],*/
 
-            'sqlite' => [
+            'default' => [
                 'adapter'  => getenv("SQLITE_ADAPTER"),
                 'path'     => getenv('PROJECT_PATH') . DIRECTORY_SEPARATOR . getenv("SQLITE_PATH"),
                 'pragma'   => explode(',', getenv("SQLITE_PRAGMA")),

skeleton/meta/definitions/auth.php

@@ -4,6 +4,7 @@ use function DI\autowire, DI\create, DI\get;
 
 use %NAMESPACE%\Entity;
 
+use Psr\Container\ContainerInterface;
 use Psr\Http\Message\ServerRequestInterface;
 
 use Ulmus\Entity\Field\Datetime,
@@ -21,16 +22,18 @@ use TheBugs\Email\{ EmailConfiguration, MailerInterface, SwiftMailer };
 
 use Taxus\{ Taxus, PermissionGrantInterface };
 
+use Lean\Factory\HttpFactoryInterface;
+
 return [
     \Ulmus\User\Entity\UserInterface::class => autowire(Entity\User::class),
 
-    SecurityHandler::class => create(SecurityHandler::class)->constructor(function() {
+    SecurityHandler::class => create(SecurityHandler::class)->constructor(function(ContainerInterface $c) {
-        return Lean\Factory\HttpFactory::createRedirectResponse(getenv("URL_BASE")."/login");
+        return $c->get(HttpFactoryInterface::class)::createRedirectResponse(getenv("URL_BASE")."/login");
     }, get('authentication.unauthorize'), get(Taxus::class)),
 
-    'authentication.unauthorize' => function($c, Picea $picea) {
+    'authentication.unauthorize' => function(ContainerInterface $c, Picea $picea) {
-        return function($message) use ($picea) {
+        return function($message) use ($c, $picea) {
-            return Lean\Factory\HttpFactory::createHtmlResponse($picea->renderHtml('lean/error/401', [
+            return $c->get(HttpFactoryInterface::class)::createHtmlResponse($picea->renderHtml('lean/error/401', [
                 'title' => "",
                 'subtitle' => "",
                 'message' => $message,
@@ -40,7 +43,7 @@ return [
 
     EmailConfiguration::class => function($c) {
         $email = new EmailConfiguration( EmailConfiguration::AUTH_TYPE_SMTP );
-        $email->smtpHost = getenv('SMTP_HOSTNAME');
+        $email->smtpHost = getenv('SMTP_HOST');
         $email->smtpPort = getenv('SMTP_PORT');
         $email->smtpUsername = getenv('SMTP_USERNAME');
         $email->smtpPassword = getenv('SMTP_PASSWORD');

skeleton/meta/definitions/definitions.php

@@ -7,6 +7,10 @@ use function DI\{ autowire, add, create, get };
 $dir = dirname(__DIR__, 2);
 
 return [
+    \%NAMESPACE%\Factory\FormFactoryInterface::class => autowire(\%NAMESPACE%\Factory\FormFactory::class),
+    \Lean\Api\Factory\MessageFactoryInterface::class => autowire(\%NAMESPACE%\Lib\Message::class),
+
+
     '%APPKEY%' => [
         'picea' => [
             'context' => "%ESCAPED_NAMESPACE%\\View",

skeleton/meta/definitions/env.php

@@ -1,3 +1,13 @@
 <?php
 
+if (! function_exists('getenvonce')) {
+    function getenvonce(string $name) : array|string|false
+    {
+        $value = getenv($name);
+        unset($_ENV[$name], $_SERVER[$name]);
+        putenv($name . "=");
+        return $value;
+    }
+}
+
 return require("env/" . ( getenv('APP_ENV') ?? 'prod' ) . ".php");

skeleton/meta/definitions/env/prod.php

@@ -4,7 +4,7 @@ use Picea\Picea;
 
 use Negundo\Client\{ NegundoMiddleware, SoftwareConfig };
 
-use Lean\Factory\HttpFactory;
+use Lean\Factory\HttpFactoryInterface;
 
 use Psr\Http\Server\MiddlewareInterface,
     Psr\Http\Message\ServerRequestInterface,
@@ -13,7 +13,7 @@ use Psr\Http\Server\MiddlewareInterface,
 
 use function DI\{ create, get, autowire };
 
-error_reporting(getenv('ERROR_REPORTING') ?: ( E_ALL & ~E_USER_DEPRECATED & ~E_DEPRECATED & ~E_STRICT & ~E_NOTICE ));
+error_reporting(getenv('ERROR_REPORTING') ?: ( E_ALL & ~E_USER_DEPRECATED & ~E_DEPRECATED & ~E_NOTICE ));
 
 return [
     /* do nothing in production !*/
@@ -31,11 +31,11 @@ return [
 
     "errorHandler" => create(NegundoMiddleware::class)->constructor(get(SoftwareConfig::class), null, get('app.errorhandler.html')),
 
-    'app.errorhandler.html' => function($c, Picea $picea) {
+    'app.errorhandler.html' => function(\Psr\Container\ContainerInterface $c, Picea $picea) {
-        return function(\Throwable $exception) use ($picea) {
+        return function(\Throwable $exception) use ($c, $picea) {
             error_log($exception->getMessage());
 
-            return HttpFactory::createHtmlResponse($picea->renderHtml('lean/error/500', [
+            return $c->get(HttpFactoryInterface::class)::createHtmlResponse($picea->renderHtml('lean/error/500', [
                 'title' => "Une erreur s'est produite lors de l'exécution du script.",
                 'subtitle' => "Êtes-vous connecté avec le bon compte ?",
                 'message' => $exception->getMessage(),

skeleton/public/index.php

@@ -1,8 +1,14 @@
 <?php
 
 try {
-    require_once(dirname(__DIR__)."/src/Kernel.php");
+    $projectPath = dirname(__DIR__);
+
+    require_once $projectPath . '/vendor/autoload.php';
+
+    new class($projectPath) extends %NAMESPACE%\Kernel {};
 }
 catch(\Throwable $t) {
-    echo sprintf("%s in <strong>%s</strong> <pre>%s</pre>", $t->getMessage(), $t->getFile() . ":" . $t->getLine(), $t->getTraceAsString());
+    echo sprintf("%s<hr><small>%s:%d</small><br><pre>%s</pre>",  $t->getMessage(), $t->getFile(), $t->getLine(), getenv('DEBUG') ? var_export($t->getTrace(), true) : "");
+    error_log($t->getMessage());
+    header("HTTP/1.1 500 Internal Server Error");
 }

skeleton/src/Factory/FormFactory.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace %NAMESPACE%\Factory;
+
+use Lean\Api\Factory\MessageFactoryInterface;
+use Lean\LanguageHandler;
+use Picea\Ui\Method\FormContextInterface;
+use Picea\Ui\Method\FormInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Storage\Session;
+use Ulmus\Entity\EntityInterface;
+use Ulmus\User\Entity\UserInterface;
+use Ulmus\User\Lib\Authenticate;
+
+class FormFactory implements FormFactoryInterface
+{
+ /*
+    public function __construct(
+        protected ServerRequestInterface $request,
+        protected Authenticate $authenticate,
+        protected Session $session,
+        protected LanguageHandler $languageHandler,
+        protected MessageFactoryInterface $messageFactory,
+    ) {}
+
+    public function save(EntityInterface $entity): FormInterface
+    {
+        return new Form\Save($this->languageHandler, $this->messageFactory, $entity);
+    }
+
+    public function saveContext(? ServerRequestInterface $request = null, ? string $formName = null): FormContextInterface
+    {
+        return new Form\SaveContext($request ?: $this->request, $formName);
+    }
+
+    public function delete(EntityInterface $entity): FormInterface
+    {
+        return new Form\Delete($this->languageHandler, $this->messageFactory, $entity);
+    }
+
+    public function deleteContext(?ServerRequestInterface $request = null, ?string $formName = null): FormContextInterface
+    {
+        return new Lib\FormContext($request, $formName);
+    }
+ */
+}

skeleton/src/Factory/FormFactoryInterface.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace %NAMESPACE%\Factory;
+
+use Lean\Api\Factory\MessageFactoryInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Picea\Ui\Method\{ FormInterface, FormContextInterface };
+use Storage\Session;
+use Lean\LanguageHandler;
+use Ulmus\Entity\EntityInterface;
+use Ulmus\User\Entity\UserInterface;
+use Ulmus\User\Lib\Authenticate;
+
+interface FormFactoryInterface
+{
+/*    public function __construct(ServerRequestInterface $request, Authenticate $authenticate, Session $session, LanguageHandler $languageHandler, MessageFactoryInterface $messageFactory,);
+
+    public function save(EntityInterface $entity): FormInterface;
+
+    public function saveContext(?ServerRequestInterface $request = null, ?string $formName = null): FormContextInterface;
+
+    public function delete(EntityInterface $entity): FormInterface;
+
+    public function deleteContext(?ServerRequestInterface $request = null, ?string $formName = null): FormContextInterface;*/
+}

skeleton/src/Lib/ApiTrait.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace %NAMESPACE%\Lib;
+
+use Picea\Picea;
+use Storage\Session;
+use Mcnd\Event\EventManager;
+use Notes\{ Attribute\Ignore, Route\Attribute\Object\Route, Security\Attribute\Security };
+use Ulmus\User\Entity\{ User, UserInterface };
+
+use %NAMESPACE%\{ Entity, Lib, Form, Factory };
+
+#[Security(locked: false)]
+#[Route(base: "/api", method: [ "GET", "POST", "PUT", "PATCH", "DELETE", ])]
+trait ApiTrait {
+    use \Lean\ControllerTrait, \Lean\Api\LeanApiTrait {
+        \Lean\Api\LeanApiTrait::renderMarkdown insteadof \Lean\ControllerTrait;
+    }
+
+    #[Ignore]
+    public UserInterface $user;
+
+    #[Ignore]
+    protected EventManager $eventManager;
+
+    #[Ignore]
+    protected Factory\FormFactoryInterface $formFactory;
+}

skeleton/src/Lib/ControllerTrait.php

@@ -7,6 +7,7 @@ use Storage\Session;
 use Ulmus\User\Entity\User;
 use Notes\Route\Attribute\Object\Route;
 use Notes\Security\Attribute\Security;
+use DI\Attribute\Inject;
 
 use %NAMESPACE%\{ Entity, Lib, Form };
 
@@ -18,24 +19,9 @@ use Notes\Attribute\Ignore;use Ulmus\User\Entity\UserInterface;
 trait ControllerTrait {
     use \Lean\ControllerTrait;
 
-    #[Ignore]
+    #[Inject]
     public ? UserInterface $user;
 
-    #[Ignore]
+    #[Inject]
     protected EventManager $eventManager;
-
-    #[Ignore]
-    public function __construct(Picea $picea, Session $session, UserInterface $user, \Notes\Breadcrumb\Breadcrumb $breadcrumb, EventManager $eventManager) {
-        $this->initializeController($picea, $session, $user, $breadcrumb, $eventManager);
-    }
-
-    #[Ignore]
-    public function initializeController(Picea $picea, Session $session, UserInterface $user, \Notes\Breadcrumb\Breadcrumb $breadcrumb, EventManager $eventManager) {
-        $this->picea = $picea;
-        $this->session = $session;
-        $this->eventManager = $eventManager;
-        $this->breadcrumb = $breadcrumb;
-        $this->user = $user;
-    }
-
 }

skeleton/src/Lib/Message.php

@@ -2,9 +2,10 @@
 
 namespace %NAMESPACE%\Lib;
 
+use Lean\Api\Factory\MessageFactoryInterface;
 use Picea\Ui\Method\FormMessage;
 
-class Message implements FormMessage {
+class Message implements FormMessage, MessageFactoryInterface {
 
     const MESSAGE_TYPE = [
         'success' => [
@@ -34,7 +35,7 @@ class Message implements FormMessage {
 
     public ? string $header = null;
 
-    public function __construct(string $message, string $type = "error", ? string $header = null, ? string $class = null)
+    public function __construct(string $message = "", string $type = "error", ? string $header = null, ? string $class = null)
     {
         $this->message = $message;
 
@@ -86,18 +87,33 @@ class Message implements FormMessage {
         return $this->type === "error";
     }
 
-    public static function generateSuccess(string $message, ? string $header = null, ? string $class = null) : self
+    public static function generateSuccess(string $message, ? string $header = null, ? string $class = null) : MessageFactoryInterface
     {
         return new static($message, 'success', $header, $class);
     }
 
-    public static function generateError(string $message, ? string $header = null, ? string $class = null) : self
+    public static function generateError(string $message, ? string $header = null, ? string $class = null) : MessageFactoryInterface
     {
         return new static($message, 'error', $header, $class);
     }
 
-    public static function generateWarning(string $message, ? string $header = null, ? string $class = null) : self
+    public static function generateWarning(string $message, ? string $header = null, ? string $class = null) : MessageFactoryInterface
     {
         return new static($message, 'warning', $header, $class);
     }
+
+    public static function generateInformation(string $message, ?string $header = null, ?string $class = null): MessageFactoryInterface
+    {
+        return new static($message, 'information', $header, $class);
+    }
+
+    public static function generateDebug(string $message, ?string $header = null, ?string $class = null): MessageFactoryInterface
+    {
+        return new static($message, 'debug', $header, $class);
+    }
+
+    public static function generateTrace(string $message, ?string $header = null, ?string $class = null): MessageFactoryInterface
+    {
+        return new static($message, 'trace', $header, $class);
+    }
 }

src/Application.php

@@ -22,6 +22,8 @@ class Application
 
     public array $entities;
 
+    public array $connectionAdapters;
+
     public array $events;
 
     public array $tellJson;
@@ -68,6 +70,7 @@ class Application
         if (is_array($ulmus = $this->data['ulmus'] ?? false)) {
             if ($ulmus['entities'] ?? false) {
                 $this->entities = $ulmus['entities'];
+                $this->connectionAdapters = $ulmus['adapters'] ?? [];
             }
         }
 

src/ApplicationStrategy.php

@@ -2,64 +2,40 @@
 
 namespace Lean;
 
+use League\Route\Http\Exception\MethodNotAllowedException;
 use League\Route\Strategy;
-
 use League\Route\Http\Exception\NotFoundException;
-use Picea\Asset\Asset;
+use Lean\ApplicationStrategy\MethodNotAllowedInterface;
+use Lean\ApplicationStrategy\NotFoundDecoratorInterface;
+use Lean\ApplicationStrategy\ThrowableHandlerInterface;
+use Lean\Factory\HttpFactoryInterface;
 use Psr\Container\ContainerInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\MiddlewareInterface;
-use Picea\Picea;
 use Psr\Http\Server\RequestHandlerInterface;
 use function DI\get;
 
 class ApplicationStrategy extends Strategy\ApplicationStrategy {
 
-    public const ASSET_TRIGGER_UPDATE = [
-        "js", "mjs", "manifest", "webmanifest", "css", "png", "ico",
-        "jpg", "jpeg", "gif", "webp", "woff", "woff2", "eot", "svg",
-        "ttf"
-    ];
-
     public function __construct(
-        protected Picea $picea,
+        ContainerInterface $di,
-        protected ContainerInterface $di,
+    ) {
-    ) {}
+        $this->setContainer($di);
+    }
 
     public function getNotFoundDecorator(NotFoundException $exception): MiddlewareInterface
     {
-        return new class($this->picea, $this->di) implements MiddlewareInterface {
+        return $this->getContainer()->get(NotFoundDecoratorInterface::class);
+    }
 
-            public function __construct(
+    public function getThrowableHandler(): MiddlewareInterface
-                protected Picea $picea,
-                protected ContainerInterface $di,
-            ) { }
-
-            public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
     {
-                if (php_sapi_name() !== 'cli' and ! defined('STDIN'))  {
+        return $this->getContainer()->get(ThrowableHandlerInterface::class);
-                    return $this->throw404($request);
     }
 
-                return $handler->handle($request);;
+    public function getMethodNotAllowedDecorator(MethodNotAllowedException $exception): MiddlewareInterface
-            }
-
-            public function throw404(ServerRequestInterface $request) : ResponseInterface
     {
-                if ( getenv('DEBUG') && $this->di->has(\Picea\Asset\Asset::class) ) {
+        return $this->getContainer()->has(MethodNotAllowedInterface::class) ? $this->getContainer()->get(MethodNotAllowedInterface::class) : parent::getMethodNotAllowedDecorator($exception);
-                    $params = $request->getServerParams();
-
-                    $scpName = basename(explode('?', $params['REQUEST_URI'] ?? "", 2)[0]);
-                    list(, $ext) = array_pad(explode('.', $scpName), 2, null);
-
-                    if ($ext && in_array($ext, ApplicationStrategy::ASSET_TRIGGER_UPDATE)) {
-                        $this->di->get(\Picea\Asset\Asset::class)->launchInstall();
-                    }
-                }
-
-                return new \Laminas\Diactoros\Response\HtmlResponse($this->picea->renderHtml("lean/error/404", [], $this), 404);
-            }
-        };
     }
 }

src/ApplicationStrategy/MethodNotAllowedInterface.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace Lean\ApplicationStrategy;
+
+use Psr\Http\Server\MiddlewareInterface;
+
+interface MethodNotAllowedInterface extends MiddlewareInterface
+{
+
+}

src/ApplicationStrategy/NotFoundDecorator.php

@@ -0,0 +1,62 @@
+<?php
+
+namespace Lean\ApplicationStrategy;
+
+use DI\Attribute\Inject;
+use Lean\ApplicationStrategy;
+use Lean\Factory\HttpFactoryInterface;
+use Picea\Picea;
+use Psr\Container\ContainerInterface;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\RequestHandlerInterface;
+
+class NotFoundDecorator implements NotFoundDecoratorInterface
+{
+    #[Inject]
+    protected Picea $picea;
+
+    #[Inject]
+    protected ContainerInterface $container;
+
+    #[Inject]
+    protected HttpFactoryInterface $httpFactory;
+
+    public const ASSET_TRIGGER_UPDATE = [
+        "js", "mjs", "manifest", "webmanifest", "css", "png", "ico",
+        "jpg", "jpeg", "gif", "webp", "woff", "woff2", "eot", "svg",
+        "ttf"
+    ];
+
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
+    {
+        if (php_sapi_name() !== 'cli' and ! defined('STDIN'))  {
+            return $this->throw404($request);
+        }
+
+        return $handler->handle($request);
+    }
+
+    public function throw404(ServerRequestInterface $request) : ResponseInterface
+    {
+        return $this->checkAssetTrigger($request) ?: $this->container->get('error.404');
+    }
+
+    protected function checkAssetTrigger(ServerRequestInterface $request) : false|ResponseInterface
+    {
+        if (getenv('DEBUG') && $this->container->has(\Picea\Asset\Asset::class)) {
+            $params = $request->getServerParams();
+
+            $scpName = basename(explode('?', $params['REQUEST_URI'] ?? "", 2)[0]);
+            list(, $ext) = array_pad(explode('.', $scpName), 2, null);
+
+            if ($ext && in_array($ext, static::ASSET_TRIGGER_UPDATE)) {
+                $this->container->get(\Picea\Asset\Asset::class)->launchInstall();
+
+                return $this->httpFactory->createTextResponse("Asset updated");
+            }
+        }
+
+        return false;
+    }
+}

src/ApplicationStrategy/NotFoundDecoratorInterface.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace Lean\ApplicationStrategy;
+
+use Psr\Http\Server\MiddlewareInterface;
+
+interface NotFoundDecoratorInterface extends MiddlewareInterface
+{
+
+}

src/ApplicationStrategy/ThrowableHandler.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace Lean\ApplicationStrategy;
+
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\MiddlewareInterface;
+use Psr\Http\Server\RequestHandlerInterface;
+
+class ThrowableHandler implements ThrowableHandlerInterface
+{
+    public function process(
+        ServerRequestInterface $request,
+        RequestHandlerInterface $handler
+    ): ResponseInterface {
+        try {
+            return $handler->handle($request);
+        } catch (Throwable $e) {
+            throw $e;
+        }
+    }
+}

src/ApplicationStrategy/ThrowableHandlerInterface.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace Lean\ApplicationStrategy;
+
+use Psr\Http\Server\MiddlewareInterface;
+
+interface ThrowableHandlerInterface extends MiddlewareInterface
+{
+
+}

src/Composer.php

@@ -27,7 +27,8 @@ class Composer
                 $source = static::createPath('vendor', 'mcnd', 'lean', 'skeleton');
                 $dest = static::createPath('skeleton');
 
-                `cp -a $source $dest`;
+                shell_exec("cp -a $source $dest");
+                #`cp -a $source $dest`;
 
                 $iterator = new \RecursiveDirectoryIterator($dest);
                 $iterator->setFlags(\RecursiveDirectoryIterator::SKIP_DOTS);
@@ -102,7 +103,7 @@ class Composer
             throw new \UnexpectedValueException("Composer file 'composer.json' could not be found within your project's root folder.");
         }
 
-        return $content ??= file_exists($path) ? json_decode(file_get_contents($path), true) : false;
+        return $content ??= file_exists($path) ? json_decode(file_get_contents($path), true, 512, \JSON_THROW_ON_ERROR) : false;
     }
 
     protected static function getNamespaceFromAutoload(Event $event) : ? string
@@ -125,7 +126,7 @@ class Composer
 
         $event->getIO()->writeError("Your composer file do not seem to contains a valid psr-4 project pointing to the src folder.");
 
-        return null;
+        return false;
     }
 
     protected static function createPath(... $path) : string

src/ControllerTrait.php

@@ -7,10 +7,11 @@ use Lean\Factory\HttpFactory;
 use Notes\Attribute\Ignore;
 use Notes\Route\Attribute\Object\Route;
 use Notes\Security\Attribute\Security;
-use Picea, Picea\Ui\Method\FormContext;
+use Picea\Ui\Method\FormContextInterface;
 use TheBugs\Email\MailerInterface;
 use Storage\{ Cookie, Session };
 use League\CommonMark\CommonMarkConverter;
+use Picea;
 
 use Psr\Http\Message\{ ServerRequestInterface, ResponseInterface };
 
@@ -20,9 +21,6 @@ use function file_get_contents;
 #[Route(method: [ "GET", "POST" ])]
 trait ControllerTrait {
 
-    #[Inject]
-    public \Notes\Breadcrumb\Breadcrumb $breadcrumb;
-
     #[Inject]
     public Session $session;
 
@@ -84,6 +82,13 @@ trait ControllerTrait {
         return HttpFactory::createRedirectResponse($url, $code, $headers);
     }
 
+    #[Ignore]
+    protected function refresh(int $code = 204, array $headers = []) {
+        return static::renderNothing($code, [
+            'Refresh' => 0
+        ] + $headers);
+    }
+
     #[Ignore]
     public static function renderNothing(int $code = 204, array $headers = []) : ResponseInterface
     {
@@ -147,13 +152,15 @@ trait ControllerTrait {
     #[Ignore]
     public function renderCLI(ServerRequestInterface $request, mixed $data) : ResponseInterface
     {
-        if ($data instanceof \JsonSerializable ) {
+        if (! $data instanceof \Stringable) {
+            if ($data instanceof \JsonSerializable) {
                 return $this->renderJson(
                     $data
                 );
             }
-        elseif ( is_array($data) ) {
+            elseif (is_iterable($data) || is_object($data)) {
-            var_export($data);
+                return $this->renderText(var_export($data, true));
+            }
         }
 
         return $this->renderText(
@@ -203,6 +210,16 @@ trait ControllerTrait {
         return $this->picea->compiler->getExtensionFromToken('route')->buildRouteUrl($name, $parameters);
     }
 
+    #[Ignore]
+    public function form(FormInterface $form, ? FormContextInterface $formContext = null) : Picea\Ui\Method\FormHandler
+    {
+        if (! $this->picea ) {
+            throw new \Exception("A picea object must be provided on class initialization to use this method.");
+        }
+
+        return $this->picea->compiler->getExtensionInstanceOf(Picea\Ui\Method\Form::class)->formClass($form, $formContext);
+    }
+
     #[Ignore]
     public function json($data, int $flags = 0) : string
     {
@@ -210,7 +227,7 @@ trait ControllerTrait {
     }
 
     #[Ignore]
-    public function pushContext(FormContext $context) : FormContext
+    public function pushContext(FormContextInterface $context) : FormContextInterface
     {
         $this->contextList[$context->formName ?? uniqid("context_")] = $context;
 
@@ -218,7 +235,7 @@ trait ControllerTrait {
     }
 
     #[Ignore]
-    public function context(? string $name = null) : ? FormContext
+    public function context(? string $name = null) : ? FormContextInterface
     {
         return $name ? $this->contextList[$name] : array_values($this->contextList)[0] ?? null;
     }

src/Event/RoutingMapRoutes.php

@@ -6,6 +6,7 @@ use Lean\Routing;
 use Notes\Route\Attribute\Method\Route;
 use Psr\Container\ContainerInterface;
 use Psr\Http\Message\{ ResponseInterface, ServerRequestInterface };
+use Ulmus\User\Entity\UserInterface;
 
 interface RoutingMapRoutes {
     public function execute(Routing $routing, ContainerInterface $container, ServerRequestInterface & $request, Route $attribute) : void;

src/Factory/HttpFactory.php

@@ -5,13 +5,15 @@ namespace Lean\Factory;
 use Laminas\Diactoros\Response\{EmptyResponse, HtmlResponse, JsonResponse, RedirectResponse, TextResponse};
 use Lean\Response\{ DownloadResponse, ImageResponse, FileDownloadResponse, PdfResponse };
 use Laminas\Diactoros\Response;
+use Laminas\Diactoros\StreamFactory;
 use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\StreamInterface;
 
-class HttpFactory
+class HttpFactory implements HttpFactoryInterface
 {
-    public static function createResponse(string $url, int $code = 302, array $headers = []) : ResponseInterface
+    public static function createResponse(mixed $body = 'php://memory', int $code = 200, array $headers = []) : ResponseInterface
     {
-        return new Response($url, $code, $headers);
+        return new Response($body, $code, $headers);
     }
 
     public static function createRedirectResponse(string $url, int $code = 302, array $headers = []) : ResponseInterface
@@ -58,4 +60,9 @@ class HttpFactory
     {
         return new FileDownloadResponse($path, $code, $headers);
     }
+
+    public static function createStream(string $content): StreamInterface
+    {
+        return new StreamFactory()->createStream($content);
+    }
 }

src/Factory/HttpFactoryInterface.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace Lean\Factory;
+
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\StreamInterface;
+
+interface HttpFactoryInterface
+{
+    public static function createResponse(string $url, int $code = 302, array $headers = []) : ResponseInterface;
+    public static function createRedirectResponse(string $url, int $code = 302, array $headers = []) : ResponseInterface;
+    public static function createHtmlResponse(string $html, int $code = 200, array $headers = []) : ResponseInterface;
+    public static function createTextResponse(string $text, int $code = 200, array $headers = []) : ResponseInterface;
+    public static function createJsonResponse(mixed $data, int $code = 200, array $headers = []) : ResponseInterface;
+    public static function createEmptyResponse(int $code = 204, array $headers = []) : ResponseInterface;
+    public static function createPdfResponse(\Stringable|string $binary, int $code = 200, array $headers = []) : ResponseInterface;
+    public static function createDownloadableResponse(string $data, string $filename, int $code = 200, array $headers = []) : ResponseInterface;
+    public static function createImageResponse(string $data, int $code = 200, array $headers = []) : ResponseInterface;
+    public static function createFileDownloadResponse(string $path, int $code = 200, array $headers = []) : ResponseInterface;
+    public static function createStream(string $content) : StreamInterface;
+}

src/File.php

@@ -14,20 +14,20 @@ class File
         $beginning = false;
         $text = array();
 
-        while ($counter && ! $beginning) {
+        while ($counter && !$beginning) {
             $t = "";
 
             while ($t !== PHP_EOL) {
-                if(fseek($handle, $pos, SEEK_END) == -1) {
+                if (fseek($handle, $pos, SEEK_END) == -1) {
                     $beginning = true;
                     break;
                 }
 
                 $t = fgetc($handle);
-                $pos --;
+                $pos--;
             }
 
-            $counter --;
+            $counter--;
 
             if ($beginning) {
                 rewind($handle);
@@ -36,8 +36,40 @@ class File
             $text[$lines - $counter - 1] = fgets($handle);
         }
 
-        fclose ($handle);
+        fclose($handle);
 
         return array_reverse($text);
     }
+
+    public static function sanitizeFilePath($path) : string
+    {
+        // Remove null bytes
+        $path = str_replace("\0", "", $path);
+
+        $path = str_replace([ "\\", "/" ], DIRECTORY_SEPARATOR, $path);
+
+        $path = preg_replace('#' . DIRECTORY_SEPARATOR . '+#', DIRECTORY_SEPARATOR, $path);
+
+        // Remove . and .. directory traversal attempts
+        $path = preg_replace('#\.{1,2}/#', '', $path);
+
+        $path = trim($path, '/\\');
+
+        return $path;
+    }
+
+    public static function assertFileExists(string $filepath) : void
+    {
+        if (! is_file($filepath)) {
+            throw new \InvalidArgumentException("File does not exist: {$filepath}");
+        }
+    }
+
+    public static function assertFolderExists(string $path) : void
+    {
+        if (! is_dir($path)) {
+            throw new \InvalidArgumentException("Folder does not exist: {$path}");
+        }
+    }
+
 }

src/Kernel.php

@@ -27,17 +27,21 @@ class Kernel {
 
     public array $paths = [];
 
-    public int $errorReporting = E_ALL & ~E_USER_DEPRECATED & ~E_DEPRECATED & ~E_STRICT & ~E_NOTICE;
+    public int $errorReportingDev = -1;
+
+    public int $errorReportingProd = E_ALL & ~E_USER_DEPRECATED & ~E_DEPRECATED /*& ~E_NOTICE*/;
 
     public array $definitionFilePaths;
 
     public string $errorLogPath;
 
-    public string $projectPath;
+    public function __construct(
+        public string $projectPath
+    ) {
+        # Still not sure about adding a folder check each call just to add a basic project setup error ...
+        # File::assertFolderExists($this->projectPath);
 
-    public function __construct(string $projectPath)
+        define('IS_CLI', php_sapi_name() === 'cli' OR defined('STDIN'));
-    {
-        $this->projectPath = $projectPath;
 
         $this->setEnvironment();
         $this->initializeEngine();
@@ -46,21 +50,27 @@ class Kernel {
         $this->handleRequest();
     }
 
-    public static function putenv($var, $value)
+    public static function putenv($var, $value) : void
     {
         putenv("$var=$value");
         $_ENV[$var] = $value;
     }
 
-    protected function setEnvironment() {
+    protected function setEnvironment() : void
+    {
         static::putenv('PROJECT_PATH', $this->projectPath);
 
         // Environment vars (accessible from \DI\env(), getenv(), $_ENV and $_SERVER)
         Dotenv::create(getenv("PROJECT_PATH"))->load();
 
         // Override using headers
-        if ( ( $keys = getenv('KEYS') ) && ( $auth = $_SERVER["HTTP_X_DEV_AUTH"] ?? null ) && in_array($auth, explode(',', $keys)) ) {
+        if (($keys = getenv('KEYS')) && ($auth = $_SERVER["HTTP_X_DEV_AUTH"] ?? null) && in_array($auth, explode(',', $keys))) {
-            foreach (['APP_ENV', 'DEBUG',] as $env) {
+            unset($_SERVER["HTTP_X_DEV_AUTH"]);
+
+            unset($_ENV['KEYS'], $_SERVER['KEYS']);
+            putenv("KEYS=");
+
+            foreach(['APP_ENV', 'DEBUG',] as $env) {
                 if (null !== $value = $_SERVER["HTTP_X_$env"] ?? null) {
                     static::putenv($env, $value);
                 }
@@ -73,7 +83,11 @@ class Kernel {
                 $path = getenv("PROJECT_PATH") . DIRECTORY_SEPARATOR . getenv($envkey);
 
                 if (getenv('DEBUG') && ! file_exists($path)) {
-                    mkdir($path, 0755, true);
+                    if (false === @mkdir($path, 0755, true)) {
+                        if (! IS_CLI) {
+                            throw new \Exception(sprintf("Folder '%s' could not be created", $path));
+                        }
+                    }
                 }
 
                 static::putenv($name, realpath($path));
@@ -93,11 +107,16 @@ class Kernel {
             \Locale::setDefault($this->locale);
         }
 
-        ini_set("log_errors", "1");
+        ini_set("error_log", $this->errorLogPath ?? getenv("LOGS_PATH") . DIRECTORY_SEPARATOR. date("Y-m").".log");
-        ini_set("error_log", $this->errorLogPath);
+        ini_set("log_errors", true);
-        ini_set('display_errors', getenv("DEBUG") ? 'on' : 'on');
+        ini_set('display_errors', getenv("DEBUG") ? 'on' : 'off');
 
-        error_reporting($this->errorReporting);
+        if (getenv("DEBUG")) {
+            error_reporting(getenv('ERROR_REPORTING_DEV') ?: $this->errorReportingDev);
+        }
+        else {
+            error_reporting(getenv('ERROR_REPORTING_PROD') ?: $this->errorReportingProd);
+        }
 
         return $this;
     }
@@ -119,7 +138,7 @@ class Kernel {
         else {
             $compiled = getenv("CACHE_PATH") . "/di/CompiledContainer.php";
 
-            if ( file_exists($compiled) ) {
+            if (file_exists($compiled)) {
                 unlink($compiled);
             }
         }
@@ -154,7 +173,7 @@ class Kernel {
         }
 
         # Must be removed from KERNEL !
-        $this->container->has('ulmus.caching') and ( Ulmus::$cache = $this->container->get('ulmus.caching') );
+        $this->container->has('ulmus.caching') and (Ulmus::$cache = $this->container->get('ulmus.caching'));
 
         return $this;
     }

src/Lean.php

@@ -77,37 +77,42 @@ class Lean
 
     public function getRoutable() : array
     {
-        return array_merge(...array_map(fn($app) => $app->routes ?? [], $this->applications));
+        return array_merge(...array_map(fn(Application $app) => $app->routes ?? [], $this->applications));
     }
 
     public function getCronard() : array
     {
-        return array_merge(...array_map(fn($app) => $app->cronard ?? [], $this->applications));
+        return array_merge(...array_map(fn(Application $app) => $app->cronard ?? [], $this->applications));
     }
 
     public function getCLI() : array
     {
-        return array_merge(...array_map(fn($app) => $app->cli ?? [], $this->applications));
+        return array_merge(...array_map(fn(Application $app) => $app->cli ?? [], $this->applications));
     }
 
     public function getEvents() : array
     {
-        return array_merge(...array_map(fn($app) => $app->events ?? [], $this->applications));
+        return array_merge(...array_map(fn(Application $app) => $app->events ?? [], $this->applications));
     }
 
     public function getTaxusPrivileges() : array
     {
-        return array_merge(...array_map(fn($app) => $app->taxus ?? [], $this->applications));
+        return array_merge(...array_map(fn(Application $app) => $app->taxus ?? [], $this->applications));
     }
 
     public function getEntities() : array
     {
-        return array_merge(...array_map(fn($app) => $app->entities ?? [], $this->applications));
+        return array_merge(...array_map(fn(Application $app) => $app->entities ?? [], $this->applications));
+    }
+
+    public function getConnectionAdapters() : array
+    {
+        return array_merge(...array_map(fn(Application $app) => $app->connectionAdapters ?? [], $this->applications));
     }
 
     public function getViewPaths() : array
     {
-        $list = array_merge(...array_map(fn($app) => $app->views ?? [], $this->applications));
+        $list = array_merge(...array_map(fn(Application $app) => $app->views ?? [], $this->applications));
 
         $this->verifyPathList($list);
 
@@ -118,7 +123,7 @@ class Lean
 
     public function getAssetPaths() : array
     {
-        $list = array_merge(...array_map(fn($app) => $app->piceaAssets ?? [], $this->applications));
+        $list = array_merge(...array_map(fn(Application $app) => $app->piceaAssets ?? [], $this->applications));
 
         $this->verifyPathList($list);
 
@@ -140,11 +145,11 @@ class Lean
     {
         switch($reader) {
             case "php":
-                $list = array_merge(...array_map(fn($app) => $app->tellPhp ?? [], $this->applications));
+                $list = array_merge(...array_map(fn(Application $app) => $app->tellPhp ?? [], $this->applications));
                 break;
 
             case "json":
-                $list = array_merge(...array_map(fn($app) => $app->tellJson ?? [], $this->applications));
+                $list = array_merge(...array_map(fn(Application $app) => $app->tellJson ?? [], $this->applications));
                 break;
         }
 
@@ -239,4 +244,15 @@ class Lean
 
         return call_user_func($func);
     }
+
+    public static function path(...$parts) : string
+    {
+        return implode(DIRECTORY_SEPARATOR, $parts);
+    }
+
+
+    public static function rawPath(...$parts) : string
+    {
+        return implode(DIRECTORY_SEPARATOR, $parts);
+    }
 }

src/Response/FileDownloadResponse.php

@@ -43,7 +43,6 @@ class FileDownloadResponse extends Response
         else {
             $finfo = finfo_open(FILEINFO_MIME_TYPE);
             $mime = finfo_file($finfo, $filepath);
-            finfo_close($finfo);
         }
 
         parent::__construct(

src/Routing.php

@@ -44,6 +44,11 @@ class Routing {
 
                         $container->set(ServerRequestInterface::class, $request);
 
+                        # Decoding arguments received from the router
+                        foreach($arguments as &$arg) {
+                            $arg = urldecode($arg);
+                        }
+
                         return $this->response ?? $object->$method($request, $arguments);
                     });
                 }

view/lean/block/message.phtml

@@ -0,0 +1,11 @@
+{% arguments array $contextList %}
+
+{% if $contextList %}
+    <div class="message-wrapper">{% php
+        foreach($contextList as $name => $context) {
+            foreach($context->formContextMessages ?? [] as $message) {
+                echo $message->render();
+            }
+        }
+    %}</div>
+{% endif %}

view/lean/block/since.phtml

@@ -0,0 +1,23 @@
+{% arguments \DateInterval $interval %}
+
+{% if $interval->y %}
+    {% lang "lean.date.interval.years", [ 'years' => $interval->y ] %},
+{% endif %}
+
+{% if $interval->m %}
+    {% lang "lean.date.interval.months", [ 'months' => $interval->m ] %},
+{% endif %}
+
+{% if $interval->d %}
+    {% lang "lean.date.interval.days", [ 'days' => $interval->d ] %},
+{% endif %}
+
+{% if $interval->h %}
+    {% lang "lean.date.interval.hours", [ 'hours' => $interval->h ] %},
+{% endif %}
+
+{% if $interval->i %}
+    {% lang "lean.date.interval.minutes", [ 'minutes' => $interval->i ] %}
+{% else %}
+    {% lang "lean.date.interval.seconds", [ 'seconds' => $interval->s ] %}
+{% endif %}

view/lean/error/401.phtml

@@ -9,7 +9,7 @@
         <div class="title">{% _ "title" %}</div>
         <div class="subtitle">{% _ "subtitle" %}</div>
         <div class="content">{% _ "message" %}</div>
-        <u><a href="#" onclick="history.back()">{% _ "back" %}</a></u>
+        <u><a href="{% url %}">{% _ "back" %}</a></u>
     </div>
 {% endsection %}
 
@@ -22,5 +22,5 @@
 {% section "head.css" %}
     .title {font-size:2rem}
     .subtitle {font-size:1.25rem; padding-top: 1rem;}
-    .content {padding-top:1rem}
+    .content {background: #f7f7f7;padding: 7px;color: #8c3c3c;max-height:300px;overflow-y:auto}
 {% endsection %}

view/lean/error/404.phtml

@@ -18,9 +18,3 @@
         {% view "lean/picto/undraw_lost" %}
     </div>
 {% endsection %}
-
-{% section "head.css" %}
-    .title {font-size:2rem}
-    .subtitle {font-size:1.25rem; padding-top: 1rem;}
-    .content {padding-top:1rem}
-{% endsection %}

view/lean/error/500.phtml

@@ -18,9 +18,3 @@
         {% view "lean/picto/undraw_error" %}
     </div>
 {% endsection %}
-
-{% section "head.css" %}
-    .title {font-size:2rem}
-    .subtitle {font-size:1.25rem; padding-top: 1rem;}
-    .content {background: #f7f7f7;padding: 7px;color: #8c3c3c;max-height:300px;overflow-y:auto}
-{% endsection %}

view/lean/layout/error.phtml

@@ -2,6 +2,7 @@
     <!DOCTYPE html>
     <html>
         <head>
+            <meta charset="UTF-8" />
             <meta http-equiv="Content-Type" content="text/html; ">
             <meta name="viewport" content="width=device-width">
             <title>{{ title() }}</title>
@@ -10,14 +11,14 @@
             <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bulma/0.7.1/css/bulma.min.css">
 
             <style>
-                body {background:#272822}
+                body {background:#272822;min-height:100vh;}
                 #main-content {min-height: 100vh;width: 100vw;align-items:center;justify-content: center;}
                 #wrapper-content {max-width:960px; max-height:65vh;flex-direction:row-reverse; margin:0 10vw}
                 #wrapper-content .content-right {background:#efefef;padding:5vh 2vw;align-items:center;display:flex;justify-content:center; width:100%;border-radius:6px 0 0 6px}
                 #wrapper-content .content-left {background:#ffffff;padding:5vh 2vw;border-radius:0 6px 6px 0;display:flex;align-items:center;justify-content: center}
 
                 .form-user-login {width:80%;}
-                .picto-login svg {max-width:100%;}
+                .picto-login svg {max-width:100%;width:100%;max-height:33vh}
 
                 {% section "head.css" %}{% endsection %}
             </style>

view/lean/picto/undraw_error.phtml

@@ -1 +1 @@
-<svg id="e7dedc5b-fca6-4313-b5a0-e6297481e8ae" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="1022.7" height="785.81" viewBox="0 0 1022.7 785.81"><defs><linearGradient id="af83dc26-9572-4816-b7a1-1af4f72ff554" x1="678.2" y1="821.79" x2="678.2" y2="493.4" gradientTransform="translate(-20.24 29.65) rotate(-2.31)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="gray" stop-opacity="0.25"/><stop offset="0.54" stop-color="gray" stop-opacity="0.12"/><stop offset="1" stop-color="gray" stop-opacity="0.1"/></linearGradient></defs><title>bug fixing</title><ellipse cx="468.63" cy="660.88" rx="425" ry="33" fill="#6c63ff" opacity="0.1"/><g opacity="0.1"><path d="M933.7,529.93c-2.54-7.71-12.84-11.26-23-7.92a24.76,24.76,0,0,0-4.23,1.83c-.65-.18-1.32-.34-2-.46a22.42,22.42,0,0,0,.63-6.79A24.6,24.6,0,0,0,916,495.12a24.63,24.63,0,0,0,10.86-21.47,23.76,23.76,0,0,0,8.23-9.32c4.9-9.7,2.87-20.6-4.54-24.35s-17.4,1.08-22.3,10.78a23.69,23.69,0,0,0-2.63,12.15,24.63,24.63,0,0,0-10.86,21.47,24.63,24.63,0,0,0-10.86,21.47A24.64,24.64,0,0,0,873,527.33a23.76,23.76,0,0,0-8.23,9.32,25.46,25.46,0,0,0-2.08,5.74,21.18,21.18,0,0,0-4.44-4.73,25.38,25.38,0,0,0-1-4.5c-3.34-10.17-12.3-16.37-20-13.83s-11.26,12.83-7.92,23a23.07,23.07,0,0,0,7.56,11.08,25.38,25.38,0,0,0,1,4.5c1.94,5.9,5.77,10.46,10.15,12.75a23.23,23.23,0,0,0-.83,3.9,25.29,25.29,0,0,0-7.54,14.91,25.27,25.27,0,0,0-7.54,14.92,24.63,24.63,0,0,0-5,6.81c-4.91,9.7-2.88,20.61,4.53,24.35s17.4-1.07,22.31-10.78a24.62,24.62,0,0,0,2.5-8.09,25.29,25.29,0,0,0,7.54-14.91,25.27,25.27,0,0,0,7.54-14.92A25.21,25.21,0,0,0,879,571.94,25.21,25.21,0,0,0,886.56,557a24.11,24.11,0,0,0,3.39-4,23.46,23.46,0,0,0,12.27-.77,24.76,24.76,0,0,0,4.23-1.83,23.2,23.2,0,0,0,13.42-.48C930,546.61,936.23,537.65,933.7,529.93Z" transform="translate(-88.65 -57.09)" fill="#3f3d56"/><g opacity="0.1"><path d="M915.77,499.53a21.5,21.5,0,0,1-3.44,2.75,23,23,0,0,1-1.11,8.43,26.18,26.18,0,0,0,2.1-3.43A24.64,24.64,0,0,0,915.77,499.53Z" transform="translate(-88.65 -57.09)"/><path d="M926.63,478.06a21.5,21.5,0,0,1-3.44,2.75,23,23,0,0,1-1.11,8.43,25.65,25.65,0,0,0,2.1-3.44A24.85,24.85,0,0,0,926.63,478.06Z" transform="translate(-88.65 -57.09)"/><path d="M902,470.07a21.91,21.91,0,0,1,.17-4.41,24.93,24.93,0,0,0-4.78,6.57,25.63,25.63,0,0,0-1.52,3.73A22.75,22.75,0,0,1,902,470.07Z" transform="translate(-88.65 -57.09)"/><path d="M833.07,600a23.59,23.59,0,0,1,2.95-3.38,22.92,22.92,0,0,1,.87-4,25.09,25.09,0,0,0-2.29,3.71A25.59,25.59,0,0,0,833.07,600Z" transform="translate(-88.65 -57.09)"/><path d="M840.61,585.1a23.59,23.59,0,0,1,2.95-3.38,23,23,0,0,1,.83-3.9l0,0a25.68,25.68,0,0,0-2.2,3.59A26.76,26.76,0,0,0,840.61,585.1Z" transform="translate(-88.65 -57.09)"/><path d="M904.9,521a20.82,20.82,0,0,1-3.43,2.74,22.45,22.45,0,0,1-.63,6.79,18.75,18.75,0,0,1,2,.46,24.76,24.76,0,0,1,4.23-1.83c10.18-3.34,20.47.21,23,7.92a11.68,11.68,0,0,1,.32,6c3.35-3.94,4.74-8.74,3.3-13.14-2.54-7.71-12.84-11.26-23-7.92a24.76,24.76,0,0,0-4.23,1.83c-.65-.18-1.32-.34-2-.46C904.65,522.59,904.79,521.8,904.9,521Z" transform="translate(-88.65 -57.09)"/><path d="M829.35,607.49a25.09,25.09,0,0,0-2.29,3.71,26.56,26.56,0,0,0-1.54,3.74,24.48,24.48,0,0,1,3-3.4A22.92,22.92,0,0,1,829.35,607.49Z" transform="translate(-88.65 -57.09)"/><path d="M891.09,491.54a22,22,0,0,1,.17-4.41,24.93,24.93,0,0,0-4.78,6.57,25.63,25.63,0,0,0-1.52,3.73A22.75,22.75,0,0,1,891.09,491.54Z" transform="translate(-88.65 -57.09)"/><path d="M875.4,579.1a24.29,24.29,0,0,1-1,4.38,26.67,26.67,0,0,0,2.09-3.44,25.49,25.49,0,0,0,1.63-4A24.23,24.23,0,0,1,875.4,579.1Z" transform="translate(-88.65 -57.09)"/><path d="M860.32,608.92a24.15,24.15,0,0,1-1,4.38,25.65,25.65,0,0,0,2.1-3.44,26.47,26.47,0,0,0,1.63-4A23.57,23.57,0,0,1,860.32,608.92Z" transform="translate(-88.65 -57.09)"/><path d="M867.86,594a24.11,24.11,0,0,1-1,4.38A26.67,26.67,0,0,0,869,595a25.49,25.49,0,0,0,1.63-4A24.23,24.23,0,0,1,867.86,594Z" transform="translate(-88.65 -57.09)"/><path d="M882.94,564.19a24,24,0,0,1-1,4.37,25.89,25.89,0,0,0,2.09-3.43,25.48,25.48,0,0,0,1.64-4.07A23.22,23.22,0,0,1,882.94,564.19Z" transform="translate(-88.65 -57.09)"/><path d="M833.57,526.48c7.72-2.53,16.68,3.66,20,13.83a25.68,25.68,0,0,1,1,4.51,21.18,21.18,0,0,1,4.44,4.73,25.53,25.53,0,0,1,2.08-5.75c.35-.68.73-1.33,1.12-2a21.07,21.07,0,0,0-4-4.18,25.38,25.38,0,0,0-1-4.5c-3.34-10.17-12.3-16.37-20-13.83-4.4,1.44-7.44,5.41-8.62,10.43A11.69,11.69,0,0,1,833.57,526.48Z" transform="translate(-88.65 -57.09)"/><path d="M869.37,534.48a21.85,21.85,0,0,1,.18-4.4,24.73,24.73,0,0,0-4.79,6.57,25.07,25.07,0,0,0-1.52,3.72A23,23,0,0,1,869.37,534.48Z" transform="translate(-88.65 -57.09)"/><path d="M880.23,513a21.85,21.85,0,0,1,.18-4.4,24.52,24.52,0,0,0-4.79,6.56,25.63,25.63,0,0,0-1.52,3.73A22.75,22.75,0,0,1,880.23,513Z" transform="translate(-88.65 -57.09)"/><path d="M852.78,623.83a24.25,24.25,0,0,1-1,4.39,25.73,25.73,0,0,0,3.73-7.49A23.57,23.57,0,0,1,852.78,623.83Z" transform="translate(-88.65 -57.09)"/></g><path d="M948.52,430.71a23.68,23Line truncated
+<svg xmlns="http://www.w3.org/2000/svg" width="799.031" height="618.112" viewBox="0 0 799.031 618.112" xmlns:xlink="http://www.w3.org/1999/xlink" role="img" artist="Katerina Limpitsouni" source="https://undraw.co/"><g transform="translate(-893 -197)"><path d="M15.18,488.763c0,.872.478,1.573,1.073,1.573h535.1c.6,0,1.073-.7,1.073-1.573s-.478-1.573-1.073-1.573H16.253C15.658,487.191,15.18,487.891,15.18,488.763Z" transform="translate(1007.711 324.776)" fill="#ccc"/><rect width="19.105" height="3.371" transform="translate(1198.162 808.354)" fill="#b6b3c5"/><rect width="19.105" height="3.371" transform="translate(1367.295 808.917)" fill="#b6b3c5"/><path d="M352.955,370.945a27.529,27.529,0,0,1-54.321,0H229.146V521.536h193.3V370.945Z" transform="translate(966.721 287.378)" fill="#d6d6e3"/><rect width="193.296" height="5.242" transform="translate(1196.43 796.983)" fill="#090814"/><path d="M788.255,487.17H10.776A10.788,10.788,0,0,1,0,476.394V32.688A10.788,10.788,0,0,1,10.776,21.911H788.255a10.789,10.789,0,0,1,10.776,10.776V476.394a10.789,10.789,0,0,1-10.776,10.776Z" transform="translate(893 175.089)" fill="#090814"/><rect width="760.822" height="429.297" transform="translate(911.104 213.968)" fill="#fff"/><g transform="translate(20.477 16.308)"><path d="M604.463,379.271H317.442a8.655,8.655,0,0,1-8.645-8.645V273.8a8.655,8.655,0,0,1,8.645-8.645H604.463a8.655,8.655,0,0,1,8.645,8.645v96.826a8.655,8.655,0,0,1-8.645,8.645Z" transform="translate(811.648 85.826)" fill="#6c63ff"/><rect width="76.078" height="8.645" rx="2" transform="translate(1165.4 380.374)" fill="#fff"/><ellipse cx="5.187" cy="5.187" rx="5.187" ry="5.187" transform="translate(1336.576 380.374)" fill="#090814"/><ellipse cx="5.187" cy="5.187" rx="5.187" ry="5.187" transform="translate(1353.865 380.374)" fill="#090814"/><ellipse cx="5.187" cy="5.187" rx="5.187" ry="5.187" transform="translate(1371.156 380.374)" fill="#090814"/></g><ellipse cx="40.952" cy="40.952" rx="40.952" ry="40.952" transform="translate(1404.281 440.452)" fill="#090814"/><path d="M10.863-57.7l-.524-29.6h8.246l-.554,29.6Zm3.613,14.307a4.7,4.7,0,0,1-3.409-1.3,4.368,4.368,0,0,1-1.34-3.278,4.39,4.39,0,0,1,1.34-3.322,4.732,4.732,0,0,1,3.409-1.282,4.732,4.732,0,0,1,3.409,1.282,4.39,4.39,0,0,1,1.34,3.322,4.368,4.368,0,0,1-1.34,3.278A4.7,4.7,0,0,1,14.476-43.394Z" transform="translate(1430.76 546.754)" fill="#fff"/></g></svg>

view/lean/picto/undraw_forbidden.phtml

@@ -1 +1 @@
-<svg id="a63b68c9-40cd-4f97-89ed-e7d494eb42f9" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" width="742.41705" height="712.57302" viewBox="0 0 742.41705 712.57302"><path id="aa38b2e7-2ea9-4025-adcf-83f87c0cfc4a" data-name="Path 968" d="M853.60644,262.60547h-3.9v-106.977a61.915,61.915,0,0,0-61.915-61.915h-226.65a61.915,61.915,0,0,0-61.916,61.914v586.884a61.915,61.915,0,0,0,61.915,61.915h226.648a61.915,61.915,0,0,0,61.915-61.915v-403.758h3.9Z" transform="translate(-228.79147 -93.71349)" fill="#3f3d56"/><path id="f27259c2-0089-4137-bfd8-cb22dff914f1" data-name="Path 969" d="M837.00647,151.48149v595.175a46.959,46.959,0,0,1-46.942,46.952h-231.3a46.966,46.966,0,0,1-46.973-46.952v-595.175a46.965,46.965,0,0,1,46.971-46.951h28.058a22.329,22.329,0,0,0,20.656,30.74h131.868a22.329,22.329,0,0,0,20.656-30.74h30.055a46.959,46.959,0,0,1,46.951,46.942Z" transform="translate(-228.79147 -93.71349)" fill="#fff"/><circle id="fc31cc31-f989-45cc-bd1e-521a0ee1871b" data-name="Ellipse 18" cx="445.56497" cy="200.129" r="96.565" fill="#6c63ff"/><path id="a573942c-3bf3-4c43-b474-689725a927f7" data-name="Path 39" d="M779.67245,494.30947h-205.537a3.81,3.81,0,0,1-3.806-3.806V439.51949a3.811,3.811,0,0,1,3.806-3.806h205.537a3.811,3.811,0,0,1,3.806,3.806v50.985a3.811,3.811,0,0,1-3.806,3.806Zm-205.537-57.074a2.286,2.286,0,0,0-2.284,2.284v50.985a2.286,2.286,0,0,0,2.284,2.284h205.537a2.286,2.286,0,0,0,2.284-2.284v-50.985a2.286,2.286,0,0,0-2.284-2.284Z" transform="translate(-228.79147 -93.71349)" fill="#e6e6e6"/><path id="fb5feb1e-1fe2-48fa-806d-0a2b51d12b49" data-name="Path 40" d="M637.69945,454.07448a2.66449,2.66449,0,0,0,0,5.329h125.605a2.665,2.665,0,0,0,.2041-5.32611q-.0585-.00221-.11713-.0019h-125.692Z" transform="translate(-228.79147 -93.71349)" fill="#e6e6e6"/><path id="bcb9932f-0864-4b7e-b0ed-f7254bb9b8bf" data-name="Path 41" d="M637.69945,470.05846a2.66449,2.66449,0,0,0,0,5.329h125.605a2.665,2.665,0,0,0,.2041-5.32611q-.0585-.00219-.11713-.00189h-125.692Z" transform="translate(-228.79147 -93.71349)" fill="#e6e6e6"/><path id="f88e2a8b-becc-4da9-bd36-af011daaaaf2" data-name="Path 42" d="M779.67245,579.28947h-205.537a3.81,3.81,0,0,1-3.806-3.806V524.49949a3.811,3.811,0,0,1,3.806-3.806h205.537a3.811,3.811,0,0,1,3.806,3.806v50.985A3.811,3.811,0,0,1,779.67245,579.28947Zm-205.537-57.074a2.286,2.286,0,0,0-2.284,2.284v50.985a2.286,2.286,0,0,0,2.284,2.284h205.537a2.286,2.286,0,0,0,2.284-2.284v-50.985a2.286,2.286,0,0,0-2.284-2.284Z" transform="translate(-228.79147 -93.71349)" fill="#e6e6e6"/><path id="e192d34f-2ccc-4f79-b47a-46430e4d87f6" data-name="Path 43" d="M637.69945,539.33047a2.66449,2.66449,0,0,0,0,5.329h125.605a2.665,2.665,0,0,0,.087-5.328h-125.692Z" transform="translate(-228.79147 -93.71349)" fill="#e6e6e6"/><path id="b230677c-48cc-4ee6-87d6-a753204ffe47" data-name="Path 44" d="M637.69945,555.3185a2.66449,2.66449,0,0,0,0,5.329h125.605a2.665,2.665,0,0,0,.087-5.328h-125.692Z" transform="translate(-228.79147 -93.71349)" fill="#e6e6e6"/><path id="b88a2a79-0ae3-4fd9-9894-02e0db9a2271" data-name="Path 39-2" d="M779.67245,664.54748h-205.537a3.81,3.81,0,0,1-3.806-3.806V609.7575a3.811,3.811,0,0,1,3.806-3.806h205.537a3.811,3.811,0,0,1,3.806,3.806v50.985a3.811,3.811,0,0,1-3.806,3.806Zm-205.537-57.074a2.286,2.286,0,0,0-2.284,2.284v50.985a2.286,2.286,0,0,0,2.284,2.284h205.537a2.286,2.286,0,0,0,2.284-2.284v-50.985a2.286,2.286,0,0,0-2.284-2.284Z" transform="translate(-228.79147 -93.71349)" fill="#e6e6e6"/><path id="aa2394a9-8b56-4a12-a2cd-a583e6ea12eb" data-name="Path 40-2" d="M637.69945,624.59148a2.66449,2.66449,0,1,0,0,5.329h125.605a2.665,2.665,0,0,0,.2041-5.32611q-.0585-.00219-.11713-.00189h-125.692Z" transform="translate(-228.79147 -93.71349)" fill="#e6e6e6"/><path id="bc352cb2-8959-4b51-bd18-df6817a9a47e" data-name="Path 41-2" d="M637.69945,640.57846a2.66449,2.66449,0,0,0,0,5.329h125.605a2.665,2.665,0,0,0,.2041-5.32611q-.0585-.0022-.11713-.00189h-125.692Z" transform="translate(-228.79147 -93.71349)" fill="#e6e6e6"/><path id="b30ee82f-5b3a-4aa4-9db7-ead828191937" data-name="Path 970" d="M969.27042,806.28651h-738.541c-1.071,0-1.938-.468-1.938-1.045s.868-1.045,1.938-1.045H969.27054c1.06994,0,1.938.468,1.938,1.045S970.34146,806.28651,969.27042,806.28651Z" transform="translate(-228.79147 -93.71349)" fill="#e6e6e6"/><g id="f24cf2fd-107c-4150-a0f1-6f6b12d88bf3" data-name="Group 58"><path id="a2b576eb-bb95-4480-aa60-cd8aa023fe61" data-name="Path 438" d="M937.99248,765.52151a19.4741,19.4741,0,0,1-18.806-3.313c-6.587-5.528-8.652-14.636-10.332-23.07l-4.97-24.945,10.405,7.165c7.483,5.152,15.134,10.47,20.316,17.933s7.443,17.651,3.28,25.726" transform="translate(-228.79147 -93.71349)" fill="#e6e6e6"/><path id="fe1c5433-44e0-47a6-8430-329cbd7c4dea" data-name="Path 439" d="M936.38547,797.45852c1.31-9.542,2.657-19.206,1.738-28.849-.816-8.565-3.429-16.93-8.749-23.789a39.57365,39.57365,0,0,0-10.153-9.2c-1.015-.641-1.95.968-.939,1.606a37.62192,37.62192,0,0,1,14.881,17.956c3.24,8.241,3.76,17.224,3.2,25.977-.338,5.294-1.053,10.553-1.774,15.805a.964.964,0,0,0,.6Line truncated
+<svg width="742" height="712" id="a63b68c9-40cd-4f97-89ed-e7d494eb42f9" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 742.41705 712.57302"><path id="aa38b2e7-2ea9-4025-adcf-83f87c0cfc4a" data-name="Path 968" d="M853.60644,262.60547h-3.9v-106.977a61.915,61.915,0,0,0-61.915-61.915h-226.65a61.915,61.915,0,0,0-61.916,61.914v586.884a61.915,61.915,0,0,0,61.915,61.915h226.648a61.915,61.915,0,0,0,61.915-61.915v-403.758h3.9Z" transform="translate(-228.79147 -93.71349)" fill="#3f3d56"/><path id="f27259c2-0089-4137-bfd8-cb22dff914f1" data-name="Path 969" d="M837.00647,151.48149v595.175a46.959,46.959,0,0,1-46.942,46.952h-231.3a46.966,46.966,0,0,1-46.973-46.952v-595.175a46.965,46.965,0,0,1,46.971-46.951h28.058a22.329,22.329,0,0,0,20.656,30.74h131.868a22.329,22.329,0,0,0,20.656-30.74h30.055a46.959,46.959,0,0,1,46.951,46.942Z" transform="translate(-228.79147 -93.71349)" fill="#fff"/><circle id="fc31cc31-f989-45cc-bd1e-521a0ee1871b" data-name="Ellipse 18" cx="445.56497" cy="200.129" r="96.565" fill="#6c63ff"/><path id="a573942c-3bf3-4c43-b474-689725a927f7" data-name="Path 39" d="M779.67245,494.30947h-205.537a3.81,3.81,0,0,1-3.806-3.806V439.51949a3.811,3.811,0,0,1,3.806-3.806h205.537a3.811,3.811,0,0,1,3.806,3.806v50.985a3.811,3.811,0,0,1-3.806,3.806Zm-205.537-57.074a2.286,2.286,0,0,0-2.284,2.284v50.985a2.286,2.286,0,0,0,2.284,2.284h205.537a2.286,2.286,0,0,0,2.284-2.284v-50.985a2.286,2.286,0,0,0-2.284-2.284Z" transform="translate(-228.79147 -93.71349)" fill="#e6e6e6"/><path id="fb5feb1e-1fe2-48fa-806d-0a2b51d12b49" data-name="Path 40" d="M637.69945,454.07448a2.66449,2.66449,0,0,0,0,5.329h125.605a2.665,2.665,0,0,0,.2041-5.32611q-.0585-.00221-.11713-.0019h-125.692Z" transform="translate(-228.79147 -93.71349)" fill="#e6e6e6"/><path id="bcb9932f-0864-4b7e-b0ed-f7254bb9b8bf" data-name="Path 41" d="M637.69945,470.05846a2.66449,2.66449,0,0,0,0,5.329h125.605a2.665,2.665,0,0,0,.2041-5.32611q-.0585-.00219-.11713-.00189h-125.692Z" transform="translate(-228.79147 -93.71349)" fill="#e6e6e6"/><path id="f88e2a8b-becc-4da9-bd36-af011daaaaf2" data-name="Path 42" d="M779.67245,579.28947h-205.537a3.81,3.81,0,0,1-3.806-3.806V524.49949a3.811,3.811,0,0,1,3.806-3.806h205.537a3.811,3.811,0,0,1,3.806,3.806v50.985A3.811,3.811,0,0,1,779.67245,579.28947Zm-205.537-57.074a2.286,2.286,0,0,0-2.284,2.284v50.985a2.286,2.286,0,0,0,2.284,2.284h205.537a2.286,2.286,0,0,0,2.284-2.284v-50.985a2.286,2.286,0,0,0-2.284-2.284Z" transform="translate(-228.79147 -93.71349)" fill="#e6e6e6"/><path id="e192d34f-2ccc-4f79-b47a-46430e4d87f6" data-name="Path 43" d="M637.69945,539.33047a2.66449,2.66449,0,0,0,0,5.329h125.605a2.665,2.665,0,0,0,.087-5.328h-125.692Z" transform="translate(-228.79147 -93.71349)" fill="#e6e6e6"/><path id="b230677c-48cc-4ee6-87d6-a753204ffe47" data-name="Path 44" d="M637.69945,555.3185a2.66449,2.66449,0,0,0,0,5.329h125.605a2.665,2.665,0,0,0,.087-5.328h-125.692Z" transform="translate(-228.79147 -93.71349)" fill="#e6e6e6"/><path id="b88a2a79-0ae3-4fd9-9894-02e0db9a2271" data-name="Path 39-2" d="M779.67245,664.54748h-205.537a3.81,3.81,0,0,1-3.806-3.806V609.7575a3.811,3.811,0,0,1,3.806-3.806h205.537a3.811,3.811,0,0,1,3.806,3.806v50.985a3.811,3.811,0,0,1-3.806,3.806Zm-205.537-57.074a2.286,2.286,0,0,0-2.284,2.284v50.985a2.286,2.286,0,0,0,2.284,2.284h205.537a2.286,2.286,0,0,0,2.284-2.284v-50.985a2.286,2.286,0,0,0-2.284-2.284Z" transform="translate(-228.79147 -93.71349)" fill="#e6e6e6"/><path id="aa2394a9-8b56-4a12-a2cd-a583e6ea12eb" data-name="Path 40-2" d="M637.69945,624.59148a2.66449,2.66449,0,1,0,0,5.329h125.605a2.665,2.665,0,0,0,.2041-5.32611q-.0585-.00219-.11713-.00189h-125.692Z" transform="translate(-228.79147 -93.71349)" fill="#e6e6e6"/><path id="bc352cb2-8959-4b51-bd18-df6817a9a47e" data-name="Path 41-2" d="M637.69945,640.57846a2.66449,2.66449,0,0,0,0,5.329h125.605a2.665,2.665,0,0,0,.2041-5.32611q-.0585-.0022-.11713-.00189h-125.692Z" transform="translate(-228.79147 -93.71349)" fill="#e6e6e6"/><path id="b30ee82f-5b3a-4aa4-9db7-ead828191937" data-name="Path 970" d="M969.27042,806.28651h-738.541c-1.071,0-1.938-.468-1.938-1.045s.868-1.045,1.938-1.045H969.27054c1.06994,0,1.938.468,1.938,1.045S970.34146,806.28651,969.27042,806.28651Z" transform="translate(-228.79147 -93.71349)" fill="#e6e6e6"/><g id="f24cf2fd-107c-4150-a0f1-6f6b12d88bf3" data-name="Group 58"><path id="a2b576eb-bb95-4480-aa60-cd8aa023fe61" data-name="Path 438" d="M937.99248,765.52151a19.4741,19.4741,0,0,1-18.806-3.313c-6.587-5.528-8.652-14.636-10.332-23.07l-4.97-24.945,10.405,7.165c7.483,5.152,15.134,10.47,20.316,17.933s7.443,17.651,3.28,25.726" transform="translate(-228.79147 -93.71349)" fill="#e6e6e6"/><path id="fe1c5433-44e0-47a6-8430-329cbd7c4dea" data-name="Path 439" d="M936.38547,797.45852c1.31-9.542,2.657-19.206,1.738-28.849-.816-8.565-3.429-16.93-8.749-23.789a39.57365,39.57365,0,0,0-10.153-9.2c-1.015-.641-1.95.968-.939,1.606a37.62192,37.62192,0,0,1,14.881,17.956c3.24,8.241,3.76,17.224,3.2,25.977-.338,5.294-1.053,10.553-1.774,15.805a.964.964,0,0,0,.65,1.144.936.Line truncated

view/lean/widget/calendar.phtml

@@ -22,7 +22,7 @@
             {% slot "week.heading", $day, $month, $year %}
                 <div class="day-box">
                     {# Random calendar date that starts on a sunday #}
-                    {{ substr(( new Date("2019-12-$day") )->formatLocale("%A"), 0, 3) }}
+                    {{ new Date("2019-12-$day")->formatLocaleIntl(\IntlDateFormatter::SHORT, \IntlDateFormatter::NONE, 'EEE') }}
                 </div>
             {% endslot %}
         {% endforeach %}

view/lean/widget/message.phtml

@@ -5,14 +5,4 @@
     if ($context && ! in_array($context, $messageList)) {
         $messageList[] = $context;
     }
-%}
+%}{% block "lean/block/message", $messageList %}{% endblock %}
-
-{% if $messageList %}
-    <div class="message-wrapper">{% php
-        foreach($messageList as $name => $context) {
-            foreach($context->messages ?? [] as $message) {
-                echo $message->render();
-            }
-        }
-    %}</div>
-{% endif %}