- Merged with master done

- Fixed some minor bugs

composer.json

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

meta/definitions/authorize.php

@@ -2,13 +2,16 @@
 
 use Lean\Factory\HttpFactoryInterface;
 
-use Ulmus\User\{Authorize\HeaderAuthentication,
+use Ulmus\User\{
+    Authorize\CookieAuthentication,
+    Authorize\HeaderAuthentication,
     Entity,
 
     Lib\Authenticate,
     Lib\Authorize,
     Middleware\AuthenticationMiddleware,
     Middleware\HeaderAuthenticationMiddleware,
+    Middleware\CookieAuthenticationMiddleware,
     Middleware\PostRequestAuthenticationMiddleware,
     Authorize\PostRequestAuthentication};
 
@@ -30,6 +33,10 @@ return [
 
     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)),

meta/definitions/event.php

@@ -37,7 +37,7 @@ 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 ));
                     }
                 }
             },
@@ -52,7 +52,6 @@ return [
                 {
                     $class = $attribute->class;
                     $method = $attribute->classMethod;
-                    $object = $container->get($class);
 
                     $request = $request->withAttribute('lean.route', $attribute);
 

meta/definitions/http.php

@@ -1,11 +1,15 @@
 <?php
 
 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 };
 
@@ -24,6 +28,22 @@ return [
 
     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);
     },
@@ -34,5 +54,5 @@ return [
 
     '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/routes.php

@@ -68,7 +68,7 @@ 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);

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;
 
@@ -78,12 +75,6 @@ return [
 
     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_");

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_ADAPTER = "SQLite"
-#SQLITE_PRAGMA_BEGIN = "foreign_keys=ON,synchronous=NORMAL"
-#SQLITE_PRAGMA_DEBUG_BEGIN = "journal_mode=WAL"
-#SQLITE_PRAGMA_CLOSE = "analysis_limit=500,optimize"
+SQLITE_PATH = "var/myapp.sqlite3"
+SQLITE_ADAPTER = "SQLite"
+SQLITE_PRAGMA_BEGIN = "foreign_keys=ON,synchronous=NORMAL"
+SQLITE_PRAGMA_DEBUG_BEGIN = "journal_mode=WAL"
+SQLITE_PRAGMA_CLOSE = "analysis_limit=500,optimize"
 
-DATABASE_PORT = ""
-DATABASE_HOST = ""
-DATABASE_NAME = ""
-DATABASE_USERNAME = ""
-DATABASE_PASSWORD = ""
-DATABASE_CHARSET = "utf8"
-DATABASE_ADAPTER = "MariaDB"
+#DATABASE_PORT = ""
+#DATABASE_HOST = ""
+#DATABASE_NAME = ""
+#DATABASE_USERNAME = ""
+#DATABASE_PASSWORD = ""
+#DATABASE_CHARSET = "utf8"
+#DATABASE_ADAPTER = "MariaDB"
 
 LEAN_RANDOM = "%RAND64%"
-

skeleton/composer.json.dist

@@ -25,20 +25,20 @@
         "league/oauth2-client": "dev-master",
         "php-di/php-di": "dev-master",
         "league/commonmark": "^2.7@dev",
-        "assets-package/ace": "dev-master",
+        "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-api": "dev-master",
-        "mcnd/ulmus-user": "dev-master",
+        "mcnd/ulmus": "^1.0 || ^2.0",
+        "mcnd/ulmus-api": "^1.3.0",
+        "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-api": "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",
@@ -47,8 +47,12 @@
     },
     "repositories": [
         {
-            "type": "vcs",
-            "url": "https://git.mcnd.ca/mcndave/cronard.git"
+            "type": "composer",
+            "url": "https://git.mcnd.ca/api/packages/mcndave/composer"
+        },
+        {
+            "type": "composer",
+            "url": "https://git.mcnd.ca/api/packages/assets-package/composer"
         },
         {
             "type": "vcs",

skeleton/meta/config.php

@@ -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

@@ -43,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/env/prod.php

@@ -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 !*/

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/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,9 +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;
 }

src/ApplicationStrategy.php

@@ -38,12 +38,10 @@ class ApplicationStrategy extends Strategy\ApplicationStrategy {
     {
         return $this->getContainer()->has(MethodNotAllowedInterface::class) ? $this->getContainer()->get(MethodNotAllowedInterface::class) : parent::getMethodNotAllowedDecorator($exception);
     }
-    /*
-<<<<<<< HEAD
+
+/*<<<<<<< HEAD
+        /*=======
     public function getMethodNotAllowedDecorator(MethodNotAllowedException $exception): MiddlewareInterface
-    {
-        return $this->getContainer()->has(MethodNotAllowedInterface::class) ? $this->getContainer()->get(MethodNotAllowedInterface::class) : parent::getMethodNotAllowedDecorator($exception);
-=======
             public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
             {
                 if (php_sapi_name() !== 'cli' and ! defined('STDIN'))  {
@@ -69,6 +67,8 @@ class ApplicationStrategy extends Strategy\ApplicationStrategy {
                 return $this->di->get('error.404');
             }
         };
->>>>>>> af8b686 (- WIP on ulmus-user mechanics updates)
-    }*/
+<<<<<<< HEAD
+    }
+
+>>>>>>> af8b686 (- WIP on ulmus-user mechanics updates)*/
 }

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

src/ControllerTrait.php

@@ -9,6 +9,7 @@ use Notes\Route\Attribute\Object\Route;
 use Notes\Security\Attribute\Security;
 use Picea, Picea\Ui\Method\FormContext;
 use Picea\Ui\Method\FormContextInterface;
+use Picea\Ui\Method\FormInterface;
 use TheBugs\Email\MailerInterface;
 use Storage\{ Cookie, Session };
 use League\CommonMark\CommonMarkConverter;
@@ -82,6 +83,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
     {
@@ -203,6 +211,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
     {

src/Factory/HttpFactory.php

@@ -11,9 +11,9 @@ use Psr\Http\Message\StreamInterface;
 
 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

src/File.php

@@ -40,4 +40,36 @@ class File
 
         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

@@ -11,23 +11,22 @@ use League\Route\Strategy\ApplicationStrategy;
 
 use Psr\Http\Message\ServerRequestInterface;
 
-use Tell\I18n;
-use Ulmus\Container\AdapterProxy;
-
 use Laminas\Diactoros\ServerRequestFactory,
     Laminas\HttpHandlerRunner\Emitter\EmitterInterface;
 
 use Ulmus\Ulmus;
 
-class Kernel {
-
+class Kernel
+{
     protected Container $container;
 
     protected string $locale;
 
     public array $paths = [];
 
-    public int $errorReporting = E_ALL & ~E_USER_DEPRECATED & ~E_DEPRECATED & ~E_NOTICE;
+    public int $errorReportingDev = -1 & ~E_USER_DEPRECATED & ~E_DEPRECATED ;
+
+    public int $errorReportingProd = E_ALL & ~E_USER_DEPRECATED & ~E_DEPRECATED /*& ~E_NOTICE*/;
 
     public array $definitionFilePaths;
 
@@ -36,6 +35,11 @@ class Kernel {
     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);
+
+        define('IS_CLI', php_sapi_name() === 'cli' OR defined('STDIN'));
+
         $this->setEnvironment();
         $this->initializeEngine();
         $this->setupContainer();
@@ -43,13 +47,14 @@ 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)
@@ -57,6 +62,11 @@ class Kernel {
 
         // Override using headers
         if (($keys = getenv('KEYS')) && ($auth = $_SERVER["HTTP_X_DEV_AUTH"] ?? null) && in_array($auth, explode(',', $keys))) {
+            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);
@@ -70,10 +80,12 @@ class Kernel {
                 $path = getenv("PROJECT_PATH") . DIRECTORY_SEPARATOR . getenv($envkey);
 
                 if (getenv('DEBUG') && ! file_exists($path)) {
-                    if (false === 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));
             }
@@ -92,11 +104,16 @@ class Kernel {
             \Locale::setDefault($this->locale);
         }
 
-        ini_set("log_errors", "1");
-        ini_set("error_log", $this->errorLogPath);
-        ini_set('display_errors', getenv("DEBUG") ? 'on' : 'on');
+        ini_set("error_log", $this->errorLogPath ?? getenv("LOGS_PATH") . DIRECTORY_SEPARATOR. date("Y-m").".log");
+        ini_set("log_errors", true);
+        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;
     }
@@ -109,7 +126,8 @@ class Kernel {
 
         if (getenv("APP_ENV") === "prod") {
             if (getenv("CACHE_PATH")) {
-                # check if ACPU is there first, $containerBuilder->enableDefinitionCache();
+                # check if ACPU is there first,
+                # $containerBuilder->enableDefinitionCache();                # Do not work .. ?
 
                 $containerBuilder->enableCompilation(getenv("CACHE_PATH") . "/di/");
                 # No proxies yet... $containerBuilder->writeProxiesToFile(true, getenv("CACHE_PATH") . "/di/");
@@ -154,7 +172,6 @@ class Kernel {
 
         # Must be removed from KERNEL !
         $this->container->has('ulmus.caching') and (Ulmus::$cache = $this->container->get('ulmus.caching'));
-        # $this->container->has(AdapterProxy::class) and ( $ )
 
         return $this;
     }
@@ -177,4 +194,4 @@ class Kernel {
 
         return $this;
     }
-};
+}

src/Lean.php

@@ -244,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/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>

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;
     }
-%}
-
-{% if $messageList %}
-    <div class="message-wrapper">{% php
-        foreach($messageList as $name => $context) {
-            foreach($context->formContextMessages ?? [] as $message) {
-                echo $message->render();
-            }
-        }
-    %}</div>
-{% endif %}
+%}{% block "lean/block/message", $messageList %}{% endblock %}