From 8be85417c02cc97f9e23b5352b22be915e74b626 Mon Sep 17 00:00:00 2001
From: Bojan Rajh <schtr4jh@schtr4jh.net>
Date: Sun, 22 Nov 2020 18:59:07 +0100
Subject: [PATCH 01/66] Session, vue routes, vue layout

---
 src/Pckg/Framework/Application/Website.php    |  2 +-
 src/Pckg/Framework/Helper/functions.php       | 32 ++++++++++++++-----
 src/Pckg/Framework/Provider/Framework.php     |  2 +-
 .../Request/Data/SessionDriver/FileDriver.php |  4 ++-
 .../Response/Command/ProcessRouteMatch.php    |  1 +
 src/Pckg/Framework/Router.php                 | 23 +++++++++++--
 .../Router/Command/ResolveDependencies.php    | 11 ++++++-
 7 files changed, 61 insertions(+), 14 deletions(-)

diff --git a/src/Pckg/Framework/Application/Website.php b/src/Pckg/Framework/Application/Website.php
index 8493a19c..95d20664 100644
--- a/src/Pckg/Framework/Application/Website.php
+++ b/src/Pckg/Framework/Application/Website.php
@@ -25,12 +25,12 @@ public function inits()
             Localize::class,
             InitRouter::class,
             InitDatabase::class, // can we init it on demand?
-            InitSession::class, // can we init it on demand?
 
             RegisterApplication::class,
 
             InitResponse::class,
             InitRequest::class,
+            InitSession::class, // can we init it on demand?
         ];
     }
 
diff --git a/src/Pckg/Framework/Helper/functions.php b/src/Pckg/Framework/Helper/functions.php
index 8a15a619..1d80e728 100644
--- a/src/Pckg/Framework/Helper/functions.php
+++ b/src/Pckg/Framework/Helper/functions.php
@@ -1203,27 +1203,43 @@ function route($route, $view, $controller = null)
 }
 
 if (!function_exists('vueRoute')) {
-    function vueRoute($route, $component, array $tags = [])
+    function vueRoute(string $route = '', string $component = null, array $tags = [])
     {
+        $defaultTags = [
+            'vue:route',
+            'vue:route:template' => substr($component, 0, 1) !== '<'
+                ? '<' . $component . '></' . $component . '>'
+                : $component,
+        ];
+
         return route($route, function() use ($tags) {
             $config = config();
 
             $layout = null;
+            $isVue = false;
             foreach ($tags as $tag) {
                 if (strpos($tag, 'layout:') === 0) {
-                    $layout = 'Pckg/Generic:' . substr($tag, strlen('layout:'));
+                    if (strpos($tag, '-') === false) {
+                        $layout = 'Pckg/Generic:' . substr($tag, strlen('layout:'));
+                    } else {
+                        $layout = substr($tag, strlen('layout:'));
+                        $isVue = true;
+                    }
                     break;
                 }
             }
 
+            if ($isVue) {
+                /**
+                 * We will parse Vue routes into the frontend layout.
+                 * It is currently hardcoded to print <frontend-app></frontend-app> which prints header, body and others.
+                 */
+                return view('Pckg/Generic/View/frontend', ['content' => '<pckg-app data-frontend></pckg-app>']);
+            }
+
             return view($layout ?? $config->get('pckg.router.layout', 'layout'), ['content' => Vue::getLayout()]);
         })->data([
-                     'tags' => [
-                         'vue:route',
-                         'vue:route:template' => substr($component, 0, 1) !== '<'
-                             ? '<' . $component . '></' . $component . '>'
-                             : $component,
-                     ],
+                     'tags' => $tags ? array_merge($defaultTags, $tags) : $defaultTags,
             'method' => 'GET',
                  ]);
     }
diff --git a/src/Pckg/Framework/Provider/Framework.php b/src/Pckg/Framework/Provider/Framework.php
index 55afacf9..43406509 100644
--- a/src/Pckg/Framework/Provider/Framework.php
+++ b/src/Pckg/Framework/Provider/Framework.php
@@ -52,7 +52,7 @@ public function viewObjects()
             '_env'        => Environment::class,
             //'_lang'       => LangInterface::class,
             '_config'     => Config::class,
-            '_session'    => Session::class, // why is this commented out?
+            //'_session'    => Session::class, // why is this commented out?
             '_cookie'     => Cookie::class,
             // '_flash'      => Flash::class,
             '_debugBar'   => debugBar(),
diff --git a/src/Pckg/Framework/Request/Data/SessionDriver/FileDriver.php b/src/Pckg/Framework/Request/Data/SessionDriver/FileDriver.php
index bb876b82..2e029655 100644
--- a/src/Pckg/Framework/Request/Data/SessionDriver/FileDriver.php
+++ b/src/Pckg/Framework/Request/Data/SessionDriver/FileDriver.php
@@ -95,12 +95,14 @@ public function register()
 
     protected function startSession($SID = null, $PHPSESSID = null)
     {
+        $readAndClose = ($SID || $PHPSESSID) && in_array('session:close', router()->get('tags'));
+
         /**
          * Start a new session.
          */
         $started = session_start([
             'cookie_lifetime' => static::DURATION,
-            'read_and_close' => false,
+            'read_and_close' => $readAndClose,
         ]);
 
         if (!$started) {
diff --git a/src/Pckg/Framework/Response/Command/ProcessRouteMatch.php b/src/Pckg/Framework/Response/Command/ProcessRouteMatch.php
index b232bf9a..5bcf8794 100644
--- a/src/Pckg/Framework/Response/Command/ProcessRouteMatch.php
+++ b/src/Pckg/Framework/Response/Command/ProcessRouteMatch.php
@@ -70,6 +70,7 @@ public function execute()
 
                 $this->response->code(204)->respond();
             };
+
             if (is_only_callable($this->match['view'])) {
                 /**
                  * Simple action will take all requests - GET, POST, DELETE, ...
diff --git a/src/Pckg/Framework/Router.php b/src/Pckg/Framework/Router.php
index 206c4e22..32ee1cdd 100644
--- a/src/Pckg/Framework/Router.php
+++ b/src/Pckg/Framework/Router.php
@@ -407,12 +407,31 @@ protected function transformVueRoute($route, $prefix = '')
         $url = str_replace(['[', ']'], [':', ''], $url);
         $vueRoute = [
             'path' => $url,
+            'name' => $route['name'],
         ];
         if (array_key_exists('vue:route:redirect', $tags)) {
             $vueRoute['redirect'] = $prefix . $tags['vue:route:redirect'];
         }
-        if (array_key_exists('vue:route:template', $tags)) {
-            $vueRoute['component'] = ['template' => $tags['vue:route:template']];
+
+        /**
+         * When there's a layout, the layout should render the component.
+         */
+        $component = null;
+        foreach ($tags as $k => $v) {
+            if (strpos($v, 'layout:') === 0) {
+                if ($v === 'layout:frontend') {
+                    $component = '<route-layout></route-layout>';
+                } else {
+                    $component = substr($v, strlen('layout:'));
+                    $component = '<' . $component . '></' . $component . '>';
+                }
+                break;
+            }
+        }
+        if ($component) {
+            $vueRoute['component'] = ['name' => sluggify($component), 'template' => $component];
+        } else if (array_key_exists('vue:route:template', $tags)) {
+            $vueRoute['component'] = ['name' => sluggify($tags['vue:route:template']), 'template' => $tags['vue:route:template']];
         }
         if (array_key_exists('vue:route:children', $tags)) {
             $routes = $this->getRoutes();
diff --git a/src/Pckg/Framework/Router/Command/ResolveDependencies.php b/src/Pckg/Framework/Router/Command/ResolveDependencies.php
index ce4f065c..9cb5d0bb 100644
--- a/src/Pckg/Framework/Router/Command/ResolveDependencies.php
+++ b/src/Pckg/Framework/Router/Command/ResolveDependencies.php
@@ -42,7 +42,12 @@ public function execute()
         }
 
         foreach ($resolvers as $urlKey => $resolver) {
-            if (is_object($resolver)) {
+            if (is_only_callable($resolver)) {
+                /**
+                 * Callable was passed to optimize things.
+                 */
+                $realResolver = $resolver();
+            } else if (is_object($resolver)) {
                 /**
                  * Resolver was passed.
                  */
@@ -63,6 +68,10 @@ public function execute()
             $k = $data[$urlKey] ?? null;
             $resolved = $realResolver->resolve(urldecode($k));
 
+            /**
+             * Validate resolved value for access?
+             */
+
             if (is_string($urlKey)) {
                 $data[$urlKey] = $resolved;
             } else {

From 92d170d35122a4b0de6d0ac738bb6f7b0dfd2885 Mon Sep 17 00:00:00 2001
From: Bojan Rajh <schtr4jh@schtr4jh.net>
Date: Sun, 22 Nov 2020 22:31:12 +0100
Subject: [PATCH 02/66] Optimize session, backend layout

---
 .../Framework/Request/Data/SessionDriver/FileDriver.php   | 8 ++++++--
 src/Pckg/Framework/Router.php                             | 3 ++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/Pckg/Framework/Request/Data/SessionDriver/FileDriver.php b/src/Pckg/Framework/Request/Data/SessionDriver/FileDriver.php
index 2e029655..1578f209 100644
--- a/src/Pckg/Framework/Request/Data/SessionDriver/FileDriver.php
+++ b/src/Pckg/Framework/Request/Data/SessionDriver/FileDriver.php
@@ -95,7 +95,7 @@ public function register()
 
     protected function startSession($SID = null, $PHPSESSID = null)
     {
-        $readAndClose = ($SID || $PHPSESSID) && in_array('session:close', router()->get('tags'));
+        $readAndClose = ($SID || $PHPSESSID) && (in_array('session:close', router()->get('tags')) || (!get('lang') && !post()->all()));
 
         /**
          * Start a new session.
@@ -138,7 +138,11 @@ protected function startSession($SID = null, $PHPSESSID = null)
      */
     public function destroyCookieSession($message = null)
     {
-        session_destroy();
+        try {
+            session_destroy();
+        } catch (\Throwable $e) {
+            error_log(exception($e));
+        }
         $_SESSION = [];
         $PHPSESSIDSECURE = $this->startSession();
         //cookie()->set(static::PHPSESSID, null);
diff --git a/src/Pckg/Framework/Router.php b/src/Pckg/Framework/Router.php
index 32ee1cdd..44be150a 100644
--- a/src/Pckg/Framework/Router.php
+++ b/src/Pckg/Framework/Router.php
@@ -420,7 +420,8 @@ protected function transformVueRoute($route, $prefix = '')
         foreach ($tags as $k => $v) {
             if (strpos($v, 'layout:') === 0) {
                 if ($v === 'layout:frontend') {
-                    $component = '<route-layout></route-layout>';
+                    $component = '<pb-route-layout></pb-route-layout>';
+                } else if ($v === 'layout:backend') {
                 } else {
                     $component = substr($v, strlen('layout:'));
                     $component = '<' . $component . '></' . $component . '>';

From 93a55e5be1cbe75f92be427fb83acdbbbc01bbd4 Mon Sep 17 00:00:00 2001
From: Bojan Rajh <schtr4jh@schtr4jh.net>
Date: Tue, 24 Nov 2020 14:01:52 +0100
Subject: [PATCH 03/66] Component, vue tags, validate resolver

---
 src/Pckg/Framework/Helper/functions.php       | 24 ++++++++++++++++++
 .../Helper/PostValidationResolver.php         | 24 ++++++++++++++++++
 .../Response/Command/RunResponse.php          |  3 +++
 src/Pckg/Framework/Router.php                 | 25 +++++++++++++++++--
 .../Framework/Router/Command/ResolveRoute.php |  2 +-
 5 files changed, 75 insertions(+), 3 deletions(-)
 create mode 100644 src/Pckg/Framework/Provider/Helper/PostValidationResolver.php

diff --git a/src/Pckg/Framework/Helper/functions.php b/src/Pckg/Framework/Helper/functions.php
index 1d80e728..656bb047 100644
--- a/src/Pckg/Framework/Helper/functions.php
+++ b/src/Pckg/Framework/Helper/functions.php
@@ -14,6 +14,7 @@
 use Pckg\Framework\Response;
 use Pckg\Framework\Router;
 use Pckg\Framework\View\Twig;
+use Pckg\Generic\Service\Generic;
 use Pckg\Mail\Service\Mail\Handler\Queue as QueueMailHandler;
 use Pckg\Manager\Asset;
 use Pckg\Manager\Cache;
@@ -1258,6 +1259,29 @@ function routeGroup($data = [], $routes)
     }
 }
 
+if (!function_exists('component')) {
+    function component($component, array $params = [])
+    {
+        $build = '<' . $component . '';
+        $generic = null;
+        foreach ($params as $k => $v) {
+            if (substr($k, 0, 1) === ':') {
+                if (!$generic) {
+                    $generic = resolve(Generic::class);
+                }
+
+                $key = $generic->pushMetadata('router', substr($k, 1), $v);
+                $build .= ' ' . $k . '="' . $key . '"';
+            } else {
+                $build .= ' ' . $k . '="' . $v . '"';
+            }
+        }
+        $build .= '></' . $component . '>';
+
+        return $build;
+    }
+}
+
 if (!function_exists('price')) {
     function price($price, $currency = null)
     {
diff --git a/src/Pckg/Framework/Provider/Helper/PostValidationResolver.php b/src/Pckg/Framework/Provider/Helper/PostValidationResolver.php
new file mode 100644
index 00000000..6dd3f1df
--- /dev/null
+++ b/src/Pckg/Framework/Provider/Helper/PostValidationResolver.php
@@ -0,0 +1,24 @@
+<?php namespace Pckg\Framework\Provider\Helper;
+
+trait PostValidationResolver
+{
+    
+    protected $validator;
+
+    public function validator(callable $validator)
+    {
+        $this->validator = $validator;
+
+        return $this;
+    }
+
+    public function validate($resolved)
+    {
+        if ($this->validator) {
+            ($this->validator)($resolved);
+        }
+
+        return $resolved;
+    }
+
+}
\ No newline at end of file
diff --git a/src/Pckg/Framework/Response/Command/RunResponse.php b/src/Pckg/Framework/Response/Command/RunResponse.php
index 696d1784..02331554 100644
--- a/src/Pckg/Framework/Response/Command/RunResponse.php
+++ b/src/Pckg/Framework/Response/Command/RunResponse.php
@@ -6,6 +6,7 @@
 use Pckg\Framework\Request;
 use Pckg\Framework\Response;
 use Pckg\Framework\View\AbstractView;
+use Pckg\Generic\Service\Generic;
 
 class RunResponse extends AbstractChainOfReponsibility
 {
@@ -41,6 +42,8 @@ public function execute(callable $next)
             $response->setOutput($response->arrayToString([
                                                               'html' => $output,
                                                               'vue'  => $vue,
+                                                              'resolved' => router()->resolved(),
+                                                              'metadata' => resolve(Generic::class)->getMetadata(),
                                                           ]));
         } else if (is_bool($output)) {
             $response->setOutput($response->arrayToString(['success' => $output]));
diff --git a/src/Pckg/Framework/Router.php b/src/Pckg/Framework/Router.php
index 44be150a..fca95021 100644
--- a/src/Pckg/Framework/Router.php
+++ b/src/Pckg/Framework/Router.php
@@ -261,7 +261,9 @@ public function make($routeName = null, $arguments = [], $absolute = false, $env
                      * T00D00 - this needs to be resolved without proper index (find by class)
                      */
                     if (isset($args['[' . $key . ']']) && is_object($args['[' . $key . ']'])) {
-                        $realResolver = is_object($resolver) ? $resolver : resolve($resolver);
+                        $realResolver = is_only_callable($resolver) ? $resolver() : (is_object($resolver)
+                            ? $resolver
+                            : resolve($resolver));
                         $recordObject = $args['[' . $key . ']'];
                         $args['[' . $key . ']'] = $realResolver->parametrize($recordObject);
                         /**
@@ -429,11 +431,18 @@ protected function transformVueRoute($route, $prefix = '')
                 break;
             }
         }
+
+        /**
+         * VueJS.
+         */
         if ($component) {
             $vueRoute['component'] = ['name' => sluggify($component), 'template' => $component];
         } else if (array_key_exists('vue:route:template', $tags)) {
             $vueRoute['component'] = ['name' => sluggify($tags['vue:route:template']), 'template' => $tags['vue:route:template']];
+        } else {
+            //$vueRoute['component'] = 'pb-router-layout';
         }
+
         if (array_key_exists('vue:route:children', $tags)) {
             $routes = $this->getRoutes();
             $vueRoute['children'] = [];
@@ -451,7 +460,19 @@ protected function transformVueRoute($route, $prefix = '')
                 $vueRoute['children'][] = $childRoute;
             }
         }
-        $vueRoute['meta']['tags'] = $tags;
+
+        /**
+         * Frontend tags are objectized. ['vue:route', 't' => 'x'] becomes {'vue:route':true,'t':'x'}
+         */
+        $finalTags = new \stdClass();
+        foreach ($tags as $k => $v) {
+            if (is_numeric($k)) {
+                $finalTags->{$v} = true;
+            } else {
+                $finalTags->{$k} = $v;
+            }
+        }
+        $vueRoute['meta']['tags'] = $finalTags;
 
         return $vueRoute;
     }
diff --git a/src/Pckg/Framework/Router/Command/ResolveRoute.php b/src/Pckg/Framework/Router/Command/ResolveRoute.php
index 8b28c91e..3265b177 100644
--- a/src/Pckg/Framework/Router/Command/ResolveRoute.php
+++ b/src/Pckg/Framework/Router/Command/ResolveRoute.php
@@ -84,7 +84,7 @@ public function execute()
                     // validate method
                     if (isset($conf['method']) && !empty($conf['method']) && !in_array(
                             strtolower($_SERVER['REQUEST_METHOD']),
-                            explode("|", strtolower($conf['method']))
+                            explode("|", strtolower(is_array($conf['method']) ? implode('|', $conf['method']) : $conf['method']))
                         )
                     ) {
                         continue;

From 63980b7057a30477f186dbe90fc59d3a5d170779 Mon Sep 17 00:00:00 2001
From: Bojan Rajh <schtr4jh@schtr4jh.net>
Date: Fri, 27 Nov 2020 16:34:47 +0100
Subject: [PATCH 04/66] Update children

---
 src/Pckg/Framework/Helper/functions.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Pckg/Framework/Helper/functions.php b/src/Pckg/Framework/Helper/functions.php
index 8aa59217..8577d550 100644
--- a/src/Pckg/Framework/Helper/functions.php
+++ b/src/Pckg/Framework/Helper/functions.php
@@ -1240,9 +1240,9 @@ function vueRoute(string $route = '', string $component = null, array $tags = []
 
             return view($layout ?? $config->get('pckg.router.layout', 'layout'), ['content' => Vue::getLayout()]);
         })->data([
-                     'tags' => $tags ? array_merge($defaultTags, $tags) : $defaultTags,
+            'tags' => $tags ? array_merge($defaultTags, $tags) : $defaultTags,
             'method' => 'GET',
-                 ])->children($children);
+        ]);
     }
 }
 

From 24b63e7d03b21f2e562bc277d26a3f74c782e21b Mon Sep 17 00:00:00 2001
From: Bojan Rajh <schtr4jh@schtr4jh.net>
Date: Sun, 29 Nov 2020 15:09:06 +0100
Subject: [PATCH 05/66] Session lock, route child

---
 src/Pckg/Framework/Request/Data/SessionDriver/FileDriver.php | 2 +-
 src/Pckg/Framework/Router.php                                | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Pckg/Framework/Request/Data/SessionDriver/FileDriver.php b/src/Pckg/Framework/Request/Data/SessionDriver/FileDriver.php
index 1578f209..5ae30ea9 100644
--- a/src/Pckg/Framework/Request/Data/SessionDriver/FileDriver.php
+++ b/src/Pckg/Framework/Request/Data/SessionDriver/FileDriver.php
@@ -95,7 +95,7 @@ public function register()
 
     protected function startSession($SID = null, $PHPSESSID = null)
     {
-        $readAndClose = ($SID || $PHPSESSID) && (in_array('session:close', router()->get('tags')) || (!get('lang') && !post()->all()));
+        $readAndClose = ($SID || $PHPSESSID) && (in_array('session:close', router()->get('tags')) || (!get('lang') && !post()->all()) || request()->isSearch());
 
         /**
          * Start a new session.
diff --git a/src/Pckg/Framework/Router.php b/src/Pckg/Framework/Router.php
index 88db117a..8d9535da 100644
--- a/src/Pckg/Framework/Router.php
+++ b/src/Pckg/Framework/Router.php
@@ -502,6 +502,9 @@ public function getVueRoutes()
             if (!in_array('vue:route', $tags)) {
                 continue;
             }
+            if (in_array('vue:route:child', $tags)) {
+                continue;
+            }
             /**
              * Skip auth routes for non-auth users.
              */

From f895dacdd32197228228bea683645e8eb3dd019b Mon Sep 17 00:00:00 2001
From: Bojan Rajh <schtr4jh@schtr4jh.net>
Date: Sun, 24 Jan 2021 15:16:48 +0100
Subject: [PATCH 06/66] Skip child routes, ajax request

---
 src/Pckg/Framework/Helper/functions.php             | 7 +++++++
 src/Pckg/Framework/Response/Command/RunResponse.php | 2 +-
 src/Pckg/Framework/Router.php                       | 7 +++++--
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/Pckg/Framework/Helper/functions.php b/src/Pckg/Framework/Helper/functions.php
index 6348af37..25db4478 100644
--- a/src/Pckg/Framework/Helper/functions.php
+++ b/src/Pckg/Framework/Helper/functions.php
@@ -1238,14 +1238,21 @@ function vueRoute(string $route = '', string $component = null, array $tags = []
                 }
             }
 
+
             if ($isVue) {
                 /**
                  * We will parse Vue routes into the frontend layout.
                  * It is currently hardcoded to print <frontend-app></frontend-app> which prints header, body and others.
                  */
+                if (request()->isAjax()) {
+                    return '<pckg-app data-frontend></pckg-app>';
+                }
                 return view('Pckg/Generic/View/frontend', ['content' => '<pckg-app data-frontend></pckg-app>']);
             }
 
+            if (request()->isAjax()) {
+                return Vue::getLayout();
+            }
             return view($layout ?? $config->get('pckg.router.layout', 'layout'), ['content' => Vue::getLayout()]);
         })->data([
             'tags' => $tags ? array_merge($defaultTags, $tags) : $defaultTags,
diff --git a/src/Pckg/Framework/Response/Command/RunResponse.php b/src/Pckg/Framework/Response/Command/RunResponse.php
index 02331554..dde37988 100644
--- a/src/Pckg/Framework/Response/Command/RunResponse.php
+++ b/src/Pckg/Framework/Response/Command/RunResponse.php
@@ -37,7 +37,7 @@ public function execute(callable $next)
             $response->setOutput($response->arrayToString($output));
         } else if (is_object($output) && method_exists($output, '__toString')) {
             $response->setOutput((string)$output);
-        } else if (is_string($output) && $isAjax && get('html')) {
+        } else if (is_string($output) && $isAjax) {
             $vue = vueManager()->getViews();
             $response->setOutput($response->arrayToString([
                                                               'html' => $output,
diff --git a/src/Pckg/Framework/Router.php b/src/Pckg/Framework/Router.php
index 2f3332b8..d0fc7f1c 100644
--- a/src/Pckg/Framework/Router.php
+++ b/src/Pckg/Framework/Router.php
@@ -497,12 +497,15 @@ public function getVueRoutes()
             $firstRoute = $routeArr[0];
             $tags = $firstRoute['tags'] ?? [];
             /**
-             * Skip non-vue routes.
+             * Skip non-vue routes, and non-vue child routes
              */
             if (!in_array('vue:route', $tags)) {
                 continue;
             }
-            if (in_array('vue:route:child', $tags)) {
+            /**
+             * Why skip child routes?
+             */
+            if (false && in_array('vue:route:child', $tags)) {
                 continue;
             }
             /**

From c9f377954869fefb04901440594b4f503b322f62 Mon Sep 17 00:00:00 2001
From: Bojan Rajh <schtr4jh@schtr4jh.net>
Date: Sun, 24 Jan 2021 18:16:39 +0100
Subject: [PATCH 07/66] Vue route

---
 src/Pckg/Framework/Helper/functions.php | 15 ++++++++++++---
 src/Pckg/Framework/Router.php           |  6 ++++++
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/Pckg/Framework/Helper/functions.php b/src/Pckg/Framework/Helper/functions.php
index 25db4478..07c5e1c0 100644
--- a/src/Pckg/Framework/Helper/functions.php
+++ b/src/Pckg/Framework/Helper/functions.php
@@ -1212,6 +1212,12 @@ function route($route, $view, $controller = null)
 }
 
 if (!function_exists('vueRoute')) {
+    /**
+     * @param string $route
+     * @param string|null $component
+     * @param array $tags
+     * @return Router\Route\Route|Router\Route\VueRoute
+     */
     function vueRoute(string $route = '', string $component = null, array $tags = [])
     {
         $defaultTags = [
@@ -1221,12 +1227,12 @@ function vueRoute(string $route = '', string $component = null, array $tags = []
                 : $component,
         ];
 
-        return route($route, function() use ($tags) {
+        return (new Router\Route\VueRoute($route, function() use ($tags) {
             $config = config();
 
             $layout = null;
             $isVue = false;
-            foreach ($tags as $tag) {
+            foreach ($tags as $key => $tag) {
                 if (strpos($tag, 'layout:') === 0) {
                     if (strpos($tag, '-') === false) {
                         $layout = 'Pckg/Generic:' . substr($tag, strlen('layout:'));
@@ -1235,6 +1241,9 @@ function vueRoute(string $route = '', string $component = null, array $tags = []
                         $isVue = true;
                     }
                     break;
+                } elseif ($key === 'layout') {
+                    $layout = $tag;
+                    $isVue = true;
                 }
             }
 
@@ -1254,7 +1263,7 @@ function vueRoute(string $route = '', string $component = null, array $tags = []
                 return Vue::getLayout();
             }
             return view($layout ?? $config->get('pckg.router.layout', 'layout'), ['content' => Vue::getLayout()]);
-        })->data([
+        }))->data([
             'tags' => $tags ? array_merge($defaultTags, $tags) : $defaultTags,
             'method' => 'GET',
         ]);
diff --git a/src/Pckg/Framework/Router.php b/src/Pckg/Framework/Router.php
index d0fc7f1c..add91bc5 100644
--- a/src/Pckg/Framework/Router.php
+++ b/src/Pckg/Framework/Router.php
@@ -420,6 +420,12 @@ protected function transformVueRoute($route, $prefix = '')
          */
         $component = null;
         foreach ($tags as $k => $v) {
+            if (!is_string($v)) {
+                continue;
+            }
+            if ($k === 'layout') {
+                $component = '<' . $v . '></' . $v . '>';
+            }
             if (strpos($v, 'layout:') === 0) {
                 if ($v === 'layout:frontend') {
                     $component = '<pb-route-layout></pb-route-layout>';

From cb76312cb4167ba8a5babcb5d100cecb4ce531f3 Mon Sep 17 00:00:00 2001
From: Bojan Rajh <schtr4jh@schtr4jh.net>
Date: Tue, 26 Jan 2021 10:56:04 +0100
Subject: [PATCH 08/66] FW

---
 .../Framework/Console/Command/InitEnv.php     | 63 +++++++++++++++++++
 .../Framework/Console/Command/InitProject.php | 16 ++++-
 2 files changed, 76 insertions(+), 3 deletions(-)
 create mode 100644 src/Pckg/Framework/Console/Command/InitEnv.php

diff --git a/src/Pckg/Framework/Console/Command/InitEnv.php b/src/Pckg/Framework/Console/Command/InitEnv.php
new file mode 100644
index 00000000..2d265aee
--- /dev/null
+++ b/src/Pckg/Framework/Console/Command/InitEnv.php
@@ -0,0 +1,63 @@
+<?php namespace Pckg\Framework\Console\Command;
+
+use Pckg\Framework\Console\Command;
+use Symfony\Component\Console\Input\InputArgument;
+
+class InitEnv extends Command
+{
+
+    public function createFiles()
+    {
+        foreach ($this->files() as $file => $content) {
+            if (!is_file($file)) {
+                $this->output('Creating file ' . $file);
+                file_put_contents(path('root') . $file, $content);
+            } else {
+                $this->output('File ' . $file . ' already exists');
+            }
+        }
+    }
+
+    public function copyConfigs()
+    {
+        $files = [
+            'codeception.sample.yml'                 => 'codeception.yml',
+            '.env.example' => '.env',
+        ];
+
+        if ($app = $this->option('app')) {
+            $path = 'app' . path('ds') . $app . path('ds') . 'config' . path('ds');
+            // $files[$path . 'env.sample.php'] = $path . 'env.php';
+        }
+
+        foreach ($files as $original => $copy) {
+            if (is_file(path('root') . $original)) {
+                if (!is_file(path('root') . $copy)) {
+                    $this->output('Copying ' . $original . ' => ' . $copy);
+                    file_put_contents(path('root') . $copy, file_get_contents(path('root') . $original));
+                    $this->output('Copied!');
+                } else {
+                    $this->output('File ' . $copy . ' already exists.');
+                }
+            } else {
+                $this->output('Original file ' . $original . ' does not exist.');
+            }
+        }
+    }
+
+    public function handle()
+    {
+        $this->createDirs();
+        $this->createSymlinks();
+        $this->createFiles();
+        $this->copyConfigs();
+    }
+
+    protected function configure()
+    {
+        $this->setName('project:init')
+             ->setDescription('Initialize project (create required directories and configs)')
+             ->addOption('app', 'app', InputArgument::OPTIONAL, 'Init app structure and configs');
+    }
+
+}
diff --git a/src/Pckg/Framework/Console/Command/InitProject.php b/src/Pckg/Framework/Console/Command/InitProject.php
index d00ea76e..3f69c4f3 100644
--- a/src/Pckg/Framework/Console/Command/InitProject.php
+++ b/src/Pckg/Framework/Console/Command/InitProject.php
@@ -38,7 +38,7 @@ public function dirs()
     public function files()
     {
         return [
-            'pckg.json' => '[]',
+            // 'pckg.json' => '[]',
         ];
     }
 
@@ -80,9 +80,18 @@ public function createFiles()
 
     public function copyConfigs()
     {
+        $env = $this->option('env', 'docker');
         $files = [
-            'codeception.sample.yml'                 => 'codeception.yml',
+            'codeception.sample.yml' => 'codeception.yml',
+            '.env.' . $env => '.env',
             '.env.example' => '.env',
+            '.env.database.' . $env => '.env.database',
+            '.env.redis.' . $env => '.env.redis',
+            '.env.queue.' . $env => '.env.queue',
+            '.env.rabbit.' . $env => '.env.rabbit',
+            '.env.cache.' . $env => '.env.cache',
+            '.env.web.' . $env => '.env.web',
+            '.env.www.' . $env => '.env.www',
         ];
 
         if ($app = $this->option('app')) {
@@ -117,7 +126,8 @@ protected function configure()
     {
         $this->setName('project:init')
              ->setDescription('Initialize project (create required directories and configs)')
-             ->addOption('app', 'app', InputArgument::OPTIONAL, 'Init app structure and configs');
+             ->addOption('app', 'app', InputArgument::OPTIONAL, 'Init app structure and configs')
+             ->addOption('env', 'env', InputArgument::OPTIONAL, 'Default = docker');
     }
 
 }

From d4d54b563249dfebe402e577a147e395ffeafa6f Mon Sep 17 00:00:00 2001
From: Bojan Rajh <schtr4jh@schtr4jh.net>
Date: Fri, 26 Feb 2021 20:10:18 +0100
Subject: [PATCH 09/66] Support children

---
 src/Pckg/Framework/Helper/functions.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Pckg/Framework/Helper/functions.php b/src/Pckg/Framework/Helper/functions.php
index f22ae9fa..532c129a 100644
--- a/src/Pckg/Framework/Helper/functions.php
+++ b/src/Pckg/Framework/Helper/functions.php
@@ -1221,7 +1221,7 @@ function route($route, $view, $controller = null)
      * @param array $tags
      * @return Router\Route\Route|Router\Route\VueRoute
      */
-    function vueRoute(string $route = '', string $component = null, array $tags = [])
+    function vueRoute(string $route = '', string $component = null, array $tags = [], array $children = [])
     {
         $defaultTags = [
             'vue:route',
@@ -1269,7 +1269,7 @@ function vueRoute(string $route = '', string $component = null, array $tags = []
         }))->data([
             'tags' => $tags ? array_merge($defaultTags, $tags) : $defaultTags,
             'method' => 'GET',
-        ]);
+        ])->children($children);
     }
 }
 

From 6162b18b9ea9ad62586054d783e9801d21a7f80e Mon Sep 17 00:00:00 2001
From: Bojan Rajh <schtr4jh@schtr4jh.net>
Date: Fri, 26 Feb 2021 20:11:36 +0100
Subject: [PATCH 10/66] Add param

---
 src/Pckg/Framework/Helper/functions.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Pckg/Framework/Helper/functions.php b/src/Pckg/Framework/Helper/functions.php
index 532c129a..83d1f4c4 100644
--- a/src/Pckg/Framework/Helper/functions.php
+++ b/src/Pckg/Framework/Helper/functions.php
@@ -1219,6 +1219,7 @@ function route($route, $view, $controller = null)
      * @param string $route
      * @param string|null $component
      * @param array $tags
+     * @param array $children
      * @return Router\Route\Route|Router\Route\VueRoute
      */
     function vueRoute(string $route = '', string $component = null, array $tags = [], array $children = [])

From 205ea1144a2dc2310542b0bcba6c240700749ff3 Mon Sep 17 00:00:00 2001
From: Bojan Rajh <schtr4jh@schtr4jh.net>
Date: Sat, 27 Feb 2021 11:47:34 +0100
Subject: [PATCH 11/66] Change route

---
 .../Framework/Response/Afterware/EncapsulateResponse.php    | 6 +++++-
 src/Pckg/Framework/Response/Command/ProcessRouteMatch.php   | 2 +-
 src/Pckg/Framework/Router.php                               | 6 +++---
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/Pckg/Framework/Response/Afterware/EncapsulateResponse.php b/src/Pckg/Framework/Response/Afterware/EncapsulateResponse.php
index cbd02d68..032c9eb2 100644
--- a/src/Pckg/Framework/Response/Afterware/EncapsulateResponse.php
+++ b/src/Pckg/Framework/Response/Afterware/EncapsulateResponse.php
@@ -18,7 +18,11 @@ public function execute(callable $next)
         $router = router();
         $tags = $router->get('tags');
 
-        if (!in_array('layout:frontend', $tags)) {
+        /**
+         * Why only encapsulate frontend?
+         * Disabled.
+         */
+        if (false && !in_array('layout:frontend', $tags)) {
             return $next();
         }
 
diff --git a/src/Pckg/Framework/Response/Command/ProcessRouteMatch.php b/src/Pckg/Framework/Response/Command/ProcessRouteMatch.php
index cfe70f01..9b2a048a 100644
--- a/src/Pckg/Framework/Response/Command/ProcessRouteMatch.php
+++ b/src/Pckg/Framework/Response/Command/ProcessRouteMatch.php
@@ -213,4 +213,4 @@ public function parseView($viewData)
 
         throw new Exception("View is unknown type " . (is_object($viewData) ? get_class($viewData) : ''));
     }
-}
\ No newline at end of file
+}
diff --git a/src/Pckg/Framework/Router.php b/src/Pckg/Framework/Router.php
index 244509f4..3d6cb7c1 100644
--- a/src/Pckg/Framework/Router.php
+++ b/src/Pckg/Framework/Router.php
@@ -435,9 +435,9 @@ protected function transformVueRoute($route, $prefix = '')
             }
             if (strpos($v, 'layout:') === 0) {
                 if ($v === 'layout:frontend') {
-                    $component = '<pb-route-layout></pb-route-layout>';
+                    //$component = '<pb-route-layout></pb-route-layout>';
                 } else if ($v === 'layout:backend') {
-                } else {
+                } else { // focused? blank?
                     $component = substr($v, strlen('layout:'));
                     $component = '<' . $component . '></' . $component . '>';
                 }
@@ -543,7 +543,7 @@ public function getVueRoutes()
         }
         return $vueRoutes;
     }
-    
+
     public function mock(callable $task)
     {
         return context()->mock(new Router(config()), $task);

From 286fb4bb24b02acaba195764a38d304039e61ed1 Mon Sep 17 00:00:00 2001
From: Bojan Rajh <schtr4jh@schtr4jh.net>
Date: Sat, 27 Feb 2021 16:20:51 +0100
Subject: [PATCH 12/66] Dont auto close

---
 src/Pckg/Framework/Request/Data/SessionDriver/FileDriver.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Pckg/Framework/Request/Data/SessionDriver/FileDriver.php b/src/Pckg/Framework/Request/Data/SessionDriver/FileDriver.php
index e5d5852b..fbd3a058 100644
--- a/src/Pckg/Framework/Request/Data/SessionDriver/FileDriver.php
+++ b/src/Pckg/Framework/Request/Data/SessionDriver/FileDriver.php
@@ -100,6 +100,7 @@ public function register()
     protected function startSession($SID = null, $PHPSESSID = null)
     {
         $readAndClose = ($SID || $PHPSESSID) && (in_array('session:close', router()->get('tags')) || (!get('lang') && !post()->all()) || request()->isSearch());
+        $readAndClose = false;
 
         /**
          * Start a new session.
@@ -157,4 +158,4 @@ public function destroyCookieSession($message = null)
 
         return $PHPSESSIDSECURE;
     }
-}
\ No newline at end of file
+}

From fd3afa8aab4710bc3d5f6b669b4eb760c6009b76 Mon Sep 17 00:00:00 2001
From: Bojan Rajh <schtr4jh@schtr4jh.net>
Date: Sun, 28 Feb 2021 12:52:17 +0100
Subject: [PATCH 13/66] More vueify

---
 src/Pckg/Framework/Helper/functions.php                  | 9 ++++++++-
 src/Pckg/Framework/Middleware/ShowNiceErrorPage.php      | 4 +++-
 src/Pckg/Framework/Request/Command/InitRequest.php       | 4 ++--
 .../Framework/Response/Command/ProcessRouteMatch.php     | 2 +-
 src/Pckg/Framework/Router/Command/ResolveRoute.php       | 4 ++--
 src/Pckg/Framework/View/Twig.php                         | 6 +++++-
 6 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/src/Pckg/Framework/Helper/functions.php b/src/Pckg/Framework/Helper/functions.php
index 83d1f4c4..faa4699d 100644
--- a/src/Pckg/Framework/Helper/functions.php
+++ b/src/Pckg/Framework/Helper/functions.php
@@ -1251,15 +1251,22 @@ function vueRoute(string $route = '', string $component = null, array $tags = []
                 }
             }
 
+            // safe already?
+            $isVue = true;
 
             if ($isVue) {
                 /**
                  * We will parse Vue routes into the frontend layout.
                  * It is currently hardcoded to print <frontend-app></frontend-app> which prints header, body and others.
                  */
-                if (request()->isAjax()) {
+                if (true || request()->isAjax()) {
+                    // why is ajax different?
                     return '<pckg-app data-frontend></pckg-app>';
                 }
+                /**
+                 * What about other layouts?
+                 * Shouldn't we leave this to Afterware?
+                 */
                 return view('Pckg/Generic/View/frontend', ['content' => '<pckg-app data-frontend></pckg-app>']);
             }
 
diff --git a/src/Pckg/Framework/Middleware/ShowNiceErrorPage.php b/src/Pckg/Framework/Middleware/ShowNiceErrorPage.php
index 4123e602..d0bd5a2c 100644
--- a/src/Pckg/Framework/Middleware/ShowNiceErrorPage.php
+++ b/src/Pckg/Framework/Middleware/ShowNiceErrorPage.php
@@ -27,7 +27,9 @@ public function handle()
     public function handlePartial()
     {
         try {
-            $output = view('Pckg/Framework:error/_partial');
+            $output = view('Pckg/Framework:error/default', [
+                'extends' => 'Pckg/Generic/View/error.twig',
+            ]);
         } catch (Throwable $e) {
             if (dev()) {
                 throw $e;
diff --git a/src/Pckg/Framework/Request/Command/InitRequest.php b/src/Pckg/Framework/Request/Command/InitRequest.php
index bf22f258..87329786 100644
--- a/src/Pckg/Framework/Request/Command/InitRequest.php
+++ b/src/Pckg/Framework/Request/Command/InitRequest.php
@@ -72,8 +72,8 @@ public function execute(callable $next)
                     return (new ShowNiceErrorPage())->handlePartial();
                 },
                 'tags'      => ['layout:frontend'],
-                'name'      => null,
-                'url'       => null,
+                'name'      => 'error',
+                'url'       => '/#error',
                 'method'    => 'GET',
                 'resolvers' => [],
             ];
diff --git a/src/Pckg/Framework/Response/Command/ProcessRouteMatch.php b/src/Pckg/Framework/Response/Command/ProcessRouteMatch.php
index 9b2a048a..d6071778 100644
--- a/src/Pckg/Framework/Response/Command/ProcessRouteMatch.php
+++ b/src/Pckg/Framework/Response/Command/ProcessRouteMatch.php
@@ -114,7 +114,7 @@ public function execute()
             if (!$this->response->hasResponded()) {
                 $dispatcher->trigger(ProcessRouteMatch::class . '.ran');
                 $output = $this->parseView($response);
-
+                
                 $this->response->setOutput($output);
             }
 
diff --git a/src/Pckg/Framework/Router/Command/ResolveRoute.php b/src/Pckg/Framework/Router/Command/ResolveRoute.php
index 96561580..9d71ba0d 100644
--- a/src/Pckg/Framework/Router/Command/ResolveRoute.php
+++ b/src/Pckg/Framework/Router/Command/ResolveRoute.php
@@ -43,7 +43,7 @@ public function execute()
                     }
 
                     /**
-                     * @deprecated 
+                     * @deprecated
                      */
                     if (isset($route['secure']) && is_only_callable($route['secure']) && !$route['secure']()) {
                         break;
@@ -204,4 +204,4 @@ public function execute()
 
         return $match;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Pckg/Framework/View/Twig.php b/src/Pckg/Framework/View/Twig.php
index 80b3edf2..402b3b0c 100644
--- a/src/Pckg/Framework/View/Twig.php
+++ b/src/Pckg/Framework/View/Twig.php
@@ -117,7 +117,11 @@ public function autoparse()
         trigger(View::class . '.loading', ['view' => $this->file, 'twig' => $this]);
 
         if ($this->file) {
-            $this->twig = $this->twig->loadTemplate($this->file . ".twig");
+            if (strpos($this->file, '<') === false) {
+                $this->twig = $this->twig->loadTemplate($this->file . ".twig");
+            } else {
+                $this->twig = $this->twig->createTemplate($this->file);
+            }
         } else {
             $this->twig = $this->twig->createTemplate($this->template);
         }

From 0a16408d57c5a96ab4a0bf27b6612e0d2b207221 Mon Sep 17 00:00:00 2001
From: Bojan Rajh <schtr4jh@schtr4jh.net>
Date: Tue, 2 Mar 2021 15:43:31 +0100
Subject: [PATCH 14/66] Fix child routes

---
 src/Pckg/Framework/Router/Route/VueRoute.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/Pckg/Framework/Router/Route/VueRoute.php b/src/Pckg/Framework/Router/Route/VueRoute.php
index bc75f512..9286032b 100644
--- a/src/Pckg/Framework/Router/Route/VueRoute.php
+++ b/src/Pckg/Framework/Router/Route/VueRoute.php
@@ -18,9 +18,15 @@ public function register($parentData)
     {
         $vueChildRoutes = [];
         if ($this->children) {
-            $vueChildRoutes = collect(array_keys($this->children))->map(function ($name) {
-                return $this->name . '.' . $name;
-            })->values();
+            $vueChildRoutes = collect($this->children)
+                ->realReduce(function (VueRoute $vueRoute, $name, $reduce) {
+                    $reduce[] = $this->name . '.' . trim($name, '.');
+                    $reduce = collect($vueRoute->children)->realReduce(function (VueRoute $vueRoute, $subname, $reduce) use ($name) {
+                        $reduce[] = $this->name . '.' . trim($name, '.') . '.' . trim($subname, '.');
+                        return $reduce;
+                    }, $reduce);
+                    return $reduce;
+                }, []);
             $this->data['tags']['vue:route:children'] = $vueChildRoutes;
         }
 

From 2685385a80f200341809d9d16d5bb6d5de0f5269 Mon Sep 17 00:00:00 2001
From: Bojan Rajh <schtr4jh@schtr4jh.net>
Date: Sat, 6 Mar 2021 13:07:21 +0100
Subject: [PATCH 15/66] Allow different twig version

---
 composer.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 97b8786d..69938177 100644
--- a/composer.json
+++ b/composer.json
@@ -14,7 +14,7 @@
     "pckg/database": "dev-master",
     "pckg/cache": "dev-master",
     "pckg/locale": "dev-master",
-    "twig/twig": "1.*",
+    "twig/twig": ">=1 <=2",
     "josegonzalez/dotenv": "dev-master",
     "rollbar/rollbar": "2.*",
     "fzaninotto/faker": "1.*",
@@ -68,4 +68,4 @@
   },
   "minimum-stability": "dev",
   "prefer-stable": true
-}
\ No newline at end of file
+}

From 682cb990bda3f74cf361e1996239b2e76faf6af8 Mon Sep 17 00:00:00 2001
From: Bojan Rajh <schtr4jh@schtr4jh.net>
Date: Tue, 6 Apr 2021 16:24:18 +0200
Subject: [PATCH 16/66] Simplify vue, refactor output parsing, multi-resolve

---
 src/Pckg/Framework/Helper/functions.php       | 64 +++++------------
 .../Framework/Provider/ResolvesMultiple.php   |  8 +++
 .../Framework/Reflect/FrameworkResolver.php   |  8 +--
 .../Framework/Request/Command/RunRequest.php  |  2 +-
 src/Pckg/Framework/Response.php               | 38 ++++++++++
 .../Response/Command/ProcessRouteMatch.php    | 71 +++++++------------
 .../Response/Command/RunResponse.php          |  2 +-
 .../Router/Command/ResolveDependencies.php    | 24 +++----
 8 files changed, 103 insertions(+), 114 deletions(-)
 create mode 100644 src/Pckg/Framework/Provider/ResolvesMultiple.php

diff --git a/src/Pckg/Framework/Helper/functions.php b/src/Pckg/Framework/Helper/functions.php
index 06c006e5..acabaebb 100644
--- a/src/Pckg/Framework/Helper/functions.php
+++ b/src/Pckg/Framework/Helper/functions.php
@@ -1226,57 +1226,22 @@ function vueRoute(string $route = '', string $component = null, array $tags = []
     {
         $defaultTags = [
             'vue:route',
-            'vue:route:template' => substr($component, 0, 1) !== '<'
-                ? '<' . $component . '></' . $component . '>'
-                : $component,
         ];
 
-        return (new Router\Route\VueRoute($route, function() use ($tags) {
-            $config = config();
-
-            $layout = null;
-            $isVue = false;
-            foreach ($tags as $key => $tag) {
-                if (strpos($tag, 'layout:') === 0) {
-                    if (strpos($tag, '-') === false) {
-                        $layout = 'Pckg/Generic:' . substr($tag, strlen('layout:'));
-                    } else {
-                        $layout = substr($tag, strlen('layout:'));
-                        $isVue = true;
-                    }
-                    break;
-                } elseif ($key === 'layout') {
-                    $layout = $tag;
-                    $isVue = true;
-                }
-            }
-
-            // safe already?
-            $isVue = true;
-
-            if ($isVue) {
-                /**
-                 * We will parse Vue routes into the frontend layout.
-                 * It is currently hardcoded to print <frontend-app></frontend-app> which prints header, body and others.
-                 */
-                if (true || request()->isAjax()) {
-                    // why is ajax different?
-                    return '<pckg-app data-frontend></pckg-app>';
-                }
-                /**
-                 * What about other layouts?
-                 * Shouldn't we leave this to Afterware?
-                 */
-                return view('Pckg/Generic/View/frontend', ['content' => '<pckg-app data-frontend></pckg-app>']);
-            }
+        /**
+         * Build the component.
+         */
+        if ($component) {
+            $defaultTags['vue:route:template'] = substr($component, 0, 1) !== '<'
+                ? '<' . $component . '></' . $component . '>'
+                : $component;
+        }
 
-            if (request()->isAjax()) {
-                return Vue::getLayout();
-            }
-            return view($layout ?? $config->get('pckg.router.layout', 'layout'), ['content' => Vue::getLayout()]);
+        return (new Router\Route\VueRoute($route, function () use ($tags, $defaultTags) {
+            return $defaultTags['vue:route:template'] ?? Vue::getLayout();
         }))->data([
             'tags' => $tags ? array_merge($defaultTags, $tags) : $defaultTags,
-            'method' => 'GET',
+            'method' => 'GET', // what happens on other methods?
         ])->children($children);
     }
 }
@@ -1305,7 +1270,12 @@ function component($component, array $params = [])
                     $generic = resolve(Generic::class);
                 }
 
-                $key = $generic->pushMetadata('router', substr($k, 1), $v);
+                $store = true;
+                if (is_string($v) && substr($v, 0, 1) === '$') {
+                    $key = '$store.state.generic.metadata.router[' . json_encode(substr($k, 1)) . ']';
+                } else {
+                    $key = $generic->pushMetadata('router', substr($k, 1), $v, $store);
+                }
                 $build .= ' ' . $k . '="' . $key . '"';
             } else {
                 $build .= ' ' . $k . '="' . $v . '"';
diff --git a/src/Pckg/Framework/Provider/ResolvesMultiple.php b/src/Pckg/Framework/Provider/ResolvesMultiple.php
new file mode 100644
index 00000000..9d406f35
--- /dev/null
+++ b/src/Pckg/Framework/Provider/ResolvesMultiple.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Pckg\Framework\Provider;
+
+interface ResolvesMultiple
+{
+    
+}
diff --git a/src/Pckg/Framework/Reflect/FrameworkResolver.php b/src/Pckg/Framework/Reflect/FrameworkResolver.php
index 6ce886aa..890bd520 100644
--- a/src/Pckg/Framework/Reflect/FrameworkResolver.php
+++ b/src/Pckg/Framework/Reflect/FrameworkResolver.php
@@ -59,7 +59,7 @@ public function canResolve($class)
         return false;
     }
 
-    public function resolve($class)
+    public function resolve($class, $data = [])
     {
         if (!class_exists($class) && !interface_exists($class)) {
             return false;
@@ -89,7 +89,7 @@ public function resolve($class)
         if (class_exists($class)) {
             if (in_array($class, static::$singletones)) {
                 $mockedClass = config('pckg.reflect.singletones.' . $class, $class);
-                $newInstance = Reflect::create($mockedClass);
+                $newInstance = Reflect::create($mockedClass, $data);
 
                 context()->bind($class, $newInstance);
 
@@ -98,7 +98,7 @@ public function resolve($class)
 
             foreach (static::$parents as $parent) {
                 if (in_array($parent, class_parents($class))) {
-                    $newInstance = Reflect::create($class);
+                    $newInstance = Reflect::create($class, $data);
                     context()->bind($class, $newInstance);
 
                     return $newInstance;
@@ -109,7 +109,7 @@ public function resolve($class)
         if (interface_exists($class)) {
             foreach (static::$singletones as $s) {
                 if (object_implements($s, $class)) {
-                    $newInstance = Reflect::create($s);
+                    $newInstance = Reflect::create($s, $data);
                     context()->bind($class, $newInstance);
 
                     return $newInstance;
diff --git a/src/Pckg/Framework/Request/Command/RunRequest.php b/src/Pckg/Framework/Request/Command/RunRequest.php
index 8026753d..3f75cd50 100644
--- a/src/Pckg/Framework/Request/Command/RunRequest.php
+++ b/src/Pckg/Framework/Request/Command/RunRequest.php
@@ -21,7 +21,7 @@ public function execute(callable $next)
     {
         trigger(Request::class . '.running', [$this->request]);
 
-        Reflect::create(ProcessRouteMatch::class, ['match' => $this->request->getMatch()])->execute();
+        Reflect::create(ProcessRouteMatch::class)->execute();
 
         trigger(Request::class . '.ran', [$this->request]);
 
diff --git a/src/Pckg/Framework/Response.php b/src/Pckg/Framework/Response.php
index ffb61911..09222a91 100644
--- a/src/Pckg/Framework/Response.php
+++ b/src/Pckg/Framework/Response.php
@@ -2,12 +2,14 @@
 
 namespace Pckg\Framework;
 
+use Pckg\Collection;
 use Pckg\Framework\Request\Data\Flash;
 use Pckg\Framework\Request\Data\Session;
 use Pckg\Framework\Request\Message;
 use Pckg\Framework\Response\Command\RunResponse;
 use Pckg\Framework\Response\Exceptions;
 use Pckg\Framework\Router\URL;
+use Pckg\Framework\View\ViewInterface;
 use Psr\Http\Message\ResponseInterface;
 use Throwable;
 
@@ -140,6 +142,42 @@ public function getOutput()
         return $this->output;
     }
 
+    public function reparseOutput()
+    {
+        $this->output = $this->parseOutput();
+
+        return $this;
+    }
+
+    public function parseOutput()
+    {
+        if (is_string($this->output) || is_array($this->output)) {
+            // print view as content
+            return $this->output;
+        } else if (is_object($this->output)) {
+            if ($this->output instanceof ViewInterface) {
+                // parse layout into view
+                return $this->output->autoparse();
+            } else if ($this->output instanceof Collection) {
+                // convert to array
+                return $this->output->toArray();
+            } else if (method_exists($this->output, '__toString')) {
+                return (string)$this->output;
+            } else if ($this->output instanceof \stdClass) {
+                return json_encode($this->output);
+            } else if ($this->output instanceof Response) {
+                $this->output = $this->output->getOutput();
+
+                return $this->parseOutput();
+            }
+        } else if (is_null($this->output) || is_int($this->output) || is_bool($this->output)) {
+            // without view // no int? or bool?
+            return json_encode($this->output);
+        }
+
+        throw new Exception("Output is unknown type " . (is_object($this->output) ? get_class($this->output) : ''));
+    }
+
     private function getMinusUrl()
     {
         if (isset($_SERVER['HTTP_REFERER'])) {
diff --git a/src/Pckg/Framework/Response/Command/ProcessRouteMatch.php b/src/Pckg/Framework/Response/Command/ProcessRouteMatch.php
index 06799bf6..65bdac06 100644
--- a/src/Pckg/Framework/Response/Command/ProcessRouteMatch.php
+++ b/src/Pckg/Framework/Response/Command/ProcessRouteMatch.php
@@ -9,6 +9,7 @@
 use Pckg\Framework\Exception\Bad;
 use Pckg\Framework\Exception\NotFound;
 use Pckg\Framework\Exception\Unauthorized;
+use Pckg\Framework\Request;
 use Pckg\Framework\Response;
 use Pckg\Framework\Response\Exception\TheEnd;
 use Pckg\Framework\Router\Command\ResolveDependencies;
@@ -18,19 +19,15 @@
 class ProcessRouteMatch extends AbstractChainOfReponsibility
 {
 
-    protected $match;
-
-    protected $view;
-
     protected $controller;
 
     protected $response;
 
     protected $loadView;
 
-    public function __construct($match, Response $response, LoadView $loadView)
+    public function __construct(LoadView $loadView, Request $request, Response $response)
     {
-        $this->match = $match;
+        $this->request = $request;
         $this->response = $response;
         $this->loadView = $loadView;
     }
@@ -39,6 +36,11 @@ public function execute()
     {
         $e = null;
         try {
+            /**
+             * Get defaults.
+             */
+            $match = $this->request->getMatch();
+
             /**
              * Apply global middlewares.
              */
@@ -51,8 +53,8 @@ public function execute()
             /**
              * Apply route middlewares.
              */
-            if (isset($this->match['middlewares'])) {
-                chain($this->match['middlewares'], 'execute');
+            if (isset($match['middlewares'])) {
+                chain($match['middlewares'], 'execute');
             }
 
             /**
@@ -73,22 +75,23 @@ public function execute()
                 $this->response->code(204)->respond();
             };
 
-            if (is_only_callable($this->match['view'])) {
+            if (is_only_callable($match['view'])) {
                 /**
                  * Simple action will take all requests - GET, POST, DELETE, ...
                  */
                 $processOptions();
-                $response = Reflect::call($this->match['view'], $resolved);
-            } elseif (array_key_exists('controller', $this->match)) {
+                $response = Reflect::call($match['view'], $resolved);
+                $this->response->setOutput($response);
+            } elseif (array_key_exists('controller', $match)) {
                 /**
                  * Create controller object.
                  */
-                $this->controller = Reflect::create($this->match['controller']);
+                $this->controller = Reflect::create($match['controller']);
 
                 /**
                  * Check for OPTIONS.
                  */
-                $method = strtolower(request()->header('Access-Control-Request-Method')) . ucfirst($this->match['view']) . 'Action';
+                $method = strtolower(request()->header('Access-Control-Request-Method')) . ucfirst($match['view']) . 'Action';
                 if (method_exists($this->controller, $method)) {
                     $processOptions();
                 } elseif ($isOptionsRequest) {
@@ -99,23 +102,24 @@ public function execute()
                  * Get main action response.
                  * This is where Resolvers may already Respond with final response.
                  */
-                $response = $this->loadView->set($this->match['view'], $resolved, $this->controller)->execute();
+                $response = $this->loadView->set($match['view'], $resolved, $this->controller)->execute();
+                $this->response->setOutput($response);
             } else {
                 /**
                  * Vue route or similar?
                  */
                 $processOptions();
-                $response = $this->match['view'];
+                $response = $match['view'];
+                $this->response->setOutput($response);
             }
 
             /**
              * Trigger an event on successful response.
+             * Transform output to string or array.
              */
             if (!$this->response->hasResponded()) {
                 $dispatcher->trigger(ProcessRouteMatch::class . '.ran');
-                $output = $this->parseView($response);
-                
-                $this->response->setOutput($output);
+                $this->response->reparseOutput();
             }
 
             /**
@@ -129,8 +133,8 @@ public function execute()
             /**
              * Apply route afterwares/decorators.
              */
-            if (isset($this->match['afterwares'])) {
-                chain($this->match['afterwares'], 'execute', [$this->response]);
+            if (isset($match['afterwares'])) {
+                chain($match['afterwares'], 'execute', [$this->response]);
             }
         } catch (TheEnd $e) {
             /**
@@ -186,31 +190,4 @@ public function execute()
             throw $e;
         }
     }
-
-    public function parseView($viewData)
-    {
-        if (is_object($viewData)) {
-            if ($viewData instanceof ViewInterface) {
-                // parse layout into view
-                return $viewData->autoparse();
-            } else if ($viewData instanceof Collection) {
-                // convert to array
-                return $viewData->toArray();
-            } else if (method_exists($viewData, '__toString')) {
-                return (string)$viewData;
-            } else if ($viewData instanceof \stdClass) {
-                return json_encode($viewData);
-            } else if ($viewData instanceof Response) {
-                return $this->parseView($viewData->getOutput());
-            }
-        } else if (is_string($viewData) || is_array($viewData)) {
-            // print view as content
-            return $viewData;
-        } else if (is_null($viewData) || is_int($viewData) || is_bool($viewData)) {
-            // without view
-            return null;
-        }
-
-        throw new Exception("View is unknown type " . (is_object($viewData) ? get_class($viewData) : ''));
-    }
 }
diff --git a/src/Pckg/Framework/Response/Command/RunResponse.php b/src/Pckg/Framework/Response/Command/RunResponse.php
index 413c7b75..c46ab915 100644
--- a/src/Pckg/Framework/Response/Command/RunResponse.php
+++ b/src/Pckg/Framework/Response/Command/RunResponse.php
@@ -68,4 +68,4 @@ public function execute(callable $next)
 
         return $next();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Pckg/Framework/Router/Command/ResolveDependencies.php b/src/Pckg/Framework/Router/Command/ResolveDependencies.php
index 53a3acd3..a200759e 100644
--- a/src/Pckg/Framework/Router/Command/ResolveDependencies.php
+++ b/src/Pckg/Framework/Router/Command/ResolveDependencies.php
@@ -2,6 +2,7 @@
 
 namespace Pckg\Framework\Router\Command;
 
+use Pckg\Framework\Provider\ResolvesMultiple;
 use Pckg\Framework\Router;
 
 class ResolveDependencies
@@ -64,7 +65,7 @@ public function execute()
                 /**
                  * Create resolver.
                  */
-                $realResolver = resolve($resolver);
+                $realResolver = resolve($resolver, $data);
             }
 
             $k = $data[$urlKey] ?? null;
@@ -73,25 +74,20 @@ public function execute()
             /**
              * Validate resolved value for access?
              */
-
+            $resolvesMultiple = object_implements($realResolver, ResolvesMultiple::class);
             if (is_string($urlKey)) {
                 $data[$urlKey] = $resolved;
-            } else {
-                $data[] = $resolved;
-            }
-
-            if (!is_int($urlKey)) {
                 router()->resolve($urlKey, $resolved);
-                /**
-                 * Remove resolved key.
-                 * Why? Can we delete it?
-                 */
-                if (isset($data[$urlKey])) {
-                    //unset($data[$urlKey]);
+            } elseif ($resolvesMultiple) {
+                foreach ($resolved as $resolvedKey => $resolvedValue) {
+                    $data[$resolvedKey] = $resolvedValue;
+                    router()->resolve($resolvedKey, $resolvedValue);
                 }
+            } else {
+                $data[] = $resolved;
             }
         }
 
         return $data;
     }
-}
\ No newline at end of file
+}

From 7a8cc78a36c024210b4ed3eac63c78ec809c5d9b Mon Sep 17 00:00:00 2001
From: Bojan Rajh <schtr4jh@schtr4jh.net>
Date: Sat, 24 Apr 2021 20:17:15 +0200
Subject: [PATCH 17/66] Session driver, regenerate

---
 src/Pckg/Framework/Request/Data/Session.php   |  5 +++
 .../Request/Data/SessionDriver/Db.php         |  5 +++
 .../Request/Data/SessionDriver/FileDriver.php | 33 +++++++++++++++++++
 .../Request/Data/SessionDriver/MockDriver.php |  5 +++
 src/Pckg/Framework/Response.php               |  2 +-
 src/Pckg/Framework/Test/MockRequest.php       |  7 ++--
 6 files changed, 53 insertions(+), 4 deletions(-)

diff --git a/src/Pckg/Framework/Request/Data/Session.php b/src/Pckg/Framework/Request/Data/Session.php
index b7b60300..779808ca 100644
--- a/src/Pckg/Framework/Request/Data/Session.php
+++ b/src/Pckg/Framework/Request/Data/Session.php
@@ -53,4 +53,9 @@ public function __destruct()
     {
         // TODO: Implement __destruct() method.
     }
+    
+    public function getDriver()
+    {
+        return $this->driver;
+    }
 }
diff --git a/src/Pckg/Framework/Request/Data/SessionDriver/Db.php b/src/Pckg/Framework/Request/Data/SessionDriver/Db.php
index 919a744e..dec40851 100644
--- a/src/Pckg/Framework/Request/Data/SessionDriver/Db.php
+++ b/src/Pckg/Framework/Request/Data/SessionDriver/Db.php
@@ -46,4 +46,9 @@ public function gc($maxLifetime)
     {
         return true;
     }
+    
+    public function regenerate()
+    {
+        return $this;
+    }
 }
diff --git a/src/Pckg/Framework/Request/Data/SessionDriver/FileDriver.php b/src/Pckg/Framework/Request/Data/SessionDriver/FileDriver.php
index fbd3a058..f9fd1483 100644
--- a/src/Pckg/Framework/Request/Data/SessionDriver/FileDriver.php
+++ b/src/Pckg/Framework/Request/Data/SessionDriver/FileDriver.php
@@ -158,4 +158,37 @@ public function destroyCookieSession($message = null)
 
         return $PHPSESSIDSECURE;
     }
+    
+    public function regenerate()
+    {
+        /**
+         * Deactivate current session.
+         */
+        $_SESSION['deactivated'] = time();
+
+        /**
+         * Regenerate session and sign it.
+         */
+        try {
+            //error_log('regenerating session ' . session_id());
+            $regenerated = session_regenerate_id(true);
+            if (!$regenerated) {
+                error_log('Error regenerating session ' . session_id());
+            } else {
+                //error_log('Session regenerated to ' . session_id());
+            }
+        } catch (\Throwable $e) {
+            error_log('Cannot regenerate session, destroying session ' . session_id());
+            session_start();
+            $_SESSION = [];
+            //throw $e;
+        }
+
+        /**
+         * Sign session and set it active.
+         */
+        $sid = session_id();
+        $_SESSION[FileDriver::PHPSESSID . FileDriver::SIGNATURE] = auth()->hashPassword($sid);
+        unset($_SESSION['deactivated']);
+    }
 }
diff --git a/src/Pckg/Framework/Request/Data/SessionDriver/MockDriver.php b/src/Pckg/Framework/Request/Data/SessionDriver/MockDriver.php
index 3c3ef3f7..d212413f 100644
--- a/src/Pckg/Framework/Request/Data/SessionDriver/MockDriver.php
+++ b/src/Pckg/Framework/Request/Data/SessionDriver/MockDriver.php
@@ -58,4 +58,9 @@ public function updateTimestamp($session_id, $session_data)
     {
         return $this;
     }
+
+    public function regenerate()
+    {
+        return $this;
+    }
 }
diff --git a/src/Pckg/Framework/Response.php b/src/Pckg/Framework/Response.php
index 09222a91..4b64fc05 100644
--- a/src/Pckg/Framework/Response.php
+++ b/src/Pckg/Framework/Response.php
@@ -659,7 +659,7 @@ public function sendNoCacheHeaders()
 
     public function sendNoIndexHeader()
     {
-        header('X-Robots-Tax', 'noindex');
+        header('X-Robots-Tag: noindex');
 
         return $this;
     }
diff --git a/src/Pckg/Framework/Test/MockRequest.php b/src/Pckg/Framework/Test/MockRequest.php
index 38151c68..f24d5923 100644
--- a/src/Pckg/Framework/Test/MockRequest.php
+++ b/src/Pckg/Framework/Test/MockRequest.php
@@ -64,11 +64,11 @@ public function __construct($test, $app)
      * @throws \PHPUnit\Framework\ExpectationFailedException
      * @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
      */
-    public function assertResponseCode($code)
+    public function assertResponseCode($code, $message = null)
     {
         $response = $this->context->get(Response::class);
 
-        $this->test->assertEquals($code, $response->getCode(), 'Response code not ' . $code);
+        $this->test->assertEquals($code, $response->getCode(), $message ?? ('Response code not ' . $code));
 
         return $this;
     }
@@ -98,7 +98,7 @@ public function assertResponseContains($value)
     {
         $response = $this->context->get(Response::class)->getOutput();
 
-        $this->test->assertEquals(true, strpos($response, $value) >= 0, 'Response does not contain ' . $value);
+        $this->test->assertEquals(true, str_contains($response, $value), 'Response does not contain ' . $value);
 
         return $this;
     }
@@ -127,6 +127,7 @@ public function modifyConfigurator(callable $configurator = null, $mode = null)
             $request->server()->set('HTTP_X_PCKG_CSRF', metaManager()->getCsrfValue());
             $request->server()->set('HTTP_REFERER', 'https://localhost');
             $request->server()->set('HTTP_ORIGIN', 'localhost:99999');
+            $request->server()->set('HTTP_HOST', 'localhost');
             $this->mergeRequestHeaders($context, [
                 'Accept' => 'application/json',
                 'X-Pckg-CSRF' => metaManager()->getCsrfValue(),

From 5f42c79a10c664e125069368b561c4890f2fdda0 Mon Sep 17 00:00:00 2001
From: Bojan Rajh <schtr4jh@schtr4jh.net>
Date: Mon, 26 Apr 2021 12:48:26 +0200
Subject: [PATCH 18/66] Cors simplify

---
 src/Pckg/Framework/Environment/Production.php | 4 ++--
 src/Pckg/Framework/Request.php                | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Pckg/Framework/Environment/Production.php b/src/Pckg/Framework/Environment/Production.php
index 4868159c..d3fef8b6 100644
--- a/src/Pckg/Framework/Environment/Production.php
+++ b/src/Pckg/Framework/Environment/Production.php
@@ -104,11 +104,11 @@ protected function handleException(Throwable $e)
             /**
              * Handle JSON request.
              */
-            if ($request->isJson() || $request->isAjax()) {
+            if ($request->isJson() || $request->isAjax() || $request->isCORS()) {
                 $response = [
                     'success' => false,
                     'error' => true,
-                    'message' => $e->getMessage(),
+                    'message' => $message,
                     'statusCode' => $response->getCode(),
                     'exception' => implicitDev() ? exception($e) : null,
                 ];
diff --git a/src/Pckg/Framework/Request.php b/src/Pckg/Framework/Request.php
index cbd5b2fc..bc373c6f 100644
--- a/src/Pckg/Framework/Request.php
+++ b/src/Pckg/Framework/Request.php
@@ -388,7 +388,7 @@ public function isCORS()
         /**
          * Leave OPTIONS and GET?
          */
-        return $this->isPost() || $this->isSearch() || $this->isDelete() || $this->isPut() || $this->isPatch() || $this->isHead();
+        return !($this->isGet() || $this->isOptions());
     }
 
     /**

From 50635684b39994b8a846c5dc903a934065d10433 Mon Sep 17 00:00:00 2001
From: Bojan Rajh <schtr4jh@schtr4jh.net>
Date: Sat, 22 May 2021 11:22:44 +0200
Subject: [PATCH 19/66] Tests

---
 .../_generated/AcceptanceTesterActions.php    | 49 +++++-----
 .../_generated/FunctionalTesterActions.php    |  2 +-
 .../_support/_generated/UnitTesterActions.php |  2 +-
 tests/unit/ConfigCest.php                     |  4 +-
 tests/unit/EntrypointCest.php                 | 91 +++++++++++++++++++
 ...workApplicationCommandInitDatabaseCest.php | 80 ++++++++++++++++
 ...licationCommandRegisterApplicationCest.php | 52 +++++++++++
 .../unit/FrameworkApplicationConsoleCest.php  | 50 ++++++++++
 ...pplicationConsoleCommandRunCommandCest.php | 69 ++++++++++++++
 tests/unit/FrameworkApplicationQueueCest.php  | 50 ++++++++++
 .../unit/FrameworkApplicationWebsiteCest.php  | 50 ++++++++++
 .../FrameworkConfigCommandInitConfigCest.php  | 44 +++++++++
 tests/unit/RequestDataCest.php                |  9 +-
 13 files changed, 521 insertions(+), 31 deletions(-)
 create mode 100644 tests/unit/EntrypointCest.php
 create mode 100644 tests/unit/FrameworkApplicationCommandInitDatabaseCest.php
 create mode 100644 tests/unit/FrameworkApplicationCommandRegisterApplicationCest.php
 create mode 100644 tests/unit/FrameworkApplicationConsoleCest.php
 create mode 100644 tests/unit/FrameworkApplicationConsoleCommandRunCommandCest.php
 create mode 100644 tests/unit/FrameworkApplicationQueueCest.php
 create mode 100644 tests/unit/FrameworkApplicationWebsiteCest.php
 create mode 100644 tests/unit/FrameworkConfigCommandInitConfigCest.php

diff --git a/tests/_support/_generated/AcceptanceTesterActions.php b/tests/_support/_generated/AcceptanceTesterActions.php
index 90a2ba7d..fb2d6516 100644
--- a/tests/_support/_generated/AcceptanceTesterActions.php
+++ b/tests/_support/_generated/AcceptanceTesterActions.php
@@ -1,4 +1,4 @@
-<?php  //[STAMP] be4500c292253caff3f9d4f8829e582a
+<?php  //[STAMP] 016a504fd382a4e0bcbfb1e226258f07
 namespace _generated;
 
 // This class was automatically generated by build task
@@ -32,8 +32,8 @@ public function setHeader($name, $value) {
      *
      * Authenticates user for HTTP_AUTH
      *
-     * @param $username
-     * @param $password
+     * @param string $username
+     * @param string $password
      * @see \Codeception\Module\PhpBrowser::amHttpAuthenticated()
      */
     public function amHttpAuthenticated($username, $password) {
@@ -110,7 +110,7 @@ public function amOnSubdomain($subdomain) {
      * @return mixed
      * @see \Codeception\Module\PhpBrowser::executeInGuzzle()
      */
-    public function executeInGuzzle($function) {
+    public function executeInGuzzle(\Closure $function) {
         return $this->getScenario()->runStep(new \Codeception\Step\Action('executeInGuzzle', func_get_args()));
     }
 
@@ -126,7 +126,6 @@ public function executeInGuzzle($function) {
      * <?php
      * $I->haveHttpHeader('X-Requested-With', 'Codeception');
      * $I->amOnPage('test-headers.php');
-     * ?>
      * ```
      *
      * To use special chars in Header Key use HTML Character Entities:
@@ -137,7 +136,6 @@ public function executeInGuzzle($function) {
      * ```php
      * <?php
      * $I->haveHttpHeader('Client&#95;Id', 'Codeception');
-     * ?>
      * ```
      *
      * @param string $name the name of the request header
@@ -164,7 +162,6 @@ public function haveHttpHeader($name, $value) {
      * // ...
      * $I->deleteHeader('X-Requested-With');
      * $I->amOnPage('some-other-page.php');
-     * ?>
      * ```
      *
      * @param string $name the name of the header to delete.
@@ -696,7 +693,7 @@ public function dontSeeInField($field, $value) {
      * @param $params
      * @see \Codeception\Lib\InnerBrowser::seeInFormFields()
      */
-    public function seeInFormFields($formSelector, $params) {
+    public function seeInFormFields($formSelector, array $params) {
         return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeInFormFields', func_get_args()));
     }
 
@@ -745,7 +742,7 @@ public function seeInFormFields($formSelector, $params) {
      * @param $params
      * @see \Codeception\Lib\InnerBrowser::dontSeeInFormFields()
      */
-    public function dontSeeInFormFields($formSelector, $params) {
+    public function dontSeeInFormFields($formSelector, array $params) {
         return $this->getScenario()->runStep(new \Codeception\Step\Action('dontSeeInFormFields', func_get_args()));
     }
 
@@ -924,7 +921,7 @@ public function dontSeeInFormFields($formSelector, $params) {
      * @param $button
      * @see \Codeception\Lib\InnerBrowser::submitForm()
      */
-    public function submitForm($selector, $params, $button = NULL) {
+    public function submitForm($selector, array $params, $button = NULL) {
         return $this->getScenario()->runStep(new \Codeception\Step\Action('submitForm', func_get_args()));
     }
 
@@ -937,7 +934,7 @@ public function submitForm($selector, $params, $button = NULL) {
      * ``` php
      * <?php
      * $I->fillField("//input[@type='text']", "Hello World!");
-     * $I->fillField(['name' => 'email'], 'jon@mail.com');
+     * $I->fillField(['name' => 'email'], 'jon@example.com');
      * ?>
      * ```
      *
@@ -1083,7 +1080,7 @@ public function sendAjaxGetRequest($uri, $params = []) {
      *     'task' => 'lorem ipsum',
      *     'category' => 'miscellaneous',
      * ]]);
-     * ```    
+     * ```
      *
      * @param string $uri
      * @param array $params
@@ -1107,7 +1104,7 @@ public function sendAjaxPostRequest($uri, $params = []) {
      *
      * @param $method
      * @param $uri
-     * @param $params
+     * @param array $params
      * @see \Codeception\Lib\InnerBrowser::sendAjaxRequest()
      */
     public function sendAjaxRequest($method, $uri, $params = []) {
@@ -1249,7 +1246,7 @@ public function grabValueFrom($field) {
      * @return mixed
      * @see \Codeception\Lib\InnerBrowser::setCookie()
      */
-    public function setCookie($name, $val, $params = []) {
+    public function setCookie($name, $val, array $params = []) {
         return $this->getScenario()->runStep(new \Codeception\Step\Action('setCookie', func_get_args()));
     }
 
@@ -1267,7 +1264,7 @@ public function setCookie($name, $val, $params = []) {
      * @return mixed
      * @see \Codeception\Lib\InnerBrowser::grabCookie()
      */
-    public function grabCookie($cookie, $params = []) {
+    public function grabCookie($cookie, array $params = []) {
         return $this->getScenario()->runStep(new \Codeception\Step\Action('grabCookie', func_get_args()));
     }
 
@@ -1278,7 +1275,6 @@ public function grabCookie($cookie, $params = []) {
      * Grabs current page source code.
      *
      * @throws ModuleException if no page was opened.
-     *
      * @return string Current page source code.
      * @see \Codeception\Lib\InnerBrowser::grabPageSource()
      */
@@ -1304,7 +1300,7 @@ public function grabPageSource() {
      * @return mixed
      * @see \Codeception\Lib\InnerBrowser::seeCookie()
      */
-    public function seeCookie($cookie, $params = []) {
+    public function seeCookie($cookie, array $params = []) {
         return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeCookie', func_get_args()));
     }
 
@@ -1321,7 +1317,7 @@ public function seeCookie($cookie, $params = []) {
      * @return mixed
      * @see \Codeception\Lib\InnerBrowser::dontSeeCookie()
      */
-    public function dontSeeCookie($cookie, $params = []) {
+    public function dontSeeCookie($cookie, array $params = []) {
         return $this->getScenario()->runStep(new \Codeception\Step\Action('dontSeeCookie', func_get_args()));
     }
 
@@ -1338,7 +1334,7 @@ public function dontSeeCookie($cookie, $params = []) {
      * @return mixed
      * @see \Codeception\Lib\InnerBrowser::resetCookie()
      */
-    public function resetCookie($name, $params = []) {
+    public function resetCookie($cookie, array $params = []) {
         return $this->getScenario()->runStep(new \Codeception\Step\Action('resetCookie', func_get_args()));
     }
 
@@ -1483,7 +1479,7 @@ public function seePageNotFound() {
      * $I->seeResponseCodeIs(\Codeception\Util\HttpCode::OK);
      * ```
      *
-     * @param $code
+     * @param int $code
      * @see \Codeception\Lib\InnerBrowser::seeResponseCodeIs()
      */
     public function seeResponseCodeIs($code) {
@@ -1496,8 +1492,8 @@ public function seeResponseCodeIs($code) {
      *
      * Checks that response code is between a certain range. Between actually means [from <= CODE <= to]
      *
-     * @param $from
-     * @param $to
+     * @param int $from
+     * @param int $to
      * @see \Codeception\Lib\InnerBrowser::seeResponseCodeIsBetween()
      */
     public function seeResponseCodeIsBetween($from, $to) {
@@ -1517,7 +1513,7 @@ public function seeResponseCodeIsBetween($from, $to) {
      * // recommended \Codeception\Util\HttpCode
      * $I->dontSeeResponseCodeIs(\Codeception\Util\HttpCode::OK);
      * ```
-     * @param $code
+     * @param int $code
      * @see \Codeception\Lib\InnerBrowser::dontSeeResponseCodeIs()
      */
     public function dontSeeResponseCodeIs($code) {
@@ -1651,10 +1647,9 @@ public function moveBack($numberOfSteps = 1) {
      * ```php
      * $I->setServerParameters([]);
      * ```
-     * @param array $params
      * @see \Codeception\Lib\InnerBrowser::setServerParameters()
      */
-    public function setServerParameters($params) {
+    public function setServerParameters(array $params) {
         return $this->getScenario()->runStep(new \Codeception\Step\Action('setServerParameters', func_get_args()));
     }
 
@@ -1667,8 +1662,8 @@ public function setServerParameters($params) {
      * ```php
      * $I->haveServerParameter('name', 'value');
      * ```
-     * @param $name
-     * @param $value
+     * @param string $name
+     * @param string $value
      * @see \Codeception\Lib\InnerBrowser::haveServerParameter()
      */
     public function haveServerParameter($name, $value) {
diff --git a/tests/_support/_generated/FunctionalTesterActions.php b/tests/_support/_generated/FunctionalTesterActions.php
index 4ba4a013..b69ca553 100644
--- a/tests/_support/_generated/FunctionalTesterActions.php
+++ b/tests/_support/_generated/FunctionalTesterActions.php
@@ -1,4 +1,4 @@
-<?php  //[STAMP] b63e24bf4e93e45af9ce8b1d13486a07
+<?php  //[STAMP] e2eff677ee2ccfc61a57bc6f370ead20
 namespace _generated;
 
 // This class was automatically generated by build task
diff --git a/tests/_support/_generated/UnitTesterActions.php b/tests/_support/_generated/UnitTesterActions.php
index 6937a111..14a2f6b9 100644
--- a/tests/_support/_generated/UnitTesterActions.php
+++ b/tests/_support/_generated/UnitTesterActions.php
@@ -1,4 +1,4 @@
-<?php  //[STAMP] ebb5fcfe0622759842f79be09fbd5591
+<?php  //[STAMP] 3f0d0e7c1b9ecffaaef21acb99a0cf16
 namespace _generated;
 
 // This class was automatically generated by build task
diff --git a/tests/unit/ConfigCest.php b/tests/unit/ConfigCest.php
index 1d4d4400..cf4c0cfa 100644
--- a/tests/unit/ConfigCest.php
+++ b/tests/unit/ConfigCest.php
@@ -7,7 +7,9 @@ class ConfigCest
 
     public function _before(UnitTester $I)
     {
-        define('__ROOT__', realpath(__DIR__ . '/../..') . '/');
+        if (!defined('__ROOT__')) {
+            define('__ROOT__', realpath(__DIR__ . '/../..') . '/');
+        }
         $this->mockFramework();
     }
 
diff --git a/tests/unit/EntrypointCest.php b/tests/unit/EntrypointCest.php
new file mode 100644
index 00000000..cfdd3d68
--- /dev/null
+++ b/tests/unit/EntrypointCest.php
@@ -0,0 +1,91 @@
+<?php
+
+class EntrypointCest
+{
+
+    public function _before(UnitTester $I)
+    {
+        if (!defined('__ROOT__')) {
+            define('__ROOT__', realpath(__DIR__ . '/../..') . '/');
+        }
+        //$this->mockFramework();
+    }
+
+    // tests
+    public function bootstrapTest(UnitTester $I)
+    {
+        $included = require __ROOT__ . 'src/bootstrap.php';
+
+        $I->assertIsCallable($included);
+
+        $context = $included(null, null);
+        $I->assertEquals(\Pckg\Framework\Helper\Context::class, get_class($context));
+
+        $context2 = $included(null, null);
+        $I->assertEquals(\Pckg\Framework\Helper\Context::class, get_class($context2));
+
+        $I->assertNotSame($context, $context2);
+    }
+
+    public function productionTest(UnitTester $I)
+    {
+        if (isset($_SERVER['HTTP_HOST'])) {
+            unset($_SERVER['HTTP_HOST']);
+        }
+        $I->assertTrue(!isset($_SERVER['HTTP_HOST']));
+
+        try {
+            require __ROOT__ . 'src/production.php';
+            throw new Exception('Exception not thrown');
+        } catch (Throwable $e) {
+            $I->assertEquals('Class Test not found', $e->getMessage());
+        }
+
+        try {
+            $_SERVER['HTTP_HOST'] = 'test';
+            require __ROOT__ . 'src/production.php';
+            throw new Exception('Exception not thrown');
+        } catch (Throwable $e) {
+            $I->assertEquals('Class Test not found', $e->getMessage());
+        }
+    }
+
+    public function developmentTest(UnitTester $I)
+    {
+        if (isset($_SERVER['HTTP_HOST'])) {
+            unset($_SERVER['HTTP_HOST']);
+        }
+        $I->assertTrue(!isset($_SERVER['HTTP_HOST']));
+
+        try {
+            require __ROOT__ . 'src/development.php';
+            throw new Exception('Exception not thrown');
+        } catch (Throwable $e) {
+            $I->assertEquals('Class Test not found', $e->getMessage());
+        }
+
+        try {
+            $_SERVER['HTTP_HOST'] = 'test';
+            require __ROOT__ . 'src/development.php';
+            throw new Exception('Exception not thrown');
+        } catch (Throwable $e) {
+            $I->assertEquals('Class Test not found', $e->getMessage());
+        }
+    }
+
+    public function consoleTest(UnitTester $I)
+    {
+        $_SERVER['argv'] = [
+            'console',
+            'test',
+        ];
+        $_SERVER['argc'] = 2;
+
+        try {
+            require __ROOT__ . 'src/console.php';
+            throw new Exception('Exception not thrown');
+        } catch (Throwable $e) {
+            $I->assertEquals('Class Test not found', $e->getMessage());
+        }
+    }
+}
diff --git a/tests/unit/FrameworkApplicationCommandInitDatabaseCest.php b/tests/unit/FrameworkApplicationCommandInitDatabaseCest.php
new file mode 100644
index 00000000..9449e94a
--- /dev/null
+++ b/tests/unit/FrameworkApplicationCommandInitDatabaseCest.php
@@ -0,0 +1,80 @@
+<?php
+
+use Pckg\Framework\Application\Command\InitDatabase;
+use Pckg\Framework\Test\ContextDiff;
+use Pckg\Framework\Test\MockFramework;
+
+class FrameworkApplicationCommandInitDatabaseCest
+{
+
+    use MockFramework;
+    use ContextDiff;
+
+    protected UnitTester $unitTester;
+
+    public function _before(UnitTester $I)
+    {
+        if (!defined('__ROOT__')) {
+            define('__ROOT__', realpath(__DIR__ . '/../..') . '/');
+        }
+        $this->unitTester = $I;
+        $this->mockFramework();
+    }
+
+    protected function _after()
+    {
+    }
+
+    protected function createInitDatabaseObject(array $config = []): InitDatabase
+    {
+        return new InitDatabase(new \Pckg\Framework\Config($config));
+    }
+
+    public function testUnsetDatabaseList(): void
+    {
+        $this->checkContextDiff(function () {
+            $this->createInitDatabaseObject([])->execute(fn() => null);
+        }, 0);
+    }
+
+    public function testEmptyDatabaseList(): void
+    {
+        $this->checkContextDiff(function () {
+            $this->createInitDatabaseObject([
+                'database' => [],
+            ])->execute(fn() => null);
+        }, 0);
+    }
+
+    public function testSingleDatabaseRegistration(): void
+    {
+        $this->checkContextDiff(function () {
+            $this->createInitDatabaseObject([
+                'database' => [
+                    'default' => [
+                        'driver' => 'json',
+                        'db' => 'foo',
+                    ],
+                ],
+            ])->execute(fn() => null);
+        }, 2);
+    }
+
+    public function testDoubleDatabaseRegistration(): void
+    {
+        $this->checkContextDiff(function () {
+            $this->createInitDatabaseObject([
+                'database' => [
+                    'default' => [
+                        'driver' => 'json',
+                        'db' => 'foo',
+                    ],
+                    'alternative' => [
+                        'driver' => 'json',
+                        'db' => 'bar',
+                    ],
+                ],
+            ])->execute(fn() => null);
+        }, 3);
+    }
+}
diff --git a/tests/unit/FrameworkApplicationCommandRegisterApplicationCest.php b/tests/unit/FrameworkApplicationCommandRegisterApplicationCest.php
new file mode 100644
index 00000000..91d86717
--- /dev/null
+++ b/tests/unit/FrameworkApplicationCommandRegisterApplicationCest.php
@@ -0,0 +1,52 @@
+<?php
+
+use Pckg\Framework\Test\ContextDiff;
+use Pckg\Framework\Test\ListenForEvents;
+use Pckg\Framework\Test\MockConfig;
+use Pckg\Framework\Test\MockFramework;
+use Pckg\Framework\Test\MockInContext;
+
+class FrameworkApplicationCommandRegisterApplicationCest
+{
+
+    use MockFramework;
+    use ContextDiff;
+    use ListenForEvents;
+    use MockConfig;
+    use MockInContext;
+
+    protected UnitTester $unitTester;
+
+    public function _before(UnitTester $I)
+    {
+        if (!defined('__ROOT__')) {
+            define('__ROOT__', realpath(__DIR__ . '/../..') . '/');
+        }
+        $this->unitTester = $I;
+        $this->mockFramework();
+    }
+
+    protected function _after()
+    {
+    }
+
+    protected function testRegistersWebsiteApplication()
+    {
+        $provider = new \Pckg\Framework\Provider();
+        $application = new \Pckg\Framework\Application\Website($provider);
+
+        $config = $this->mockConfig();
+
+        $localeManager = $this->mockInContext(new Pckg\Manager\Locale(new \Pckg\Locale\Lang()));
+
+        $this->listenForEvent(\Pckg\Framework\Application::EVENT_REGISTERED);
+
+        $registerApplication = new \Pckg\Framework\Application\Command\RegisterApplication($application, $config);
+        $registerApplication->execute(fn() => null);
+
+        $this->unitTester->assertTrue($provider->isRegistered());
+        $this->unitTester->assertEquals([], $config->get());
+        $this->unitTester->assertEquals('en_GB', $localeManager->getCurrent());
+        $this->unitTester->assertEquals(1, $this->getNumberOfTriggers(\Pckg\Framework\Application::EVENT_REGISTERED));
+    }
+}
diff --git a/tests/unit/FrameworkApplicationConsoleCest.php b/tests/unit/FrameworkApplicationConsoleCest.php
new file mode 100644
index 00000000..12a8481e
--- /dev/null
+++ b/tests/unit/FrameworkApplicationConsoleCest.php
@@ -0,0 +1,50 @@
+<?php
+
+use Pckg\Concept\Event\Dispatcher;
+use Pckg\Framework\Application\Console\Command\RunCommand;
+use Pckg\Framework\Request\Data\Server;
+use Pckg\Framework\Response;
+use Pckg\Framework\Test\ContextDiff;
+use Pckg\Framework\Test\ListenForEvents;
+use Pckg\Framework\Test\MockConfig;
+use Pckg\Framework\Test\MockFramework;
+use Pckg\Framework\Test\MockInContext;
+use Symfony\Component\Console\Application;
+use Symfony\Component\Console\Output\NullOutput;
+
+class FrameworkApplicationConsoleCest
+{
+
+    use MockFramework;
+    use ContextDiff;
+    use ListenForEvents;
+    use MockConfig;
+    use MockInContext;
+
+    protected UnitTester $unitTester;
+
+    const EVENT_MIDDLEWARE = self::class . '.middleware';
+    const EVENT_AFTERWARE = self::class . '.afterware';
+
+    public function _before(UnitTester $I)
+    {
+        if (!defined('__ROOT__')) {
+            define('__ROOT__', realpath(__DIR__ . '/../..') . '/');
+        }
+        $this->unitTester = $I;
+        $this->mockFramework();
+    }
+
+    protected function _after()
+    {
+    }
+
+    public function testConsole()
+    {
+        $provider = new \Pckg\Framework\Provider();
+        $console = new \Pckg\Framework\Application\Console($provider);
+
+        $this->unitTester->assertNotEmpty($console->inits());
+        $this->unitTester->assertNotEmpty($console->runs());
+    }
+}
diff --git a/tests/unit/FrameworkApplicationConsoleCommandRunCommandCest.php b/tests/unit/FrameworkApplicationConsoleCommandRunCommandCest.php
new file mode 100644
index 00000000..eb71e97d
--- /dev/null
+++ b/tests/unit/FrameworkApplicationConsoleCommandRunCommandCest.php
@@ -0,0 +1,69 @@
+<?php
+
+use Pckg\Concept\Event\Dispatcher;
+use Pckg\Framework\Application\Console\Command\RunCommand;
+use Pckg\Framework\Request\Data\Server;
+use Pckg\Framework\Response;
+use Pckg\Framework\Test\ContextDiff;
+use Pckg\Framework\Test\ListenForEvents;
+use Pckg\Framework\Test\MockConfig;
+use Pckg\Framework\Test\MockFramework;
+use Pckg\Framework\Test\MockInContext;
+use Symfony\Component\Console\Application;
+use Symfony\Component\Console\Output\NullOutput;
+
+class FrameworkApplicationConsoleCommandRunCommandCest
+{
+
+    use MockFramework;
+    use ContextDiff;
+    use ListenForEvents;
+    use MockConfig;
+    use MockInContext;
+
+    protected UnitTester $unitTester;
+
+    const EVENT_MIDDLEWARE = self::class . '.middleware';
+    const EVENT_AFTERWARE = self::class . '.afterware';
+
+    public function _before(UnitTester $I)
+    {
+        if (!defined('__ROOT__')) {
+            define('__ROOT__', realpath(__DIR__ . '/../..') . '/');
+        }
+        $this->unitTester = $I;
+        $this->mockFramework();
+    }
+
+    protected function _after()
+    {
+    }
+
+    public function testEmptyCommandArgv()
+    {
+        $this->mockInContext(new NullOutput(), RunCommand::class . '.output');
+        $dispatcher = $this->mockInContext(new Dispatcher());
+
+        $this->listenForEvent(RunCommand::EVENT_RUNNING);
+        $this->listenForEvent(static::EVENT_MIDDLEWARE);
+        $this->listenForEvent(static::EVENT_AFTERWARE);
+
+        $response = new Response();
+        $response->addMiddleware(function () {
+            dispatcher()->trigger(static::EVENT_MIDDLEWARE);
+        });
+        $response->addAfterware(function () {
+            dispatcher()->trigger(static::EVENT_AFTERWARE);
+        });
+
+        $symfonyConsole = new Application();
+        $symfonyConsole->setAutoExit(false);
+        $server = new Server();
+
+        (new RunCommand($response, $dispatcher, $symfonyConsole, $server))->execute(fn() => null);
+
+        $this->unitTester->assertEquals(1, $this->getNumberOfTriggers(RunCommand::EVENT_RUNNING));
+        $this->unitTester->assertEquals(1, $this->getNumberOfTriggers(static::EVENT_MIDDLEWARE));
+        $this->unitTester->assertEquals(1, $this->getNumberOfTriggers(static::EVENT_AFTERWARE));
+    }
+}
diff --git a/tests/unit/FrameworkApplicationQueueCest.php b/tests/unit/FrameworkApplicationQueueCest.php
new file mode 100644
index 00000000..cbfd9016
--- /dev/null
+++ b/tests/unit/FrameworkApplicationQueueCest.php
@@ -0,0 +1,50 @@
+<?php
+
+use Pckg\Concept\Event\Dispatcher;
+use Pckg\Framework\Application\Console\Command\RunCommand;
+use Pckg\Framework\Request\Data\Server;
+use Pckg\Framework\Response;
+use Pckg\Framework\Test\ContextDiff;
+use Pckg\Framework\Test\ListenForEvents;
+use Pckg\Framework\Test\MockConfig;
+use Pckg\Framework\Test\MockFramework;
+use Pckg\Framework\Test\MockInContext;
+use Symfony\Component\Console\Application;
+use Symfony\Component\Console\Output\NullOutput;
+
+class FrameworkApplicationQueueCest
+{
+
+    use MockFramework;
+    use ContextDiff;
+    use ListenForEvents;
+    use MockConfig;
+    use MockInContext;
+
+    protected UnitTester $unitTester;
+
+    const EVENT_MIDDLEWARE = self::class . '.middleware';
+    const EVENT_AFTERWARE = self::class . '.afterware';
+
+    public function _before(UnitTester $I)
+    {
+        if (!defined('__ROOT__')) {
+            define('__ROOT__', realpath(__DIR__ . '/../..') . '/');
+        }
+        $this->unitTester = $I;
+        $this->mockFramework();
+    }
+
+    protected function _after()
+    {
+    }
+
+    public function testQueue()
+    {
+        $provider = new \Pckg\Framework\Provider();
+        $queue = new \Pckg\Framework\Application\Queue($provider);
+
+        $this->unitTester->assertNotEmpty($queue->inits());
+        $this->unitTester->assertNotEmpty($queue->runs());
+    }
+}
diff --git a/tests/unit/FrameworkApplicationWebsiteCest.php b/tests/unit/FrameworkApplicationWebsiteCest.php
new file mode 100644
index 00000000..3c6225d4
--- /dev/null
+++ b/tests/unit/FrameworkApplicationWebsiteCest.php
@@ -0,0 +1,50 @@
+<?php
+
+use Pckg\Concept\Event\Dispatcher;
+use Pckg\Framework\Application\Console\Command\RunCommand;
+use Pckg\Framework\Request\Data\Server;
+use Pckg\Framework\Response;
+use Pckg\Framework\Test\ContextDiff;
+use Pckg\Framework\Test\ListenForEvents;
+use Pckg\Framework\Test\MockConfig;
+use Pckg\Framework\Test\MockFramework;
+use Pckg\Framework\Test\MockInContext;
+use Symfony\Component\Console\Application;
+use Symfony\Component\Console\Output\NullOutput;
+
+class FrameworkApplicationWebsiteCest
+{
+
+    use MockFramework;
+    use ContextDiff;
+    use ListenForEvents;
+    use MockConfig;
+    use MockInContext;
+
+    protected UnitTester $unitTester;
+
+    const EVENT_MIDDLEWARE = self::class . '.middleware';
+    const EVENT_AFTERWARE = self::class . '.afterware';
+
+    public function _before(UnitTester $I)
+    {
+        if (!defined('__ROOT__')) {
+            define('__ROOT__', realpath(__DIR__ . '/../..') . '/');
+        }
+        $this->unitTester = $I;
+        $this->mockFramework();
+    }
+
+    protected function _after()
+    {
+    }
+
+    public function testWebsite()
+    {
+        $provider = new \Pckg\Framework\Provider();
+        $website = new \Pckg\Framework\Application\Queue($provider);
+
+        $this->unitTester->assertNotEmpty($website->inits());
+        $this->unitTester->assertNotEmpty($website->runs());
+    }
+}
diff --git a/tests/unit/FrameworkConfigCommandInitConfigCest.php b/tests/unit/FrameworkConfigCommandInitConfigCest.php
new file mode 100644
index 00000000..4ce27006
--- /dev/null
+++ b/tests/unit/FrameworkConfigCommandInitConfigCest.php
@@ -0,0 +1,44 @@
+<?php
+
+use Pckg\Framework\Config\Command\InitConfig;
+use Pckg\Framework\Test\ContextDiff;
+use Pckg\Framework\Test\ListenForEvents;
+use Pckg\Framework\Test\MockConfig;
+use Pckg\Framework\Test\MockFramework;
+use Pckg\Framework\Test\MockInContext;
+
+class FrameworkConfigCommandInitConfigCest
+{
+
+    use MockFramework;
+    use ContextDiff;
+    use ListenForEvents;
+    use MockConfig;
+    use MockInContext;
+
+    protected UnitTester $unitTester;
+
+    public function _before(UnitTester $I)
+    {
+        if (!defined('__ROOT__')) {
+            define('__ROOT__', realpath(__DIR__ . '/../..') . '/');
+        }
+        $this->unitTester = $I;
+        $this->mockFramework();
+    }
+
+    protected function _after()
+    {
+    }
+
+    public function testConfig()
+    {
+        $config = $this->mockConfig();
+        $initial = $config->get();
+        path('app', __ROOT__ . 'tests/_data/FrameworkConfigCommandInitConfigCest/');
+        (new InitConfig($config))->execute(fn() => null);
+        $final = $config->get();
+        $this->unitTester->assertNotSame($initial, $final);
+        $this->unitTester->assertSame(['foo' => 'barconfig', 'url' => 'https://'], $final);
+    }
+}
diff --git a/tests/unit/RequestDataCest.php b/tests/unit/RequestDataCest.php
index ad039050..e11faab0 100644
--- a/tests/unit/RequestDataCest.php
+++ b/tests/unit/RequestDataCest.php
@@ -7,13 +7,20 @@ class RequestDataCest
 
     public function _before(UnitTester $I)
     {
-        define('__ROOT__', realpath(__DIR__ . '/../..') . '/');
+        if (!defined('__ROOT__')) {
+            define('__ROOT__', realpath(__DIR__ . '/../..') . '/');
+        }
         $this->mockFramework();
     }
 
     // tests
     public function defaultRequestDataTest(UnitTester $I)
     {
+        $_POST = [];
+        $_GET = [];
+        $_COOKIE = [];
+        $_REQUEST = [];
+
         $request = new Pckg\Framework\Request();
         $I->assertEquals([], $request->get()->all());
         $I->assertEquals([], $request->post()->all());

From c7ac2efe8347b6b68929d8f15637b5cae337b141 Mon Sep 17 00:00:00 2001
From: Bojan Rajh <schtr4jh@schtr4jh.net>
Date: Sat, 22 May 2021 11:22:54 +0200
Subject: [PATCH 20/66] Test helpers

---
 src/Pckg/Framework/Test/ContextDiff.php     | 21 ++++++++++++++
 src/Pckg/Framework/Test/ListenForEvents.php | 31 +++++++++++++++++++++
 src/Pckg/Framework/Test/MockConfig.php      | 20 +++++++++++++
 src/Pckg/Framework/Test/MockFramework.php   | 17 +++++++++--
 src/Pckg/Framework/Test/MockInContext.php   | 14 ++++++++++
 src/Pckg/Framework/Test/MockRequest.php     |  2 +-
 src/Pckg/Framework/Test/Queues.php          |  2 --
 src/Pckg/Framework/Test/Transactions.php    |  1 -
 8 files changed, 102 insertions(+), 6 deletions(-)
 create mode 100644 src/Pckg/Framework/Test/ContextDiff.php
 create mode 100644 src/Pckg/Framework/Test/ListenForEvents.php
 create mode 100644 src/Pckg/Framework/Test/MockConfig.php
 create mode 100644 src/Pckg/Framework/Test/MockInContext.php

diff --git a/src/Pckg/Framework/Test/ContextDiff.php b/src/Pckg/Framework/Test/ContextDiff.php
new file mode 100644
index 00000000..e9e4a3d4
--- /dev/null
+++ b/src/Pckg/Framework/Test/ContextDiff.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Pckg\Framework\Test;
+
+/**
+ * Trait ContextDiff
+ * @package Pckg\Framework\Test
+ */
+trait ContextDiff
+{
+
+    protected function checkContextDiff(callable $task, int $diff)
+    {
+        $starting = $this->context->getData();
+        $response = $task();
+        $ending = $this->context->getData();
+        $this->unitTester->assertEquals($diff, count($ending) - count($starting));
+
+        return $response;
+    }
+}
diff --git a/src/Pckg/Framework/Test/ListenForEvents.php b/src/Pckg/Framework/Test/ListenForEvents.php
new file mode 100644
index 00000000..c0f9152a
--- /dev/null
+++ b/src/Pckg/Framework/Test/ListenForEvents.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace Pckg\Framework\Test;
+
+use Pckg\Concept\Event\Dispatcher;
+
+/**
+ * Trait ListenForEvents
+ * @package Pckg\Framework\Test
+ */
+trait ListenForEvents
+{
+
+    protected $triggeredEvents = [];
+
+    protected function listenForEvent(string $event, $reset = true): self
+    {
+        if ($reset) {
+            $this->triggeredEvents[$event] = 0;
+        }
+
+        $this->context->get(Dispatcher::class)->listen($event, fn() => $this->triggeredEvents[$event]++);
+
+        return $this;
+    }
+
+    protected function getNumberOfTriggers(string $event): int
+    {
+        return $this->triggeredEvents[$event] ?? 0;
+    }
+}
diff --git a/src/Pckg/Framework/Test/MockConfig.php b/src/Pckg/Framework/Test/MockConfig.php
new file mode 100644
index 00000000..38b8aa78
--- /dev/null
+++ b/src/Pckg/Framework/Test/MockConfig.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace Pckg\Framework\Test;
+
+use Pckg\Framework\Config;
+
+trait MockConfig
+{
+
+    protected function mockConfig(array $default = [], &$reset = null)
+    {
+        $original = $this->context->get(Config::class);
+        $reset = function () use ($original) {
+            $this->context->bind(Config::class, $original);
+        };
+        $config = new Config($default);
+
+        return $config;
+    }
+}
diff --git a/src/Pckg/Framework/Test/MockFramework.php b/src/Pckg/Framework/Test/MockFramework.php
index 066f74c4..bd3e2925 100644
--- a/src/Pckg/Framework/Test/MockFramework.php
+++ b/src/Pckg/Framework/Test/MockFramework.php
@@ -24,6 +24,15 @@ trait MockFramework
      */
     protected $context;
 
+    protected $recreateContext = true;
+
+    protected function setRecreateContext($recreate = false)
+    {
+        $this->recreateContext = $recreate;
+
+        return $this;
+    }
+
     /**
      * @return mixed
      */
@@ -79,7 +88,7 @@ public function mockEnvironment()
 
     public function mockFramework($url = '/', $method = 'GET')
     {
-        if (isset($this->context)) {
+        if (!$this->recreateContext && isset($this->context)) {
             $context = $this->context;
             $config = $context->get(Config::class);
         } else {
@@ -136,8 +145,12 @@ public function mock()
         return (new MockRequest($this, $this->app));
     }
 
-    public function runExtensionDecorations(string $decoration)
+    public function runExtensionDecorations($decoration)
     {
+        if (!is_string($decoration)) {
+            return;
+        }
+
         foreach (get_class_methods($this) as $method) {
             if (strpos($method, $decoration) !== 0 || strpos($method, 'Extension') === false) {
                 continue;
diff --git a/src/Pckg/Framework/Test/MockInContext.php b/src/Pckg/Framework/Test/MockInContext.php
new file mode 100644
index 00000000..0e580dd0
--- /dev/null
+++ b/src/Pckg/Framework/Test/MockInContext.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Pckg\Framework\Test;
+
+trait MockInContext
+{
+
+    public function mockInContext($object, string $name = null)
+    {
+        $this->context->bind($name ?? get_class($object), $object);
+
+        return $object;
+    }
+}
diff --git a/src/Pckg/Framework/Test/MockRequest.php b/src/Pckg/Framework/Test/MockRequest.php
index f24d5923..7b8dfa91 100644
--- a/src/Pckg/Framework/Test/MockRequest.php
+++ b/src/Pckg/Framework/Test/MockRequest.php
@@ -218,7 +218,7 @@ public function fullHttpRequest($url, callable $configurator = null, $method = '
     {
         $initialized = $this->initApp($url, $configurator, $method);
         if (!$initialized) {
-            throw new \Exception('Cannot initialize app ' . ($this->exception ? exception($e) : 'Unknown exception'));
+            throw new \Exception('Cannot initialize app ' . ($this->exception ? exception($this->exception) : 'Unknown exception'));
         }
 
         /**
diff --git a/src/Pckg/Framework/Test/Queues.php b/src/Pckg/Framework/Test/Queues.php
index 28b30377..5ab572e4 100644
--- a/src/Pckg/Framework/Test/Queues.php
+++ b/src/Pckg/Framework/Test/Queues.php
@@ -14,7 +14,5 @@ public function _beforeQueuesExtension()
 
     public function _afterQueuesExtension()
     {
-
     }
-
 }
diff --git a/src/Pckg/Framework/Test/Transactions.php b/src/Pckg/Framework/Test/Transactions.php
index c2a50645..e76541c3 100644
--- a/src/Pckg/Framework/Test/Transactions.php
+++ b/src/Pckg/Framework/Test/Transactions.php
@@ -51,5 +51,4 @@ public function _afterTransactionsExtension()
             $repository->getConnection()->rollBack();
         }
     }
-
 }

From 5b0b2bef0c129ffb1d43ddd56dd51c5707afe12d Mon Sep 17 00:00:00 2001
From: Bojan Rajh <schtr4jh@schtr4jh.net>
Date: Sat, 22 May 2021 11:23:26 +0200
Subject: [PATCH 21/66] Move functions to namespace, BC

---
 src/Pckg/Framework/Helper/functions.php    | 377 ++------
 src/Pckg/Framework/Helper/functions_bc.php | 967 +++++++++++++++++++++
 2 files changed, 1052 insertions(+), 292 deletions(-)
 create mode 100644 src/Pckg/Framework/Helper/functions_bc.php

diff --git a/src/Pckg/Framework/Helper/functions.php b/src/Pckg/Framework/Helper/functions.php
index acabaebb..dfafdd18 100644
--- a/src/Pckg/Framework/Helper/functions.php
+++ b/src/Pckg/Framework/Helper/functions.php
@@ -1,48 +1,52 @@
 <?php
 
-use Carbon\Carbon;
-use Pckg\Auth\Service\Auth;
-use Pckg\Concept\ChainOfResponsibility;
-use Pckg\Concept\Event\AbstractEvent;
-use Pckg\Concept\Reflect;
-use Pckg\Framework\Application;
-use Pckg\Framework\Config;
-use Pckg\Framework\Environment;
-use Pckg\Framework\Request;
-use Pckg\Framework\Request\Data\Flash;
-use Pckg\Framework\Request\Data\Session;
-use Pckg\Framework\Response;
-use Pckg\Framework\Router;
-use Pckg\Framework\View\Twig;
-use Pckg\Generic\Service\Generic;
-use Pckg\Mail\Service\Mail\Handler\Queue as QueueMailHandler;
-use Pckg\Manager\Asset;
-use Pckg\Manager\Cache;
-use Pckg\Manager\Gtm;
-use Pckg\Manager\Locale;
-use Pckg\Manager\Meta;
-use Pckg\Manager\Seo;
-use Pckg\Manager\Vue;
-use Pckg\Queue\Service\Queue;
-use Pckg\Translator\Service\Translator;
-
-if (!function_exists('env')) {
-/**
- * @return Environment
- */
+namespace Pckg\Framework\Helper {
+
+    use Carbon\Carbon;
+    use Exception;
+    use Pckg\Auth\Service\Auth;
+    use Pckg\Concept\ChainOfResponsibility;
+    use Pckg\Concept\Event\AbstractEvent;
+    use Pckg\Concept\Reflect;
+    use Pckg\Framework\Application;
+    use Pckg\Framework\Config;
+    use Pckg\Framework\Environment;
+    use Pckg\Framework\Request;
+    use Pckg\Framework\Request\Data\Flash;
+    use Pckg\Framework\Request\Data\Session;
+    use Pckg\Framework\Response;
+    use Pckg\Framework\Router;
+    use Pckg\Framework\Router\Route\Group;
+    use Pckg\Framework\Router\Route\Route;
+    use Pckg\Framework\Router\Route\VueRoute;
+    use Pckg\Framework\View\Twig;
+    use Pckg\Generic\Service\Generic;
+    use Pckg\Mail\Service\Mail\Handler\Queue as QueueMailHandler;
+    use Pckg\Manager\Asset;
+    use Pckg\Manager\Cache;
+    use Pckg\Manager\Gtm;
+    use Pckg\Manager\Locale;
+    use Pckg\Manager\Meta;
+    use Pckg\Manager\Seo;
+    use Pckg\Manager\Vue;
+    use Pckg\Queue\Service\Queue;
+    use Pckg\Translator\Service\Translator;
+    use Throwable;
+
+    /**
+     * @return Environment
+     */
     function env()
     {
         return context()->get(Environment::class);
     }
-}
 
-/**
- * @return mixed|string|array
- */
-if (!function_exists('dotenv')) {
+    /**
+     * @return mixed|string|array
+     */
     function dotenv($key, $default = null)
     {
-        $dotenv = context()->getOrCreate(\josegonzalez\Dotenv\Loader::class, [], null, function() {
+        $dotenv = context()->getOrCreate(\josegonzalez\Dotenv\Loader::class, [], null, function () {
             $file = BASE_PATH . '.env';
             if (!file_exists($file)) {
                 return;
@@ -62,19 +66,15 @@ function dotenv($key, $default = null)
 
         return $var[$key] ?? $default;
     }
-}
 
-/**
- * @return Application
- */
-if (!function_exists('app')) {
+    /**
+     * @return Application
+     */
     function app()
     {
         return context()->get(Application::class);
     }
-}
 
-if (!function_exists('getDotted')) {
     function getDotted($data, $keys, $i = 0, $default = null)
     {
         if (!isset($keys[$i])) {
@@ -85,9 +85,7 @@ function getDotted($data, $keys, $i = 0, $default = null)
 
         return $default;
     }
-}
 
-if (!function_exists('hasDotted')) {
     function hasDotted($data, $keys, $i = 0)
     {
         if (!isset($keys[$i])) {
@@ -102,9 +100,7 @@ function hasDotted($data, $keys, $i = 0)
 
         return false;
     }
-}
 
-if (!function_exists('retry')) {
     function retry(callable $task, int $times = null, callable $onError = null, $interval = null)
     {
         $retry = new \Pckg\Framework\Helper\Retry();
@@ -123,9 +119,7 @@ function retry(callable $task, int $times = null, callable $onError = null, $int
 
         return $retry->make($task);
     }
-}
 
-if (!function_exists('request')) {
     /**
      * @return Request
      */
@@ -133,62 +127,50 @@ function request()
     {
         return context()->getOrCreate(Request::class);
     }
-}
 
-/**
- * @return Post|mixed|string|null|array
- */
-if (!function_exists('post')) {
+    /**
+     * @return Post|mixed|string|null|array
+     */
     function post($key = null, $default = [])
     {
         return request()->post($key, $default);
     }
-}
 
-/**
- * @return Request|mixed
- */
-if (!function_exists('get')) {
+    /**
+     * @return Request|mixed
+     */
     function get($key = null, $default = [])
     {
         return request()->get($key, $default);
     }
-}
 
-/**
- * @return Request|mixed
- */
-if (!function_exists('server')) {
+    /**
+     * @return Request|mixed
+     */
     function server($key = null, $default = [])
     {
         return request()->server($key, $default);
     }
-}
 
-/**
- * @return Request|mixed
- */
-if (!function_exists('cookie')) {
+    /**
+     * @return Request|mixed
+     */
     function cookie($key = null, $default = [])
     {
         return request()->cookie($key, $default);
     }
-}
 
-/**
- * @return Request
- */
-if (!function_exists('files')) {
+    /**
+     * @return Request
+     */
     function files($key = null, $default = [])
     {
         return request()->files($key, $default);
     }
-}
 
-/**
- * @return mixed
- */
-if (!function_exists('required')) {
+    /**
+     * @return mixed
+     */
     function required($value, $type = null, $key = null)
     {
         if (!$value) {
@@ -205,9 +187,7 @@ function required($value, $type = null, $key = null)
 
         return $value;
     }
-}
 
-if (!function_exists('auth')) {
     /**
      * @return Auth
      */
@@ -221,9 +201,7 @@ function auth($provider = null)
 
         return $auth;
     }
-}
 
-if (!function_exists('uuid4')) {
     function uuid4($toString = true)
     {
         $uuid = \Ramsey\Uuid\Uuid::uuid4();
@@ -234,9 +212,7 @@ function uuid4($toString = true)
 
         return $uuid;
     }
-}
 
-if (!function_exists('response')) {
     /**
      * @return Response
      */
@@ -244,23 +220,17 @@ function response()
     {
         return context()->getOrCreate(Response::class);
     }
-}
 
-if (!function_exists('redirect')) {
     function redirect($url = null)
     {
         return response()->redirect($url);
     }
-}
 
-if (!function_exists('internal')) {
     function internal($url = null)
     {
         return response()->internal($url);
     }
-}
 
-if (!function_exists('entity')) {
     /**
      * @param null $entity
      *
@@ -270,9 +240,7 @@ function entity($entity = null)
     {
         return context()->getEntity($entity);
     }
-}
 
-if (!function_exists('form')) {
     /**
      * @param null $form
      *
@@ -282,9 +250,7 @@ function form($form = null)
     {
         return context()->getForm($form);
     }
-}
 
-if (!function_exists('factory')) {
     /**
      * @param $factory
      *
@@ -294,9 +260,7 @@ function factory($factory)
     {
         return context()->getFactory($factory);
     }
-}
 
-if (!function_exists('schedule')) {
     /**
      * @param \Event $event
      * @param        $strtotime
@@ -305,9 +269,7 @@ function schedule(AbstractEvent $event, $strtotime)
     {
         // Event::schedule($event, $strtotime);
     }
-}
 
-if (!function_exists('isValidEmail')) {
     function isValidEmail($email, $dns = false)
     {
         if (!$email) {
@@ -330,11 +292,9 @@ function isValidEmail($email, $dns = false)
 
         return true;
     }
-}
 
-/* router */
+    /* router */
 
-if (!function_exists('router')) {
     /**
      * @return \Pckg\Framework\Router
      */
@@ -342,9 +302,7 @@ function router()
     {
         return context()->get(Router::class);
     }
-}
 
-if (!function_exists('url')) {
     /**
      * @param       $url
      * @param array $params
@@ -365,25 +323,19 @@ function url($url, $params = [], $absolute = false, $envPrefix = true)
             return exception($e);
         }
     }
-}
 
-if (!function_exists('email')) {
     function email($template, $receiver, $data = [])
     {
         $handler = config('pckg.mail.handler', QueueMailHandler::class);
 
         return Reflect::create($handler)->send($template, $receiver, $data);
     }
-}
 
-if (!function_exists('resolve')) {
     function resolve($class, $data = [])
     {
         return Reflect::resolve($class, $data);
     }
-}
 
-if (!function_exists('queue')) {
     /**
      * @return Queue
      */
@@ -396,14 +348,12 @@ function queue($channel = null, $command = null, $data = [])
 
         return $queue->queue($channel, $command, $data);
     }
-}
 
-if (!function_exists('chain')) {
     /**
      * @param       $chains
-     * @param null  $method
+     * @param null $method
      * @param array $args
-     * @param null  $firstChain
+     * @param null $firstChain
      *
      * @return mixed|null|object
      * @throws Exception
@@ -412,11 +362,9 @@ function chain($chains, $method = 'execute', array $args = [], callable $firstCh
     {
         return (new ChainOfResponsibility($chains, $method, $args, $firstChain))->runChains();
     }
-}
 
-/* session */
+    /* session */
 
-if (!function_exists('session')) {
     /**
      * @return mixed|Session
      */
@@ -430,9 +378,7 @@ function session($key = null, $default = null)
 
         return $session->get($key, $default);
     }
-}
 
-if (!function_exists('flash')) {
     /**
      * @param      $key
      * @param null $val
@@ -443,11 +389,9 @@ function flash($key, $val)
     {
         return context()->getOrCreate(Flash::class)->set($key, $val);
     }
-}
 
-/* config */
+    /* config */
 
-if (!function_exists('config')) {
     /**
      * @param $text
      *
@@ -463,9 +407,7 @@ function config($key = null, $default = null)
 
         return $config;
     }
-}
 
-if (!function_exists('first')) {
     function first(...$args)
     {
         foreach ($args as $arg) {
@@ -476,9 +418,7 @@ function first(...$args)
 
         return null;
     }
-}
 
-if (!function_exists('oneFrom')) {
     function oneFrom($needle, $haystack, $default)
     {
         if (in_array($needle, $haystack)) {
@@ -487,9 +427,7 @@ function oneFrom($needle, $haystack, $default)
 
         return $default;
     }
-}
 
-if (!function_exists('firstWithZero')) {
     function firstWithZero(...$args)
     {
         foreach ($args as $arg) {
@@ -500,9 +438,7 @@ function firstWithZero(...$args)
 
         return null;
     }
-}
 
-if (!function_exists('path')) {
     /**
      * @param      $key
      * @param null $val
@@ -531,9 +467,7 @@ function path($key = null, $val = null)
 
         return $path;
     }
-}
 
-if (!function_exists('relativePath')) {
     /**
      * @param      $key
      * @param null $val
@@ -544,9 +478,7 @@ function relativePath($key = null)
     {
         return str_replace(path('root'), '/', config('path.' . $key));
     }
-}
 
-if (!function_exists('uniqueFile')) {
     /**
      * @param $filename
      * @param $dir
@@ -564,18 +496,16 @@ function uniqueFile($filename, $folder)
 
         return $newPath;
     }
-}
 
-/* quick helpers */
+    /* quick helpers */
 
-if (!function_exists('__i18n')) {
     function __i18n($key, $data = [], $lang = null)
     {
         try {
             $translator = context()->getOrCreate(
                 Translator::class,
                 [],
-                function(Translator $translator) {
+                function (Translator $translator) {
                     $translator->boot();
                 }
             );
@@ -593,16 +523,12 @@ function(Translator $translator) {
             throw $e;
         }
     }
-}
 
-if (!function_exists('__')) {
     function __($key, $data = [], $lang = null)
     {
         return __i18n($key, $data, $lang);
     }
-}
 
-if (!function_exists('toCamel')) {
     /**
      * @param $text
      *
@@ -623,9 +549,7 @@ function toCamel($text)
 
         return ucfirst(str_replace("_", "", implode($text)));
     }
-}
 
-if (!function_exists('kaorealpath')) {
     /**
      *
      */
@@ -644,9 +568,7 @@ function kaorealpath($path)
 
         return implode('/', $new);
     }
-}
 
-if (!function_exists('view')) {
     /**
      * @param       $view
      * @param array $data
@@ -658,8 +580,8 @@ function view($view = null, $data = [], $assets = [])
         $view = new Twig($view, $data);
         if (
             $parent = realpath(
-            dirname(debug_backtrace()[0]['file']) . path('ds') . '..' . path('ds') . 'View' . path('ds')
-        )
+                dirname(debug_backtrace()[0]['file']) . path('ds') . '..' . path('ds') . 'View' . path('ds')
+            )
         ) {
             if (is_dir($parent)) {
                 $view->addDir($parent, Twig::PRIORITY_LAST);
@@ -682,9 +604,7 @@ function view($view = null, $data = [], $assets = [])
 
         return $view;
     }
-}
 
-if (!function_exists('assetManager')) {
     /**
      * @return Asset
      */
@@ -692,9 +612,7 @@ function assetManager()
     {
         return context()->getOrCreate(Asset::class);
     }
-}
 
-if (!function_exists('vueManager')) {
     /**
      * @return Vue
      */
@@ -702,9 +620,7 @@ function vueManager()
     {
         return context()->getOrCreate(Vue::class);
     }
-}
 
-if (!function_exists('seoManager')) {
     /**
      * @return Seo
      */
@@ -712,9 +628,7 @@ function seoManager()
     {
         return context()->getOrCreate(Seo::class);
     }
-}
 
-if (!function_exists('localeManager')) {
     /**
      * @return Locale
      */
@@ -722,9 +636,7 @@ function localeManager()
     {
         return context()->getOrCreate(Locale::class);
     }
-}
 
-if (!function_exists('metaManager')) {
     /**
      * @return Meta
      */
@@ -732,9 +644,7 @@ function metaManager()
     {
         return context()->getOrCreate(Meta::class);
     }
-}
 
-if (!function_exists('gtmManager')) {
     /**
      * @return Gtm
      */
@@ -742,16 +652,12 @@ function gtmManager()
     {
         return context()->getOrCreate(Gtm::class);
     }
-}
 
-if (!function_exists('assets')) {
     function assets($assets)
     {
         assetManager()->addAssets($assets);
     }
-}
 
-if (!function_exists('autoloader')) {
     /**
      * @return mixed
      */
@@ -759,25 +665,19 @@ function autoloader()
     {
         return require BASE_PATH . "vendor/autoload.php";
     }
-}
 
-if (!function_exists('isConsole')) {
     function isConsole()
     {
         return !request()->server('HTTP_HOST');
         return !isset($_SERVER['HTTP_HOST']);
     }
-}
 
-if (!function_exists('isHttp')) {
     function isHttp()
     {
         return !!request()->server('HTTP_HOST');
         return isset($_SERVER['HTTP_HOST']);
     }
-}
 
-if (!function_exists('dd')) {
     /**
      * @param mixed ...$mixed
      * @deprecated
@@ -789,9 +689,7 @@ function dd(...$mixed)
         }
         die();
     }
-}
 
-if (!function_exists('ddd')) {
     function ddd(...$mixed)
     {
         foreach ($mixed as $m) {
@@ -799,9 +697,7 @@ function ddd(...$mixed)
         }
         die();
     }
-}
 
-if (!function_exists('d')) {
     function d(...$mixed)
     {
         try {
@@ -820,9 +716,7 @@ function d(...$mixed)
 
         return true;
     }
-}
 
-if (!function_exists('db')) {
     function db($depth = 3, $start = 0, $debug = true)
     {
         $db = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
@@ -837,23 +731,17 @@ function db($depth = 3, $start = 0, $debug = true)
 
         return $d;
     }
-}
 
-if (!function_exists('dev')) {
     function dev()
     {
         return env()->isDev();
     }
-}
 
-if (!function_exists('prod')) {
     function prod()
     {
         return env()->isPro();
     }
-}
 
-if (!function_exists('implicitDev')) {
     function implicitDev()
     {
         $remote = request()->clientIp();
@@ -877,23 +765,17 @@ function implicitDev()
 
         return false;
     }
-}
 
-if (!function_exists('win')) {
     function win()
     {
         return env()->isWin();
     }
-}
 
-if (!function_exists('unix')) {
     function unix()
     {
         return env()->isUnix();
     }
-}
 
-if (!function_exists('message')) {
     function message($message, $collector = 'messages')
     {
         if ($debugBar = debugBar()) {
@@ -904,9 +786,7 @@ function message($message, $collector = 'messages')
             $debugBar->getCollector($collector)->addMessage($message);
         }
     }
-}
 
-if (!function_exists('array_merge_array')) {
     function array_merge_array($merge, $to)
     {
         foreach ($to as $key => &$val) {
@@ -915,9 +795,7 @@ function array_merge_array($merge, $to)
 
         return $to;
     }
-}
 
-if (!function_exists('merge_arrays')) {
     function merge_arrays($to, $merge, $k = null)
     {
         $replace = config('pckg.config.parse.replace', []);
@@ -966,9 +844,7 @@ function merge_arrays($to, $merge, $k = null)
 
         return $to;
     }
-}
 
-if (!function_exists('array_preg_match')) {
     function array_preg_match($patterns, $subject)
     {
         foreach ($patterns as $pattern) {
@@ -979,9 +855,7 @@ function array_preg_match($patterns, $subject)
 
         return false;
     }
-}
 
-if (!function_exists('str_lreplace')) {
     function str_lreplace($search, $replace, $subject)
     {
         $pos = strrpos($subject, $search);
@@ -992,9 +866,7 @@ function str_lreplace($search, $replace, $subject)
 
         return $subject;
     }
-}
 
-if (!function_exists('exception')) {
     /**
      * @param Exception $e
      *
@@ -1005,9 +877,7 @@ function exception(Throwable $e, $parent = false)
         return $e->getMessage() . ' @ ' . $e->getFile() . ':' . $e->getLine()
             . ($parent && $e->getPrevious() ? ('(' . exception($e->getPrevious()) . ')') : '');
     }
-}
 
-if (!function_exists('img')) {
     function img($name, $dir = null, $relative = true, $base = null)
     {
         if (!$name) {
@@ -1026,16 +896,12 @@ function img($name, $dir = null, $relative = true, $base = null)
             ? str_replace(path('root'), path('ds'), $base) . $name
             : $base . $name;
     }
-}
 
-if (!function_exists('media')) {
     function media($name, $dir = null, $relative = true, $base = null)
     {
         return img($name, $dir, $relative, $base);
     }
-}
 
-if (!function_exists('runInLocale')) {
     function runInLocale($call, $locale)
     {
         $prevLocale = localeManager()->getCurrent();
@@ -1048,16 +914,12 @@ function runInLocale($call, $locale)
 
         return $response;
     }
-}
 
-if (!function_exists('isArrayList')) {
     function isArrayList($array)
     {
         return array_keys($array) === range(0, count($array) - 1);
     }
-}
 
-if (!function_exists('sluggify')) {
     function sluggify($str, $separator = '-', $special = null, $limit = 64)
     {
         /**
@@ -1087,9 +949,7 @@ function sluggify($str, $separator = '-', $special = null, $limit = 64)
 
         return $str;
     }
-}
 
-if (!function_exists('get_date_diff')) {
     function get_date_diff($time1, $time2, $precision = 2)
     {
         // If not numeric then convert timestamps
@@ -1143,9 +1003,7 @@ function get_date_diff($time1, $time2, $precision = 2)
         // Return string with times
         return implode(", ", $times);
     }
-}
 
-if (!function_exists('br2nl')) {
     function br2nl($string)
     {
         $string = str_replace(['<br />', '<br/>', '<br>'], "\n", $string);
@@ -1153,9 +1011,7 @@ function br2nl($string)
 
         return '"' . $string . '"';
     }
-}
 
-if (!function_exists('array_union')) {
     function array_union($one, $two)
     {
         return array_merge(
@@ -1164,21 +1020,17 @@ function array_union($one, $two)
             array_diff($two, $one)
         );
     }
-}
 
-if (!function_exists('transform')) {
     function transform($collection, $rules)
     {
         return collect($collection)->map($rules)->all();
     }
-}
 
-if (!function_exists('cache')) {
     /**
-     * @param null          $key
+     * @param null $key
      * @param callable|null $value
-     * @param string        $type
-     * @param int           $time
+     * @param string $type
+     * @param int $time
      *
      * @return mixed|Cache|array|string
      * @throws Exception
@@ -1191,9 +1043,7 @@ function cache($key = null, $value = null, $type = 'request', $time = 0)
             ? $cache->cache($key, $value, $type, $time)
             : $cache;
     }
-}
 
-if (!function_exists('between')) {
     function between($value, $min, $max)
     {
         $value = (int)$value;
@@ -1205,22 +1055,18 @@ function between($value, $min, $max)
 
         return $value;
     }
-}
 
-if (!function_exists('route')) {
     function route($route = '', $view = 'index', $controller = null)
     {
-        return new Pckg\Framework\Router\Route\Route($route, $view, $controller);
+        return new Route($route, $view, $controller);
     }
-}
 
-if (!function_exists('vueRoute')) {
     /**
      * @param string $route
      * @param string|null $component
      * @param array $tags
      * @param array $children
-     * @return Router\Route\Route|Router\Route\VueRoute
+     * @return Route|VueRoute
      */
     function vueRoute(string $route = '', string $component = null, array $tags = [], array $children = [])
     {
@@ -1237,19 +1083,18 @@ function vueRoute(string $route = '', string $component = null, array $tags = []
                 : $component;
         }
 
-        return (new Router\Route\VueRoute($route, function () use ($tags, $defaultTags) {
+        // @phpstan-ignore-next-line
+        return (new VueRoute($route, function () use ($tags, $defaultTags) {
             return $defaultTags['vue:route:template'] ?? Vue::getLayout();
         }))->data([
             'tags' => $tags ? array_merge($defaultTags, $tags) : $defaultTags,
             'method' => 'GET', // what happens on other methods?
         ])->children($children);
     }
-}
 
-if (!function_exists('routeGroup')) {
     function routeGroup($data = [], $routes = [])
     {
-        $routeGroup = new Pckg\Framework\Router\Route\Group($data);
+        $routeGroup = new Group($data);
 
         if ($routes) {
             $routeGroup->routes($routes);
@@ -1257,9 +1102,7 @@ function routeGroup($data = [], $routes = [])
 
         return $routeGroup;
     }
-}
 
-if (!function_exists('component')) {
     function component($component, array $params = [])
     {
         $build = '<' . $component . '';
@@ -1267,6 +1110,7 @@ function component($component, array $params = [])
         foreach ($params as $k => $v) {
             if (substr($k, 0, 1) === ':') {
                 if (!$generic) {
+                    // @phpstan-ignore-next-line
                     $generic = resolve(Generic::class);
                 }
 
@@ -1285,16 +1129,12 @@ function component($component, array $params = [])
 
         return $build;
     }
-}
 
-if (!function_exists('price')) {
     function price($price, $currency = null)
     {
         return number($price) . ' ' . ($currency ?? config('pckg.payment.currencySign'));
     }
-}
 
-if (!function_exists('number')) {
     function number($price)
     {
         if (is_null($price)) {
@@ -1304,22 +1144,18 @@ function number($price)
         $localeManager = resolve(Locale::class);
 
         return number_format(
-                $price,
-                firstWithZero(config('pckg.locale.decimals'), 2),
-                $localeManager->getDecimalPoint(),
-                $localeManager->getThousandSeparator()
-            );
+            $price,
+            firstWithZero(config('pckg.locale.decimals'), 2),
+            $localeManager->getDecimalPoint(),
+            $localeManager->getThousandSeparator()
+        );
     }
-}
 
-if (!function_exists('is_associative_array')) {
     function is_associative_array($array)
     {
         return is_array($array) && (!$array || range(0, count($array) - 1) == array_keys($array));
     }
-}
 
-if (!function_exists('strbetween')) {
     function strbetween($text, $from, $to)
     {
         $start = strpos($text, $from) + strlen($from);
@@ -1327,9 +1163,7 @@ function strbetween($text, $from, $to)
 
         return substr($text, $start, $end - $start);
     }
-}
 
-if (!function_exists('cdn')) {
     function cdn($file)
     {
         $file = trim($file);
@@ -1349,18 +1183,14 @@ function cdn($file)
 
         return 'https://' . $host . $file;
     }
-}
 
-if (!function_exists('isRemoteUrl')) {
     function isRemoteUrl($url)
     {
         $url = trim($url);
 
         return strpos($url, '//') === 0 || strpos($url, 'https://') === 0 || strpos($url, 'http://') === 0;
     }
-}
 
-if (!function_exists('only')) {
     function only($array, $keys, $keepUndefined = true)
     {
         $final = [];
@@ -1377,16 +1207,12 @@ function only($array, $keys, $keepUndefined = true)
 
         return $final;
     }
-}
 
-if (!function_exists('onlyFromRequest')) {
     function onlyFromRequest(array $data, string $key = null)
     {
         return only($data, array_keys($key ? post($key) : post()->all()), false);
     }
-}
 
-if (!function_exists('onlyWhen')) {
     function onlyWhen($array, $keys)
     {
         if (!is_array($array) && !is_object($array)) {
@@ -1411,25 +1237,19 @@ function onlyWhen($array, $keys)
 
         return $final;
     }
-}
 
-if (!function_exists('throwLogOrContinue')) {
     function throwLogOrContinue(Throwable $e)
     {
         if (dev() || isConsole()) {
             throw $e;
         }
     }
-}
 
-if (!function_exists('toSafeFilename')) {
     function toSafeFilename($filename, $special = ' ()\[\]#')
     {
         return substr(preg_replace("/[^A-Za-z0-9\-." . $special . "]/", '', $filename), -200);
     }
-}
 
-if (!function_exists('datetime')) {
     function datetime($date, $format = null)
     {
         if (!$format) {
@@ -1438,9 +1258,7 @@ function datetime($date, $format = null)
 
         return (new Carbon($date))->format($format);
     }
-}
 
-if (!function_exists('datef')) {
     function datef($date, $format = null)
     {
         if (!$format) {
@@ -1449,9 +1267,7 @@ function datef($date, $format = null)
 
         return (new Carbon($date))->format($format);
     }
-}
 
-if (!function_exists('timef')) {
     function timef($date, $format = null)
     {
         if (!$format) {
@@ -1460,24 +1276,18 @@ function timef($date, $format = null)
 
         return (new Carbon($date))->format($format);
     }
-}
 
-if (!function_exists('sha1random')) {
     function sha1random()
     {
         return sha1(\Defuse\Crypto\Key::createNewRandomKey()->saveToAsciiSafeString());
     }
-}
 
-if (!function_exists('filename')) {
     function filename($file)
     {
         $exploded = explode('/', $file);
         return end($exploded);
     }
-}
 
-if (!function_exists('escapeshellargs')) {
     function escapeshellargs($data)
     {
         $parameters = [];
@@ -1513,9 +1323,7 @@ function escapeshellargs($data)
 
         return $parameters;
     }
-}
 
-if (!function_exists('seededShuffle')) {
     function seededShuffle($seed = null, $chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ')
     {
         $items = str_split($chars, 1);
@@ -1527,9 +1335,7 @@ function seededShuffle($seed = null, $chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVW
 
         return implode($items);
     }
-}
 
-if (!function_exists('seededHash')) {
     function seededHash(int $seed, $length)
     {
         $shuffled = seededShuffle($seed);
@@ -1544,9 +1350,7 @@ function seededHash(int $seed, $length)
 
         return implode($hash);
     }
-}
 
-if (!function_exists('str2int')) {
     function str2int($string, $max = PHP_INT_MAX)
     {
         $array = str_split($string, 1);
@@ -1561,9 +1365,7 @@ function str2int($string, $max = PHP_INT_MAX)
 
         return (int)floor($range * $max);
     }
-}
 
-if (!function_exists('int2str')) {
     function int2str(int $int, $length = 8)
     {
         $chars = 'abcdefghijklmnopqrstuvwxyz';
@@ -1578,16 +1380,12 @@ function int2str(int $int, $length = 8)
 
         return str_pad($str, $length, 'a', STR_PAD_LEFT);
     }
-}
 
-if (!function_exists('numequals')) {
     function numequals($a, $b)
     {
         return abs((float)$a - (float)$b) < PHP_FLOAT_EPSILON;
     }
-}
 
-if (!function_exists('encryptBlob')) {
     function encryptBlob($plaintext, $password = null)
     {
         if (!$password) {
@@ -1596,9 +1394,7 @@ function encryptBlob($plaintext, $password = null)
 
         return \Defuse\Crypto\Crypto::encryptWithPassword($plaintext, $password);
     }
-}
 
-if (!function_exists('decryptBlob')) {
     function decryptBlob($ciphertext, $password = null)
     {
         if (!$password) {
@@ -1607,18 +1403,15 @@ function decryptBlob($ciphertext, $password = null)
 
         return \Defuse\Crypto\Crypto::decryptWithPassword($ciphertext, $password);
     }
-}
 
-if (!function_exists('appendIf')) {
     function appendIf($is, $append)
     {
         return $is ? $is . $append : '';
     }
-}
 
-if (!function_exists('prependIf')) {
     function prependIf($prepend, $is)
     {
         return $is ? $prepend . $is : '';
     }
+
 }
diff --git a/src/Pckg/Framework/Helper/functions_bc.php b/src/Pckg/Framework/Helper/functions_bc.php
new file mode 100644
index 00000000..facc6a85
--- /dev/null
+++ b/src/Pckg/Framework/Helper/functions_bc.php
@@ -0,0 +1,967 @@
+<?php
+
+use Carbon\Carbon;
+use Pckg\Auth\Service\Auth;
+use Pckg\Concept\ChainOfResponsibility;
+use Pckg\Concept\Event\AbstractEvent;
+use Pckg\Concept\Reflect;
+use Pckg\Framework\Application;
+use Pckg\Framework\Config;
+use Pckg\Framework\Environment;
+use Pckg\Framework\Request;
+use Pckg\Framework\Request\Data\Flash;
+use Pckg\Framework\Request\Data\Session;
+use Pckg\Framework\Response;
+use Pckg\Framework\Router;
+use Pckg\Framework\View\Twig;
+use Pckg\Generic\Service\Generic;
+use Pckg\Mail\Service\Mail\Handler\Queue as QueueMailHandler;
+use Pckg\Manager\Asset;
+use Pckg\Manager\Cache;
+use Pckg\Manager\Gtm;
+use Pckg\Manager\Locale;
+use Pckg\Manager\Meta;
+use Pckg\Manager\Seo;
+use Pckg\Manager\Vue;
+use Pckg\Queue\Service\Queue;
+use Pckg\Translator\Service\Translator;
+use Pckg\Framework;
+
+if (!function_exists('env')) {
+    /**
+     * @return Environment
+     */
+    function env()
+    {
+        return Framework\Helper\env();
+    }
+}
+
+/**
+ * @return mixed|string|array
+ */
+if (!function_exists('dotenv')) {
+    function dotenv($key, $default = null)
+    {
+        return Framework\Helper\dotenv($key, $default);
+    }
+}
+
+/**
+ * @return Application
+ */
+if (!function_exists('app')) {
+    function app()
+    {
+        return Framework\Helper\app();
+    }
+}
+
+if (!function_exists('getDotted')) {
+    function getDotted($data, $keys, $i = 0, $default = null)
+    {
+        return Framework\Helper\getDotted($data, $keys, $i, $default);
+    }
+}
+
+if (!function_exists('hasDotted')) {
+    function hasDotted($data, $keys, $i = 0)
+    {
+        return Framework\Helper\hasDotted($data, $keys, $i);
+    }
+}
+
+if (!function_exists('retry')) {
+    function retry(callable $task, int $times = null, callable $onError = null, $interval = null)
+    {
+        return Framework\Helper\retry($task, $times, $onError, $interval);
+    }
+}
+
+if (!function_exists('request')) {
+    /**
+     * @return Request
+     */
+    function request()
+    {
+        return Framework\Helper\request();
+    }
+}
+
+/**
+ * @return Request\Data\Post|mixed|string|null|array
+ */
+if (!function_exists('post')) {
+    function post($key = null, $default = [])
+    {
+        return Framework\Helper\post($key, $default);
+    }
+}
+
+/**
+ * @return Request|mixed
+ */
+if (!function_exists('get')) {
+    function get($key = null, $default = [])
+    {
+        return Framework\Helper\get($key, $default);
+    }
+}
+
+/**
+ * @return Request|mixed
+ */
+if (!function_exists('server')) {
+    function server($key = null, $default = [])
+    {
+        return Framework\Helper\server($key, $default);
+    }
+}
+
+/**
+ * @return Request|mixed
+ */
+if (!function_exists('cookie')) {
+    function cookie($key = null, $default = [])
+    {
+        return Framework\Helper\cookie($key, $default);
+    }
+}
+
+/**
+ * @return Request
+ */
+if (!function_exists('files')) {
+    function files($key = null, $default = [])
+    {
+        return Framework\Helper\files($key, $default);
+    }
+}
+
+/**
+ * @return mixed
+ */
+if (!function_exists('required')) {
+    function required($value, $type = null, $key = null)
+    {
+        return Framework\Helper\required($value, $type, $key);
+    }
+}
+
+if (!function_exists('auth')) {
+    /**
+     * @return Auth
+     */
+    function auth($provider = null)
+    {
+        return Framework\Helper\auth($provider);
+    }
+}
+
+if (!function_exists('uuid4')) {
+    function uuid4($toString = true)
+    {
+        return Framework\Helper\uuid4($toString);
+    }
+}
+
+if (!function_exists('response')) {
+    /**
+     * @return Response
+     */
+    function response()
+    {
+        return Framework\Helper\response();
+    }
+}
+
+if (!function_exists('redirect')) {
+    function redirect($url = null)
+    {
+        return Framework\Helper\redirect($url);
+    }
+}
+
+if (!function_exists('internal')) {
+    function internal($url = null)
+    {
+        return Framework\Helper\internal($url);
+    }
+}
+
+if (!function_exists('entity')) {
+    /**
+     * @param null $entity
+     *
+     * @return \Pckg\Database\Entity
+     */
+    function entity($entity = null)
+    {
+        return Framework\Helper\entity($entity);
+    }
+}
+
+if (!function_exists('form')) {
+    /**
+     * @param null $form
+     *
+     * @return \Htmlbuilder\Element\Form
+     */
+    function form($form = null)
+    {
+        return Framework\Helper\form($form);
+    }
+}
+
+if (!function_exists('factory')) {
+    /**
+     * @param $factory
+     *
+     * @return \Pckg\Concept\Factory
+     */
+    function factory($factory)
+    {
+        return Framework\Helper\factory($factory);
+    }
+}
+
+if (!function_exists('schedule')) {
+    /**
+     * @param \Event $event
+     * @param        $strtotime
+     */
+    function schedule(AbstractEvent $event, $strtotime)
+    {
+        return Framework\Helper\schedule($event, $strtotime);
+    }
+}
+
+if (!function_exists('isValidEmail')) {
+    function isValidEmail($email, $dns = false)
+    {
+        return Framework\Helper\isValidEmail($email, $dns);
+    }
+}
+
+/* router */
+
+if (!function_exists('router')) {
+    /**
+     * @return \Pckg\Framework\Router
+     */
+    function router()
+    {
+        return Framework\Helper\router();
+    }
+}
+
+if (!function_exists('url')) {
+    /**
+     * @param       $url
+     * @param array $params
+     *
+     * @return string
+     */
+    function url($url, $params = [], $absolute = false, $envPrefix = true)
+    {
+        return Framework\Helper\url($url, $params, $absolute, $envPrefix);
+    }
+}
+
+if (!function_exists('email')) {
+    function email($template, $receiver, $data = [])
+    {
+        return Framework\Helper\email($template, $receiver, $data);
+    }
+}
+
+if (!function_exists('resolve')) {
+    function resolve($class, $data = [])
+    {
+        return Framework\Helper\resolve($class, $data);
+    }
+}
+
+if (!function_exists('queue')) {
+    /**
+     * @return Queue
+     */
+    function queue($channel = null, $command = null, $data = [])
+    {
+        return Framework\Helper\queue($channel, $command, $data);
+    }
+}
+
+if (!function_exists('chain')) {
+    /**
+     * @param       $chains
+     * @param null $method
+     * @param array $args
+     * @param null $firstChain
+     *
+     * @return mixed|null|object
+     * @throws Exception
+     */
+    function chain($chains, $method = 'execute', array $args = [], callable $firstChain = null)
+    {
+        return Framework\Helper\chain($chains, $method, $args, $firstChain);
+    }
+}
+
+/* session */
+
+if (!function_exists('session')) {
+    /**
+     * @return mixed|Session
+     */
+    function session($key = null, $default = null)
+    {
+        return Framework\Helper\session($key, $default);
+    }
+}
+
+if (!function_exists('flash')) {
+    /**
+     * @param      $key
+     * @param null $val
+     *
+     * @return mixed|Flash
+     */
+    function flash($key, $val)
+    {
+        return Framework\Helper\flash($key, $val);
+    }
+}
+
+/* config */
+
+if (!function_exists('config')) {
+    /**
+     * @param $text
+     *
+     * @return mixed|Config|array|callable
+     */
+    function config($key = null, $default = null)
+    {
+        return Framework\Helper\config($key, $default);
+    }
+}
+
+if (!function_exists('first')) {
+    function first(...$args)
+    {
+        return Framework\Helper\first(...$args);
+    }
+}
+
+if (!function_exists('oneFrom')) {
+    function oneFrom($needle, $haystack, $default)
+    {
+        return Framework\Helper\oneFrom($needle, $haystack, $default);
+    }
+}
+
+if (!function_exists('firstWithZero')) {
+    function firstWithZero(...$args)
+    {
+        return Framework\Helper\firstWithZero(...$args);
+    }
+}
+
+if (!function_exists('path')) {
+    /**
+     * @param      $key
+     * @param null $val
+     *
+     * @return string
+     */
+    function path($key = null, $val = null)
+    {
+        return Framework\Helper\path($key, $val);
+    }
+}
+
+if (!function_exists('relativePath')) {
+    /**
+     * @param      $key
+     * @param null $val
+     *
+     * @return array|null
+     */
+    function relativePath($key = null)
+    {
+        return Framework\Helper\relativePath($key);
+    }
+}
+
+if (!function_exists('uniqueFile')) {
+    /**
+     * @param $filename
+     * @param $dir
+     *
+     * @return string
+     */
+    function uniqueFile($filename, $folder)
+    {
+        return Framework\Helper\uniqueFile($filename, $folder);
+    }
+}
+
+/* quick helpers */
+
+if (!function_exists('__i18n')) {
+    function __i18n($key, $data = [], $lang = null)
+    {
+        return Framework\Helper\__i18n($key, $data, $lang);
+    }
+}
+
+if (!function_exists('__')) {
+    function __($key, $data = [], $lang = null)
+    {
+        return Framework\Helper\__($key, $data, $lang);
+    }
+}
+
+if (!function_exists('toCamel')) {
+    /**
+     * @param $text
+     *
+     * @return string
+     */
+    function toCamel($text)
+    {
+        return Framework\Helper\toCamel($text);
+    }
+}
+
+if (!function_exists('kaorealpath')) {
+    /**
+     *
+     */
+    function kaorealpath($path)
+    {
+        return Framework\Helper\kaorealpath($path);
+    }
+}
+
+if (!function_exists('view')) {
+    /**
+     * @param       $view
+     * @param array $data
+     *
+     * @return Twig
+     */
+    function view($view = null, $data = [], $assets = [])
+    {
+        return Framework\Helper\view($view, $data, $assets);
+    }
+}
+
+if (!function_exists('assetManager')) {
+    /**
+     * @return Asset
+     */
+    function assetManager()
+    {
+        return Framework\Helper\assetManager();
+    }
+}
+
+if (!function_exists('vueManager')) {
+    /**
+     * @return Vue
+     */
+    function vueManager()
+    {
+        return Framework\Helper\vueManager();
+    }
+}
+
+if (!function_exists('seoManager')) {
+    /**
+     * @return Seo
+     */
+    function seoManager()
+    {
+        return Framework\Helper\seoManager();
+    }
+}
+
+if (!function_exists('localeManager')) {
+    /**
+     * @return Locale
+     */
+    function localeManager()
+    {
+        return Framework\Helper\localeManager();
+    }
+}
+
+if (!function_exists('metaManager')) {
+    /**
+     * @return Meta
+     */
+    function metaManager()
+    {
+        return Framework\Helper\metaManager();
+    }
+}
+
+if (!function_exists('gtmManager')) {
+    /**
+     * @return Gtm
+     */
+    function gtmManager()
+    {
+        return Framework\Helper\gtmManager();
+    }
+}
+
+if (!function_exists('assets')) {
+    function assets($assets)
+    {
+        Framework\Helper\assets($assets);
+    }
+}
+
+if (!function_exists('autoloader')) {
+    /**
+     * @return mixed
+     */
+    function autoloader()
+    {
+        return Framework\Helper\autoloader();
+    }
+}
+
+if (!function_exists('isConsole')) {
+    function isConsole()
+    {
+        return Framework\Helper\isConsole();
+    }
+}
+
+if (!function_exists('isHttp')) {
+    function isHttp()
+    {
+        return Framework\Helper\isHttp();
+    }
+}
+
+if (!function_exists('dd')) {
+    /**
+     * @param mixed ...$mixed
+     * @deprecated
+     */
+    function dd(...$mixed)
+    {
+        Framework\Helper\dd(...$mixed);
+    }
+}
+
+if (!function_exists('ddd')) {
+    function ddd(...$mixed)
+    {
+        Framework\Helper\ddd(...$mixed);
+    }
+}
+
+if (!function_exists('d')) {
+    function d(...$mixed)
+    {
+        Framework\Helper\d(...$mixed);
+    }
+}
+
+if (!function_exists('db')) {
+    function db($depth = 3, $start = 0, $debug = true)
+    {
+        return Framework\Helper\db($depth, $start, $debug);
+    }
+}
+
+if (!function_exists('dev')) {
+    function dev()
+    {
+        return Framework\Helper\dev();
+    }
+}
+
+if (!function_exists('prod')) {
+    function prod()
+    {
+        return Framework\Helper\prod();
+    }
+}
+
+if (!function_exists('implicitDev')) {
+    function implicitDev()
+    {
+        return Framework\Helper\implicitDev();
+    }
+}
+
+if (!function_exists('win')) {
+    function win()
+    {
+        return Framework\Helper\win();
+    }
+}
+
+if (!function_exists('unix')) {
+    function unix()
+    {
+        return Framework\Helper\unix();
+    }
+}
+
+if (!function_exists('message')) {
+    function message($message, $collector = 'messages')
+    {
+        Framework\Helper\message($message, $collector);
+    }
+}
+
+if (!function_exists('array_merge_array')) {
+    function array_merge_array($merge, $to)
+    {
+        return Framework\Helper\array_merge_array($merge, $to);
+    }
+}
+
+if (!function_exists('merge_arrays')) {
+    function merge_arrays($to, $merge, $k = null)
+    {
+        return Framework\Helper\merge_arrays($to, $merge, $k);
+    }
+}
+
+if (!function_exists('array_preg_match')) {
+    function array_preg_match($patterns, $subject)
+    {
+        return Framework\Helper\array_preg_match($patterns, $subject);
+    }
+}
+
+if (!function_exists('str_lreplace')) {
+    function str_lreplace($search, $replace, $subject)
+    {
+        return Framework\Helper\str_lreplace($search, $replace, $subject);
+    }
+}
+
+if (!function_exists('exception')) {
+    /**
+     * @param Exception $e
+     *
+     * @return string
+     */
+    function exception(Throwable $e, $parent = false)
+    {
+        return Framework\Helper\exception($e, $parent);
+    }
+}
+
+if (!function_exists('img')) {
+    function img($name, $dir = null, $relative = true, $base = null)
+    {
+        return Framework\Helper\img($name, $dir, $relative, $base);
+    }
+}
+
+if (!function_exists('media')) {
+    function media($name, $dir = null, $relative = true, $base = null)
+    {
+        return Framework\Helper\media($name, $dir, $relative, $base);
+    }
+}
+
+if (!function_exists('runInLocale')) {
+    function runInLocale($call, $locale)
+    {
+        return Framework\Helper\runInLocale($call, $locale);
+    }
+}
+
+if (!function_exists('isArrayList')) {
+    function isArrayList($array)
+    {
+        return Framework\Helper\isArrayList($array);
+    }
+}
+
+if (!function_exists('sluggify')) {
+    function sluggify($str, $separator = '-', $special = null, $limit = 64)
+    {
+        return Framework\Helper\sluggify($str, $separator, $special, $limit);
+    }
+}
+
+if (!function_exists('get_date_diff')) {
+    function get_date_diff($time1, $time2, $precision = 2)
+    {
+        return Framework\Helper\get_date_diff($time1, $time2, $precision);
+    }
+}
+
+if (!function_exists('br2nl')) {
+    function br2nl($string)
+    {
+        return Framework\Helper\br2nl($string);
+    }
+}
+
+if (!function_exists('array_union')) {
+    function array_union($one, $two)
+    {
+        return Framework\Helper\array_union($one, $two);
+    }
+}
+
+if (!function_exists('transform')) {
+    function transform($collection, $rules)
+    {
+        return Framework\Helper\transform($collection, $rules);
+    }
+}
+
+if (!function_exists('cache')) {
+    /**
+     * @param null $key
+     * @param callable|null $value
+     * @param string $type
+     * @param int $time
+     *
+     * @return mixed|Cache|array|string
+     * @throws Exception
+     */
+    function cache($key = null, $value = null, $type = 'request', $time = 0)
+    {
+        return Framework\Helper\cache($key, $value, $type, $time);
+    }
+}
+
+if (!function_exists('between')) {
+    function between($value, $min, $max)
+    {
+        return Framework\Helper\between($value, $min, $max);
+    }
+}
+
+if (!function_exists('route')) {
+    function route($route = '', $view = 'index', $controller = null)
+    {
+        return Framework\Helper\route($route, $view, $controller);
+    }
+}
+
+if (!function_exists('vueRoute')) {
+    /**
+     * @param string $route
+     * @param string|null $component
+     * @param array $tags
+     * @param array $children
+     * @return Router\Route\Route|Router\Route\VueRoute
+     */
+    function vueRoute(string $route = '', string $component = null, array $tags = [], array $children = [])
+    {
+        return Framework\Helper\vueRoute($route, $component, $tags, $children);
+    }
+}
+
+if (!function_exists('routeGroup')) {
+    function routeGroup($data = [], $routes = [])
+    {
+        return Framework\Helper\routeGroup($data, $routes);
+    }
+}
+
+if (!function_exists('component')) {
+    function component($component, array $params = [])
+    {
+        return Framework\Helper\component($component, $params);
+    }
+}
+
+if (!function_exists('price')) {
+    function price($price, $currency = null)
+    {
+        return Framework\Helper\price($price, $currency);
+    }
+}
+
+if (!function_exists('number')) {
+    function number($price)
+    {
+        return Framework\Helper\number($price);
+    }
+}
+
+if (!function_exists('is_associative_array')) {
+    function is_associative_array($array)
+    {
+        return Framework\Helper\is_associative_array($array);
+    }
+}
+
+if (!function_exists('strbetween')) {
+    function strbetween($text, $from, $to)
+    {
+        return Framework\Helper\strbetween($text, $from, $to);
+    }
+}
+
+if (!function_exists('cdn')) {
+    function cdn($file)
+    {
+        return Framework\Helper\cdn($file);
+    }
+}
+
+if (!function_exists('isRemoteUrl')) {
+    function isRemoteUrl($url)
+    {
+        return Framework\Helper\isRemoteUrl($url);
+    }
+}
+
+if (!function_exists('only')) {
+    function only($array, $keys, $keepUndefined = true)
+    {
+        return Framework\Helper\only($array, $keys, $keepUndefined);
+    }
+}
+
+if (!function_exists('onlyFromRequest')) {
+    function onlyFromRequest(array $data, string $key = null)
+    {
+        return Framework\Helper\onlyFromRequest($data, $key);
+    }
+}
+
+if (!function_exists('onlyWhen')) {
+    function onlyWhen($array, $keys)
+    {
+        return Framework\Helper\onlyWhen($array, $keys);
+    }
+}
+
+if (!function_exists('throwLogOrContinue')) {
+    function throwLogOrContinue(Throwable $e)
+    {
+        Framework\Helper\throwLogOrContinue($e);
+    }
+}
+
+if (!function_exists('toSafeFilename')) {
+    function toSafeFilename($filename, $special = ' ()\[\]#')
+    {
+        return Framework\Helper\toSafeFilename($filename, $special);
+    }
+}
+
+if (!function_exists('datetime')) {
+    function datetime($date, $format = null)
+    {
+        return Framework\Helper\datetime($date, $format);
+    }
+}
+
+if (!function_exists('datef')) {
+    function datef($date, $format = null)
+    {
+        return Framework\Helper\datef($date, $format);
+    }
+}
+
+if (!function_exists('timef')) {
+    function timef($date, $format = null)
+    {
+        return Framework\Helper\timef($date, $format);
+    }
+}
+
+if (!function_exists('sha1random')) {
+    function sha1random()
+    {
+        return Framework\Helper\sha1random();
+    }
+}
+
+if (!function_exists('filename')) {
+    function filename($file)
+    {
+        return Framework\Helper\filename($file);
+    }
+}
+
+if (!function_exists('escapeshellargs')) {
+    function escapeshellargs($data)
+    {
+        return Framework\Helper\escapeshellargs($data);
+    }
+}
+
+if (!function_exists('seededShuffle')) {
+    function seededShuffle($seed = null, $chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ')
+    {
+        return Framework\Helper\seededShuffle($seed, $chars);
+    }
+}
+
+if (!function_exists('seededHash')) {
+    function seededHash(int $seed, $length)
+    {
+        return Framework\Helper\seededHash($seed, $length);
+    }
+}
+
+if (!function_exists('str2int')) {
+    function str2int($string, $max = PHP_INT_MAX)
+    {
+        return Framework\Helper\str2int($string, $max);
+    }
+}
+
+if (!function_exists('int2str')) {
+    function int2str(int $int, $length = 8)
+    {
+        return Framework\Helper\int2str($int, $length);
+    }
+}
+
+if (!function_exists('numequals')) {
+    function numequals($a, $b)
+    {
+        return Framework\Helper\numequals($a, $b);
+    }
+}
+
+if (!function_exists('encryptBlob')) {
+    function encryptBlob($plaintext, $password = null)
+    {
+        return Framework\Helper\encryptBlob($plaintext, $password);
+    }
+}
+
+if (!function_exists('decryptBlob')) {
+    function decryptBlob($ciphertext, $password = null)
+    {
+        return Framework\Helper\decryptBlob($ciphertext, $password);
+    }
+}
+
+if (!function_exists('appendIf')) {
+    function appendIf($is, $append)
+    {
+        return Framework\Helper\appendIf($is, $append);
+    }
+}
+
+if (!function_exists('prependIf')) {
+    function prependIf($prepend, $is)
+    {
+        return Framework\Helper\prependIf($prepend, $is);
+    }
+}

From d61de98824031f9f685ffd431c41f307f1666c70 Mon Sep 17 00:00:00 2001
From: Bojan Rajh <schtr4jh@schtr4jh.net>
Date: Sat, 22 May 2021 11:24:01 +0200
Subject: [PATCH 22/66] PSR12* ruleset

---
 composer.json |   12 +-
 composer.lock | 1470 +++++++++++++++++++++++++++++++------------------
 ruleset.xml   |    8 +
 3 files changed, 941 insertions(+), 549 deletions(-)
 create mode 100644 ruleset.xml

diff --git a/composer.json b/composer.json
index af1cfbaa..c1731b36 100644
--- a/composer.json
+++ b/composer.json
@@ -20,7 +20,8 @@
     "filp/whoops": "2.*",
     "tgalopin/html-sanitizer": "dev-master",
     "ezyang/htmlpurifier": "dev-master",
-    "ext-json": "*"
+    "ext-json": "*",
+    "ext-pcntl": "*"
   },
   "require-dev": {
     "maximebf/debugbar": "1.*",
@@ -41,7 +42,8 @@
       "Pckg": "src\\"
     },
     "files": [
-      "src/Pckg/Framework/Helper/functions.php"
+      "src/Pckg/Framework/Helper/functions.php",
+      "src/Pckg/Framework/Helper/functions_bc.php"
     ]
   },
   "scripts": {
@@ -49,14 +51,14 @@
       "true || vendor/bin/phpunit --help --stop-on-defect",
       "true || vendor/bin/phpcloc cloc src/",
       "vendor/bin/phpstan analyse src/ --level=1",
-      "vendor/bin/phpcs --extensions=php --warning-severity=8 --error-severity=1 --standard=PSR12 --parallel=2 -p src/",
-      "vendor/bin/codecept run"
+      "vendor/bin/phpcs -s --standard=ruleset.xml --extensions=php --warning-severity=8 --error-severity=1 --parallel=2 -p src/",
+      "vendor/bin/codecept run -o \"settings: shuffle: true\""
     ],
     "applycsandpatch": [
       "composer autofix && composer autopatch"
     ],
     "autofix": [
-      "vendor/bin/phpcs --extensions=php --report-diff=phpcs.diff --warning-severity=8 --error-severity=1 --standard=PSR12 --parallel=2 -p src/"
+      "vendor/bin/phpcs --standard=ruleset.xml --extensions=php --report-diff=phpcs.diff --warning-severity=8 --error-severity=1 --parallel=2 -p src/"
     ],
     "autopatch": [
       "patch -p0 -ui phpcs.diff ; rm phpcs.diff"
diff --git a/composer.lock b/composer.lock
index 0c0302b1..0ccba1bd 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,44 +4,43 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "9dbe0d747d42c44ba24189ebb6bc0084",
+    "content-hash": "bc3ec0e0c70b22f9b89ed63711d10548",
     "packages": [
         {
             "name": "doctrine/cache",
-            "version": "1.10.2",
+            "version": "1.11.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/cache.git",
-                "reference": "13e3381b25847283a91948d04640543941309727"
+                "reference": "9c53086695937c50c47936ed86d96150ffbcf60d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/cache/zipball/13e3381b25847283a91948d04640543941309727",
-                "reference": "13e3381b25847283a91948d04640543941309727",
+                "url": "https://api.github.com/repos/doctrine/cache/zipball/9c53086695937c50c47936ed86d96150ffbcf60d",
+                "reference": "9c53086695937c50c47936ed86d96150ffbcf60d",
                 "shasum": ""
             },
             "require": {
                 "php": "~7.1 || ^8.0"
             },
             "conflict": {
-                "doctrine/common": ">2.2,<2.4"
+                "doctrine/common": ">2.2,<2.4",
+                "psr/cache": ">=3"
             },
             "require-dev": {
                 "alcaeus/mongo-php-adapter": "^1.1",
-                "doctrine/coding-standard": "^6.0",
+                "cache/integration-tests": "dev-master",
+                "doctrine/coding-standard": "^8.0",
                 "mongodb/mongodb": "^1.1",
-                "phpunit/phpunit": "^7.0",
-                "predis/predis": "~1.0"
+                "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0",
+                "predis/predis": "~1.0",
+                "psr/cache": "^1.0 || ^2.0",
+                "symfony/cache": "^4.4 || ^5.2"
             },
             "suggest": {
                 "alcaeus/mongo-php-adapter": "Required to use legacy MongoDB driver"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.9.x-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Doctrine\\Common\\Cache\\": "lib/Doctrine/Common/Cache"
@@ -88,7 +87,7 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/cache/issues",
-                "source": "https://github.com/doctrine/cache/tree/1.10.x"
+                "source": "https://github.com/doctrine/cache/tree/1.11.2"
             },
             "funding": [
                 {
@@ -104,7 +103,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-07-07T18:54:01+00:00"
+            "time": "2021-05-20T14:57:29+00:00"
         },
         {
             "name": "ezyang/htmlpurifier",
@@ -112,12 +111,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/ezyang/htmlpurifier.git",
-                "reference": "214cb8a6934f9682ce5a9d7a7f5a76801c7822e6"
+                "reference": "6f9aac9325e99a860928534cd4a5ade8962d3751"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/214cb8a6934f9682ce5a9d7a7f5a76801c7822e6",
-                "reference": "214cb8a6934f9682ce5a9d7a7f5a76801c7822e6",
+                "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/6f9aac9325e99a860928534cd4a5ade8962d3751",
+                "reference": "6f9aac9325e99a860928534cd4a5ade8962d3751",
                 "shasum": ""
             },
             "require": {
@@ -159,20 +158,20 @@
                 "issues": "https://github.com/ezyang/htmlpurifier/issues",
                 "source": "https://github.com/ezyang/htmlpurifier/tree/master"
             },
-            "time": "2021-01-26T16:11:50+00:00"
+            "time": "2021-04-22T14:01:00+00:00"
         },
         {
             "name": "filp/whoops",
-            "version": "2.9.2",
+            "version": "2.12.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filp/whoops.git",
-                "reference": "df7933820090489623ce0be5e85c7e693638e536"
+                "reference": "c13c0be93cff50f88bbd70827d993026821914dd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filp/whoops/zipball/df7933820090489623ce0be5e85c7e693638e536",
-                "reference": "df7933820090489623ce0be5e85c7e693638e536",
+                "url": "https://api.github.com/repos/filp/whoops/zipball/c13c0be93cff50f88bbd70827d993026821914dd",
+                "reference": "c13c0be93cff50f88bbd70827d993026821914dd",
                 "shasum": ""
             },
             "require": {
@@ -222,7 +221,7 @@
             ],
             "support": {
                 "issues": "https://github.com/filp/whoops/issues",
-                "source": "https://github.com/filp/whoops/tree/2.9.2"
+                "source": "https://github.com/filp/whoops/tree/2.12.1"
             },
             "funding": [
                 {
@@ -230,62 +229,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-01-24T12:00:00+00:00"
-        },
-        {
-            "name": "fzaninotto/faker",
-            "version": "v1.9.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/fzaninotto/Faker.git",
-                "reference": "848d8125239d7dbf8ab25cb7f054f1a630e68c2e"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/848d8125239d7dbf8ab25cb7f054f1a630e68c2e",
-                "reference": "848d8125239d7dbf8ab25cb7f054f1a630e68c2e",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.3.3 || ^7.0"
-            },
-            "require-dev": {
-                "ext-intl": "*",
-                "phpunit/phpunit": "^4.8.35 || ^5.7",
-                "squizlabs/php_codesniffer": "^2.9.2"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.9-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Faker\\": "src/Faker/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "François Zaninotto"
-                }
-            ],
-            "description": "Faker is a PHP library that generates fake data for you.",
-            "keywords": [
-                "data",
-                "faker",
-                "fixtures"
-            ],
-            "support": {
-                "issues": "https://github.com/fzaninotto/Faker/issues",
-                "source": "https://github.com/fzaninotto/Faker/tree/v1.9.2"
-            },
-            "abandoned": true,
-            "time": "2020-12-11T09:56:16+00:00"
+            "time": "2021-04-25T12:00:00+00:00"
         },
         {
             "name": "josegonzalez/dotenv",
@@ -647,12 +591,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/pckg/cache.git",
-                "reference": "4974920700ffabd428723b7bd0810e5b9418697a"
+                "reference": "7b56641cbacf9deb724e337335ccfe38c72c06bf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pckg/cache/zipball/4974920700ffabd428723b7bd0810e5b9418697a",
-                "reference": "4974920700ffabd428723b7bd0810e5b9418697a",
+                "url": "https://api.github.com/repos/pckg/cache/zipball/7b56641cbacf9deb724e337335ccfe38c72c06bf",
+                "reference": "7b56641cbacf9deb724e337335ccfe38c72c06bf",
                 "shasum": ""
             },
             "require": {
@@ -685,7 +629,7 @@
                 "issues": "https://github.com/pckg/cache/issues",
                 "source": "https://github.com/pckg/cache/tree/master"
             },
-            "time": "2021-02-05T20:19:06+00:00"
+            "time": "2021-03-05T18:25:17+00:00"
         },
         {
             "name": "pckg/collection",
@@ -693,12 +637,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/pckg/collection.git",
-                "reference": "f363854132cfd29b62490e0f794d18e4cbf43a0c"
+                "reference": "381871e595a2cb32acdfc5718ffb9f408f3be39a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pckg/collection/zipball/f363854132cfd29b62490e0f794d18e4cbf43a0c",
-                "reference": "f363854132cfd29b62490e0f794d18e4cbf43a0c",
+                "url": "https://api.github.com/repos/pckg/collection/zipball/381871e595a2cb32acdfc5718ffb9f408f3be39a",
+                "reference": "381871e595a2cb32acdfc5718ffb9f408f3be39a",
                 "shasum": ""
             },
             "require": {
@@ -735,7 +679,7 @@
                 "issues": "https://github.com/pckg/collection/issues",
                 "source": "https://github.com/pckg/collection/tree/master"
             },
-            "time": "2021-02-05T21:19:20+00:00"
+            "time": "2021-05-20T13:45:06+00:00"
         },
         {
             "name": "pckg/concept",
@@ -743,12 +687,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/pckg/concept.git",
-                "reference": "893fc26339bf78a32e5c8c46a1e37bf28d874392"
+                "reference": "0dbe6040750553e6986ecce35af6b642e615d91d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pckg/concept/zipball/893fc26339bf78a32e5c8c46a1e37bf28d874392",
-                "reference": "893fc26339bf78a32e5c8c46a1e37bf28d874392",
+                "url": "https://api.github.com/repos/pckg/concept/zipball/0dbe6040750553e6986ecce35af6b642e615d91d",
+                "reference": "0dbe6040750553e6986ecce35af6b642e615d91d",
                 "shasum": ""
             },
             "require-dev": {
@@ -781,7 +725,7 @@
                 "issues": "https://github.com/pckg/concept/issues",
                 "source": "https://github.com/pckg/concept/tree/master"
             },
-            "time": "2021-02-05T19:04:20+00:00"
+            "time": "2021-04-06T14:26:50+00:00"
         },
         {
             "name": "pckg/database",
@@ -789,12 +733,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/pckg/database.git",
-                "reference": "93f65eefcb9de0d06b7e48203d2574f38b98f28a"
+                "reference": "1d3329268bd04836b9d906faa2eb0f66b10be839"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pckg/database/zipball/93f65eefcb9de0d06b7e48203d2574f38b98f28a",
-                "reference": "93f65eefcb9de0d06b7e48203d2574f38b98f28a",
+                "url": "https://api.github.com/repos/pckg/database/zipball/1d3329268bd04836b9d906faa2eb0f66b10be839",
+                "reference": "1d3329268bd04836b9d906faa2eb0f66b10be839",
                 "shasum": ""
             },
             "require": {
@@ -841,7 +785,7 @@
                 "issues": "https://github.com/pckg/database/issues",
                 "source": "https://github.com/pckg/database/tree/master"
             },
-            "time": "2021-02-11T15:30:24+00:00"
+            "time": "2021-05-20T19:02:39+00:00"
         },
         {
             "name": "pckg/locale",
@@ -849,12 +793,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/pckg/locale.git",
-                "reference": "6e13abf62f6d4dc1557427154859c76e4c5c73e6"
+                "reference": "5ad051c578910670d8619d04adeadaf440facff6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pckg/locale/zipball/6e13abf62f6d4dc1557427154859c76e4c5c73e6",
-                "reference": "6e13abf62f6d4dc1557427154859c76e4c5c73e6",
+                "url": "https://api.github.com/repos/pckg/locale/zipball/5ad051c578910670d8619d04adeadaf440facff6",
+                "reference": "5ad051c578910670d8619d04adeadaf440facff6",
                 "shasum": ""
             },
             "require-dev": {
@@ -886,20 +830,20 @@
                 "issues": "https://github.com/pckg/locale/issues",
                 "source": "https://github.com/pckg/locale/tree/master"
             },
-            "time": "2021-02-06T11:47:33+00:00"
+            "time": "2021-03-05T18:27:18+00:00"
         },
         {
             "name": "psr/log",
-            "version": "1.1.3",
+            "version": "1.1.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/log.git",
-                "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc"
+                "reference": "d49695b909c3b7628b6289db5479a1c204601f11"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/log/zipball/0f73288fd15629204f9d42b7055f72dacbe811fc",
-                "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc",
+                "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11",
+                "reference": "d49695b909c3b7628b6289db5479a1c204601f11",
                 "shasum": ""
             },
             "require": {
@@ -923,7 +867,7 @@
             "authors": [
                 {
                     "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
+                    "homepage": "https://www.php-fig.org/"
                 }
             ],
             "description": "Common interface for logging libraries",
@@ -934,9 +878,9 @@
                 "psr-3"
             ],
             "support": {
-                "source": "https://github.com/php-fig/log/tree/1.1.3"
+                "source": "https://github.com/php-fig/log/tree/1.1.4"
             },
-            "time": "2020-03-23T09:12:05+00:00"
+            "time": "2021-05-03T11:20:27+00:00"
         },
         {
             "name": "rollbar/rollbar",
@@ -1004,7 +948,7 @@
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.22.0",
+            "version": "v1.22.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
@@ -1063,7 +1007,7 @@
                 "portable"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.22.0"
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.22.1"
             },
             "funding": [
                 {
@@ -1132,16 +1076,16 @@
         },
         {
             "name": "twig/twig",
-            "version": "v1.44.2",
+            "version": "v1.44.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/twigphp/Twig.git",
-                "reference": "138c493c5b8ee7cff3821f80b8896d371366b5fe"
+                "reference": "4d400421528e9fa40caaffcf7824c172526dd99d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/twigphp/Twig/zipball/138c493c5b8ee7cff3821f80b8896d371366b5fe",
-                "reference": "138c493c5b8ee7cff3821f80b8896d371366b5fe",
+                "url": "https://api.github.com/repos/twigphp/Twig/zipball/4d400421528e9fa40caaffcf7824c172526dd99d",
+                "reference": "4d400421528e9fa40caaffcf7824c172526dd99d",
                 "shasum": ""
             },
             "require": {
@@ -1194,7 +1138,7 @@
             ],
             "support": {
                 "issues": "https://github.com/twigphp/Twig/issues",
-                "source": "https://github.com/twigphp/Twig/tree/v1.44.2"
+                "source": "https://github.com/twigphp/Twig/tree/v1.44.4"
             },
             "funding": [
                 {
@@ -1206,35 +1150,31 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-01-05T10:10:05+00:00"
+            "time": "2021-05-16T12:11:20+00:00"
         }
     ],
     "packages-dev": [
         {
-            "name": "appzcoder/phpcloc",
-            "version": "v0.0.2",
+            "name": "assetic/framework",
+            "version": "v1.0.5",
             "source": {
                 "type": "git",
-                "url": "https://github.com/appzcoder/phpcloc.git",
-                "reference": "b8da7420a826361e66959e024e8223a76b5139eb"
+                "url": "https://github.com/assetic-php/assetic.git",
+                "reference": "8ab3638325af9cd144242765494a9dc9b53ab430"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/appzcoder/phpcloc/zipball/b8da7420a826361e66959e024e8223a76b5139eb",
-                "reference": "b8da7420a826361e66959e024e8223a76b5139eb",
+                "url": "https://api.github.com/repos/assetic-php/assetic/zipball/8ab3638325af9cd144242765494a9dc9b53ab430",
+                "reference": "8ab3638325af9cd144242765494a9dc9b53ab430",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.5.9",
-                "symfony/console": "^3.4 || ^4.0"
+                "php": ">=5.3.1"
             },
-            "bin": [
-                "phpcloc"
-            ],
             "type": "library",
             "autoload": {
-                "psr-4": {
-                    "Appzcoder\\PHPCloc\\": "src/"
+                "psr-0": {
+                    "Assetic": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -1243,22 +1183,22 @@
             ],
             "authors": [
                 {
-                    "name": "Sohel Amin",
-                    "email": "sohelamincse@gmail.com"
+                    "name": "Kris Wallsmith",
+                    "email": "kris.wallsmith@gmail.com",
+                    "homepage": "http://kriswallsmith.net/"
                 }
             ],
-            "description": "Cloc & duplicate code checker tool.",
+            "description": "Asset Management for PHP",
+            "homepage": "https://github.com/kriswallsmith/assetic",
             "keywords": [
-                "cloc",
-                "count lines of code",
-                "duplicate code checker",
-                "phpcloc"
+                "assets",
+                "compression",
+                "minification"
             ],
             "support": {
-                "issues": "https://github.com/appzcoder/phpcloc/issues",
-                "source": "https://github.com/appzcoder/phpcloc/tree/master"
+                "source": "https://github.com/assetic-php/assetic/tree/v1.0.5"
             },
-            "time": "2018-05-27T06:27:35+00:00"
+            "time": "2014-12-12T05:07:58+00:00"
         },
         {
             "name": "behat/gherkin",
@@ -1382,16 +1322,16 @@
         },
         {
             "name": "codeception/codeception",
-            "version": "4.1.17",
+            "version": "4.1.20",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Codeception/Codeception.git",
-                "reference": "c153b1ab289b3e3109e685379aa8847c54ac2b68"
+                "reference": "d8b16e13e1781dbc3a7ae8292117d520c89a9c5a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Codeception/Codeception/zipball/c153b1ab289b3e3109e685379aa8847c54ac2b68",
-                "reference": "c153b1ab289b3e3109e685379aa8847c54ac2b68",
+                "url": "https://api.github.com/repos/Codeception/Codeception/zipball/d8b16e13e1781dbc3a7ae8292117d520c89a9c5a",
+                "reference": "d8b16e13e1781dbc3a7ae8292117d520c89a9c5a",
                 "shasum": ""
             },
             "require": {
@@ -1465,7 +1405,7 @@
             ],
             "support": {
                 "issues": "https://github.com/Codeception/Codeception/issues",
-                "source": "https://github.com/Codeception/Codeception/tree/4.1.17"
+                "source": "https://github.com/Codeception/Codeception/tree/4.1.20"
             },
             "funding": [
                 {
@@ -1473,7 +1413,7 @@
                     "type": "open_collective"
                 }
             ],
-            "time": "2021-02-01T07:30:47+00:00"
+            "time": "2021-04-02T16:41:51+00:00"
         },
         {
             "name": "codeception/lib-asserts",
@@ -1531,16 +1471,16 @@
         },
         {
             "name": "codeception/lib-innerbrowser",
-            "version": "1.4.0",
+            "version": "1.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Codeception/lib-innerbrowser.git",
-                "reference": "b7406c710684c255d9b067d7795269a5585a0406"
+                "reference": "4b0d89b37fe454e060a610a85280a87ab4f534f1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Codeception/lib-innerbrowser/zipball/b7406c710684c255d9b067d7795269a5585a0406",
-                "reference": "b7406c710684c255d9b067d7795269a5585a0406",
+                "url": "https://api.github.com/repos/Codeception/lib-innerbrowser/zipball/4b0d89b37fe454e060a610a85280a87ab4f534f1",
+                "reference": "4b0d89b37fe454e060a610a85280a87ab4f534f1",
                 "shasum": ""
             },
             "require": {
@@ -1585,9 +1525,9 @@
             ],
             "support": {
                 "issues": "https://github.com/Codeception/lib-innerbrowser/issues",
-                "source": "https://github.com/Codeception/lib-innerbrowser/tree/1.4.0"
+                "source": "https://github.com/Codeception/lib-innerbrowser/tree/1.5.0"
             },
-            "time": "2021-01-29T18:17:25+00:00"
+            "time": "2021-04-23T06:18:29+00:00"
         },
         {
             "name": "codeception/module-asserts",
@@ -1646,6 +1586,58 @@
             },
             "time": "2020-10-21T16:48:15+00:00"
         },
+        {
+            "name": "codeception/module-db",
+            "version": "1.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Codeception/module-db.git",
+                "reference": "8c8076cd05d4db95798acd7dba2a56578210982c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Codeception/module-db/zipball/8c8076cd05d4db95798acd7dba2a56578210982c",
+                "reference": "8c8076cd05d4db95798acd7dba2a56578210982c",
+                "shasum": ""
+            },
+            "require": {
+                "codeception/codeception": "*@dev",
+                "php": ">=5.6.0 <9.0"
+            },
+            "conflict": {
+                "codeception/codeception": "<4.0"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Michael Bodnarchuk"
+                },
+                {
+                    "name": "Gintautas Miselis"
+                }
+            ],
+            "description": "DB module for Codeception",
+            "homepage": "http://codeception.com/",
+            "keywords": [
+                "codeception",
+                "database-testing",
+                "db-testing"
+            ],
+            "support": {
+                "issues": "https://github.com/Codeception/module-db/issues",
+                "source": "https://github.com/Codeception/module-db/tree/1.1.0"
+            },
+            "time": "2020-12-20T13:37:07+00:00"
+        },
         {
             "name": "codeception/module-phpbrowser",
             "version": "1.0.2",
@@ -1706,18 +1698,67 @@
             },
             "time": "2020-10-24T15:29:28+00:00"
         },
+        {
+            "name": "codeception/module-redis",
+            "version": "1.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Codeception/module-redis.git",
+                "reference": "83c6db34349f1bd8dbfe4b778d7645c9ffcacfb7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Codeception/module-redis/zipball/83c6db34349f1bd8dbfe4b778d7645c9ffcacfb7",
+                "reference": "83c6db34349f1bd8dbfe4b778d7645c9ffcacfb7",
+                "shasum": ""
+            },
+            "require": {
+                "codeception/codeception": "^4.0",
+                "php": ">=5.6.0 <9.0",
+                "predis/predis": "^1.0"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Michael Bodnarchuk"
+                },
+                {
+                    "name": "Dmitriy Maltsev"
+                }
+            ],
+            "description": "Redis module for Codeception",
+            "homepage": "http://codeception.com/",
+            "keywords": [
+                "codeception",
+                "redis"
+            ],
+            "support": {
+                "issues": "https://github.com/Codeception/module-redis/issues",
+                "source": "https://github.com/Codeception/module-redis/tree/1.1.0"
+            },
+            "time": "2021-03-31T16:02:02+00:00"
+        },
         {
             "name": "codeception/module-rest",
-            "version": "1.2.7",
+            "version": "1.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Codeception/module-rest.git",
-                "reference": "beeb5a91a97d042273bf10f00063e9b8f541879a"
+                "reference": "293a0103d5257b7c884ef276147a9a06914e878f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Codeception/module-rest/zipball/beeb5a91a97d042273bf10f00063e9b8f541879a",
-                "reference": "beeb5a91a97d042273bf10f00063e9b8f541879a",
+                "url": "https://api.github.com/repos/Codeception/module-rest/zipball/293a0103d5257b7c884ef276147a9a06914e878f",
+                "reference": "293a0103d5257b7c884ef276147a9a06914e878f",
                 "shasum": ""
             },
             "require": {
@@ -1756,22 +1797,22 @@
             ],
             "support": {
                 "issues": "https://github.com/Codeception/module-rest/issues",
-                "source": "https://github.com/Codeception/module-rest/tree/1.2.7"
+                "source": "https://github.com/Codeception/module-rest/tree/1.3.1"
             },
-            "time": "2020-11-04T16:58:11+00:00"
+            "time": "2021-04-23T08:12:24+00:00"
         },
         {
             "name": "codeception/module-webdriver",
-            "version": "dev-master",
+            "version": "1.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Codeception/module-webdriver.git",
-                "reference": "63ea08880a44df809bdfbca08597e1b68cee9f87"
+                "reference": "ebbe729c630415e8caf6b0087e457906f0c6c0c6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Codeception/module-webdriver/zipball/63ea08880a44df809bdfbca08597e1b68cee9f87",
-                "reference": "63ea08880a44df809bdfbca08597e1b68cee9f87",
+                "url": "https://api.github.com/repos/Codeception/module-webdriver/zipball/ebbe729c630415e8caf6b0087e457906f0c6c0c6",
+                "reference": "ebbe729c630415e8caf6b0087e457906f0c6c0c6",
                 "shasum": ""
             },
             "require": {
@@ -1782,7 +1823,6 @@
             "suggest": {
                 "codeception/phpbuiltinserver": "Start and stop PHP built-in web server for your tests"
             },
-            "default-branch": true,
             "type": "library",
             "autoload": {
                 "classmap": [
@@ -1813,9 +1853,9 @@
             ],
             "support": {
                 "issues": "https://github.com/Codeception/module-webdriver/issues",
-                "source": "https://github.com/Codeception/module-webdriver/tree/1.2.0"
+                "source": "https://github.com/Codeception/module-webdriver/tree/1.2.1"
             },
-            "time": "2021-01-17T19:23:20+00:00"
+            "time": "2021-04-23T17:30:57+00:00"
         },
         {
             "name": "codeception/phpunit-wrapper",
@@ -1866,6 +1906,52 @@
             },
             "time": "2020-12-28T13:59:47+00:00"
         },
+        {
+            "name": "codeception/specify",
+            "version": "1.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Codeception/Specify.git",
+                "reference": "17ae6d4d6cb201ef5461f6587ecfcff8c177f854"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Codeception/Specify/zipball/17ae6d4d6cb201ef5461f6587ecfcff8c177f854",
+                "reference": "17ae6d4d6cb201ef5461f6587ecfcff8c177f854",
+                "shasum": ""
+            },
+            "require": {
+                "myclabs/deep-copy": "~1.1",
+                "php": ">=7.1.0",
+                "phpunit/phpunit": ">=7.0 <10.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "Codeception\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Michael Bodnarchuk",
+                    "email": "davert@codeception.com"
+                },
+                {
+                    "name": "Gustavo Nieves",
+                    "homepage": "https://medium.com/@ganieves"
+                }
+            ],
+            "description": "BDD code blocks for PHPUnit and Codeception",
+            "support": {
+                "issues": "https://github.com/Codeception/Specify/issues",
+                "source": "https://github.com/Codeception/Specify/tree/1.4.0"
+            },
+            "time": "2020-08-27T20:17:29+00:00"
+        },
         {
             "name": "codeception/stub",
             "version": "3.7.0",
@@ -1902,26 +1988,25 @@
         },
         {
             "name": "defuse/php-encryption",
-            "version": "v2.2.1",
+            "version": "v2.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/defuse/php-encryption.git",
-                "reference": "0f407c43b953d571421e0020ba92082ed5fb7620"
+                "reference": "77880488b9954b7884c25555c2a0ea9e7053f9d2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/defuse/php-encryption/zipball/0f407c43b953d571421e0020ba92082ed5fb7620",
-                "reference": "0f407c43b953d571421e0020ba92082ed5fb7620",
+                "url": "https://api.github.com/repos/defuse/php-encryption/zipball/77880488b9954b7884c25555c2a0ea9e7053f9d2",
+                "reference": "77880488b9954b7884c25555c2a0ea9e7053f9d2",
                 "shasum": ""
             },
             "require": {
                 "ext-openssl": "*",
                 "paragonie/random_compat": ">= 2",
-                "php": ">=5.4.0"
+                "php": ">=5.6.0"
             },
             "require-dev": {
-                "nikic/php-parser": "^2.0|^3.0|^4.0",
-                "phpunit/phpunit": "^4|^5"
+                "phpunit/phpunit": "^4|^5|^6|^7|^8|^9"
             },
             "bin": [
                 "bin/generate-defuse-key"
@@ -1963,9 +2048,9 @@
             ],
             "support": {
                 "issues": "https://github.com/defuse/php-encryption/issues",
-                "source": "https://github.com/defuse/php-encryption/tree/master"
+                "source": "https://github.com/defuse/php-encryption/tree/v2.3.1"
             },
-            "time": "2018-07-24T23:27:56+00:00"
+            "time": "2021-04-09T23:57:26+00:00"
         },
         {
             "name": "doctrine/instantiator",
@@ -2100,22 +2185,22 @@
         },
         {
             "name": "guzzlehttp/guzzle",
-            "version": "7.2.0",
+            "version": "7.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "0aa74dfb41ae110835923ef10a9d803a22d50e79"
+                "reference": "7008573787b430c1c1f650e3722d9bba59967628"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/0aa74dfb41ae110835923ef10a9d803a22d50e79",
-                "reference": "0aa74dfb41ae110835923ef10a9d803a22d50e79",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/7008573787b430c1c1f650e3722d9bba59967628",
+                "reference": "7008573787b430c1c1f650e3722d9bba59967628",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
                 "guzzlehttp/promises": "^1.4",
-                "guzzlehttp/psr7": "^1.7",
+                "guzzlehttp/psr7": "^1.7 || ^2.0",
                 "php": "^7.2.5 || ^8.0",
                 "psr/http-client": "^1.0"
             },
@@ -2123,6 +2208,7 @@
                 "psr/http-client-implementation": "1.0"
             },
             "require-dev": {
+                "bamarni/composer-bin-plugin": "^1.4.1",
                 "ext-curl": "*",
                 "php-http/client-integration-tests": "^3.0",
                 "phpunit/phpunit": "^8.5.5 || ^9.3.5",
@@ -2136,7 +2222,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "7.1-dev"
+                    "dev-master": "7.3-dev"
                 }
             },
             "autoload": {
@@ -2178,7 +2264,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/guzzle/issues",
-                "source": "https://github.com/guzzle/guzzle/tree/7.2.0"
+                "source": "https://github.com/guzzle/guzzle/tree/7.3.0"
             },
             "funding": [
                 {
@@ -2198,20 +2284,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-10-10T11:47:56+00:00"
+            "time": "2021-03-23T11:33:13+00:00"
         },
         {
             "name": "guzzlehttp/promises",
-            "version": "1.4.0",
+            "version": "1.4.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/promises.git",
-                "reference": "60d379c243457e073cff02bc323a2a86cb355631"
+                "reference": "8e7d04f1f6450fef59366c399cfad4b9383aa30d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/promises/zipball/60d379c243457e073cff02bc323a2a86cb355631",
-                "reference": "60d379c243457e073cff02bc323a2a86cb355631",
+                "url": "https://api.github.com/repos/guzzle/promises/zipball/8e7d04f1f6450fef59366c399cfad4b9383aa30d",
+                "reference": "8e7d04f1f6450fef59366c399cfad4b9383aa30d",
                 "shasum": ""
             },
             "require": {
@@ -2251,22 +2337,22 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/promises/issues",
-                "source": "https://github.com/guzzle/promises/tree/1.4.0"
+                "source": "https://github.com/guzzle/promises/tree/1.4.1"
             },
-            "time": "2020-09-30T07:37:28+00:00"
+            "time": "2021-03-07T09:25:29+00:00"
         },
         {
             "name": "guzzlehttp/psr7",
-            "version": "1.7.0",
+            "version": "1.8.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/psr7.git",
-                "reference": "53330f47520498c0ae1f61f7e2c90f55690c06a3"
+                "reference": "dc960a912984efb74d0a90222870c72c87f10c91"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/psr7/zipball/53330f47520498c0ae1f61f7e2c90f55690c06a3",
-                "reference": "53330f47520498c0ae1f61f7e2c90f55690c06a3",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/dc960a912984efb74d0a90222870c72c87f10c91",
+                "reference": "dc960a912984efb74d0a90222870c72c87f10c91",
                 "shasum": ""
             },
             "require": {
@@ -2326,9 +2412,9 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/psr7/issues",
-                "source": "https://github.com/guzzle/psr7/tree/1.7.0"
+                "source": "https://github.com/guzzle/psr7/tree/1.8.2"
             },
-            "time": "2020-09-30T07:37:11+00:00"
+            "time": "2021-04-26T09:17:50+00:00"
         },
         {
             "name": "justinrainbow/json-schema",
@@ -2400,87 +2486,6 @@
             },
             "time": "2020-05-27T16:41:55+00:00"
         },
-        {
-            "name": "kriswallsmith/assetic",
-            "version": "v1.4.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/kriswallsmith/assetic.git",
-                "reference": "e911c437dbdf006a8f62c2f59b15b2d69a5e0aa1"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/kriswallsmith/assetic/zipball/e911c437dbdf006a8f62c2f59b15b2d69a5e0aa1",
-                "reference": "e911c437dbdf006a8f62c2f59b15b2d69a5e0aa1",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.1",
-                "symfony/process": "~2.1|~3.0"
-            },
-            "conflict": {
-                "twig/twig": "<1.27"
-            },
-            "require-dev": {
-                "leafo/lessphp": "^0.3.7",
-                "leafo/scssphp": "~0.1",
-                "meenie/javascript-packer": "^1.1",
-                "mrclay/minify": "<2.3",
-                "natxet/cssmin": "3.0.4",
-                "patchwork/jsqueeze": "~1.0|~2.0",
-                "phpunit/phpunit": "~4.8 || ^5.6",
-                "psr/log": "~1.0",
-                "ptachoire/cssembed": "~1.0",
-                "symfony/phpunit-bridge": "~2.7|~3.0",
-                "twig/twig": "~1.23|~2.0",
-                "yfix/packager": "dev-master"
-            },
-            "suggest": {
-                "leafo/lessphp": "Assetic provides the integration with the lessphp LESS compiler",
-                "leafo/scssphp": "Assetic provides the integration with the scssphp SCSS compiler",
-                "leafo/scssphp-compass": "Assetic provides the integration with the SCSS compass plugin",
-                "patchwork/jsqueeze": "Assetic provides the integration with the JSqueeze JavaScript compressor",
-                "ptachoire/cssembed": "Assetic provides the integration with phpcssembed to embed data uris",
-                "twig/twig": "Assetic provides the integration with the Twig templating engine"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.4-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Assetic": "src/"
-                },
-                "files": [
-                    "src/functions.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Kris Wallsmith",
-                    "email": "kris.wallsmith@gmail.com",
-                    "homepage": "http://kriswallsmith.net/"
-                }
-            ],
-            "description": "Asset Management for PHP",
-            "homepage": "https://github.com/kriswallsmith/assetic",
-            "keywords": [
-                "assets",
-                "compression",
-                "minification"
-            ],
-            "support": {
-                "issues": "https://github.com/kriswallsmith/assetic/issues",
-                "source": "https://github.com/kriswallsmith/assetic/tree/master"
-            },
-            "time": "2016-11-11T18:43:20+00:00"
-        },
         {
             "name": "maximebf/debugbar",
             "version": "v1.16.5",
@@ -2606,16 +2611,16 @@
         },
         {
             "name": "nesbot/carbon",
-            "version": "2.45.1",
+            "version": "2.48.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/briannesbitt/Carbon.git",
-                "reference": "528783b188bdb853eb21239b1722831e0f000a8d"
+                "reference": "d3c447f21072766cddec3522f9468a5849a76147"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/528783b188bdb853eb21239b1722831e0f000a8d",
-                "reference": "528783b188bdb853eb21239b1722831e0f000a8d",
+                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/d3c447f21072766cddec3522f9468a5849a76147",
+                "reference": "d3c447f21072766cddec3522f9468a5849a76147",
                 "shasum": ""
             },
             "require": {
@@ -2695,20 +2700,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-02-11T18:30:17+00:00"
+            "time": "2021-05-07T10:08:30+00:00"
         },
         {
             "name": "nikic/php-parser",
-            "version": "v4.10.4",
+            "version": "v4.10.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "c6d052fc58cb876152f89f532b95a8d7907e7f0e"
+                "reference": "4432ba399e47c66624bc73c8c0f811e5c109576f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/c6d052fc58cb876152f89f532b95a8d7907e7f0e",
-                "reference": "c6d052fc58cb876152f89f532b95a8d7907e7f0e",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/4432ba399e47c66624bc73c8c0f811e5c109576f",
+                "reference": "4432ba399e47c66624bc73c8c0f811e5c109576f",
                 "shasum": ""
             },
             "require": {
@@ -2749,9 +2754,9 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v4.10.4"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v4.10.5"
             },
-            "time": "2020-12-20T10:01:03+00:00"
+            "time": "2021-05-03T19:11:20+00:00"
         },
         {
             "name": "paragonie/constant_time_encoding",
@@ -2876,24 +2881,26 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/pckg-app/frontend-dev.git",
-                "reference": "0d4ff7eb2677b39e00f25afa9ae1b3f7c7d37130"
+                "reference": "9f76de112d9e35455de58df20b23dae618791dc2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pckg-app/frontend-dev/zipball/0d4ff7eb2677b39e00f25afa9ae1b3f7c7d37130",
-                "reference": "0d4ff7eb2677b39e00f25afa9ae1b3f7c7d37130",
+                "url": "https://api.github.com/repos/pckg-app/frontend-dev/zipball/9f76de112d9e35455de58df20b23dae618791dc2",
+                "reference": "9f76de112d9e35455de58df20b23dae618791dc2",
                 "shasum": ""
             },
             "require": {
-                "appzcoder/phpcloc": "^0.0.2",
                 "codeception/codeception": "4.*",
                 "codeception/module-asserts": "1.*",
-                "codeception/module-phpbrowser": "^1.0",
+                "codeception/module-db": "1.*",
+                "codeception/module-phpbrowser": "1.*",
+                "codeception/module-redis": "1.*",
                 "codeception/module-rest": "^1.2",
-                "codeception/module-webdriver": "dev-master",
+                "codeception/module-webdriver": "1.*",
+                "codeception/specify": "^1.4",
                 "maximebf/debugbar": "^1.16",
-                "phpstan/phpstan": "^0.12.42",
-                "phpstan/phpstan-strict-rules": "^0.12.5",
+                "phpstan/phpstan": "^0.12.82",
+                "phpstan/phpstan-strict-rules": "^0.12.9",
                 "squizlabs/php_codesniffer": "^3.5"
             },
             "default-branch": true,
@@ -2914,7 +2921,7 @@
                 "issues": "https://github.com/pckg-app/frontend-dev/issues",
                 "source": "https://github.com/pckg-app/frontend-dev/tree/master"
             },
-            "time": "2021-02-08T10:09:10+00:00"
+            "time": "2021-03-26T17:18:04+00:00"
         },
         {
             "name": "pckg/auth",
@@ -2922,12 +2929,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/pckg/auth.git",
-                "reference": "2743d3a706770122e6160bb70c02f12f82eeadef"
+                "reference": "85490fd383a007e4f38fa1177b1ce8b79383ee3f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pckg/auth/zipball/2743d3a706770122e6160bb70c02f12f82eeadef",
-                "reference": "2743d3a706770122e6160bb70c02f12f82eeadef",
+                "url": "https://api.github.com/repos/pckg/auth/zipball/85490fd383a007e4f38fa1177b1ce8b79383ee3f",
+                "reference": "85490fd383a007e4f38fa1177b1ce8b79383ee3f",
                 "shasum": ""
             },
             "require": {
@@ -2969,7 +2976,7 @@
                 "issues": "https://github.com/pckg/auth/issues",
                 "source": "https://github.com/pckg/auth/tree/master"
             },
-            "time": "2021-02-13T23:35:15+00:00"
+            "time": "2021-05-02T10:47:29+00:00"
         },
         {
             "name": "pckg/htmlbuilder",
@@ -2977,12 +2984,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/pckg/htmlbuilder.git",
-                "reference": "ca4153a52f8438c44073cba43bc7324acaf116de"
+                "reference": "8ce9602d4fc38de92f1702e3381e498aa0e9b1dc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pckg/htmlbuilder/zipball/ca4153a52f8438c44073cba43bc7324acaf116de",
-                "reference": "ca4153a52f8438c44073cba43bc7324acaf116de",
+                "url": "https://api.github.com/repos/pckg/htmlbuilder/zipball/8ce9602d4fc38de92f1702e3381e498aa0e9b1dc",
+                "reference": "8ce9602d4fc38de92f1702e3381e498aa0e9b1dc",
                 "shasum": ""
             },
             "require": {
@@ -3020,7 +3027,7 @@
                 "issues": "https://github.com/pckg/htmlbuilder/issues",
                 "source": "https://github.com/pckg/htmlbuilder/tree/master"
             },
-            "time": "2021-02-06T17:41:35+00:00"
+            "time": "2021-05-08T15:29:28+00:00"
         },
         {
             "name": "pckg/mail",
@@ -3028,12 +3035,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/pckg/mail.git",
-                "reference": "a68661a168979021234a9028c85de40986f179b0"
+                "reference": "bc8c05733a22f234b345c779e5abad6929b7e7bf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pckg/mail/zipball/a68661a168979021234a9028c85de40986f179b0",
-                "reference": "a68661a168979021234a9028c85de40986f179b0",
+                "url": "https://api.github.com/repos/pckg/mail/zipball/bc8c05733a22f234b345c779e5abad6929b7e7bf",
+                "reference": "bc8c05733a22f234b345c779e5abad6929b7e7bf",
                 "shasum": ""
             },
             "require": {
@@ -3072,7 +3079,7 @@
                 "issues": "https://github.com/pckg/mail/issues",
                 "source": "https://github.com/pckg/mail/tree/master"
             },
-            "time": "2021-02-06T17:51:07+00:00"
+            "time": "2021-03-05T18:27:34+00:00"
         },
         {
             "name": "pckg/manager",
@@ -3080,16 +3087,16 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/pckg/manager.git",
-                "reference": "82949dcb2702081e30db6f68e7f57ab94b9c63cb"
+                "reference": "03fffce1b8d7cde79e37f4b129200dab46356305"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pckg/manager/zipball/82949dcb2702081e30db6f68e7f57ab94b9c63cb",
-                "reference": "82949dcb2702081e30db6f68e7f57ab94b9c63cb",
+                "url": "https://api.github.com/repos/pckg/manager/zipball/03fffce1b8d7cde79e37f4b129200dab46356305",
+                "reference": "03fffce1b8d7cde79e37f4b129200dab46356305",
                 "shasum": ""
             },
             "require": {
-                "kriswallsmith/assetic": "1.4.*"
+                "assetic/framework": "1.*"
             },
             "require-dev": {
                 "pckg-app/frontend-dev": "dev-master",
@@ -3120,7 +3127,7 @@
                 "issues": "https://github.com/pckg/manager/issues",
                 "source": "https://github.com/pckg/manager/tree/master"
             },
-            "time": "2021-02-06T11:41:49+00:00"
+            "time": "2021-03-25T20:08:37+00:00"
         },
         {
             "name": "pckg/migrator",
@@ -3128,12 +3135,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/pckg/migrator.git",
-                "reference": "85dba60102dca0cd0dc91fbbfbc435335ce5bd53"
+                "reference": "1887fb0b5b50b87989369180c8b540076ff10424"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pckg/migrator/zipball/85dba60102dca0cd0dc91fbbfbc435335ce5bd53",
-                "reference": "85dba60102dca0cd0dc91fbbfbc435335ce5bd53",
+                "url": "https://api.github.com/repos/pckg/migrator/zipball/1887fb0b5b50b87989369180c8b540076ff10424",
+                "reference": "1887fb0b5b50b87989369180c8b540076ff10424",
                 "shasum": ""
             },
             "require": {
@@ -3169,7 +3176,7 @@
                 "issues": "https://github.com/pckg/migrator/issues",
                 "source": "https://github.com/pckg/migrator/tree/master"
             },
-            "time": "2021-02-11T15:37:58+00:00"
+            "time": "2021-04-27T16:41:36+00:00"
         },
         {
             "name": "pckg/queue",
@@ -3177,12 +3184,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/pckg/queue.git",
-                "reference": "2ce09e946a3e18d00579b02c3e708dd6420a82c0"
+                "reference": "a3f2ee378e95c0cb947aca4e6fef782a8f98385c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pckg/queue/zipball/2ce09e946a3e18d00579b02c3e708dd6420a82c0",
-                "reference": "2ce09e946a3e18d00579b02c3e708dd6420a82c0",
+                "url": "https://api.github.com/repos/pckg/queue/zipball/a3f2ee378e95c0cb947aca4e6fef782a8f98385c",
+                "reference": "a3f2ee378e95c0cb947aca4e6fef782a8f98385c",
                 "shasum": ""
             },
             "require": {
@@ -3223,7 +3230,7 @@
                 "issues": "https://github.com/pckg/queue/issues",
                 "source": "https://github.com/pckg/queue/tree/master"
             },
-            "time": "2021-02-06T18:18:17+00:00"
+            "time": "2021-03-23T21:40:00+00:00"
         },
         {
             "name": "pckg/translator",
@@ -3231,12 +3238,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/pckg/translator.git",
-                "reference": "b230c08d891cec6fd5d8f8368970cb6e3dc038d8"
+                "reference": "512d1476a91e73a35dd40b33423b8784e1087aa7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pckg/translator/zipball/b230c08d891cec6fd5d8f8368970cb6e3dc038d8",
-                "reference": "b230c08d891cec6fd5d8f8368970cb6e3dc038d8",
+                "url": "https://api.github.com/repos/pckg/translator/zipball/512d1476a91e73a35dd40b33423b8784e1087aa7",
+                "reference": "512d1476a91e73a35dd40b33423b8784e1087aa7",
                 "shasum": ""
             },
             "require-dev": {
@@ -3269,7 +3276,7 @@
                 "issues": "https://github.com/pckg/translator/issues",
                 "source": "https://github.com/pckg/translator/tree/master"
             },
-            "time": "2021-02-06T18:25:01+00:00"
+            "time": "2021-03-05T18:28:38+00:00"
         },
         {
             "name": "phar-io/manifest",
@@ -3333,16 +3340,16 @@
         },
         {
             "name": "phar-io/version",
-            "version": "3.0.4",
+            "version": "3.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phar-io/version.git",
-                "reference": "e4782611070e50613683d2b9a57730e9a3ba5451"
+                "reference": "bae7c545bef187884426f042434e561ab1ddb182"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phar-io/version/zipball/e4782611070e50613683d2b9a57730e9a3ba5451",
-                "reference": "e4782611070e50613683d2b9a57730e9a3ba5451",
+                "url": "https://api.github.com/repos/phar-io/version/zipball/bae7c545bef187884426f042434e561ab1ddb182",
+                "reference": "bae7c545bef187884426f042434e561ab1ddb182",
                 "shasum": ""
             },
             "require": {
@@ -3378,22 +3385,22 @@
             "description": "Library for handling version information and constraints",
             "support": {
                 "issues": "https://github.com/phar-io/version/issues",
-                "source": "https://github.com/phar-io/version/tree/3.0.4"
+                "source": "https://github.com/phar-io/version/tree/3.1.0"
             },
-            "time": "2020-12-13T23:18:30+00:00"
+            "time": "2021-02-23T14:00:09+00:00"
         },
         {
             "name": "php-amqplib/php-amqplib",
-            "version": "2.12.2",
+            "version": "v2.12.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-amqplib/php-amqplib.git",
-                "reference": "199f89c377df6e7a52d127af63b7c52b4e677c6c"
+                "reference": "f746eb44df6d8f838173729867dd1d20b0265faa"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-amqplib/php-amqplib/zipball/199f89c377df6e7a52d127af63b7c52b4e677c6c",
-                "reference": "199f89c377df6e7a52d127af63b7c52b4e677c6c",
+                "url": "https://api.github.com/repos/php-amqplib/php-amqplib/zipball/f746eb44df6d8f838173729867dd1d20b0265faa",
+                "reference": "f746eb44df6d8f838173729867dd1d20b0265faa",
                 "shasum": ""
             },
             "require": {
@@ -3459,22 +3466,22 @@
             ],
             "support": {
                 "issues": "https://github.com/php-amqplib/php-amqplib/issues",
-                "source": "https://github.com/php-amqplib/php-amqplib/tree/2.12.2"
+                "source": "https://github.com/php-amqplib/php-amqplib/tree/v2.12.3"
             },
-            "time": "2021-02-12T17:50:22+00:00"
+            "time": "2021-03-01T12:21:31+00:00"
         },
         {
             "name": "php-webdriver/webdriver",
-            "version": "1.9.0",
+            "version": "1.11.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-webdriver/php-webdriver.git",
-                "reference": "e3633154554605274cc9d59837f55a7427d72003"
+                "reference": "66adc952127dd1314af94ce28f8fc332d38f229b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-webdriver/php-webdriver/zipball/e3633154554605274cc9d59837f55a7427d72003",
-                "reference": "e3633154554605274cc9d59837f55a7427d72003",
+                "url": "https://api.github.com/repos/php-webdriver/php-webdriver/zipball/66adc952127dd1314af94ce28f8fc332d38f229b",
+                "reference": "66adc952127dd1314af94ce28f8fc332d38f229b",
                 "shasum": ""
             },
             "require": {
@@ -3490,7 +3497,7 @@
             },
             "require-dev": {
                 "friendsofphp/php-cs-fixer": "^2.0",
-                "ondram/ci-detector": "^2.1 || ^3.5",
+                "ondram/ci-detector": "^2.1 || ^3.5 || ^4.0",
                 "php-coveralls/php-coveralls": "^2.4",
                 "php-mock/php-mock-phpunit": "^1.1 || ^2.0",
                 "php-parallel-lint/php-parallel-lint": "^1.2",
@@ -3530,9 +3537,9 @@
             ],
             "support": {
                 "issues": "https://github.com/php-webdriver/php-webdriver/issues",
-                "source": "https://github.com/php-webdriver/php-webdriver/tree/1.9.0"
+                "source": "https://github.com/php-webdriver/php-webdriver/tree/1.11.0"
             },
-            "time": "2020-11-19T15:21:05+00:00"
+            "time": "2021-05-03T10:19:43+00:00"
         },
         {
             "name": "phpdocumentor/reflection-common",
@@ -3694,16 +3701,16 @@
         },
         {
             "name": "phpseclib/phpseclib",
-            "version": "3.0.5",
+            "version": "3.0.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpseclib/phpseclib.git",
-                "reference": "7c751ea006577e4c2e83326d90c8b1e8c11b8ede"
+                "reference": "d9615a6fb970d9933866ca8b4036ec3407b020b6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/7c751ea006577e4c2e83326d90c8b1e8c11b8ede",
-                "reference": "7c751ea006577e4c2e83326d90c8b1e8c11b8ede",
+                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/d9615a6fb970d9933866ca8b4036ec3407b020b6",
+                "reference": "d9615a6fb970d9933866ca8b4036ec3407b020b6",
                 "shasum": ""
             },
             "require": {
@@ -3785,7 +3792,7 @@
             ],
             "support": {
                 "issues": "https://github.com/phpseclib/phpseclib/issues",
-                "source": "https://github.com/phpseclib/phpseclib/tree/3.0.5"
+                "source": "https://github.com/phpseclib/phpseclib/tree/3.0.8"
             },
             "funding": [
                 {
@@ -3801,20 +3808,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-02-12T16:18:16+00:00"
+            "time": "2021-04-19T03:20:48+00:00"
         },
         {
             "name": "phpspec/prophecy",
-            "version": "1.12.2",
+            "version": "1.13.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "245710e971a030f42e08f4912863805570f23d39"
+                "reference": "be1996ed8adc35c3fd795488a653f4b518be70ea"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/245710e971a030f42e08f4912863805570f23d39",
-                "reference": "245710e971a030f42e08f4912863805570f23d39",
+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/be1996ed8adc35c3fd795488a653f4b518be70ea",
+                "reference": "be1996ed8adc35c3fd795488a653f4b518be70ea",
                 "shasum": ""
             },
             "require": {
@@ -3866,22 +3873,22 @@
             ],
             "support": {
                 "issues": "https://github.com/phpspec/prophecy/issues",
-                "source": "https://github.com/phpspec/prophecy/tree/1.12.2"
+                "source": "https://github.com/phpspec/prophecy/tree/1.13.0"
             },
-            "time": "2020-12-19T10:15:11+00:00"
+            "time": "2021-03-17T13:42:18+00:00"
         },
         {
             "name": "phpstan/phpstan",
-            "version": "0.12.76",
+            "version": "0.12.88",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "7aaaf9a759a29795e8f46d48041af1c1f1b23d38"
+                "reference": "464d1a81af49409c41074aa6640ed0c4cbd9bb68"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/7aaaf9a759a29795e8f46d48041af1c1f1b23d38",
-                "reference": "7aaaf9a759a29795e8f46d48041af1c1f1b23d38",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/464d1a81af49409c41074aa6640ed0c4cbd9bb68",
+                "reference": "464d1a81af49409c41074aa6640ed0c4cbd9bb68",
                 "shasum": ""
             },
             "require": {
@@ -3912,7 +3919,7 @@
             "description": "PHPStan - PHP Static Analysis Tool",
             "support": {
                 "issues": "https://github.com/phpstan/phpstan/issues",
-                "source": "https://github.com/phpstan/phpstan/tree/0.12.76"
+                "source": "https://github.com/phpstan/phpstan/tree/0.12.88"
             },
             "funding": [
                 {
@@ -3928,7 +3935,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-02-13T11:47:44+00:00"
+            "time": "2021-05-17T12:24:49+00:00"
         },
         {
             "name": "phpstan/phpstan-strict-rules",
@@ -3983,16 +3990,16 @@
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "9.2.5",
+            "version": "9.2.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "f3e026641cc91909d421802dd3ac7827ebfd97e1"
+                "reference": "f6293e1b30a2354e8428e004689671b83871edde"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/f3e026641cc91909d421802dd3ac7827ebfd97e1",
-                "reference": "f3e026641cc91909d421802dd3ac7827ebfd97e1",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/f6293e1b30a2354e8428e004689671b83871edde",
+                "reference": "f6293e1b30a2354e8428e004689671b83871edde",
                 "shasum": ""
             },
             "require": {
@@ -4048,7 +4055,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.5"
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.6"
             },
             "funding": [
                 {
@@ -4056,7 +4063,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-11-28T06:44:49+00:00"
+            "time": "2021-03-28T07:26:59+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -4301,16 +4308,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "9.5.2",
+            "version": "9.5.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "f661659747f2f87f9e72095bb207bceb0f151cb4"
+                "reference": "c73c6737305e779771147af66c96ca6a7ed8a741"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/f661659747f2f87f9e72095bb207bceb0f151cb4",
-                "reference": "f661659747f2f87f9e72095bb207bceb0f151cb4",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c73c6737305e779771147af66c96ca6a7ed8a741",
+                "reference": "c73c6737305e779771147af66c96ca6a7ed8a741",
                 "shasum": ""
             },
             "require": {
@@ -4388,7 +4395,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.2"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.4"
             },
             "funding": [
                 {
@@ -4400,34 +4407,36 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-02-02T14:45:58+00:00"
+            "time": "2021-03-23T07:16:29+00:00"
         },
         {
-            "name": "psr/container",
-            "version": "1.0.0",
+            "name": "predis/predis",
+            "version": "v1.1.7",
             "source": {
                 "type": "git",
-                "url": "https://github.com/php-fig/container.git",
-                "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f"
+                "url": "https://github.com/predis/predis.git",
+                "reference": "b240daa106d4e02f0c5b7079b41e31ddf66fddf8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
-                "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
+                "url": "https://api.github.com/repos/predis/predis/zipball/b240daa106d4e02f0c5b7079b41e31ddf66fddf8",
+                "reference": "b240daa106d4e02f0c5b7079b41e31ddf66fddf8",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.0"
+                "php": ">=5.3.9"
             },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
+            "require-dev": {
+                "phpunit/phpunit": "~4.8"
+            },
+            "suggest": {
+                "ext-curl": "Allows access to Webdis when paired with phpiredis",
+                "ext-phpiredis": "Allows faster serialization and deserialization of the Redis protocol"
             },
+            "type": "library",
             "autoload": {
                 "psr-4": {
-                    "Psr\\Container\\": "src/"
+                    "Predis\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -4436,24 +4445,133 @@
             ],
             "authors": [
                 {
-                    "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
+                    "name": "Daniele Alessandri",
+                    "email": "suppakilla@gmail.com",
+                    "homepage": "http://clorophilla.net",
+                    "role": "Creator & Maintainer"
+                },
+                {
+                    "name": "Till Krüss",
+                    "homepage": "https://till.im",
+                    "role": "Maintainer"
                 }
             ],
-            "description": "Common Container Interface (PHP FIG PSR-11)",
-            "homepage": "https://github.com/php-fig/container",
+            "description": "Flexible and feature-complete Redis client for PHP and HHVM",
+            "homepage": "http://github.com/predis/predis",
             "keywords": [
-                "PSR-11",
-                "container",
-                "container-interface",
-                "container-interop",
-                "psr"
+                "nosql",
+                "predis",
+                "redis"
             ],
             "support": {
-                "issues": "https://github.com/php-fig/container/issues",
-                "source": "https://github.com/php-fig/container/tree/master"
+                "issues": "https://github.com/predis/predis/issues",
+                "source": "https://github.com/predis/predis/tree/v1.1.7"
             },
-            "time": "2017-02-14T16:28:37+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/sponsors/tillkruss",
+                    "type": "github"
+                }
+            ],
+            "time": "2021-04-04T19:34:46+00:00"
+        },
+        {
+            "name": "psr/container",
+            "version": "1.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/container.git",
+                "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/container/zipball/8622567409010282b7aeebe4bb841fe98b58dcaf",
+                "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Container\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "https://www.php-fig.org/"
+                }
+            ],
+            "description": "Common Container Interface (PHP FIG PSR-11)",
+            "homepage": "https://github.com/php-fig/container",
+            "keywords": [
+                "PSR-11",
+                "container",
+                "container-interface",
+                "container-interop",
+                "psr"
+            ],
+            "support": {
+                "issues": "https://github.com/php-fig/container/issues",
+                "source": "https://github.com/php-fig/container/tree/1.1.1"
+            },
+            "time": "2021-03-05T17:36:06+00:00"
+        },
+        {
+            "name": "psr/event-dispatcher",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/event-dispatcher.git",
+                "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/event-dispatcher/zipball/dbefd12671e8a14ec7f180cab83036ed26714bb0",
+                "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\EventDispatcher\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Standard interfaces for event handling.",
+            "keywords": [
+                "events",
+                "psr",
+                "psr-14"
+            ],
+            "support": {
+                "issues": "https://github.com/php-fig/event-dispatcher/issues",
+                "source": "https://github.com/php-fig/event-dispatcher/tree/1.0.0"
+            },
+            "time": "2019-01-08T18:20:26+00:00"
         },
         {
             "name": "psr/http-client",
@@ -5739,25 +5857,22 @@
         },
         {
             "name": "softcreatr/jsonpath",
-            "version": "0.7.2",
+            "version": "0.7.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/SoftCreatR/JSONPath.git",
-                "reference": "46689608586a8081be399342755c36e179f3b5fc"
+                "reference": "e01ff3eae8d0b94648354cb02b614968e83d56a2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/SoftCreatR/JSONPath/zipball/46689608586a8081be399342755c36e179f3b5fc",
-                "reference": "46689608586a8081be399342755c36e179f3b5fc",
+                "url": "https://api.github.com/repos/SoftCreatR/JSONPath/zipball/e01ff3eae8d0b94648354cb02b614968e83d56a2",
+                "reference": "e01ff3eae8d0b94648354cb02b614968e83d56a2",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
                 "php": ">=7.1"
             },
-            "conflict": {
-                "phpunit/phpunit": "<7.0 || >= 10.0"
-            },
             "replace": {
                 "flow/jsonpath": "*"
             },
@@ -5793,6 +5908,7 @@
             "description": "JSONPath implementation for parsing, searching and flattening arrays",
             "support": {
                 "email": "hello@1-2.dev",
+                "forum": "https://github.com/SoftCreatR/JSONPath/discussions",
                 "issues": "https://github.com/SoftCreatR/JSONPath/issues",
                 "source": "https://github.com/SoftCreatR/JSONPath"
             },
@@ -5802,20 +5918,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-10-27T11:37:08+00:00"
+            "time": "2021-05-07T14:31:33+00:00"
         },
         {
             "name": "squizlabs/php_codesniffer",
-            "version": "3.5.8",
+            "version": "3.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
-                "reference": "9d583721a7157ee997f235f327de038e7ea6dac4"
+                "reference": "ffced0d2c8fa8e6cdc4d695a743271fab6c38625"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/9d583721a7157ee997f235f327de038e7ea6dac4",
-                "reference": "9d583721a7157ee997f235f327de038e7ea6dac4",
+                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/ffced0d2c8fa8e6cdc4d695a743271fab6c38625",
+                "reference": "ffced0d2c8fa8e6cdc4d695a743271fab6c38625",
                 "shasum": ""
             },
             "require": {
@@ -5858,7 +5974,7 @@
                 "source": "https://github.com/squizlabs/PHP_CodeSniffer",
                 "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki"
             },
-            "time": "2020-10-23T02:01:07+00:00"
+            "time": "2021-04-09T00:54:41+00:00"
         },
         {
             "name": "swiftmailer/swiftmailer",
@@ -5920,16 +6036,16 @@
         },
         {
             "name": "symfony/browser-kit",
-            "version": "v5.2.3",
+            "version": "v5.2.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/browser-kit.git",
-                "reference": "b03b2057ed53ee4eab2e8f372084d7722b7b8ffd"
+                "reference": "38e16b426f1a4cd663b2583111f213e0c9d9d4fe"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/browser-kit/zipball/b03b2057ed53ee4eab2e8f372084d7722b7b8ffd",
-                "reference": "b03b2057ed53ee4eab2e8f372084d7722b7b8ffd",
+                "url": "https://api.github.com/repos/symfony/browser-kit/zipball/38e16b426f1a4cd663b2583111f213e0c9d9d4fe",
+                "reference": "38e16b426f1a4cd663b2583111f213e0c9d9d4fe",
                 "shasum": ""
             },
             "require": {
@@ -5971,7 +6087,7 @@
             "description": "Simulates the behavior of a web browser, allowing you to make requests, click on links and submit forms programmatically",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/browser-kit/tree/v5.2.3"
+                "source": "https://github.com/symfony/browser-kit/tree/v5.2.9"
             },
             "funding": [
                 {
@@ -5987,46 +6103,48 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-01-27T12:56:27+00:00"
+            "time": "2021-05-16T13:07:46+00:00"
         },
         {
             "name": "symfony/console",
-            "version": "v4.4.19",
+            "version": "v5.2.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "24026c44fc37099fa145707fecd43672831b837a"
+                "reference": "864568fdc0208b3eba3638b6000b69d2386e6768"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/24026c44fc37099fa145707fecd43672831b837a",
-                "reference": "24026c44fc37099fa145707fecd43672831b837a",
+                "url": "https://api.github.com/repos/symfony/console/zipball/864568fdc0208b3eba3638b6000b69d2386e6768",
+                "reference": "864568fdc0208b3eba3638b6000b69d2386e6768",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1.3",
+                "php": ">=7.2.5",
                 "symfony/polyfill-mbstring": "~1.0",
                 "symfony/polyfill-php73": "^1.8",
                 "symfony/polyfill-php80": "^1.15",
-                "symfony/service-contracts": "^1.1|^2"
+                "symfony/service-contracts": "^1.1|^2",
+                "symfony/string": "^5.1"
             },
             "conflict": {
-                "symfony/dependency-injection": "<3.4",
-                "symfony/event-dispatcher": "<4.3|>=5",
+                "symfony/dependency-injection": "<4.4",
+                "symfony/dotenv": "<5.1",
+                "symfony/event-dispatcher": "<4.4",
                 "symfony/lock": "<4.4",
-                "symfony/process": "<3.3"
+                "symfony/process": "<4.4"
             },
             "provide": {
                 "psr/log-implementation": "1.0"
             },
             "require-dev": {
                 "psr/log": "~1.0",
-                "symfony/config": "^3.4|^4.0|^5.0",
-                "symfony/dependency-injection": "^3.4|^4.0|^5.0",
-                "symfony/event-dispatcher": "^4.3",
+                "symfony/config": "^4.4|^5.0",
+                "symfony/dependency-injection": "^4.4|^5.0",
+                "symfony/event-dispatcher": "^4.4|^5.0",
                 "symfony/lock": "^4.4|^5.0",
-                "symfony/process": "^3.4|^4.0|^5.0",
-                "symfony/var-dumper": "^4.3|^5.0"
+                "symfony/process": "^4.4|^5.0",
+                "symfony/var-dumper": "^4.4|^5.0"
             },
             "suggest": {
                 "psr/log": "For using the console logger",
@@ -6059,8 +6177,14 @@
             ],
             "description": "Eases the creation of beautiful and testable command line interfaces",
             "homepage": "https://symfony.com",
+            "keywords": [
+                "cli",
+                "command line",
+                "console",
+                "terminal"
+            ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v4.4.19"
+                "source": "https://github.com/symfony/console/tree/v5.2.8"
             },
             "funding": [
                 {
@@ -6076,20 +6200,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-01-27T09:09:26+00:00"
+            "time": "2021-05-11T15:45:21+00:00"
         },
         {
             "name": "symfony/css-selector",
-            "version": "v5.2.3",
+            "version": "v5.2.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/css-selector.git",
-                "reference": "f65f217b3314504a1ec99c2d6ef69016bb13490f"
+                "reference": "5d5f97809015102116208b976eb2edb44b689560"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/css-selector/zipball/f65f217b3314504a1ec99c2d6ef69016bb13490f",
-                "reference": "f65f217b3314504a1ec99c2d6ef69016bb13490f",
+                "url": "https://api.github.com/repos/symfony/css-selector/zipball/5d5f97809015102116208b976eb2edb44b689560",
+                "reference": "5d5f97809015102116208b976eb2edb44b689560",
                 "shasum": ""
             },
             "require": {
@@ -6125,7 +6249,7 @@
             "description": "Converts CSS selectors to XPath expressions",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/css-selector/tree/v5.2.3"
+                "source": "https://github.com/symfony/css-selector/tree/v5.2.9"
             },
             "funding": [
                 {
@@ -6141,20 +6265,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-01-27T10:01:46+00:00"
+            "time": "2021-05-16T13:07:46+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
-            "version": "v2.2.0",
+            "version": "v2.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/deprecation-contracts.git",
-                "reference": "5fa56b4074d1ae755beb55617ddafe6f5d78f665"
+                "reference": "5f38c8804a9e97d23e0c8d63341088cd8a22d627"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/5fa56b4074d1ae755beb55617ddafe6f5d78f665",
-                "reference": "5fa56b4074d1ae755beb55617ddafe6f5d78f665",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/5f38c8804a9e97d23e0c8d63341088cd8a22d627",
+                "reference": "5f38c8804a9e97d23e0c8d63341088cd8a22d627",
                 "shasum": ""
             },
             "require": {
@@ -6163,7 +6287,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.2-dev"
+                    "dev-main": "2.4-dev"
                 },
                 "thanks": {
                     "name": "symfony/contracts",
@@ -6192,7 +6316,7 @@
             "description": "A generic function and convention to trigger deprecation notices",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/deprecation-contracts/tree/master"
+                "source": "https://github.com/symfony/deprecation-contracts/tree/v2.4.0"
             },
             "funding": [
                 {
@@ -6208,20 +6332,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-09-07T11:33:47+00:00"
+            "time": "2021-03-23T23:28:01+00:00"
         },
         {
             "name": "symfony/dom-crawler",
-            "version": "v5.2.3",
+            "version": "v5.2.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dom-crawler.git",
-                "reference": "5d89ceb53ec65e1973a555072fac8ed5ecad3384"
+                "reference": "8d5201206ded6f37de475b041a11bfaf3ac73d5e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/5d89ceb53ec65e1973a555072fac8ed5ecad3384",
-                "reference": "5d89ceb53ec65e1973a555072fac8ed5ecad3384",
+                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/8d5201206ded6f37de475b041a11bfaf3ac73d5e",
+                "reference": "8d5201206ded6f37de475b041a11bfaf3ac73d5e",
                 "shasum": ""
             },
             "require": {
@@ -6266,7 +6390,7 @@
             "description": "Eases DOM navigation for HTML and XML documents",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/dom-crawler/tree/v5.2.3"
+                "source": "https://github.com/symfony/dom-crawler/tree/v5.2.9"
             },
             "funding": [
                 {
@@ -6282,42 +6406,44 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-01-27T10:01:46+00:00"
+            "time": "2021-05-16T13:07:46+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v4.4.19",
+            "version": "v5.2.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "c352647244bd376bf7d31efbd5401f13f50dad0c"
+                "reference": "d08d6ec121a425897951900ab692b612a61d6240"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/c352647244bd376bf7d31efbd5401f13f50dad0c",
-                "reference": "c352647244bd376bf7d31efbd5401f13f50dad0c",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/d08d6ec121a425897951900ab692b612a61d6240",
+                "reference": "d08d6ec121a425897951900ab692b612a61d6240",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1.3",
-                "symfony/event-dispatcher-contracts": "^1.1"
+                "php": ">=7.2.5",
+                "symfony/deprecation-contracts": "^2.1",
+                "symfony/event-dispatcher-contracts": "^2",
+                "symfony/polyfill-php80": "^1.15"
             },
             "conflict": {
-                "symfony/dependency-injection": "<3.4"
+                "symfony/dependency-injection": "<4.4"
             },
             "provide": {
                 "psr/event-dispatcher-implementation": "1.0",
-                "symfony/event-dispatcher-implementation": "1.1"
+                "symfony/event-dispatcher-implementation": "2.0"
             },
             "require-dev": {
                 "psr/log": "~1.0",
-                "symfony/config": "^3.4|^4.0|^5.0",
-                "symfony/dependency-injection": "^3.4|^4.0|^5.0",
-                "symfony/error-handler": "~3.4|~4.4",
-                "symfony/expression-language": "^3.4|^4.0|^5.0",
-                "symfony/http-foundation": "^3.4|^4.0|^5.0",
+                "symfony/config": "^4.4|^5.0",
+                "symfony/dependency-injection": "^4.4|^5.0",
+                "symfony/error-handler": "^4.4|^5.0",
+                "symfony/expression-language": "^4.4|^5.0",
+                "symfony/http-foundation": "^4.4|^5.0",
                 "symfony/service-contracts": "^1.1|^2",
-                "symfony/stopwatch": "^3.4|^4.0|^5.0"
+                "symfony/stopwatch": "^4.4|^5.0"
             },
             "suggest": {
                 "symfony/dependency-injection": "",
@@ -6349,7 +6475,7 @@
             "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/event-dispatcher/tree/v4.4.19"
+                "source": "https://github.com/symfony/event-dispatcher/tree/v5.2.4"
             },
             "funding": [
                 {
@@ -6365,33 +6491,33 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-01-27T09:09:26+00:00"
+            "time": "2021-02-18T17:12:37+00:00"
         },
         {
             "name": "symfony/event-dispatcher-contracts",
-            "version": "v1.1.9",
+            "version": "v2.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher-contracts.git",
-                "reference": "84e23fdcd2517bf37aecbd16967e83f0caee25a7"
+                "reference": "69fee1ad2332a7cbab3aca13591953da9cdb7a11"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/84e23fdcd2517bf37aecbd16967e83f0caee25a7",
-                "reference": "84e23fdcd2517bf37aecbd16967e83f0caee25a7",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/69fee1ad2332a7cbab3aca13591953da9cdb7a11",
+                "reference": "69fee1ad2332a7cbab3aca13591953da9cdb7a11",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1.3"
+                "php": ">=7.2.5",
+                "psr/event-dispatcher": "^1"
             },
             "suggest": {
-                "psr/event-dispatcher": "",
                 "symfony/event-dispatcher-implementation": ""
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.1-dev"
+                    "dev-main": "2.4-dev"
                 },
                 "thanks": {
                     "name": "symfony/contracts",
@@ -6428,7 +6554,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v1.1.9"
+                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v2.4.0"
             },
             "funding": [
                 {
@@ -6444,20 +6570,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-07-06T13:19:58+00:00"
+            "time": "2021-03-23T23:28:01+00:00"
         },
         {
             "name": "symfony/finder",
-            "version": "v5.2.3",
+            "version": "v5.2.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "4adc8d172d602008c204c2e16956f99257248e03"
+                "reference": "ccccb9d48ca42757dd12f2ca4bf857a4e217d90d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/4adc8d172d602008c204c2e16956f99257248e03",
-                "reference": "4adc8d172d602008c204c2e16956f99257248e03",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/ccccb9d48ca42757dd12f2ca4bf857a4e217d90d",
+                "reference": "ccccb9d48ca42757dd12f2ca4bf857a4e217d90d",
                 "shasum": ""
             },
             "require": {
@@ -6489,7 +6615,172 @@
             "description": "Finds files and directories via an intuitive fluent interface",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/finder/tree/v5.2.3"
+                "source": "https://github.com/symfony/finder/tree/v5.2.9"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2021-05-16T13:07:46+00:00"
+        },
+        {
+            "name": "symfony/polyfill-intl-grapheme",
+            "version": "v1.22.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-intl-grapheme.git",
+                "reference": "5601e09b69f26c1828b13b6bb87cb07cddba3170"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/5601e09b69f26c1828b13b6bb87cb07cddba3170",
+                "reference": "5601e09b69f26c1828b13b6bb87cb07cddba3170",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1"
+            },
+            "suggest": {
+                "ext-intl": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.22-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Polyfill\\Intl\\Grapheme\\": ""
+                },
+                "files": [
+                    "bootstrap.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill for intl's grapheme_* functions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "grapheme",
+                "intl",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.22.1"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2021-01-22T09:19:47+00:00"
+        },
+        {
+            "name": "symfony/polyfill-intl-normalizer",
+            "version": "v1.22.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
+                "reference": "43a0283138253ed1d48d352ab6d0bdb3f809f248"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/43a0283138253ed1d48d352ab6d0bdb3f809f248",
+                "reference": "43a0283138253ed1d48d352ab6d0bdb3f809f248",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1"
+            },
+            "suggest": {
+                "ext-intl": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.22-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Polyfill\\Intl\\Normalizer\\": ""
+                },
+                "files": [
+                    "bootstrap.php"
+                ],
+                "classmap": [
+                    "Resources/stubs"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill for intl's Normalizer class and related functions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "intl",
+                "normalizer",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.22.1"
             },
             "funding": [
                 {
@@ -6505,20 +6796,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-01-28T22:06:19+00:00"
+            "time": "2021-01-22T09:19:47+00:00"
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.22.0",
+            "version": "v1.22.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "f377a3dd1fde44d37b9831d68dc8dea3ffd28e13"
+                "reference": "5232de97ee3b75b0360528dae24e73db49566ab1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/f377a3dd1fde44d37b9831d68dc8dea3ffd28e13",
-                "reference": "f377a3dd1fde44d37b9831d68dc8dea3ffd28e13",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/5232de97ee3b75b0360528dae24e73db49566ab1",
+                "reference": "5232de97ee3b75b0360528dae24e73db49566ab1",
                 "shasum": ""
             },
             "require": {
@@ -6569,7 +6860,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.22.0"
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.22.1"
             },
             "funding": [
                 {
@@ -6585,11 +6876,11 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-01-07T16:49:33+00:00"
+            "time": "2021-01-22T09:19:47+00:00"
         },
         {
             "name": "symfony/polyfill-php73",
-            "version": "v1.22.0",
+            "version": "v1.22.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php73.git",
@@ -6648,7 +6939,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php73/tree/v1.22.0"
+                "source": "https://github.com/symfony/polyfill-php73/tree/v1.22.1"
             },
             "funding": [
                 {
@@ -6668,7 +6959,7 @@
         },
         {
             "name": "symfony/polyfill-php80",
-            "version": "v1.22.0",
+            "version": "v1.22.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php80.git",
@@ -6731,7 +7022,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php80/tree/v1.22.0"
+                "source": "https://github.com/symfony/polyfill-php80/tree/v1.22.1"
             },
             "funding": [
                 {
@@ -6751,20 +7042,21 @@
         },
         {
             "name": "symfony/process",
-            "version": "v3.4.47",
+            "version": "v5.2.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "b8648cf1d5af12a44a51d07ef9bf980921f15fca"
+                "reference": "98cb8eeb72e55d4196dd1e36f1f16e7b3a9a088e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/b8648cf1d5af12a44a51d07ef9bf980921f15fca",
-                "reference": "b8648cf1d5af12a44a51d07ef9bf980921f15fca",
+                "url": "https://api.github.com/repos/symfony/process/zipball/98cb8eeb72e55d4196dd1e36f1f16e7b3a9a088e",
+                "reference": "98cb8eeb72e55d4196dd1e36f1f16e7b3a9a088e",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.5.9|>=7.0.8"
+                "php": ">=7.2.5",
+                "symfony/polyfill-php80": "^1.15"
             },
             "type": "library",
             "autoload": {
@@ -6789,10 +7081,10 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony Process Component",
+            "description": "Executes commands in sub-processes",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/process/tree/v3.4.47"
+                "source": "https://github.com/symfony/process/tree/v5.3.0-BETA1"
             },
             "funding": [
                 {
@@ -6808,25 +7100,25 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-10-24T10:57:07+00:00"
+            "time": "2021-04-08T10:27:02+00:00"
         },
         {
             "name": "symfony/service-contracts",
-            "version": "v2.2.0",
+            "version": "v2.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "d15da7ba4957ffb8f1747218be9e1a121fd298a1"
+                "reference": "f040a30e04b57fbcc9c6cbcf4dbaa96bd318b9bb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/d15da7ba4957ffb8f1747218be9e1a121fd298a1",
-                "reference": "d15da7ba4957ffb8f1747218be9e1a121fd298a1",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/f040a30e04b57fbcc9c6cbcf4dbaa96bd318b9bb",
+                "reference": "f040a30e04b57fbcc9c6cbcf4dbaa96bd318b9bb",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.2.5",
-                "psr/container": "^1.0"
+                "psr/container": "^1.1"
             },
             "suggest": {
                 "symfony/service-implementation": ""
@@ -6834,7 +7126,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.2-dev"
+                    "dev-main": "2.4-dev"
                 },
                 "thanks": {
                     "name": "symfony/contracts",
@@ -6871,7 +7163,90 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/service-contracts/tree/master"
+                "source": "https://github.com/symfony/service-contracts/tree/v2.4.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2021-04-01T10:43:52+00:00"
+        },
+        {
+            "name": "symfony/string",
+            "version": "v5.2.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/string.git",
+                "reference": "01b35eb64cac8467c3f94cd0ce2d0d376bb7d1db"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/string/zipball/01b35eb64cac8467c3f94cd0ce2d0d376bb7d1db",
+                "reference": "01b35eb64cac8467c3f94cd0ce2d0d376bb7d1db",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2.5",
+                "symfony/polyfill-ctype": "~1.8",
+                "symfony/polyfill-intl-grapheme": "~1.0",
+                "symfony/polyfill-intl-normalizer": "~1.0",
+                "symfony/polyfill-mbstring": "~1.0",
+                "symfony/polyfill-php80": "~1.15"
+            },
+            "require-dev": {
+                "symfony/error-handler": "^4.4|^5.0",
+                "symfony/http-client": "^4.4|^5.0",
+                "symfony/translation-contracts": "^1.1|^2",
+                "symfony/var-exporter": "^4.4|^5.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\String\\": ""
+                },
+                "files": [
+                    "Resources/functions.php"
+                ],
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Provides an object-oriented API to strings and deals with bytes, UTF-8 code points and grapheme clusters in a unified way",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "grapheme",
+                "i18n",
+                "string",
+                "unicode",
+                "utf-8",
+                "utf8"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/string/tree/v5.2.8"
             },
             "funding": [
                 {
@@ -6887,20 +7262,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-09-07T11:33:47+00:00"
+            "time": "2021-05-10T14:56:10+00:00"
         },
         {
             "name": "symfony/translation",
-            "version": "v5.2.3",
+            "version": "v5.2.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation.git",
-                "reference": "c021864d4354ee55160ddcfd31dc477a1bc77949"
+                "reference": "61af68dba333e2d376a325a29c2a3f2a605b4876"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation/zipball/c021864d4354ee55160ddcfd31dc477a1bc77949",
-                "reference": "c021864d4354ee55160ddcfd31dc477a1bc77949",
+                "url": "https://api.github.com/repos/symfony/translation/zipball/61af68dba333e2d376a325a29c2a3f2a605b4876",
+                "reference": "61af68dba333e2d376a325a29c2a3f2a605b4876",
                 "shasum": ""
             },
             "require": {
@@ -6917,7 +7292,7 @@
                 "symfony/yaml": "<4.4"
             },
             "provide": {
-                "symfony/translation-implementation": "2.0"
+                "symfony/translation-implementation": "2.3"
             },
             "require-dev": {
                 "psr/log": "~1.0",
@@ -6964,7 +7339,7 @@
             "description": "Provides tools to internationalize your application",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/translation/tree/v5.2.3"
+                "source": "https://github.com/symfony/translation/tree/v5.2.9"
             },
             "funding": [
                 {
@@ -6980,20 +7355,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-01-27T10:15:41+00:00"
+            "time": "2021-05-16T13:07:46+00:00"
         },
         {
             "name": "symfony/translation-contracts",
-            "version": "v2.3.0",
+            "version": "v2.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation-contracts.git",
-                "reference": "e2eaa60b558f26a4b0354e1bbb25636efaaad105"
+                "reference": "95c812666f3e91db75385749fe219c5e494c7f95"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/e2eaa60b558f26a4b0354e1bbb25636efaaad105",
-                "reference": "e2eaa60b558f26a4b0354e1bbb25636efaaad105",
+                "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/95c812666f3e91db75385749fe219c5e494c7f95",
+                "reference": "95c812666f3e91db75385749fe219c5e494c7f95",
                 "shasum": ""
             },
             "require": {
@@ -7005,7 +7380,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.3-dev"
+                    "dev-main": "2.4-dev"
                 },
                 "thanks": {
                     "name": "symfony/contracts",
@@ -7042,7 +7417,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/translation-contracts/tree/v2.3.0"
+                "source": "https://github.com/symfony/translation-contracts/tree/v2.4.0"
             },
             "funding": [
                 {
@@ -7058,20 +7433,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-09-28T13:05:58+00:00"
+            "time": "2021-03-23T23:28:01+00:00"
         },
         {
             "name": "symfony/var-dumper",
-            "version": "v5.2.3",
+            "version": "v5.2.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "72ca213014a92223a5d18651ce79ef441c12b694"
+                "reference": "d693200a73fae179d27f8f1b16b4faf3e8569eba"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/72ca213014a92223a5d18651ce79ef441c12b694",
-                "reference": "72ca213014a92223a5d18651ce79ef441c12b694",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/d693200a73fae179d27f8f1b16b4faf3e8569eba",
+                "reference": "d693200a73fae179d27f8f1b16b4faf3e8569eba",
                 "shasum": ""
             },
             "require": {
@@ -7130,7 +7505,7 @@
                 "dump"
             ],
             "support": {
-                "source": "https://github.com/symfony/var-dumper/tree/v5.2.3"
+                "source": "https://github.com/symfony/var-dumper/tree/v5.2.8"
             },
             "funding": [
                 {
@@ -7146,20 +7521,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-01-27T10:15:41+00:00"
+            "time": "2021-05-07T13:42:21+00:00"
         },
         {
             "name": "symfony/yaml",
-            "version": "v5.2.3",
+            "version": "v5.2.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/yaml.git",
-                "reference": "338cddc6d74929f6adf19ca5682ac4b8e109cdb0"
+                "reference": "d23115e4a3d50520abddccdbec9514baab1084c8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/338cddc6d74929f6adf19ca5682ac4b8e109cdb0",
-                "reference": "338cddc6d74929f6adf19ca5682ac4b8e109cdb0",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/d23115e4a3d50520abddccdbec9514baab1084c8",
+                "reference": "d23115e4a3d50520abddccdbec9514baab1084c8",
                 "shasum": ""
             },
             "require": {
@@ -7205,7 +7580,7 @@
             "description": "Loads and dumps YAML files",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/yaml/tree/v5.2.3"
+                "source": "https://github.com/symfony/yaml/tree/v5.2.9"
             },
             "funding": [
                 {
@@ -7221,7 +7596,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-02-03T04:42:09+00:00"
+            "time": "2021-05-16T13:07:46+00:00"
         },
         {
             "name": "theseer/tokenizer",
@@ -7275,30 +7650,35 @@
         },
         {
             "name": "webmozart/assert",
-            "version": "1.9.1",
+            "version": "1.10.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/webmozarts/assert.git",
-                "reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389"
+                "reference": "6964c76c7804814a842473e0c8fd15bab0f18e25"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/webmozarts/assert/zipball/bafc69caeb4d49c39fd0779086c03a3738cbb389",
-                "reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389",
+                "url": "https://api.github.com/repos/webmozarts/assert/zipball/6964c76c7804814a842473e0c8fd15bab0f18e25",
+                "reference": "6964c76c7804814a842473e0c8fd15bab0f18e25",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.3.3 || ^7.0 || ^8.0",
+                "php": "^7.2 || ^8.0",
                 "symfony/polyfill-ctype": "^1.8"
             },
             "conflict": {
                 "phpstan/phpstan": "<0.12.20",
-                "vimeo/psalm": "<3.9.1"
+                "vimeo/psalm": "<4.6.1 || 4.6.2"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.8.36 || ^7.5.13"
+                "phpunit/phpunit": "^8.5.13"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.10-dev"
+                }
+            },
             "autoload": {
                 "psr-4": {
                     "Webmozart\\Assert\\": "src/"
@@ -7322,9 +7702,9 @@
             ],
             "support": {
                 "issues": "https://github.com/webmozarts/assert/issues",
-                "source": "https://github.com/webmozarts/assert/tree/1.9.1"
+                "source": "https://github.com/webmozarts/assert/tree/1.10.0"
             },
-            "time": "2020-07-08T17:02:28+00:00"
+            "time": "2021-03-09T10:59:23+00:00"
         }
     ],
     "aliases": [],
@@ -7348,7 +7728,9 @@
     },
     "prefer-stable": true,
     "prefer-lowest": false,
-    "platform": [],
+    "platform": {
+        "ext-json": "*"
+    },
     "platform-dev": [],
     "plugin-api-version": "2.0.0"
 }
diff --git a/ruleset.xml b/ruleset.xml
new file mode 100644
index 00000000..d5c7f80d
--- /dev/null
+++ b/ruleset.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<ruleset name="Pckg">
+    <description>The PSR-12* coding standard.</description>
+    <arg name="tab-width" value="4"/>
+    <rule ref="PSR12">
+        <exclude name="PSR2.Methods.MethodDeclaration.Underscore"/>
+    </rule>
+</ruleset>

From 4cc6045434ec45cbe334bb17dab2a6f238ca92c3 Mon Sep 17 00:00:00 2001
From: Bojan Rajh <schtr4jh@schtr4jh.net>
Date: Sat, 22 May 2021 11:24:58 +0200
Subject: [PATCH 23/66] Prettify

---
 src/Pckg/Framework/Application.php            |   5 +-
 .../Application/Command/InitDatabase.php      |  12 +-
 .../Command/RegisterApplication.php           |  25 +-
 .../Console/Command/RunCommand.php            |  38 +-
 src/Pckg/Framework/Application/Website.php    |   2 +-
 .../Website/Command/InitLastAssets.php        |  11 +-
 src/Pckg/Framework/Config.php                 |   6 +
 .../Console/Command/DeployProject.php         |   8 +-
 .../Framework/Console/Command/InitEnv.php     |  63 ---
 .../Framework/Environment/Development.php     |   2 +-
 src/Pckg/Framework/Environment/Production.php |   5 +-
 .../Framework/{Command => Handler}/Forked.php |   2 +-
 src/Pckg/Framework/Provider/Framework.php     | 145 +++----
 .../Helper/PostValidationResolver.php         |   9 +-
 .../Framework/Provider/ResolvesMultiple.php   |   2 +-
 src/Pckg/Framework/Request/Data/Session.php   |   2 +-
 .../Request/Data/SessionDriver/Db.php         |   2 +-
 .../Request/Data/SessionDriver/FileDriver.php |   2 +-
 .../Response/Command/ProcessRouteMatch.php    |   8 +-
 .../Response/Command/RunResponse.php          |   1 +
 src/Pckg/Framework/Router.php                 |   2 +-
 .../Framework/Router/Command/ResolveRoute.php | 361 +++++++++---------
 22 files changed, 343 insertions(+), 370 deletions(-)
 delete mode 100644 src/Pckg/Framework/Console/Command/InitEnv.php
 rename src/Pckg/Framework/{Command => Handler}/Forked.php (93%)

diff --git a/src/Pckg/Framework/Application.php b/src/Pckg/Framework/Application.php
index 6d4204a5..7d55f475 100644
--- a/src/Pckg/Framework/Application.php
+++ b/src/Pckg/Framework/Application.php
@@ -2,7 +2,6 @@
 
 namespace Pckg\Framework;
 
-use Pckg\Framework\Application\ApplicationInterface;
 use Pckg\Framework\Provider\Helper\Registrator;
 
 class Application
@@ -11,6 +10,8 @@ class Application
 
     protected $provider;
 
+    const EVENT_REGISTERED = self::class . '.registered';
+
     public function __construct(Provider $provider)
     {
         $this->provider = $provider;
@@ -25,7 +26,7 @@ public function initAndRun()
     {
         /**
          * Initialize application.
-         * This will parse config, set localization 'things', estamblish connection to database, initialize and register
+         * This will parse config, set localization 'things', establish connection to database, initialize and register
          * routes, set application autoloaders and providers, session, response, request and assets.
          */
         measure('Initializing ' . static::class, function () {
diff --git a/src/Pckg/Framework/Application/Command/InitDatabase.php b/src/Pckg/Framework/Application/Command/InitDatabase.php
index 860ec70c..62257ced 100644
--- a/src/Pckg/Framework/Application/Command/InitDatabase.php
+++ b/src/Pckg/Framework/Application/Command/InitDatabase.php
@@ -3,15 +3,23 @@
 namespace Pckg\Framework\Application\Command;
 
 use Pckg\Database\Repository\RepositoryFactory;
+use Pckg\Framework\Config;
 
 class InitDatabase
 {
 
+    protected Config $config;
+
+    public function __construct(Config $config)
+    {
+        $this->config = $config;
+    }
+
     public function execute(callable $next)
     {
-        foreach (config('database', []) as $name => $config) {
+        foreach ($this->config->get('database', []) as $name => $config) {
             /**
-             * Skip lazy initialize connections which will be estamblished on demand.
+             * Skip lazy initialize connections which will be established on demand.
              */
             if (is_string($config) || ($config['lazy'] ?? false)) {
                 continue;
diff --git a/src/Pckg/Framework/Application/Command/RegisterApplication.php b/src/Pckg/Framework/Application/Command/RegisterApplication.php
index 277ffdc5..bdb9bb09 100644
--- a/src/Pckg/Framework/Application/Command/RegisterApplication.php
+++ b/src/Pckg/Framework/Application/Command/RegisterApplication.php
@@ -2,7 +2,9 @@
 
 namespace Pckg\Framework\Application\Command;
 
+use Pckg\Concept\Event\Dispatcher;
 use Pckg\Framework\Application;
+use Pckg\Framework\Config;
 use Pckg\Framework\Provider\Helper\Registrator;
 use Pckg\Locale\Command\Localize;
 
@@ -10,11 +12,17 @@ class RegisterApplication
 {
     use Registrator;
 
+    protected Application $application;
 
-    protected $application;
-    public function __construct(Application $application)
+    protected Config $config;
+
+    protected Dispatcher $dispatcher;
+
+    public function __construct(Application $application, Config $config, Dispatcher $dispatcher)
     {
         $this->application = $application;
+        $this->config = $config;
+        $this->dispatcher = $dispatcher;
     }
 
     public function execute(callable $next)
@@ -23,20 +31,23 @@ public function execute(callable $next)
          * Register main application provider.
          */
         $this->application->getProvider()->register();
-// 0.44 -> 0.97 / 1.03 = 0.53s = 50%
+        // 0.44 -> 0.97 / 1.03 = 0.53s = 50%
 
         /**
          * Parse application config.
          */
-        config()->parseDir(path('app'));
-/**
+        $this->config->parseDir(path('app'));
+
+        /**
          * Localize any config changes.
          */
         chain([Localize::class]);
-/**
+
+        /**
          * Trigger event.
          */
-        trigger(Application::class . '.registered');
+        $this->dispatcher->trigger(Application::EVENT_REGISTERED);
+
         return $next();
     }
 }
diff --git a/src/Pckg/Framework/Application/Console/Command/RunCommand.php b/src/Pckg/Framework/Application/Console/Command/RunCommand.php
index 462c46df..8ceddd99 100644
--- a/src/Pckg/Framework/Application/Console/Command/RunCommand.php
+++ b/src/Pckg/Framework/Application/Console/Command/RunCommand.php
@@ -3,24 +3,32 @@
 namespace Pckg\Framework\Application\Console\Command;
 
 use Pckg\Concept\AbstractChainOfReponsibility;
+use Pckg\Concept\Event\Dispatcher;
+use Pckg\Framework\Request\Data\Server;
 use Pckg\Framework\Response;
-use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Application as SymfonyConsole;
-use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\ArgvInput;
-use Symfony\Component\Console\Input\InputArgument;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
 use Throwable;
 
 class RunCommand extends AbstractChainOfReponsibility
 {
 
-    protected $response;
+    protected Response $response;
 
-    public function __construct(Response $response)
+    protected Dispatcher $dispatcher;
+
+    protected SymfonyConsole $symfonyConsole;
+
+    protected Server $server;
+
+    const EVENT_RUNNING = self::class . '.running';
+
+    public function __construct(Response $response, Dispatcher $dispatcher, SymfonyConsole $symfonyConsole, Server $server)
     {
         $this->response = $response;
+        $this->dispatcher = $dispatcher;
+        $this->symfonyConsole = $symfonyConsole;
+        $this->server = $server;
     }
 
     public function execute(callable $next)
@@ -32,7 +40,7 @@ public function execute(callable $next)
              * If it's command, we leave things as they are.
              * Id it's app, we unset it.
              */
-            $argv = $_SERVER['argv'];
+            $argv = $this->server->get('argv', []);
 
             /**
              * Remove application name.
@@ -44,13 +52,11 @@ public function execute(callable $next)
             /**
              * Trigger event
              */
-            trigger(RunCommand::class . '.running', []);
+            $this->dispatcher->trigger(static::EVENT_RUNNING, []);
 
             /**
              * Get Symfony Console Application, find available commands and run app.
-             * @var SymfonyConsole $application
              */
-            $application = context()->get(SymfonyConsole::class);
             try {
                 /**
                  * Apply global middlewares.
@@ -59,7 +65,7 @@ public function execute(callable $next)
                     chain($middlewares, 'execute');
                 }
 
-                $application->run(new ArgvInput(array_values($argv)));
+                $this->symfonyConsole->run(new ArgvInput(array_values($argv)), context()->getOrDefault(RunCommand::class . '.output'));
 
                 /**
                  * Apply global afterwares/decorators.
@@ -68,14 +74,10 @@ public function execute(callable $next)
                     chain($afterwares, 'execute', [$this->response]);
                 }
             } catch (Throwable $e) {
-                die("EXCEPTION: " . exception($e));
+                die("EXCEPTION: " . \Pckg\Framework\Helper\exception($e));
             }
-
-            /**
-             * This is here just for better readability. =)
-             */
-            echo "\n";
         } catch (Throwable $e) {
+            error_log(\Pckg\Framework\Helper\exception($e));
         }
 
         return $next();
diff --git a/src/Pckg/Framework/Application/Website.php b/src/Pckg/Framework/Application/Website.php
index 7a7b7eb7..bf4c66a2 100644
--- a/src/Pckg/Framework/Application/Website.php
+++ b/src/Pckg/Framework/Application/Website.php
@@ -48,4 +48,4 @@ public function runs()
             RunResponse::class,
         ];
     }
-}
\ No newline at end of file
+}
diff --git a/src/Pckg/Framework/Application/Website/Command/InitLastAssets.php b/src/Pckg/Framework/Application/Website/Command/InitLastAssets.php
index 49a66ab8..f015ee85 100644
--- a/src/Pckg/Framework/Application/Website/Command/InitLastAssets.php
+++ b/src/Pckg/Framework/Application/Website/Command/InitLastAssets.php
@@ -6,6 +6,11 @@
 use Pckg\Framework\Environment;
 use Pckg\Manager\Asset as AssetManager;
 
+/**
+ * Class InitLastAssets
+ * @package Pckg\Framework\Application\Website\Command
+ * @deprecated
+ */
 class InitLastAssets extends AbstractChainOfReponsibility
 {
 
@@ -13,10 +18,8 @@ class InitLastAssets extends AbstractChainOfReponsibility
 
     protected $environment;
 
-    public function __construct(
-        Environment $environment,
-        AssetManager $assetManager
-    ) {
+    public function __construct(Environment $environment, AssetManager $assetManager)
+    {
         $this->assetManager = $assetManager;
         $this->environment = $environment;
     }
diff --git a/src/Pckg/Framework/Config.php b/src/Pckg/Framework/Config.php
index 014d8c53..a54fbdb4 100644
--- a/src/Pckg/Framework/Config.php
+++ b/src/Pckg/Framework/Config.php
@@ -7,6 +7,8 @@ class Config
 
     protected $data = [];
 
+    const EVENT_DIR_PARSED = self::class . '.dirParsed';
+
     public function __construct(array $data = [])
     {
         $this->overwrite($data);
@@ -113,6 +115,10 @@ public function parseDir($dir)
 
         $this->data = merge_arrays($this->data, $settings);
 
+        /**
+         * @T00D00 - move this to the event handler
+         */
+        trigger(static::EVENT_DIR_PARSED, [$this]);
         $this->set('url', "https://" . config('domain'));
     }
 
diff --git a/src/Pckg/Framework/Console/Command/DeployProject.php b/src/Pckg/Framework/Console/Command/DeployProject.php
index 22ab17e7..a4b2dd58 100644
--- a/src/Pckg/Framework/Console/Command/DeployProject.php
+++ b/src/Pckg/Framework/Console/Command/DeployProject.php
@@ -30,9 +30,9 @@ public function handle()
             $this->output('Happy FRIDAY deploy!');
         }
 
-        $this->output('Estamblishing SSH connection to ' . $remote['host'] . '.');
+        $this->output('Establishing SSH connection to ' . $remote['host'] . '.');
         $sshConnection = ssh2_connect($remote['host'], $remote['port']);
-        $this->output('SSH connection estamblished.');
+        $this->output('SSH connection established.');
 
         /**
          * Authenticate with username and password or username and key.
@@ -41,12 +41,12 @@ public function handle()
             if (
                 !ssh2_auth_password($sshConnection, $remote['username'], $remote['password'])
             ) {
-                throw new Exception('Cannot estamblish SSH connection to remote with username and password');
+                throw new Exception('Cannot establish SSH connection to remote with username and password');
             }
         } elseif (
             !ssh2_auth_pubkey_file($sshConnection, $remote['username'], $remote['key'] . '.pub', $remote['key'], '')
         ) {
-            throw new Exception('Cannot estamblish SSH connection to remote with username and key');
+            throw new Exception('Cannot establish SSH connection to remote with username and key');
         }
 
         $paths = $remote['root'];
diff --git a/src/Pckg/Framework/Console/Command/InitEnv.php b/src/Pckg/Framework/Console/Command/InitEnv.php
deleted file mode 100644
index 2d265aee..00000000
--- a/src/Pckg/Framework/Console/Command/InitEnv.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php namespace Pckg\Framework\Console\Command;
-
-use Pckg\Framework\Console\Command;
-use Symfony\Component\Console\Input\InputArgument;
-
-class InitEnv extends Command
-{
-
-    public function createFiles()
-    {
-        foreach ($this->files() as $file => $content) {
-            if (!is_file($file)) {
-                $this->output('Creating file ' . $file);
-                file_put_contents(path('root') . $file, $content);
-            } else {
-                $this->output('File ' . $file . ' already exists');
-            }
-        }
-    }
-
-    public function copyConfigs()
-    {
-        $files = [
-            'codeception.sample.yml'                 => 'codeception.yml',
-            '.env.example' => '.env',
-        ];
-
-        if ($app = $this->option('app')) {
-            $path = 'app' . path('ds') . $app . path('ds') . 'config' . path('ds');
-            // $files[$path . 'env.sample.php'] = $path . 'env.php';
-        }
-
-        foreach ($files as $original => $copy) {
-            if (is_file(path('root') . $original)) {
-                if (!is_file(path('root') . $copy)) {
-                    $this->output('Copying ' . $original . ' => ' . $copy);
-                    file_put_contents(path('root') . $copy, file_get_contents(path('root') . $original));
-                    $this->output('Copied!');
-                } else {
-                    $this->output('File ' . $copy . ' already exists.');
-                }
-            } else {
-                $this->output('Original file ' . $original . ' does not exist.');
-            }
-        }
-    }
-
-    public function handle()
-    {
-        $this->createDirs();
-        $this->createSymlinks();
-        $this->createFiles();
-        $this->copyConfigs();
-    }
-
-    protected function configure()
-    {
-        $this->setName('project:init')
-             ->setDescription('Initialize project (create required directories and configs)')
-             ->addOption('app', 'app', InputArgument::OPTIONAL, 'Init app structure and configs');
-    }
-
-}
diff --git a/src/Pckg/Framework/Environment/Development.php b/src/Pckg/Framework/Environment/Development.php
index 7aa104e8..5de470bc 100644
--- a/src/Pckg/Framework/Environment/Development.php
+++ b/src/Pckg/Framework/Environment/Development.php
@@ -44,7 +44,7 @@ public function register()
     public function registerExceptionHandler()
     {
         $whoops = new Run();
-        $whoops->pushHandler(function(\Throwable $e){
+        $whoops->pushHandler(function (\Throwable $e) {
             @error_log(exception($e));
         });
         $whoops->pushHandler(new PrettyPageHandler());
diff --git a/src/Pckg/Framework/Environment/Production.php b/src/Pckg/Framework/Environment/Production.php
index b34279a8..fc9cbe38 100644
--- a/src/Pckg/Framework/Environment/Production.php
+++ b/src/Pckg/Framework/Environment/Production.php
@@ -165,9 +165,10 @@ protected function handleException(Throwable $e)
     public function getApplicationNameFromGlobalRouter()
     {
         $apps = config('router.apps', []);
+        $hostname = $_SERVER['HTTP_HOST'] ?? null;
 
         foreach ($apps as $app => $config) {
-            if (in_array($_SERVER['HTTP_HOST'], $config['host'])) {
+            if (in_array($hostname, $config['host'])) {
                 return $app;
             }
 
@@ -176,7 +177,7 @@ public function getApplicationNameFromGlobalRouter()
             }
 
             foreach ($config['host'] as $host) {
-                if (strpos($host, '(') !== false && preg_match('/' . $host . '/', $_SERVER['HTTP_HOST'])) {
+                if (strpos($host, '(') !== false && preg_match('/' . $host . '/', $hostname)) {
                     return $app;
                 }
             }
diff --git a/src/Pckg/Framework/Command/Forked.php b/src/Pckg/Framework/Handler/Forked.php
similarity index 93%
rename from src/Pckg/Framework/Command/Forked.php
rename to src/Pckg/Framework/Handler/Forked.php
index 958b8b6b..63b73994 100644
--- a/src/Pckg/Framework/Command/Forked.php
+++ b/src/Pckg/Framework/Handler/Forked.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Pckg\Framework\Command;
+namespace Pckg\Framework\Handler;
 
 use Pckg\Database\Repository;
 
diff --git a/src/Pckg/Framework/Provider/Framework.php b/src/Pckg/Framework/Provider/Framework.php
index efc61d39..583be28d 100644
--- a/src/Pckg/Framework/Provider/Framework.php
+++ b/src/Pckg/Framework/Provider/Framework.php
@@ -1,75 +1,76 @@
 <?php
 
 namespace Pckg\Framework\Provider;
-
-use Pckg\Framework\Command\Forked;
-use Pckg\Framework\Config;
-use Pckg\Framework\Console\Command\ClearCache;
-use Pckg\Framework\Console\Command\CreatePckgProject;
-use Pckg\Framework\Environment;
-use Pckg\Framework\Provider;
-use Pckg\Framework\Request;
-use Pckg\Framework\Request\Data\Cookie;
-use Pckg\Framework\Request\Data\Flash;
-use Pckg\Framework\Request\Data\Server;
-use Pckg\Framework\Request\Data\Session;
-use Pckg\Framework\Response;
-use Pckg\Framework\Router;
-use Pckg\Framework\Router\Console\ListRoutes;
-use Pckg\Framework\View\Handler\RegisterTwigExtensions;
-use Pckg\Framework\View\Twig;
-use Pckg\Htmlbuilder\Provider\Htmlbuilder;
-use Pckg\Locale\LangInterface;
-use Pckg\Locale\Provider\Localizer;
-use Pckg\Migration\Provider\Migration as MigrationProvider;
-
-class Framework extends Provider
-{
-
-    public function consoles()
-    {
-        return [
-            CreatePckgProject::class,
-            ClearCache::class,
-            ListRoutes::class,
-        ];
-    }
-
-    public function providers()
-    {
-        return [
-            MigrationProvider::class,
-            Htmlbuilder::class,
-            Localizer::class,
-        ];
-    }
-
-    public function viewObjects()
-    {
-        return [
-            // '_request'    => Request::class,
-            '_response'   => Response::class,
-            //'_server'     => Server::class,
-            '_router'     => Router::class,
-            '_env'        => Environment::class,
-            //'_lang'       => LangInterface::class,
-            '_config'     => Config::class,
-            //'_session'    => Session::class, // why is this commented out?
-            '_cookie'     => Cookie::class,
-            // '_flash'      => Flash::class,
-            '_debugBar'   => debugBar(),
-        ];
-    }
-
-    public function listeners()
-    {
-        return [
-            'forked'                            => [
-                Forked::class,
-            ],
-            Twig::class . '.registerExtensions' => [
-                RegisterTwigExtensions::class,
-            ],
-        ];
-    }
-}
\ No newline at end of file
+
+use Pckg\Framework\Handler\Forked;
+use Pckg\Framework\Config;
+use Pckg\Framework\Console\Command\ClearCache;
+use Pckg\Framework\Console\Command\CreatePckgProject;
+use Pckg\Framework\Environment;
+use Pckg\Framework\Provider;
+use Pckg\Framework\Request;
+use Pckg\Framework\Request\Data\Cookie;
+use Pckg\Framework\Request\Data\Flash;
+use Pckg\Framework\Request\Data\Server;
+use Pckg\Framework\Request\Data\Session;
+use Pckg\Framework\Response;
+use Pckg\Framework\Router;
+use Pckg\Framework\Router\Console\ListRoutes;
+use Pckg\Framework\View\Handler\RegisterTwigExtensions;
+use Pckg\Framework\View\Twig;
+use Pckg\Htmlbuilder\Provider\Htmlbuilder;
+use Pckg\Locale\LangInterface;
+use Pckg\Locale\Provider\Localizer;
+use Pckg\Migration\Provider\Migration as MigrationProvider;
+
+class Framework extends Provider
+{
+
+
+    public function consoles()
+    {
+        return [
+            CreatePckgProject::class,
+            ClearCache::class,
+            ListRoutes::class,
+        ];
+    }
+
+    public function providers()
+    {
+        return [
+            MigrationProvider::class,
+            Htmlbuilder::class,
+            Localizer::class,
+        ];
+    }
+
+    public function viewObjects()
+    {
+        return [
+            // '_request'    => Request::class,
+            '_response'   => Response::class,
+            //'_server'     => Server::class,
+            '_router'     => Router::class,
+            '_env'        => Environment::class,
+            //'_lang'       => LangInterface::class,
+            '_config'     => Config::class,
+            //'_session'    => Session::class, // why is this commented out?
+            '_cookie'     => Cookie::class,
+            // '_flash'      => Flash::class,
+            '_debugBar'   => debugBar(),
+        ];
+    }
+
+    public function listeners()
+    {
+        return [
+            'forked'                            => [
+                Forked::class,
+            ],
+            Twig::class . '.registerExtensions' => [
+                RegisterTwigExtensions::class,
+            ],
+        ];
+    }
+}
diff --git a/src/Pckg/Framework/Provider/Helper/PostValidationResolver.php b/src/Pckg/Framework/Provider/Helper/PostValidationResolver.php
index 6dd3f1df..cd00c9cd 100644
--- a/src/Pckg/Framework/Provider/Helper/PostValidationResolver.php
+++ b/src/Pckg/Framework/Provider/Helper/PostValidationResolver.php
@@ -1,8 +1,10 @@
-<?php namespace Pckg\Framework\Provider\Helper;
+<?php
+
+namespace Pckg\Framework\Provider\Helper;
 
 trait PostValidationResolver
 {
-    
+
     protected $validator;
 
     public function validator(callable $validator)
@@ -20,5 +22,4 @@ public function validate($resolved)
 
         return $resolved;
     }
-
-}
\ No newline at end of file
+}
diff --git a/src/Pckg/Framework/Provider/ResolvesMultiple.php b/src/Pckg/Framework/Provider/ResolvesMultiple.php
index 9d406f35..835ea62b 100644
--- a/src/Pckg/Framework/Provider/ResolvesMultiple.php
+++ b/src/Pckg/Framework/Provider/ResolvesMultiple.php
@@ -4,5 +4,5 @@
 
 interface ResolvesMultiple
 {
-    
+
 }
diff --git a/src/Pckg/Framework/Request/Data/Session.php b/src/Pckg/Framework/Request/Data/Session.php
index 779808ca..f8f505c0 100644
--- a/src/Pckg/Framework/Request/Data/Session.php
+++ b/src/Pckg/Framework/Request/Data/Session.php
@@ -53,7 +53,7 @@ public function __destruct()
     {
         // TODO: Implement __destruct() method.
     }
-    
+
     public function getDriver()
     {
         return $this->driver;
diff --git a/src/Pckg/Framework/Request/Data/SessionDriver/Db.php b/src/Pckg/Framework/Request/Data/SessionDriver/Db.php
index dec40851..8769f710 100644
--- a/src/Pckg/Framework/Request/Data/SessionDriver/Db.php
+++ b/src/Pckg/Framework/Request/Data/SessionDriver/Db.php
@@ -46,7 +46,7 @@ public function gc($maxLifetime)
     {
         return true;
     }
-    
+
     public function regenerate()
     {
         return $this;
diff --git a/src/Pckg/Framework/Request/Data/SessionDriver/FileDriver.php b/src/Pckg/Framework/Request/Data/SessionDriver/FileDriver.php
index f9fd1483..d319c154 100644
--- a/src/Pckg/Framework/Request/Data/SessionDriver/FileDriver.php
+++ b/src/Pckg/Framework/Request/Data/SessionDriver/FileDriver.php
@@ -158,7 +158,7 @@ public function destroyCookieSession($message = null)
 
         return $PHPSESSIDSECURE;
     }
-    
+
     public function regenerate()
     {
         /**
diff --git a/src/Pckg/Framework/Response/Command/ProcessRouteMatch.php b/src/Pckg/Framework/Response/Command/ProcessRouteMatch.php
index 65bdac06..a2483118 100644
--- a/src/Pckg/Framework/Response/Command/ProcessRouteMatch.php
+++ b/src/Pckg/Framework/Response/Command/ProcessRouteMatch.php
@@ -21,6 +21,8 @@ class ProcessRouteMatch extends AbstractChainOfReponsibility
 
     protected $controller;
 
+    protected $request;
+
     protected $response;
 
     protected $loadView;
@@ -45,7 +47,7 @@ public function execute()
              * Apply global middlewares.
              */
             $dispatcher = dispatcher();
-            $dispatcher->trigger(ProcessRouteMatch::class .'.runningMiddlewares');
+            $dispatcher->trigger(ProcessRouteMatch::class . '.runningMiddlewares');
             if ($middlewares = $this->response->getMiddlewares()) {
                 chain($middlewares, 'execute');
             }
@@ -67,7 +69,7 @@ public function execute()
              * Check for CORS?
              */
             $isOptionsRequest = request()->isOptions();
-            $processOptions = function() use ($isOptionsRequest) {
+            $processOptions = function () use ($isOptionsRequest) {
                 if (!$isOptionsRequest) {
                     return;
                 };
@@ -125,7 +127,7 @@ public function execute()
             /**
              * Apply global afterwares/decorators.
              */
-            $dispatcher->trigger(ProcessRouteMatch::class .'.runningAfterwares');
+            $dispatcher->trigger(ProcessRouteMatch::class . '.runningAfterwares');
             if ($afterwares = $this->response->getAfterwares()) {
                 chain($afterwares, 'execute', [$this->response]);
             }
diff --git a/src/Pckg/Framework/Response/Command/RunResponse.php b/src/Pckg/Framework/Response/Command/RunResponse.php
index c46ab915..15ade4c1 100644
--- a/src/Pckg/Framework/Response/Command/RunResponse.php
+++ b/src/Pckg/Framework/Response/Command/RunResponse.php
@@ -43,6 +43,7 @@ public function execute(callable $next)
                                                               'html' => $output,
                                                               'vue'  => $vue,
                                                               'resolved' => router()->resolved(),
+                                                               // @phpstan-ignore-next-line
                                                               'metadata' => resolve(Generic::class)->getMetadata(),
                                                           ]));
         } else if (is_bool($output)) {
diff --git a/src/Pckg/Framework/Router.php b/src/Pckg/Framework/Router.php
index 3d6cb7c1..03576678 100644
--- a/src/Pckg/Framework/Router.php
+++ b/src/Pckg/Framework/Router.php
@@ -299,7 +299,7 @@ public function make($routeName = null, $arguments = [], $absolute = false, $env
                             }
                         }
                     }
-                    $filteredArgs = (new Collection($args))->reduce(function($item) {
+                    $filteredArgs = (new Collection($args))->reduce(function ($item) {
                         return !is_object($item);
                     }, true)->all();
                     $route['url'] = str_replace(array_keys($filteredArgs), $filteredArgs, $route['url']);
diff --git a/src/Pckg/Framework/Router/Command/ResolveRoute.php b/src/Pckg/Framework/Router/Command/ResolveRoute.php
index 5bc15f94..476c900e 100644
--- a/src/Pckg/Framework/Router/Command/ResolveRoute.php
+++ b/src/Pckg/Framework/Router/Command/ResolveRoute.php
@@ -1,181 +1,180 @@
-<?php
-
-namespace Pckg\Framework\Router\Command;
-
-use Exception;
-use Pckg\Framework\Router;
-
-class ResolveRoute
-{
-
-    protected $router;
-    protected $url;
-    protected $domain;
-    public function __construct(Router $router, $url, $domain = null)
-    {
-        $this->router = $router;
-        $this->url = $url;
-        $this->domain = $domain;
-    }
-
-    public function execute()
-    {
-        $url = $this->url;
-        $routes = $this->router->getRoutes();
-// exact match
-        $found = false;
-        $match = false;
-
-        foreach ($routes as $routeArr) {
-            foreach ($routeArr as $route) {
-                if (
-                    ($route["url"] == $url || $route["url"] == $url . '/') && !(strpos($url, "[")
-                        || strpos($url, "]"))
-                ) {
-        // validate method
-                    if (
-                        isset($route['method']) && !empty($route['method']) && !in_array(strtoupper($_SERVER['REQUEST_METHOD']), explode("|", strtoupper($route['method'])))
-                    ) {
-                /**
-                                         * Check next resolved route.
-                                         */
-                            continue;
-                    }
-
-                    /**
-                     * @deprecated
-                     */
-                    if (isset($route['secure']) && is_only_callable($route['secure']) && !$route['secure']()) {
-                        break;
-                    }
-
-                    if ($route['language'] ?? false) {
-                        if ($this->domain) {
-                            if ($route['domain'] && $route['domain'] != $this->domain) {
-                                break;
-                            }
-                        } else if ($route['language'] != localeManager()->getDefaultFrontendLanguage()->slug) {
-                            break;
-                        }
-                    }
-
-                    $found = true;
-                    $match = $route;
-                    break;
-                }
-            }
-        }
-
-        if (!$found) {
-            $arrUrl = explode("/", substr($url, 1));
-            foreach ($routes as $routeArr) {
-                foreach ($routeArr as $conf) {
-
-                    // validate language
-                    if ($conf['language'] ?? false) {
-                        if ($this->domain) {
-                            if ($conf['domain'] && ($conf['domain'] !== $this->domain)) {
-                                continue;
-                            }
-                        } else if (localeManager()->getDefaultFrontendLanguage()->slug !== $conf['language']) {
-                            continue;
-                        }
-                    }
-
-                    // validate method
-                    if (isset($conf['method']) && !empty($conf['method']) && !in_array(strtolower($_SERVER['REQUEST_METHOD']), explode("|", strtolower($conf['method'])))) {
-                        continue;
-                    }
-
-                    $arrRoutes = explode("/", substr($conf["url"], 1));
-
-                    // skip urls shorter than routes
-                    if (count($arrRoutes) > count($arrUrl)) {
-                        continue;
-                    }
-
-                    // extract parameters
-                    $error = false;
-                    $regexData = [];
-                    for ($i = 0; $i < count($arrUrl); $i++) {
-                        // break when URL is longer
-                        // error when not wildcard
-                        if (!isset($arrRoutes[$i])) {
-                            $error = $arrRoutes[$i - 1] !== '*';
-                            break;
-                        }
-
-                        $routePart = $arrRoutes[$i] ?? null;
-                        $urlPart = $arrUrl[$i] ?? null;
-
-                        // full match
-                        if ($routePart === $urlPart) {
-                            continue; // ok
-                        }
-
-                        // anything
-                        if ($routePart === '*') {
-                            continue; // ok // break?
-                        }
-
-                        // not dynamic
-                        if (strpos($routePart, '[') === false) {
-                            $error = true;
-                            break;
-                        }
-
-                        // match parameters
-                        $matches = null;
-                        $matched = preg_match_all("/\[[^\]]*\]/", $routePart, $matches);
-                        if (!$matched) {
-                            $error = true;
-                            break;
-                        }
-
-                        // replace matched parts with regex
-                        $tempRoutePart = $routePart;
-                        foreach ($matches[0] as $match) {
-                            $tempRoutePart = str_replace($match, '(?<' . substr($match, 1, -1) . '>\S+)', $tempRoutePart);
-                        }
-
-                        // perform regex matching
-                        $matches = null;
-                        if (!preg_match_all('/^' . $tempRoutePart . '$/', $urlPart, $matches, PREG_SET_ORDER)) {
-                            $error = true;
-                            break;
-                        }
-
-                        // get parameters
-                        foreach ($matches[0] as $key => $val) {
-                            if (is_string($key)) {
-                                $regexData[$key] = $val;
-                            }
-                        }
-                    }
-
-                    if (!$error) {
-                        $match = $conf;
-                        $match["data"] = $regexData;
-                        $found = true;
-                        break;
-                    }
-                }
-
-                if ($found) {
-                    break;
-                }
-            }
-        }
-
-        if (!$found) {
-            return null;
-        }
-
-        $match['method'] = $match['method'] ?? 'GET|POST';
-        if (!isset($match["view"])) {
-            throw new Exception("View not set.");
-        }
-
-        return $match;
-    }
-}
+<?php
+
+namespace Pckg\Framework\Router\Command;
+
+use Exception;
+use Pckg\Framework\Router;
+
+class ResolveRoute
+{
+
+    protected $router;
+    protected $url;
+    protected $domain;
+    public function __construct(Router $router, $url, $domain = null)
+    {
+        $this->router = $router;
+        $this->url = $url;
+        $this->domain = $domain;
+    }
+
+    public function execute()
+    {
+        $url = $this->url;
+        $routes = $this->router->getRoutes();
+// exact match
+        $found = false;
+        $match = false;
+
+        foreach ($routes as $routeArr) {
+            foreach ($routeArr as $route) {
+                if (
+                    ($route["url"] == $url || $route["url"] == $url . '/') && !(strpos($url, "[")
+                        || strpos($url, "]"))
+                ) {
+        // validate method
+                    if (
+                        isset($route['method']) && !empty($route['method']) && !in_array(strtoupper($_SERVER['REQUEST_METHOD']), explode("|", strtoupper($route['method'])))
+                    ) {
+                /**
+                                         * Check next resolved route.
+                                         */
+                            continue;
+                    }
+
+                    /**
+                     * @deprecated
+                     */
+                    if (isset($route['secure']) && is_only_callable($route['secure']) && !$route['secure']()) {
+                        break;
+                    }
+
+                    if ($route['language'] ?? false) {
+                        if ($this->domain) {
+                            if ($route['domain'] && $route['domain'] != $this->domain) {
+                                break;
+                            }
+                        } else if ($route['language'] != localeManager()->getDefaultFrontendLanguage()->slug) {
+                            break;
+                        }
+                    }
+
+                    $found = true;
+                    $match = $route;
+                    break;
+                }
+            }
+        }
+
+        if (!$found) {
+            $arrUrl = explode("/", substr($url, 1));
+            foreach ($routes as $routeArr) {
+                foreach ($routeArr as $conf) {
+                    // validate language
+                    if ($conf['language'] ?? false) {
+                        if ($this->domain) {
+                            if ($conf['domain'] && ($conf['domain'] !== $this->domain)) {
+                                continue;
+                            }
+                        } else if (localeManager()->getDefaultFrontendLanguage()->slug !== $conf['language']) {
+                            continue;
+                        }
+                    }
+
+                    // validate method
+                    if (isset($conf['method']) && !empty($conf['method']) && !in_array(strtolower($_SERVER['REQUEST_METHOD']), explode("|", strtolower($conf['method'])))) {
+                        continue;
+                    }
+
+                    $arrRoutes = explode("/", substr($conf["url"], 1));
+
+                    // skip urls shorter than routes
+                    if (count($arrRoutes) > count($arrUrl)) {
+                        continue;
+                    }
+
+                    // extract parameters
+                    $error = false;
+                    $regexData = [];
+                    for ($i = 0; $i < count($arrUrl); $i++) {
+                        // break when URL is longer
+                        // error when not wildcard
+                        if (!isset($arrRoutes[$i])) {
+                            $error = $arrRoutes[$i - 1] !== '*';
+                            break;
+                        }
+
+                        $routePart = $arrRoutes[$i] ?? null;
+                        $urlPart = $arrUrl[$i] ?? null;
+
+                        // full match
+                        if ($routePart === $urlPart) {
+                            continue; // ok
+                        }
+
+                        // anything
+                        if ($routePart === '*') {
+                            continue; // ok // break?
+                        }
+
+                        // not dynamic
+                        if (strpos($routePart, '[') === false) {
+                            $error = true;
+                            break;
+                        }
+
+                        // match parameters
+                        $matches = null;
+                        $matched = preg_match_all("/\[[^\]]*\]/", $routePart, $matches);
+                        if (!$matched) {
+                            $error = true;
+                            break;
+                        }
+
+                        // replace matched parts with regex
+                        $tempRoutePart = $routePart;
+                        foreach ($matches[0] as $match) {
+                            $tempRoutePart = str_replace($match, '(?<' . substr($match, 1, -1) . '>\S+)', $tempRoutePart);
+                        }
+
+                        // perform regex matching
+                        $matches = null;
+                        if (!preg_match_all('/^' . $tempRoutePart . '$/', $urlPart, $matches, PREG_SET_ORDER)) {
+                            $error = true;
+                            break;
+                        }
+
+                        // get parameters
+                        foreach ($matches[0] as $key => $val) {
+                            if (is_string($key)) {
+                                $regexData[$key] = $val;
+                            }
+                        }
+                    }
+
+                    if (!$error) {
+                        $match = $conf;
+                        $match["data"] = $regexData;
+                        $found = true;
+                        break;
+                    }
+                }
+
+                if ($found) {
+                    break;
+                }
+            }
+        }
+
+        if (!$found) {
+            return null;
+        }
+
+        $match['method'] = $match['method'] ?? 'GET|POST';
+        if (!isset($match["view"])) {
+            throw new Exception("View not set.");
+        }
+
+        return $match;
+    }
+}

From 19ec27a2209be398f38693a515a888df879ec6f3 Mon Sep 17 00:00:00 2001
From: Bojan Rajh <schtr4jh@schtr4jh.net>
Date: Sat, 22 May 2021 11:25:24 +0200
Subject: [PATCH 24/66] Test config

---
 config/defaults.php | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 config/defaults.php

diff --git a/config/defaults.php b/config/defaults.php
new file mode 100644
index 00000000..3d866322
--- /dev/null
+++ b/config/defaults.php
@@ -0,0 +1,13 @@
+<?php
+
+return [
+    'router' => [
+        'apps' => [
+            'test' => [
+                'host' => [
+                    '(.*)',
+                ],
+            ],
+        ],
+    ],
+];

From ec4febc6df82be5257b28c7b1aa113ac69e41bdf Mon Sep 17 00:00:00 2001
From: Bojan Rajh <schtr4jh@schtr4jh.net>
Date: Sat, 22 May 2021 11:25:57 +0200
Subject: [PATCH 25/66] Flow

---
 .github/workflows/checkout.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/checkout.yml b/.github/workflows/checkout.yml
index d79cb2e1..e4ada431 100644
--- a/.github/workflows/checkout.yml
+++ b/.github/workflows/checkout.yml
@@ -2,9 +2,9 @@ name: Pckg Framework CI
 
 on:
   push:
-    branches: [ master ]
+    branches: [ master, master-yoda ]
   pull_request:
-    branches: [ master ]
+    branches: [ master, master-yoda ]
 
 jobs:
 

From 4c7db8dd7bbb9203cd02df31d94c964de63010a8 Mon Sep 17 00:00:00 2001
From: Bojan Rajh <schtr4jh@schtr4jh.net>
Date: Sat, 22 May 2021 11:29:06 +0200
Subject: [PATCH 26/66] DUpdate

---
 composer.lock | 30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/composer.lock b/composer.lock
index 0ccba1bd..357d5885 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "bc3ec0e0c70b22f9b89ed63711d10548",
+    "content-hash": "0861a9685c5c575c260ae9b1cac6c2f0",
     "packages": [
         {
             "name": "doctrine/cache",
@@ -111,12 +111,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/ezyang/htmlpurifier.git",
-                "reference": "6f9aac9325e99a860928534cd4a5ade8962d3751"
+                "reference": "3a368d76686683d73c3463c7d051c12664f54ad2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/6f9aac9325e99a860928534cd4a5ade8962d3751",
-                "reference": "6f9aac9325e99a860928534cd4a5ade8962d3751",
+                "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/3a368d76686683d73c3463c7d051c12664f54ad2",
+                "reference": "3a368d76686683d73c3463c7d051c12664f54ad2",
                 "shasum": ""
             },
             "require": {
@@ -158,7 +158,7 @@
                 "issues": "https://github.com/ezyang/htmlpurifier/issues",
                 "source": "https://github.com/ezyang/htmlpurifier/tree/master"
             },
-            "time": "2021-04-22T14:01:00+00:00"
+            "time": "2021-05-22T00:46:13+00:00"
         },
         {
             "name": "filp/whoops",
@@ -3472,16 +3472,16 @@
         },
         {
             "name": "php-webdriver/webdriver",
-            "version": "1.11.0",
+            "version": "1.11.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-webdriver/php-webdriver.git",
-                "reference": "66adc952127dd1314af94ce28f8fc332d38f229b"
+                "reference": "da16e39968f8dd5cfb7d07eef91dc2b731c69880"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-webdriver/php-webdriver/zipball/66adc952127dd1314af94ce28f8fc332d38f229b",
-                "reference": "66adc952127dd1314af94ce28f8fc332d38f229b",
+                "url": "https://api.github.com/repos/php-webdriver/php-webdriver/zipball/da16e39968f8dd5cfb7d07eef91dc2b731c69880",
+                "reference": "da16e39968f8dd5cfb7d07eef91dc2b731c69880",
                 "shasum": ""
             },
             "require": {
@@ -3509,11 +3509,6 @@
                 "ext-SimpleXML": "For Firefox profile creation"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.8.x-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Facebook\\WebDriver\\": "lib/"
@@ -3537,9 +3532,9 @@
             ],
             "support": {
                 "issues": "https://github.com/php-webdriver/php-webdriver/issues",
-                "source": "https://github.com/php-webdriver/php-webdriver/tree/1.11.0"
+                "source": "https://github.com/php-webdriver/php-webdriver/tree/1.11.1"
             },
-            "time": "2021-05-03T10:19:43+00:00"
+            "time": "2021-05-21T15:12:49+00:00"
         },
         {
             "name": "phpdocumentor/reflection-common",
@@ -7729,7 +7724,8 @@
     "prefer-stable": true,
     "prefer-lowest": false,
     "platform": {
-        "ext-json": "*"
+        "ext-json": "*",
+        "ext-pcntl": "*"
     },
     "platform-dev": [],
     "plugin-api-version": "2.0.0"

From 3e5f44260232dadca443ced59b769a3a50b0b516 Mon Sep 17 00:00:00 2001
From: Bojan Rajh <schtr4jh@schtr4jh.net>
Date: Sat, 22 May 2021 11:32:26 +0200
Subject: [PATCH 27/66] Lock

---
 composer.json | 7 ++++++-
 composer.lock | 5 ++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index c1731b36..13527258 100644
--- a/composer.json
+++ b/composer.json
@@ -68,5 +68,10 @@
     "test": "Run all tests and quality checks"
   },
   "minimum-stability": "dev",
-  "prefer-stable": true
+  "prefer-stable": true,
+  "config": {
+    "platform": {
+      "php": "7.4"
+    }
+  }
 }
diff --git a/composer.lock b/composer.lock
index 357d5885..33c27827 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "0861a9685c5c575c260ae9b1cac6c2f0",
+    "content-hash": "63d06011acae44a4c6025757a370413a",
     "packages": [
         {
             "name": "doctrine/cache",
@@ -7728,5 +7728,8 @@
         "ext-pcntl": "*"
     },
     "platform-dev": [],
+    "platform-overrides": {
+        "php": "7.4"
+    },
     "plugin-api-version": "2.0.0"
 }

From afe7bad16afc09f0472bb84664da423a7090a86b Mon Sep 17 00:00:00 2001
From: Bojan Rajh <schtr4jh@schtr4jh.net>
Date: Sat, 22 May 2021 11:33:46 +0200
Subject: [PATCH 28/66] Update workflow

---
 .github/workflows/checkout.yml | 2 +-
 composer.json                  | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/checkout.yml b/.github/workflows/checkout.yml
index e4ada431..971d1a59 100644
--- a/.github/workflows/checkout.yml
+++ b/.github/workflows/checkout.yml
@@ -28,7 +28,7 @@ jobs:
           key: composer-${{ hashFiles('composer.lock') }}
 
       - name: Install Composer dependencies
-        run: composer install --dev --prefer-dist --no-progress --no-suggest --optimize-autoloader --ignore-platform-reqs
+        run: composer update --ignore-platform-reqs && composer install --dev --prefer-dist --no-progress --no-suggest --optimize-autoloader --ignore-platform-reqs
 
       - name: Copy Codeception config
         run: cp codeception.sample.travis.yml codeception.yml
diff --git a/composer.json b/composer.json
index 13527258..c1731b36 100644
--- a/composer.json
+++ b/composer.json
@@ -68,10 +68,5 @@
     "test": "Run all tests and quality checks"
   },
   "minimum-stability": "dev",
-  "prefer-stable": true,
-  "config": {
-    "platform": {
-      "php": "7.4"
-    }
-  }
+  "prefer-stable": true
 }

From ac250869fe55b2546e0071dba2784d8af710f7e5 Mon Sep 17 00:00:00 2001
From: Bojan Rajh <schtr4jh@schtr4jh.net>
Date: Sat, 22 May 2021 11:40:25 +0200
Subject: [PATCH 29/66] Update lock

---
 .github/workflows/checkout.yml | 4 ++--
 composer.lock                  | 5 +----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/checkout.yml b/.github/workflows/checkout.yml
index 971d1a59..c21a8e77 100644
--- a/.github/workflows/checkout.yml
+++ b/.github/workflows/checkout.yml
@@ -25,10 +25,10 @@ jobs:
         uses: actions/cache@v2
         with:
           path: vendor
-          key: composer-${{ hashFiles('composer.lock') }}
+          key: composer-v1-${{ hashFiles('composer.lock') }}
 
       - name: Install Composer dependencies
-        run: composer update --ignore-platform-reqs && composer install --dev --prefer-dist --no-progress --no-suggest --optimize-autoloader --ignore-platform-reqs
+        run: composer install --prefer-dist --no-progress --optimize-autoloader --ignore-platform-reqs
 
       - name: Copy Codeception config
         run: cp codeception.sample.travis.yml codeception.yml
diff --git a/composer.lock b/composer.lock
index 33c27827..357d5885 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "63d06011acae44a4c6025757a370413a",
+    "content-hash": "0861a9685c5c575c260ae9b1cac6c2f0",
     "packages": [
         {
             "name": "doctrine/cache",
@@ -7728,8 +7728,5 @@
         "ext-pcntl": "*"
     },
     "platform-dev": [],
-    "platform-overrides": {
-        "php": "7.4"
-    },
     "plugin-api-version": "2.0.0"
 }

From 297e107cb70c7cc659e7ccca9b34c9aac36f5e7d Mon Sep 17 00:00:00 2001
From: Bojan Rajh <schtr4jh@schtr4jh.net>
Date: Sat, 22 May 2021 11:42:16 +0200
Subject: [PATCH 30/66] Self update first

---
 .github/workflows/checkout.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/checkout.yml b/.github/workflows/checkout.yml
index c21a8e77..cd58a691 100644
--- a/.github/workflows/checkout.yml
+++ b/.github/workflows/checkout.yml
@@ -28,7 +28,7 @@ jobs:
           key: composer-v1-${{ hashFiles('composer.lock') }}
 
       - name: Install Composer dependencies
-        run: composer install --prefer-dist --no-progress --optimize-autoloader --ignore-platform-reqs
+        run: composer self-update && composer install --prefer-dist --no-progress --optimize-autoloader --ignore-platform-reqs
 
       - name: Copy Codeception config
         run: cp codeception.sample.travis.yml codeception.yml

From 323f50a462dd7616314afbf1a0f2bc956a0a3975 Mon Sep 17 00:00:00 2001
From: Bojan Rajh <schtr4jh@schtr4jh.net>
Date: Sat, 22 May 2021 11:42:51 +0200
Subject: [PATCH 31/66] Sudo

---
 .github/workflows/checkout.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/checkout.yml b/.github/workflows/checkout.yml
index cd58a691..266d36de 100644
--- a/.github/workflows/checkout.yml
+++ b/.github/workflows/checkout.yml
@@ -28,7 +28,7 @@ jobs:
           key: composer-v1-${{ hashFiles('composer.lock') }}
 
       - name: Install Composer dependencies
-        run: composer self-update && composer install --prefer-dist --no-progress --optimize-autoloader --ignore-platform-reqs
+        run: sudo composer self-update && composer install --prefer-dist --no-progress --optimize-autoloader --ignore-platform-reqs
 
       - name: Copy Codeception config
         run: cp codeception.sample.travis.yml codeception.yml

From 3d895e9f59753dfdc3e80d6607457f665e125904 Mon Sep 17 00:00:00 2001
From: Bojan Rajh <schtr4jh@schtr4jh.net>
Date: Sat, 22 May 2021 11:46:48 +0200
Subject: [PATCH 32/66] Update

---
 .github/workflows/checkout.yml |  2 +-
 composer.lock                  | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/checkout.yml b/.github/workflows/checkout.yml
index 266d36de..c21a8e77 100644
--- a/.github/workflows/checkout.yml
+++ b/.github/workflows/checkout.yml
@@ -28,7 +28,7 @@ jobs:
           key: composer-v1-${{ hashFiles('composer.lock') }}
 
       - name: Install Composer dependencies
-        run: sudo composer self-update && composer install --prefer-dist --no-progress --optimize-autoloader --ignore-platform-reqs
+        run: composer install --prefer-dist --no-progress --optimize-autoloader --ignore-platform-reqs
 
       - name: Copy Codeception config
         run: cp codeception.sample.travis.yml codeception.yml
diff --git a/composer.lock b/composer.lock
index 357d5885..bdd48e41 100644
--- a/composer.lock
+++ b/composer.lock
@@ -2929,18 +2929,18 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/pckg/auth.git",
-                "reference": "85490fd383a007e4f38fa1177b1ce8b79383ee3f"
+                "reference": "148b47cdcf97e9b10834871c93dbe9361bbb7879"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pckg/auth/zipball/85490fd383a007e4f38fa1177b1ce8b79383ee3f",
-                "reference": "85490fd383a007e4f38fa1177b1ce8b79383ee3f",
+                "url": "https://api.github.com/repos/pckg/auth/zipball/148b47cdcf97e9b10834871c93dbe9361bbb7879",
+                "reference": "148b47cdcf97e9b10834871c93dbe9361bbb7879",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
                 "facebook/graph-sdk": "5.*",
-                "pckg/framework": "dev-master"
+                "pckg/framework": "dev-master || dev-master-yoda"
             },
             "require-dev": {
                 "facebook/facebook-instant-articles-sdk-php": "dev-master",
@@ -2976,7 +2976,7 @@
                 "issues": "https://github.com/pckg/auth/issues",
                 "source": "https://github.com/pckg/auth/tree/master"
             },
-            "time": "2021-05-02T10:47:29+00:00"
+            "time": "2021-05-22T09:45:11+00:00"
         },
         {
             "name": "pckg/htmlbuilder",

From 9b6118f8c83922a9d086b11f2e0bd56f39cdc687 Mon Sep 17 00:00:00 2001
From: Bojan Rajh <schtr4jh@schtr4jh.net>
Date: Sat, 22 May 2021 11:49:12 +0200
Subject: [PATCH 33/66] Allow 2 versions

---
 composer.lock | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/composer.lock b/composer.lock
index bdd48e41..c8cdcc1a 100644
--- a/composer.lock
+++ b/composer.lock
@@ -2984,20 +2984,20 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/pckg/htmlbuilder.git",
-                "reference": "8ce9602d4fc38de92f1702e3381e498aa0e9b1dc"
+                "reference": "618286089d9f6740c80f15bed899a4b9cba0fe19"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pckg/htmlbuilder/zipball/8ce9602d4fc38de92f1702e3381e498aa0e9b1dc",
-                "reference": "8ce9602d4fc38de92f1702e3381e498aa0e9b1dc",
+                "url": "https://api.github.com/repos/pckg/htmlbuilder/zipball/618286089d9f6740c80f15bed899a4b9cba0fe19",
+                "reference": "618286089d9f6740c80f15bed899a4b9cba0fe19",
                 "shasum": ""
             },
             "require": {
-                "pckg/concept": "dev-master",
-                "pckg/framework": "dev-master"
+                "pckg/concept": "dev-master"
             },
             "require-dev": {
-                "pckg-app/frontend-dev": "dev-master"
+                "pckg-app/frontend-dev": "dev-master",
+                "pckg/framework": "dev-master || dev-master-yoda"
             },
             "default-branch": true,
             "type": "library",
@@ -3027,7 +3027,7 @@
                 "issues": "https://github.com/pckg/htmlbuilder/issues",
                 "source": "https://github.com/pckg/htmlbuilder/tree/master"
             },
-            "time": "2021-05-08T15:29:28+00:00"
+            "time": "2021-05-22T09:48:19+00:00"
         },
         {
             "name": "pckg/mail",

From 1246a412408b4ffeda75561f46780f915373d1ba Mon Sep 17 00:00:00 2001
From: Bojan Rajh <schtr4jh@schtr4jh.net>
Date: Sat, 22 May 2021 11:50:52 +0200
Subject: [PATCH 34/66] Add tests data

---
 .gitignore                                                   | 3 +--
 tests/_data/.gitkeep                                         | 0
 .../FrameworkConfigCommandInitConfigCest/config/defaults.php | 5 +++++
 3 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 tests/_data/.gitkeep
 create mode 100644 tests/_data/FrameworkConfigCommandInitConfigCest/config/defaults.php

diff --git a/.gitignore b/.gitignore
index a5ee1d21..3648d3ce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
 .idea/
 vendor/
-tests/_data/*
 tests/_output/*
-codeception.yml
\ No newline at end of file
+codeception.yml
diff --git a/tests/_data/.gitkeep b/tests/_data/.gitkeep
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/_data/FrameworkConfigCommandInitConfigCest/config/defaults.php b/tests/_data/FrameworkConfigCommandInitConfigCest/config/defaults.php
new file mode 100644
index 00000000..84e2a93d
--- /dev/null
+++ b/tests/_data/FrameworkConfigCommandInitConfigCest/config/defaults.php
@@ -0,0 +1,5 @@
+<?php
+
+return [
+    'foo' => 'barconfig',
+];

From 3d7bdcc46bd15f870703345815825150cce45906 Mon Sep 17 00:00:00 2001
From: Bojan Rajh <schtr4jh@schtr4jh.net>
Date: Sat, 22 May 2021 14:34:20 +0200
Subject: [PATCH 35/66] Update workflow

---
 .github/workflows/checkout.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/checkout.yml b/.github/workflows/checkout.yml
index c21a8e77..f9787deb 100644
--- a/.github/workflows/checkout.yml
+++ b/.github/workflows/checkout.yml
@@ -4,7 +4,7 @@ on:
   push:
     branches: [ master, master-yoda ]
   pull_request:
-    branches: [ master, master-yoda ]
+    branches: [ master ]
 
 jobs:
 

From 79dc87c656347ab3b679434426b8a0bfe1877cdc Mon Sep 17 00:00:00 2001
From: Bojan Rajh <schtr4jh@schtr4jh.net>
Date: Sat, 22 May 2021 15:06:00 +0200
Subject: [PATCH 36/66] Namespaced tests

---
 src/Pckg/Framework/Test/Codeception/Cest.php  | 25 ++++++++++
 src/Pckg/Framework/Test/MockFramework.php     |  1 +
 tests/unit/ConfigCest.php                     | 12 +----
 .../Application/Command/InitDatabaseCest.php} | 22 ++------
 .../Command/RegisterApplicationCest.php}      | 21 ++------
 .../Console/Command/RunCommandCest.php}       | 22 ++------
 .../Framework/Application/ConsoleCest.php     | 30 +++++++++++
 .../unit/Framework/Application/QueueCest.php  | 30 +++++++++++
 .../Framework/Application/WebsiteCest.php     | 30 +++++++++++
 .../Config/Command/InitConfigCest.php}        | 22 ++------
 .../unit/FrameworkApplicationConsoleCest.php  | 50 -------------------
 tests/unit/FrameworkApplicationQueueCest.php  | 50 -------------------
 .../unit/FrameworkApplicationWebsiteCest.php  | 50 -------------------
 tests/unit/RequestDataCest.php                | 12 +----
 14 files changed, 134 insertions(+), 243 deletions(-)
 create mode 100644 src/Pckg/Framework/Test/Codeception/Cest.php
 rename tests/unit/{FrameworkApplicationCommandInitDatabaseCest.php => Framework/Application/Command/InitDatabaseCest.php} (79%)
 rename tests/unit/{FrameworkApplicationCommandRegisterApplicationCest.php => Framework/Application/Command/RegisterApplicationCest.php} (72%)
 rename tests/unit/{FrameworkApplicationConsoleCommandRunCommandCest.php => Framework/Application/Console/Command/RunCommandCest.php} (80%)
 create mode 100644 tests/unit/Framework/Application/ConsoleCest.php
 create mode 100644 tests/unit/Framework/Application/QueueCest.php
 create mode 100644 tests/unit/Framework/Application/WebsiteCest.php
 rename tests/unit/{FrameworkConfigCommandInitConfigCest.php => Framework/Config/Command/InitConfigCest.php} (63%)
 delete mode 100644 tests/unit/FrameworkApplicationConsoleCest.php
 delete mode 100644 tests/unit/FrameworkApplicationQueueCest.php
 delete mode 100644 tests/unit/FrameworkApplicationWebsiteCest.php

diff --git a/src/Pckg/Framework/Test/Codeception/Cest.php b/src/Pckg/Framework/Test/Codeception/Cest.php
new file mode 100644
index 00000000..95216dff
--- /dev/null
+++ b/src/Pckg/Framework/Test/Codeception/Cest.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace Pckg\Framework\Test\Codeception;
+
+use Pckg\Framework\Test\MockFramework;
+use UnitTester;
+
+class Cest
+{
+    use MockFramework;
+
+    // @phpstan-ignore-next-line
+    protected UnitTester $unitTester;
+
+    // @phpstan-ignore-next-line
+    public function _before(UnitTester $I)
+    {
+        if (!defined('__ROOT__')) {
+            // @phpstan-ignore-next-line
+            define('__ROOT__', codecept_root_dir() . '/');
+        }
+        $this->unitTester = $I;
+        $this->mockFramework();
+    }
+}
diff --git a/src/Pckg/Framework/Test/MockFramework.php b/src/Pckg/Framework/Test/MockFramework.php
index bd3e2925..fcb41d4f 100644
--- a/src/Pckg/Framework/Test/MockFramework.php
+++ b/src/Pckg/Framework/Test/MockFramework.php
@@ -142,6 +142,7 @@ protected function mergeRequestHeaders(Context $context, array $headers)
 
     public function mock()
     {
+        // @phpstan-ignore-next-line
         return (new MockRequest($this, $this->app));
     }
 
diff --git a/tests/unit/ConfigCest.php b/tests/unit/ConfigCest.php
index cf4c0cfa..14ff122a 100644
--- a/tests/unit/ConfigCest.php
+++ b/tests/unit/ConfigCest.php
@@ -1,18 +1,8 @@
 <?php
 
-class ConfigCest
+class ConfigCest extends \Pckg\Framework\Test\Codeception\Cest
 {
 
-    use \Pckg\Framework\Test\MockFramework;
-
-    public function _before(UnitTester $I)
-    {
-        if (!defined('__ROOT__')) {
-            define('__ROOT__', realpath(__DIR__ . '/../..') . '/');
-        }
-        $this->mockFramework();
-    }
-
     // tests
     public function defaultConfigTest(UnitTester $I)
     {
diff --git a/tests/unit/FrameworkApplicationCommandInitDatabaseCest.php b/tests/unit/Framework/Application/Command/InitDatabaseCest.php
similarity index 79%
rename from tests/unit/FrameworkApplicationCommandInitDatabaseCest.php
rename to tests/unit/Framework/Application/Command/InitDatabaseCest.php
index 9449e94a..ddd8b171 100644
--- a/tests/unit/FrameworkApplicationCommandInitDatabaseCest.php
+++ b/tests/unit/Framework/Application/Command/InitDatabaseCest.php
@@ -1,29 +1,17 @@
 <?php
 
+namespace Test\Framework\Application\Command;
+
 use Pckg\Framework\Application\Command\InitDatabase;
+use Pckg\Framework\Test\Codeception\Cest;
 use Pckg\Framework\Test\ContextDiff;
-use Pckg\Framework\Test\MockFramework;
 
-class FrameworkApplicationCommandInitDatabaseCest
+class InitDatabaseCest extends Cest
 {
 
-    use MockFramework;
     use ContextDiff;
 
-    protected UnitTester $unitTester;
-
-    public function _before(UnitTester $I)
-    {
-        if (!defined('__ROOT__')) {
-            define('__ROOT__', realpath(__DIR__ . '/../..') . '/');
-        }
-        $this->unitTester = $I;
-        $this->mockFramework();
-    }
-
-    protected function _after()
-    {
-    }
+    protected \UnitTester $unitTester;
 
     protected function createInitDatabaseObject(array $config = []): InitDatabase
     {
diff --git a/tests/unit/FrameworkApplicationCommandRegisterApplicationCest.php b/tests/unit/Framework/Application/Command/RegisterApplicationCest.php
similarity index 72%
rename from tests/unit/FrameworkApplicationCommandRegisterApplicationCest.php
rename to tests/unit/Framework/Application/Command/RegisterApplicationCest.php
index 91d86717..00522d29 100644
--- a/tests/unit/FrameworkApplicationCommandRegisterApplicationCest.php
+++ b/tests/unit/Framework/Application/Command/RegisterApplicationCest.php
@@ -1,35 +1,20 @@
 <?php
 
+namespace Test\Framework\Application\Command;
+
 use Pckg\Framework\Test\ContextDiff;
 use Pckg\Framework\Test\ListenForEvents;
 use Pckg\Framework\Test\MockConfig;
-use Pckg\Framework\Test\MockFramework;
 use Pckg\Framework\Test\MockInContext;
 
-class FrameworkApplicationCommandRegisterApplicationCest
+class RegisterApplicationCest extends \Pckg\Framework\Test\Codeception\Cest
 {
 
-    use MockFramework;
     use ContextDiff;
     use ListenForEvents;
     use MockConfig;
     use MockInContext;
 
-    protected UnitTester $unitTester;
-
-    public function _before(UnitTester $I)
-    {
-        if (!defined('__ROOT__')) {
-            define('__ROOT__', realpath(__DIR__ . '/../..') . '/');
-        }
-        $this->unitTester = $I;
-        $this->mockFramework();
-    }
-
-    protected function _after()
-    {
-    }
-
     protected function testRegistersWebsiteApplication()
     {
         $provider = new \Pckg\Framework\Provider();
diff --git a/tests/unit/FrameworkApplicationConsoleCommandRunCommandCest.php b/tests/unit/Framework/Application/Console/Command/RunCommandCest.php
similarity index 80%
rename from tests/unit/FrameworkApplicationConsoleCommandRunCommandCest.php
rename to tests/unit/Framework/Application/Console/Command/RunCommandCest.php
index eb71e97d..afd5e9a0 100644
--- a/tests/unit/FrameworkApplicationConsoleCommandRunCommandCest.php
+++ b/tests/unit/Framework/Application/Console/Command/RunCommandCest.php
@@ -1,44 +1,30 @@
 <?php
 
+namespace Test\Framework\Application\Console\Command;
+
 use Pckg\Concept\Event\Dispatcher;
 use Pckg\Framework\Application\Console\Command\RunCommand;
 use Pckg\Framework\Request\Data\Server;
 use Pckg\Framework\Response;
+use Pckg\Framework\Test\Codeception\Cest;
 use Pckg\Framework\Test\ContextDiff;
 use Pckg\Framework\Test\ListenForEvents;
 use Pckg\Framework\Test\MockConfig;
-use Pckg\Framework\Test\MockFramework;
 use Pckg\Framework\Test\MockInContext;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Output\NullOutput;
 
-class FrameworkApplicationConsoleCommandRunCommandCest
+class RunCommandCest extends Cest
 {
 
-    use MockFramework;
     use ContextDiff;
     use ListenForEvents;
     use MockConfig;
     use MockInContext;
 
-    protected UnitTester $unitTester;
-
     const EVENT_MIDDLEWARE = self::class . '.middleware';
     const EVENT_AFTERWARE = self::class . '.afterware';
 
-    public function _before(UnitTester $I)
-    {
-        if (!defined('__ROOT__')) {
-            define('__ROOT__', realpath(__DIR__ . '/../..') . '/');
-        }
-        $this->unitTester = $I;
-        $this->mockFramework();
-    }
-
-    protected function _after()
-    {
-    }
-
     public function testEmptyCommandArgv()
     {
         $this->mockInContext(new NullOutput(), RunCommand::class . '.output');
diff --git a/tests/unit/Framework/Application/ConsoleCest.php b/tests/unit/Framework/Application/ConsoleCest.php
new file mode 100644
index 00000000..b2e04c3b
--- /dev/null
+++ b/tests/unit/Framework/Application/ConsoleCest.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Test\Framework\Application;
+
+use Pckg\Framework\Test\Codeception\Cest;
+use Pckg\Framework\Test\ContextDiff;
+use Pckg\Framework\Test\ListenForEvents;
+use Pckg\Framework\Test\MockConfig;
+use Pckg\Framework\Test\MockInContext;
+
+class ConsoleCest extends Cest
+{
+
+    use ContextDiff;
+    use ListenForEvents;
+    use MockConfig;
+    use MockInContext;
+
+    const EVENT_MIDDLEWARE = self::class . '.middleware';
+    const EVENT_AFTERWARE = self::class . '.afterware';
+
+    public function testConsole()
+    {
+        $provider = new \Pckg\Framework\Provider();
+        $console = new \Pckg\Framework\Application\Console($provider);
+
+        $this->unitTester->assertNotEmpty($console->inits());
+        $this->unitTester->assertNotEmpty($console->runs());
+    }
+}
diff --git a/tests/unit/Framework/Application/QueueCest.php b/tests/unit/Framework/Application/QueueCest.php
new file mode 100644
index 00000000..4b5772dc
--- /dev/null
+++ b/tests/unit/Framework/Application/QueueCest.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Test\Framework\Application;
+
+use Pckg\Framework\Test\Codeception\Cest;
+use Pckg\Framework\Test\ContextDiff;
+use Pckg\Framework\Test\ListenForEvents;
+use Pckg\Framework\Test\MockConfig;
+use Pckg\Framework\Test\MockInContext;
+
+class QueueCest extends Cest
+{
+
+    use ContextDiff;
+    use ListenForEvents;
+    use MockConfig;
+    use MockInContext;
+
+    const EVENT_MIDDLEWARE = self::class . '.middleware';
+    const EVENT_AFTERWARE = self::class . '.afterware';
+
+    public function testQueue()
+    {
+        $provider = new \Pckg\Framework\Provider();
+        $queue = new \Pckg\Framework\Application\Queue($provider);
+
+        $this->unitTester->assertNotEmpty($queue->inits());
+        $this->unitTester->assertNotEmpty($queue->runs());
+    }
+}
diff --git a/tests/unit/Framework/Application/WebsiteCest.php b/tests/unit/Framework/Application/WebsiteCest.php
new file mode 100644
index 00000000..34d820c1
--- /dev/null
+++ b/tests/unit/Framework/Application/WebsiteCest.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Test\Framework\Application;
+
+use Pckg\Framework\Test\Codeception\Cest;
+use Pckg\Framework\Test\ContextDiff;
+use Pckg\Framework\Test\ListenForEvents;
+use Pckg\Framework\Test\MockConfig;
+use Pckg\Framework\Test\MockInContext;
+
+class WebsiteCest extends Cest
+{
+
+    use ContextDiff;
+    use ListenForEvents;
+    use MockConfig;
+    use MockInContext;
+
+    const EVENT_MIDDLEWARE = self::class . '.middleware';
+    const EVENT_AFTERWARE = self::class . '.afterware';
+
+    public function testWebsite()
+    {
+        $provider = new \Pckg\Framework\Provider();
+        $website = new \Pckg\Framework\Application\Queue($provider);
+
+        $this->unitTester->assertNotEmpty($website->inits());
+        $this->unitTester->assertNotEmpty($website->runs());
+    }
+}
diff --git a/tests/unit/FrameworkConfigCommandInitConfigCest.php b/tests/unit/Framework/Config/Command/InitConfigCest.php
similarity index 63%
rename from tests/unit/FrameworkConfigCommandInitConfigCest.php
rename to tests/unit/Framework/Config/Command/InitConfigCest.php
index 4ce27006..2cd9fae1 100644
--- a/tests/unit/FrameworkConfigCommandInitConfigCest.php
+++ b/tests/unit/Framework/Config/Command/InitConfigCest.php
@@ -1,36 +1,22 @@
 <?php
 
+namespace Test\Framework\Config\Command;
+
 use Pckg\Framework\Config\Command\InitConfig;
+use Pckg\Framework\Test\Codeception\Cest;
 use Pckg\Framework\Test\ContextDiff;
 use Pckg\Framework\Test\ListenForEvents;
 use Pckg\Framework\Test\MockConfig;
-use Pckg\Framework\Test\MockFramework;
 use Pckg\Framework\Test\MockInContext;
 
-class FrameworkConfigCommandInitConfigCest
+class InitConfigCest extends Cest
 {
 
-    use MockFramework;
     use ContextDiff;
     use ListenForEvents;
     use MockConfig;
     use MockInContext;
 
-    protected UnitTester $unitTester;
-
-    public function _before(UnitTester $I)
-    {
-        if (!defined('__ROOT__')) {
-            define('__ROOT__', realpath(__DIR__ . '/../..') . '/');
-        }
-        $this->unitTester = $I;
-        $this->mockFramework();
-    }
-
-    protected function _after()
-    {
-    }
-
     public function testConfig()
     {
         $config = $this->mockConfig();
diff --git a/tests/unit/FrameworkApplicationConsoleCest.php b/tests/unit/FrameworkApplicationConsoleCest.php
deleted file mode 100644
index 12a8481e..00000000
--- a/tests/unit/FrameworkApplicationConsoleCest.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-use Pckg\Concept\Event\Dispatcher;
-use Pckg\Framework\Application\Console\Command\RunCommand;
-use Pckg\Framework\Request\Data\Server;
-use Pckg\Framework\Response;
-use Pckg\Framework\Test\ContextDiff;
-use Pckg\Framework\Test\ListenForEvents;
-use Pckg\Framework\Test\MockConfig;
-use Pckg\Framework\Test\MockFramework;
-use Pckg\Framework\Test\MockInContext;
-use Symfony\Component\Console\Application;
-use Symfony\Component\Console\Output\NullOutput;
-
-class FrameworkApplicationConsoleCest
-{
-
-    use MockFramework;
-    use ContextDiff;
-    use ListenForEvents;
-    use MockConfig;
-    use MockInContext;
-
-    protected UnitTester $unitTester;
-
-    const EVENT_MIDDLEWARE = self::class . '.middleware';
-    const EVENT_AFTERWARE = self::class . '.afterware';
-
-    public function _before(UnitTester $I)
-    {
-        if (!defined('__ROOT__')) {
-            define('__ROOT__', realpath(__DIR__ . '/../..') . '/');
-        }
-        $this->unitTester = $I;
-        $this->mockFramework();
-    }
-
-    protected function _after()
-    {
-    }
-
-    public function testConsole()
-    {
-        $provider = new \Pckg\Framework\Provider();
-        $console = new \Pckg\Framework\Application\Console($provider);
-
-        $this->unitTester->assertNotEmpty($console->inits());
-        $this->unitTester->assertNotEmpty($console->runs());
-    }
-}
diff --git a/tests/unit/FrameworkApplicationQueueCest.php b/tests/unit/FrameworkApplicationQueueCest.php
deleted file mode 100644
index cbfd9016..00000000
--- a/tests/unit/FrameworkApplicationQueueCest.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-use Pckg\Concept\Event\Dispatcher;
-use Pckg\Framework\Application\Console\Command\RunCommand;
-use Pckg\Framework\Request\Data\Server;
-use Pckg\Framework\Response;
-use Pckg\Framework\Test\ContextDiff;
-use Pckg\Framework\Test\ListenForEvents;
-use Pckg\Framework\Test\MockConfig;
-use Pckg\Framework\Test\MockFramework;
-use Pckg\Framework\Test\MockInContext;
-use Symfony\Component\Console\Application;
-use Symfony\Component\Console\Output\NullOutput;
-
-class FrameworkApplicationQueueCest
-{
-
-    use MockFramework;
-    use ContextDiff;
-    use ListenForEvents;
-    use MockConfig;
-    use MockInContext;
-
-    protected UnitTester $unitTester;
-
-    const EVENT_MIDDLEWARE = self::class . '.middleware';
-    const EVENT_AFTERWARE = self::class . '.afterware';
-
-    public function _before(UnitTester $I)
-    {
-        if (!defined('__ROOT__')) {
-            define('__ROOT__', realpath(__DIR__ . '/../..') . '/');
-        }
-        $this->unitTester = $I;
-        $this->mockFramework();
-    }
-
-    protected function _after()
-    {
-    }
-
-    public function testQueue()
-    {
-        $provider = new \Pckg\Framework\Provider();
-        $queue = new \Pckg\Framework\Application\Queue($provider);
-
-        $this->unitTester->assertNotEmpty($queue->inits());
-        $this->unitTester->assertNotEmpty($queue->runs());
-    }
-}
diff --git a/tests/unit/FrameworkApplicationWebsiteCest.php b/tests/unit/FrameworkApplicationWebsiteCest.php
deleted file mode 100644
index 3c6225d4..00000000
--- a/tests/unit/FrameworkApplicationWebsiteCest.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-use Pckg\Concept\Event\Dispatcher;
-use Pckg\Framework\Application\Console\Command\RunCommand;
-use Pckg\Framework\Request\Data\Server;
-use Pckg\Framework\Response;
-use Pckg\Framework\Test\ContextDiff;
-use Pckg\Framework\Test\ListenForEvents;
-use Pckg\Framework\Test\MockConfig;
-use Pckg\Framework\Test\MockFramework;
-use Pckg\Framework\Test\MockInContext;
-use Symfony\Component\Console\Application;
-use Symfony\Component\Console\Output\NullOutput;
-
-class FrameworkApplicationWebsiteCest
-{
-
-    use MockFramework;
-    use ContextDiff;
-    use ListenForEvents;
-    use MockConfig;
-    use MockInContext;
-
-    protected UnitTester $unitTester;
-
-    const EVENT_MIDDLEWARE = self::class . '.middleware';
-    const EVENT_AFTERWARE = self::class . '.afterware';
-
-    public function _before(UnitTester $I)
-    {
-        if (!defined('__ROOT__')) {
-            define('__ROOT__', realpath(__DIR__ . '/../..') . '/');
-        }
-        $this->unitTester = $I;
-        $this->mockFramework();
-    }
-
-    protected function _after()
-    {
-    }
-
-    public function testWebsite()
-    {
-        $provider = new \Pckg\Framework\Provider();
-        $website = new \Pckg\Framework\Application\Queue($provider);
-
-        $this->unitTester->assertNotEmpty($website->inits());
-        $this->unitTester->assertNotEmpty($website->runs());
-    }
-}
diff --git a/tests/unit/RequestDataCest.php b/tests/unit/RequestDataCest.php
index e11faab0..1cb6e516 100644
--- a/tests/unit/RequestDataCest.php
+++ b/tests/unit/RequestDataCest.php
@@ -1,18 +1,8 @@
 <?php
 
-class RequestDataCest
+class RequestDataCest extends \Pckg\Framework\Test\Codeception\Cest
 {
 
-    use \Pckg\Framework\Test\MockFramework;
-
-    public function _before(UnitTester $I)
-    {
-        if (!defined('__ROOT__')) {
-            define('__ROOT__', realpath(__DIR__ . '/../..') . '/');
-        }
-        $this->mockFramework();
-    }
-
     // tests
     public function defaultRequestDataTest(UnitTester $I)
     {

From e2bba43c71ae0a37f2fc4f2be70216fb64cf6272 Mon Sep 17 00:00:00 2001
From: Bojan Rajh <schtr4jh@schtr4jh.net>
Date: Tue, 25 May 2021 11:52:02 +0200
Subject: [PATCH 37/66] Test config, request files

---
 composer.json                                 |  2 +-
 src/Pckg/Framework/Config.php                 |  8 ++
 src/Pckg/Framework/Environment.php            | 13 +++-
 src/Pckg/Framework/Helper/functions.php       |  8 ++
 .../Framework/Middleware/DropRequests.php     |  5 ++
 .../Framework/Middleware/RedirectToHttps.php  |  5 ++
 src/Pckg/Framework/Request.php                |  3 +-
 src/Pckg/Framework/Request/Data/Files.php     | 16 ++++
 src/Pckg/Framework/Request/Message.php        |  3 +-
 src/Pckg/Framework/Test/Codeception/Cest.php  | 14 ++--
 src/Pckg/Framework/Test/ContextDiff.php       |  2 +-
 src/Pckg/Framework/Test/ListenForEvents.php   | 26 ++++++-
 src/Pckg/Framework/Test/MockConfig.php        |  5 ++
 src/Pckg/Framework/Test/MockContext.php       | 44 +++++++++++
 src/Pckg/Framework/Test/MockExceptions.php    | 17 +++++
 src/Pckg/Framework/Test/MockFramework.php     | 32 +-------
 src/Pckg/Framework/Test/MockRouter.php        | 51 +++++++++++++
 .../Command/RegisterApplicationCest.php       |  8 +-
 .../Console/Command/RunCommandCest.php        |  6 +-
 .../Framework/Application/ConsoleCest.php     |  4 +-
 .../unit/Framework/Application/QueueCest.php  |  4 +-
 .../Framework/Application/WebsiteCest.php     |  4 +-
 .../Config/Command/InitConfigCest.php         |  4 +-
 .../Environment/Command/DefinePathsCest.php   | 48 ++++++++++++
 .../Framework/Environment/ConsoleCest.php     | 48 ++++++++++++
 tests/unit/Framework/EnvironmentCest.php      | 36 +++++++++
 .../Reflect/FrameworkResolverCest.php         | 72 ++++++++++++++++++
 .../Router/Command/ResolveRouteCest.php       | 75 +++++++++++++++++++
 28 files changed, 506 insertions(+), 57 deletions(-)
 create mode 100644 src/Pckg/Framework/Request/Data/Files.php
 create mode 100644 src/Pckg/Framework/Test/MockContext.php
 create mode 100644 src/Pckg/Framework/Test/MockExceptions.php
 create mode 100644 src/Pckg/Framework/Test/MockRouter.php
 create mode 100644 tests/unit/Framework/Environment/Command/DefinePathsCest.php
 create mode 100644 tests/unit/Framework/Environment/ConsoleCest.php
 create mode 100644 tests/unit/Framework/EnvironmentCest.php
 create mode 100644 tests/unit/Framework/Reflect/FrameworkResolverCest.php
 create mode 100644 tests/unit/Framework/Router/Command/ResolveRouteCest.php

diff --git a/composer.json b/composer.json
index c1731b36..850c79d5 100644
--- a/composer.json
+++ b/composer.json
@@ -52,7 +52,7 @@
       "true || vendor/bin/phpcloc cloc src/",
       "vendor/bin/phpstan analyse src/ --level=1",
       "vendor/bin/phpcs -s --standard=ruleset.xml --extensions=php --warning-severity=8 --error-severity=1 --parallel=2 -p src/",
-      "vendor/bin/codecept run -o \"settings: shuffle: true\""
+      "vendor/bin/codecept run"
     ],
     "applycsandpatch": [
       "composer autofix && composer autopatch"
diff --git a/src/Pckg/Framework/Config.php b/src/Pckg/Framework/Config.php
index a54fbdb4..e28fd679 100644
--- a/src/Pckg/Framework/Config.php
+++ b/src/Pckg/Framework/Config.php
@@ -7,6 +7,8 @@ class Config
 
     protected $data = [];
 
+    protected $registeredDirs = [];
+
     const EVENT_DIR_PARSED = self::class . '.dirParsed';
 
     public function __construct(array $data = [])
@@ -97,6 +99,11 @@ private function setRecursive($keys, $val, $data, $i, $merge = true)
         return $data;
     }
 
+    public function hasRegisteredDir($dir): bool
+    {
+        return in_array($dir, $this->registeredDirs);
+    }
+
     public function parseDir($dir)
     {
         if (!$dir) {
@@ -118,6 +125,7 @@ public function parseDir($dir)
         /**
          * @T00D00 - move this to the event handler
          */
+        $this->registeredDirs[] = $dir;
         trigger(static::EVENT_DIR_PARSED, [$this]);
         $this->set('url', "https://" . config('domain'));
     }
diff --git a/src/Pckg/Framework/Environment.php b/src/Pckg/Framework/Environment.php
index 07df5935..fe3e2036 100644
--- a/src/Pckg/Framework/Environment.php
+++ b/src/Pckg/Framework/Environment.php
@@ -26,6 +26,10 @@ class Environment implements AssetManager
      */
     protected $config;
 
+    const EVENT_INITIALIZING = self::class . '.initializing';
+
+    const EVENT_INITIALIZED = self::class . '.initialized';
+
     public function __construct(Config $config, Context $context)
     {
         $this->config = $config;
@@ -39,6 +43,11 @@ public function getUrlPrefix()
         return $this->urlPrefix;
     }
 
+    /**
+     * @param $url
+     * @return false|mixed|string
+     * @deprecated
+     */
     public function replaceUrlPrefix($url)
     {
         if (strpos($url, $this->urlPrefix . '/') === 0) {
@@ -50,11 +59,11 @@ public function replaceUrlPrefix($url)
 
     public function init()
     {
-        trigger(Environment::class . '.initializing', [$this]);
+        trigger(static::EVENT_INITIALIZING, [$this]);
 
         chain($this->initArray());
 
-        trigger(Environment::class . '.initialized', [$this]);
+        trigger(static::EVENT_INITIALIZED, [$this]);
 
         return $this;
     }
diff --git a/src/Pckg/Framework/Helper/functions.php b/src/Pckg/Framework/Helper/functions.php
index dfafdd18..b9866f11 100644
--- a/src/Pckg/Framework/Helper/functions.php
+++ b/src/Pckg/Framework/Helper/functions.php
@@ -454,6 +454,10 @@ function path($key = null, $val = null)
         [$realKey] = explode('/', $key);
         $path = config('path.' . $realKey);
 
+        if (!$path) {
+            throw new Exception('Path ' . $key . ' is not defined');
+        }
+
         if (strpos($key, '/')) {
             $path .= rtrim(substr($key, strlen($realKey) + 1), '/') . '/';
         }
@@ -465,6 +469,10 @@ function path($key = null, $val = null)
             $path = str_replace(path('root'), path('ds'), $path);
         }
 
+        if ($key !== 'ds' && $val === '/') {
+            throw new Exception('Root path (/) is not allowed');
+        }
+
         return $path;
     }
 
diff --git a/src/Pckg/Framework/Middleware/DropRequests.php b/src/Pckg/Framework/Middleware/DropRequests.php
index be6bfa12..ba976075 100644
--- a/src/Pckg/Framework/Middleware/DropRequests.php
+++ b/src/Pckg/Framework/Middleware/DropRequests.php
@@ -2,6 +2,11 @@
 
 namespace Pckg\Framework\Middleware;
 
+/**
+ * Class DropRequests
+ * @package Pckg\Framework\Middleware
+ * @deprecated
+ */
 class DropRequests
 {
 
diff --git a/src/Pckg/Framework/Middleware/RedirectToHttps.php b/src/Pckg/Framework/Middleware/RedirectToHttps.php
index 51ba7ace..7c1a6b6a 100644
--- a/src/Pckg/Framework/Middleware/RedirectToHttps.php
+++ b/src/Pckg/Framework/Middleware/RedirectToHttps.php
@@ -2,6 +2,11 @@
 
 namespace Pckg\Framework\Middleware;
 
+/**
+ * Class RedirectToHttps
+ * @package Pckg\Framework\Middleware
+ * @deprecated
+ */
 class RedirectToHttps
 {
 
diff --git a/src/Pckg/Framework/Request.php b/src/Pckg/Framework/Request.php
index bc373c6f..0470fe9d 100644
--- a/src/Pckg/Framework/Request.php
+++ b/src/Pckg/Framework/Request.php
@@ -5,6 +5,7 @@
 use Pckg\Concept\Reflect;
 use Pckg\Framework\Helper\Lazy;
 use Pckg\Framework\Request\Data\Cookie;
+use Pckg\Framework\Request\Data\Files;
 use Pckg\Framework\Request\Data\Get;
 use Pckg\Framework\Request\Data\Post;
 use Pckg\Framework\Request\Data\Server;
@@ -65,7 +66,7 @@ public function __construct()
         $this->post = (new Post())->setFromGlobals();
         $this->get = (new Get())->setFromGlobals();
         $this->cookie = (new Cookie())->setFromGlobals();
-        $this->files = (new Lazy($_FILES));
+        $this->files = (new Files())->setFromGlobals();
         $this->headers = collect(getallheaders())->groupBy(function ($value, $key) {
             return $key;
         })->all();
diff --git a/src/Pckg/Framework/Request/Data/Files.php b/src/Pckg/Framework/Request/Data/Files.php
new file mode 100644
index 00000000..4f61672d
--- /dev/null
+++ b/src/Pckg/Framework/Request/Data/Files.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Pckg\Framework\Request\Data;
+
+use Pckg\Framework\Helper\Lazy;
+
+class Files extends Lazy
+{
+
+    public function setFromGlobals()
+    {
+        $this->setData($_FILES);
+
+        return $this;
+    }
+}
diff --git a/src/Pckg/Framework/Request/Message.php b/src/Pckg/Framework/Request/Message.php
index 26c98556..1a1cb78f 100644
--- a/src/Pckg/Framework/Request/Message.php
+++ b/src/Pckg/Framework/Request/Message.php
@@ -7,6 +7,7 @@
 use Pckg\Concept\Reflect;
 use Pckg\Framework\Helper\Lazy;
 use Pckg\Framework\Request\Data\Cookie;
+use Pckg\Framework\Request\Data\Files;
 use Pckg\Framework\Request\Data\Get;
 use Pckg\Framework\Request\Data\Post;
 use Pckg\Framework\Request\Data\Server;
@@ -53,7 +54,7 @@ public function __construct()
         $this->post = new Post();
         $this->get = new Get();
         $this->server = new Server();
-        $this->files = new Lazy();
+        $this->files = new Files();
         $this->cookie = new Cookie();
         $this->request = new \Pckg\Framework\Request\Data\Request();
 
diff --git a/src/Pckg/Framework/Test/Codeception/Cest.php b/src/Pckg/Framework/Test/Codeception/Cest.php
index 95216dff..65367917 100644
--- a/src/Pckg/Framework/Test/Codeception/Cest.php
+++ b/src/Pckg/Framework/Test/Codeception/Cest.php
@@ -2,24 +2,26 @@
 
 namespace Pckg\Framework\Test\Codeception;
 
+use Codeception\Specify;
 use Pckg\Framework\Test\MockFramework;
 use UnitTester;
 
 class Cest
 {
+    //use Specify;
     use MockFramework;
 
-    // @phpstan-ignore-next-line
-    protected UnitTester $unitTester;
-
     // @phpstan-ignore-next-line
     public function _before(UnitTester $I)
     {
         if (!defined('__ROOT__')) {
             // @phpstan-ignore-next-line
-            define('__ROOT__', codecept_root_dir() . '/');
+            define('__ROOT__', codecept_root_dir());
+        }
+        $this->tester = $I;
+
+        if (!isset($this->disableFramework)) {
+            $this->mockFramework();
         }
-        $this->unitTester = $I;
-        $this->mockFramework();
     }
 }
diff --git a/src/Pckg/Framework/Test/ContextDiff.php b/src/Pckg/Framework/Test/ContextDiff.php
index e9e4a3d4..3f3466dc 100644
--- a/src/Pckg/Framework/Test/ContextDiff.php
+++ b/src/Pckg/Framework/Test/ContextDiff.php
@@ -14,7 +14,7 @@ protected function checkContextDiff(callable $task, int $diff)
         $starting = $this->context->getData();
         $response = $task();
         $ending = $this->context->getData();
-        $this->unitTester->assertEquals($diff, count($ending) - count($starting));
+        $this->tester->assertEquals($diff, count($ending) - count($starting));
 
         return $response;
     }
diff --git a/src/Pckg/Framework/Test/ListenForEvents.php b/src/Pckg/Framework/Test/ListenForEvents.php
index c0f9152a..2f99e85b 100644
--- a/src/Pckg/Framework/Test/ListenForEvents.php
+++ b/src/Pckg/Framework/Test/ListenForEvents.php
@@ -11,7 +11,16 @@
 trait ListenForEvents
 {
 
-    protected $triggeredEvents = [];
+    protected array $triggeredEvents = [];
+
+    protected function listenForEvents(array $events, $reset = true): self
+    {
+        foreach ($events as $event) {
+            $this->listenForEvent($event, $reset);
+        }
+
+        return $this;
+    }
 
     protected function listenForEvent(string $event, $reset = true): self
     {
@@ -28,4 +37,19 @@ protected function getNumberOfTriggers(string $event): int
     {
         return $this->triggeredEvents[$event] ?? 0;
     }
+
+    protected function hasTriggered($events, int $min = 1): bool
+    {
+        if (!is_array($events)) {
+            $events = [$events];
+        }
+
+        foreach ($events as $event) {
+            if ($this->getNumberOfTriggers($event) < $min) {
+                return false;
+            }
+        }
+
+        return true;
+    }
 }
diff --git a/src/Pckg/Framework/Test/MockConfig.php b/src/Pckg/Framework/Test/MockConfig.php
index 38b8aa78..c56cfef3 100644
--- a/src/Pckg/Framework/Test/MockConfig.php
+++ b/src/Pckg/Framework/Test/MockConfig.php
@@ -17,4 +17,9 @@ protected function mockConfig(array $default = [], &$reset = null)
 
         return $config;
     }
+
+    protected function getConfig(): Config
+    {
+        return $this->context->get(Config::class);
+    }
 }
diff --git a/src/Pckg/Framework/Test/MockContext.php b/src/Pckg/Framework/Test/MockContext.php
new file mode 100644
index 00000000..b3643bb7
--- /dev/null
+++ b/src/Pckg/Framework/Test/MockContext.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace Pckg\Framework\Test;
+
+use Pckg\Concept\Context;
+use Pckg\Framework\Stack;
+
+trait MockContext
+{
+
+    /**
+     * @return mixed
+     */
+    protected function getPckgBootstrap()
+    {
+        $file = 'vendor/pckg/framework/src/bootstrap.php';
+        if (!is_file($file)) {
+            $file = 'src/bootstrap.php';
+        }
+        return include $file;
+    }
+
+    protected function mockContext(): \Pckg\Framework\Helper\Context
+    {
+        /**
+         * Make sure that App is fully loaded?
+         * We would like to mock the environment, application and request.
+         */
+        $bootstrap = $this->getPckgBootstrap();
+
+        /**
+         * Only bootstrap and create context. Do not create environment or init the application.
+         * @var $context \Pckg\Concept\Context|\Pckg\Framework\Helper\Context
+         */
+        $originalContext = context();
+        Stack::$providers = [];
+        $this->context = $context = $bootstrap(null, null);
+
+        $originalContext->bind(Context::class, $context);
+        $originalContext->bind(\Pckg\Framework\Helper\Context::class, $context);
+
+        return $context;
+    }
+}
diff --git a/src/Pckg/Framework/Test/MockExceptions.php b/src/Pckg/Framework/Test/MockExceptions.php
new file mode 100644
index 00000000..ee5c2f30
--- /dev/null
+++ b/src/Pckg/Framework/Test/MockExceptions.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Pckg\Framework\Test;
+
+trait MockExceptions
+{
+
+    protected function throwException($message = 'Miss-match exception')
+    {
+        throw new \Exception($message);
+    }
+
+    protected function matchException($message, $e)
+    {
+        $this->tester->assertSame($message, $e->getMessage());
+    }
+}
diff --git a/src/Pckg/Framework/Test/MockFramework.php b/src/Pckg/Framework/Test/MockFramework.php
index fcb41d4f..9d12ced9 100644
--- a/src/Pckg/Framework/Test/MockFramework.php
+++ b/src/Pckg/Framework/Test/MockFramework.php
@@ -13,6 +13,7 @@
 
 trait MockFramework
 {
+    use MockContext;
 
     /**
      * @var \UnitTester
@@ -20,7 +21,7 @@ trait MockFramework
     protected $tester;
 
     /**
-     * @var Context
+     * @var \Pckg\Framework\Helper\Context
      */
     protected $context;
 
@@ -33,36 +34,9 @@ protected function setRecreateContext($recreate = false)
         return $this;
     }
 
-    /**
-     * @return mixed
-     */
-    protected function getPckgBootstrap()
-    {
-        $file = 'vendor/pckg/framework/src/bootstrap.php';
-        if (!is_file($file)) {
-            $file = 'src/bootstrap.php';
-        }
-        return include $file;
-    }
-
     public function mockEnvironment()
     {
-        /**
-         * Make sure that App is fully loaded?
-         * We would like to mock the environment, application and request.
-         */
-        $bootstrap = $this->getPckgBootstrap();
-
-        /**
-         * Only bootstrap and create context. Do not create environment or init the application.
-         * @var $context \Pckg\Concept\Context|\Pckg\Framework\Helper\Context
-         */
-        $originalContext = context();
-        Stack::$providers = [];
-        $this->context = $context = $bootstrap(null, null);
-
-        $originalContext->bind(Context::class, $context);
-        $originalContext->bind(\Pckg\Framework\Helper\Context::class, $context);
+        $context = $this->mockContext();
 
         /**
          * Create, bind and register the environment.
diff --git a/src/Pckg/Framework/Test/MockRouter.php b/src/Pckg/Framework/Test/MockRouter.php
new file mode 100644
index 00000000..46b9796c
--- /dev/null
+++ b/src/Pckg/Framework/Test/MockRouter.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace Pckg\Framework\Test;
+
+use Pckg\Framework\Config;
+use Pckg\Framework\Helper\Context;
+use Pckg\Framework\Router;
+
+/**
+ * Trait MockRouter
+ * @package Pckg\Framework\Test
+ * @property Context $context
+ */
+trait MockRouter
+{
+    protected Router $mockedRouter;
+
+    protected function mockRouter(): Router
+    {
+        if (!isset($this->mockedRouter)) {
+            $this->mockedRouter = new Router($this->context->get(Config::class));
+            $this->context->bind(Router::class, $this->mockedRouter);
+            //$this->mockInContext($this->mockedRouter);
+        }
+
+        return $this->mockedRouter;
+    }
+
+    protected function fetchRouter(): Router
+    {
+        if (isset($this->mockedRouter)) {
+            return $this->mockedRouter;
+        }
+        if ($this->context->exists(Router::class)) {
+            return $this->context->get(Router::class);
+        }
+
+        return $this->mockRouter();
+    }
+
+    protected function registerRoutes(array $routes): Router
+    {
+        $router = $this->fetchRouter();
+
+        foreach ($routes as $url => $route) {
+            $router->add($url, $route);
+        }
+
+        return $router;
+    }
+}
diff --git a/tests/unit/Framework/Application/Command/RegisterApplicationCest.php b/tests/unit/Framework/Application/Command/RegisterApplicationCest.php
index 00522d29..4e4a2719 100644
--- a/tests/unit/Framework/Application/Command/RegisterApplicationCest.php
+++ b/tests/unit/Framework/Application/Command/RegisterApplicationCest.php
@@ -29,9 +29,9 @@ protected function testRegistersWebsiteApplication()
         $registerApplication = new \Pckg\Framework\Application\Command\RegisterApplication($application, $config);
         $registerApplication->execute(fn() => null);
 
-        $this->unitTester->assertTrue($provider->isRegistered());
-        $this->unitTester->assertEquals([], $config->get());
-        $this->unitTester->assertEquals('en_GB', $localeManager->getCurrent());
-        $this->unitTester->assertEquals(1, $this->getNumberOfTriggers(\Pckg\Framework\Application::EVENT_REGISTERED));
+        $this->tester->assertTrue($provider->isRegistered());
+        $this->tester->assertEquals([], $config->get());
+        $this->tester->assertEquals('en_GB', $localeManager->getCurrent());
+        $this->tester->assertEquals(1, $this->getNumberOfTriggers(\Pckg\Framework\Application::EVENT_REGISTERED));
     }
 }
diff --git a/tests/unit/Framework/Application/Console/Command/RunCommandCest.php b/tests/unit/Framework/Application/Console/Command/RunCommandCest.php
index afd5e9a0..69b3cd4d 100644
--- a/tests/unit/Framework/Application/Console/Command/RunCommandCest.php
+++ b/tests/unit/Framework/Application/Console/Command/RunCommandCest.php
@@ -48,8 +48,8 @@ public function testEmptyCommandArgv()
 
         (new RunCommand($response, $dispatcher, $symfonyConsole, $server))->execute(fn() => null);
 
-        $this->unitTester->assertEquals(1, $this->getNumberOfTriggers(RunCommand::EVENT_RUNNING));
-        $this->unitTester->assertEquals(1, $this->getNumberOfTriggers(static::EVENT_MIDDLEWARE));
-        $this->unitTester->assertEquals(1, $this->getNumberOfTriggers(static::EVENT_AFTERWARE));
+        $this->tester->assertEquals(1, $this->getNumberOfTriggers(RunCommand::EVENT_RUNNING));
+        $this->tester->assertEquals(1, $this->getNumberOfTriggers(static::EVENT_MIDDLEWARE));
+        $this->tester->assertEquals(1, $this->getNumberOfTriggers(static::EVENT_AFTERWARE));
     }
 }
diff --git a/tests/unit/Framework/Application/ConsoleCest.php b/tests/unit/Framework/Application/ConsoleCest.php
index b2e04c3b..bc10ff4f 100644
--- a/tests/unit/Framework/Application/ConsoleCest.php
+++ b/tests/unit/Framework/Application/ConsoleCest.php
@@ -24,7 +24,7 @@ public function testConsole()
         $provider = new \Pckg\Framework\Provider();
         $console = new \Pckg\Framework\Application\Console($provider);
 
-        $this->unitTester->assertNotEmpty($console->inits());
-        $this->unitTester->assertNotEmpty($console->runs());
+        $this->tester->assertNotEmpty($console->inits());
+        $this->tester->assertNotEmpty($console->runs());
     }
 }
diff --git a/tests/unit/Framework/Application/QueueCest.php b/tests/unit/Framework/Application/QueueCest.php
index 4b5772dc..5842b1cf 100644
--- a/tests/unit/Framework/Application/QueueCest.php
+++ b/tests/unit/Framework/Application/QueueCest.php
@@ -24,7 +24,7 @@ public function testQueue()
         $provider = new \Pckg\Framework\Provider();
         $queue = new \Pckg\Framework\Application\Queue($provider);
 
-        $this->unitTester->assertNotEmpty($queue->inits());
-        $this->unitTester->assertNotEmpty($queue->runs());
+        $this->tester->assertNotEmpty($queue->inits());
+        $this->tester->assertNotEmpty($queue->runs());
     }
 }
diff --git a/tests/unit/Framework/Application/WebsiteCest.php b/tests/unit/Framework/Application/WebsiteCest.php
index 34d820c1..751465f4 100644
--- a/tests/unit/Framework/Application/WebsiteCest.php
+++ b/tests/unit/Framework/Application/WebsiteCest.php
@@ -24,7 +24,7 @@ public function testWebsite()
         $provider = new \Pckg\Framework\Provider();
         $website = new \Pckg\Framework\Application\Queue($provider);
 
-        $this->unitTester->assertNotEmpty($website->inits());
-        $this->unitTester->assertNotEmpty($website->runs());
+        $this->tester->assertNotEmpty($website->inits());
+        $this->tester->assertNotEmpty($website->runs());
     }
 }
diff --git a/tests/unit/Framework/Config/Command/InitConfigCest.php b/tests/unit/Framework/Config/Command/InitConfigCest.php
index 2cd9fae1..84471b79 100644
--- a/tests/unit/Framework/Config/Command/InitConfigCest.php
+++ b/tests/unit/Framework/Config/Command/InitConfigCest.php
@@ -24,7 +24,7 @@ public function testConfig()
         path('app', __ROOT__ . 'tests/_data/FrameworkConfigCommandInitConfigCest/');
         (new InitConfig($config))->execute(fn() => null);
         $final = $config->get();
-        $this->unitTester->assertNotSame($initial, $final);
-        $this->unitTester->assertSame(['foo' => 'barconfig', 'url' => 'https://'], $final);
+        $this->tester->assertNotSame($initial, $final);
+        $this->tester->assertSame(['foo' => 'barconfig', 'url' => 'https://'], $final);
     }
 }
diff --git a/tests/unit/Framework/Environment/Command/DefinePathsCest.php b/tests/unit/Framework/Environment/Command/DefinePathsCest.php
new file mode 100644
index 00000000..ff2d091e
--- /dev/null
+++ b/tests/unit/Framework/Environment/Command/DefinePathsCest.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace Test\Framework\Config\Command;
+
+use Pckg\Framework\Environment\Command\DefinePaths;
+use Pckg\Framework\Test\Codeception\Cest;
+use Pckg\Framework\Test\MockConfig;
+
+class DefinePathsCest extends Cest
+{
+
+    public function testConfig()
+    {
+        $paths = [
+            'ds' => '/',
+            'root' => '/var/www/html/',
+            'apps' => '/var/www/html/app/',
+            'src' => '/var/www/html/src/',
+            'storage' => '/var/www/html/storage/',
+            'private' => '/var/www/html/storage/private/',
+            'public' => '/var/www/html/storage/public/',
+            'www' => '/var/www/html/www/',
+            'cache' => '/var/www/html/storage/cache/',
+            'tmp' => '/var/www/html/storage/tmp/',
+            'uploads' => '/var/www/html/storage/uploads/',
+            'vendor' => '/var/www/html/vendor/',
+            'build' => '/var/www/html/build/',
+        ];
+
+        $preRegistered = true;
+        if (!$preRegistered) {
+            foreach ($paths as $key => $val) {
+                try {
+                    path($key);
+                    throw new \Exception('Miss-exception ' . $key);
+                } catch (\Throwable $e) {
+                    $this->tester->assertNotEquals('Miss-exception ' . $key, $e->getMessage());
+                }
+            }
+
+            (new DefinePaths())->execute(fn() => null);
+        }
+
+        foreach ($paths as $key => $val) {
+            $this->tester->assertEquals($val, path($key), 'Checking ' . $key);
+        }
+    }
+}
diff --git a/tests/unit/Framework/Environment/ConsoleCest.php b/tests/unit/Framework/Environment/ConsoleCest.php
new file mode 100644
index 00000000..e172400c
--- /dev/null
+++ b/tests/unit/Framework/Environment/ConsoleCest.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace Test\Framework\Environment;
+
+use Pckg\Framework\Config;
+use Pckg\Framework\Environment;
+use Pckg\Framework\Environment\Console;
+use Pckg\Framework\Test\Codeception\Cest;
+use Pckg\Framework\Test\ListenForEvents;
+use Pckg\Framework\Test\MockConfig;
+
+class ConsoleCest extends Cest
+{
+    use MockConfig;
+    use ListenForEvents;
+
+    public function testConsoleEnvironmentRegistration()
+    {
+        $config = $this->mockConfig();
+
+        $this->tester->assertFalse($config->hasRegisteredDir(BASE_PATH));
+
+        $this->listenForEvents([Environment::EVENT_INITIALIZING, Environment::EVENT_INITIALIZED]);
+
+        // this is being tested
+        (new Console($config, $this->context))->register();
+
+        $this->tester->assertEquals(E_ALL, error_reporting());
+        $this->tester->assertEquals('1', ini_get('display_errors'));
+
+        $this->tester->assertTrue($config->hasRegisteredDir(BASE_PATH));
+
+        $this->tester->assertEquals(1, $this->getNumberOfTriggers(Environment::EVENT_INITIALIZING));
+        $this->tester->assertEquals(1, $this->getNumberOfTriggers(Environment::EVENT_INITIALIZED));
+    }
+
+    public function testConsoleAppCreation()
+    {
+        $config = $this->context->get(Config::class);
+
+        try {
+            (new Console($config, $this->context))->createApplication($this->context, 'test');
+            throw new \Exception('Miss-exception');
+        } catch (\Throwable $e) {
+            $this->tester->assertEquals('Class Test not found', $e->getMessage());
+        }
+    }
+}
diff --git a/tests/unit/Framework/EnvironmentCest.php b/tests/unit/Framework/EnvironmentCest.php
new file mode 100644
index 00000000..e7a57e19
--- /dev/null
+++ b/tests/unit/Framework/EnvironmentCest.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace Test\Framework;
+
+use Pckg\Framework\Config;
+use Pckg\Framework\Environment;
+use Pckg\Framework\Test\ListenForEvents;
+use Pckg\Framework\Test\MockContext;
+
+class EnvironmentCest
+{
+
+    use MockContext;
+    use ListenForEvents;
+
+    public function testEnvironment(\UnitTester $I)
+    {
+        $context = $this->mockContext();
+        $config = new Config();
+
+        $I->assertFalse($context->exists(Config::class));
+
+        $environment = new Environment($config, $context);
+
+        $I->assertTrue($context->exists(Config::class));
+
+        $I->assertEquals('/index.php', $environment->getUrlPrefix());
+        $I->assertNotEmpty($environment->initArray());
+
+        $this->listenForEvents([Environment::EVENT_INITIALIZING, Environment::EVENT_INITIALIZED]);
+
+        $environment->init();
+
+        $I->assertTrue($this->hasTriggered([Environment::EVENT_INITIALIZING, Environment::EVENT_INITIALIZED]));
+    }
+}
diff --git a/tests/unit/Framework/Reflect/FrameworkResolverCest.php b/tests/unit/Framework/Reflect/FrameworkResolverCest.php
new file mode 100644
index 00000000..3d343c2d
--- /dev/null
+++ b/tests/unit/Framework/Reflect/FrameworkResolverCest.php
@@ -0,0 +1,72 @@
+<?php
+
+namespace Test\Framework\Reflect;
+
+use Pckg\Auth\Service\Auth;
+use Pckg\Framework\Config;
+use Pckg\Framework\Helper\Context;
+use Pckg\Framework\Reflect\FrameworkResolver;
+use Pckg\Framework\Request;
+use Pckg\Framework\Request\Data\Flash;
+use Pckg\Framework\Response;
+use Pckg\Framework\Router;
+use Pckg\Framework\Test\Codeception\Cest;
+use Pckg\Locale\Lang;
+use Pckg\Manager\Asset;
+use Pckg\Manager\Asset\AssetManager;
+use Pckg\Manager\Locale;
+use Pckg\Manager\Meta;
+use Pckg\Manager\Seo;
+
+class FrameworkResolverCest extends Cest
+{
+
+    protected function createFrameworkResolver(): FrameworkResolver
+    {
+        return new FrameworkResolver();
+    }
+
+    public function testCantResolveDefault()
+    {
+        $frameworkResolver = $this->createFrameworkResolver();
+        $this->tester->assertFalse($frameworkResolver->canResolve(static::class), static::class);
+    }
+
+    public function testCantResolveNonExistent()
+    {
+        $frameworkResolver = $this->createFrameworkResolver();
+        $this->tester->assertFalse($frameworkResolver->canResolve(HopefullyNonExistentClassOrInterface::class));
+    }
+
+    public function testCanResolveSingletones()
+    {
+        $frameworkResolver = $this->createFrameworkResolver();
+        foreach ([
+                     Router::class,
+                     \Pckg\Concept\Context::class,
+                     Config::class,
+                     Asset::class,
+                     Meta::class,
+                     Seo::class,
+                     Flash::class,
+                     Response::class,
+                     Request::class,
+                     Lang::class,
+                     \Pckg\Auth\Entity\Adapter\Auth::class,
+                     Locale::class,
+                 ] as $class) {
+            $this->tester->assertTrue($frameworkResolver->canResolve($class), $class);
+        }
+    }
+
+    public function testCanResolveExtendedSingletones()
+    {
+        $frameworkResolver = $this->createFrameworkResolver();
+        foreach ([
+                     //Request\MockRequest::class,
+                     //Response\MockResponse::class,
+                 ] as $class) {
+            $this->tester->assertTrue($frameworkResolver->canResolve($class), $class);
+        }
+    }
+}
diff --git a/tests/unit/Framework/Router/Command/ResolveRouteCest.php b/tests/unit/Framework/Router/Command/ResolveRouteCest.php
new file mode 100644
index 00000000..0c5af89d
--- /dev/null
+++ b/tests/unit/Framework/Router/Command/ResolveRouteCest.php
@@ -0,0 +1,75 @@
+<?php
+
+namespace Test\Framework\Router\Command;
+
+use Pckg\Framework\Router;
+use Pckg\Framework\Router\Command\ResolveRoute;
+use Pckg\Framework\Test\Codeception\Cest;
+use Pckg\Framework\Test\MockConfig;
+use Pckg\Framework\Test\MockExceptions;
+use Pckg\Framework\Test\MockRouter;
+
+class ResolveRouteCest extends Cest
+{
+
+    use MockConfig;
+    use MockExceptions;
+    use MockRouter;
+
+    public function testDefaultNullMatch()
+    {
+        $resolveRoute = new ResolveRoute($this->mockRouter(), '/');
+
+        $this->tester->assertNull($resolveRoute->execute());
+    }
+
+    public function testStaticRouteMissingView()
+    {
+        $router = $this->registerRoutes([
+            '/' => [],
+        ]);
+        try {
+            $resolveRoute = new ResolveRoute($router, '/');
+            $resolveRoute->execute();
+            $this->throwException();
+        } catch (\Throwable $e) {
+            $this->matchException('View not set.', $e);
+        }
+    }
+
+    public function testMatchesSingle()
+    {
+        $router = $this->registerRoutes([
+            '/' => [
+                'view' => fn() => null,
+            ],
+        ]);
+        $resolveRoute = new ResolveRoute($router, '/');
+        $match = $resolveRoute->execute();
+        $this->tester->assertTrue(isset($match['view']));
+        unset($match['view']);
+        $expected = ['url' => '/', 'name' => null, 'domain' => null, 'method' => 'GET|POST'];
+        $this->tester->assertEquals($expected, array_union($expected, $match));
+    }
+
+    public function testMatchesCorrect()
+    {
+        $router = $this->registerRoutes([
+            '/' => [
+                'view' => fn() => null,
+            ],
+            '/foo' => [
+                'view' => fn() => null,
+            ],
+            '/bar' => [
+                'view' => fn() => null,
+            ],
+        ]);
+        $resolveRoute = new ResolveRoute($router, '/foo');
+        $match = $resolveRoute->execute();
+        $this->tester->assertTrue(isset($match['view']));
+        unset($match['view']);
+        $expected = ['url' => '/foo', 'name' => null, 'domain' => null, 'method' => 'GET|POST'];
+        $this->tester->assertEquals($expected, array_union($expected, $match));
+    }
+}

From c9ead66eaf9836888e8ff8ae8026e5b544b85270 Mon Sep 17 00:00:00 2001
From: Bojan Rajh <schtr4jh@schtr4jh.net>
Date: Tue, 25 May 2021 14:04:57 +0200
Subject: [PATCH 38/66] Fn visibility

---
 src/Pckg/Framework/Test/Helper.php        |  5 ++++
 src/Pckg/Framework/Test/MockFramework.php |  8 +++---
 src/Pckg/Framework/Test/MockInContext.php |  2 +-
 src/Pckg/Framework/Test/MockRequest.php   | 30 +++++++++++------------
 src/Pckg/Framework/Test/Transactions.php  |  4 +--
 5 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/src/Pckg/Framework/Test/Helper.php b/src/Pckg/Framework/Test/Helper.php
index b3509c79..ade17d20 100644
--- a/src/Pckg/Framework/Test/Helper.php
+++ b/src/Pckg/Framework/Test/Helper.php
@@ -9,6 +9,11 @@
 use Pckg\Database\Repository\PDO as PDORepository;
 use PDO;
 
+/**
+ * Class Helper
+ * @package Pckg\Framework\Test
+ * @deprecated ?
+ */
 class Helper extends Module
 {
 
diff --git a/src/Pckg/Framework/Test/MockFramework.php b/src/Pckg/Framework/Test/MockFramework.php
index 9d12ced9..2ac8889d 100644
--- a/src/Pckg/Framework/Test/MockFramework.php
+++ b/src/Pckg/Framework/Test/MockFramework.php
@@ -34,7 +34,7 @@ protected function setRecreateContext($recreate = false)
         return $this;
     }
 
-    public function mockEnvironment()
+    protected function mockEnvironment()
     {
         $context = $this->mockContext();
 
@@ -60,7 +60,7 @@ public function mockEnvironment()
         return [$context, $config];
     }
 
-    public function mockFramework($url = '/', $method = 'GET')
+    protected function mockFramework($url = '/', $method = 'GET')
     {
         if (!$this->recreateContext && isset($this->context)) {
             $context = $this->context;
@@ -114,13 +114,13 @@ protected function mergeRequestHeaders(Context $context, array $headers)
         return $this;
     }
 
-    public function mock()
+    protected function mock()
     {
         // @phpstan-ignore-next-line
         return (new MockRequest($this, $this->app));
     }
 
-    public function runExtensionDecorations($decoration)
+    protected function runExtensionDecorations($decoration)
     {
         if (!is_string($decoration)) {
             return;
diff --git a/src/Pckg/Framework/Test/MockInContext.php b/src/Pckg/Framework/Test/MockInContext.php
index 0e580dd0..f60144c7 100644
--- a/src/Pckg/Framework/Test/MockInContext.php
+++ b/src/Pckg/Framework/Test/MockInContext.php
@@ -5,7 +5,7 @@
 trait MockInContext
 {
 
-    public function mockInContext($object, string $name = null)
+    protected function mockInContext($object, string $name = null)
     {
         $this->context->bind($name ?? get_class($object), $object);
 
diff --git a/src/Pckg/Framework/Test/MockRequest.php b/src/Pckg/Framework/Test/MockRequest.php
index 7b8dfa91..5faecc3c 100644
--- a/src/Pckg/Framework/Test/MockRequest.php
+++ b/src/Pckg/Framework/Test/MockRequest.php
@@ -53,7 +53,7 @@ class MockRequest
      * @param Unit $test
      * @param $app
      */
-    public function __construct($test, $app)
+    protected function __construct($test, $app)
     {
         $this->test = $test;
         $this->app = $app;
@@ -64,7 +64,7 @@ public function __construct($test, $app)
      * @throws \PHPUnit\Framework\ExpectationFailedException
      * @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
      */
-    public function assertResponseCode($code, $message = null)
+    protected function assertResponseCode($code, $message = null)
     {
         $response = $this->context->get(Response::class);
 
@@ -78,7 +78,7 @@ public function assertResponseCode($code, $message = null)
      * @throws \PHPUnit\Framework\ExpectationFailedException
      * @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
      */
-    public function assertResponseHas($key)
+    protected function assertResponseHas($key)
     {
         $responseObject = $this->context->get(Response::class);
         $response = $responseObject->getOutput();
@@ -94,7 +94,7 @@ public function assertResponseHas($key)
      * @throws \PHPUnit\Framework\ExpectationFailedException
      * @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
      */
-    public function assertResponseContains($value)
+    protected function assertResponseContains($value)
     {
         $response = $this->context->get(Response::class)->getOutput();
 
@@ -110,7 +110,7 @@ public function assertResponseContains($value)
      * @param null $mode
      * @return callable|\Closure|null
      */
-    public function modifyConfigurator(callable $configurator = null, $mode = null)
+    protected function modifyConfigurator(callable $configurator = null, $mode = null)
     {
         if (!$mode && !$configurator) {
             return null;
@@ -143,7 +143,7 @@ public function modifyConfigurator(callable $configurator = null, $mode = null)
      * @param callable|null $configurator
      * @return $this
      */
-    public function httpGet($url, callable $configurator = null, $mode = null)
+    protected function httpGet($url, callable $configurator = null, $mode = null)
     {
         return $this->fullHttpRequest($url, $this->modifyConfigurator($configurator, $mode), 'GET');
     }
@@ -153,7 +153,7 @@ public function httpGet($url, callable $configurator = null, $mode = null)
      * @param callable|null $configurator
      * @return $this
      */
-    public function httpGetJson($url, callable $configurator = null)
+    protected function httpGetJson($url, callable $configurator = null)
     {
         return $this->fullHttpRequest($url, $this->modifyConfigurator($configurator, static::MODE_JSON), 'GET');
     }
@@ -163,7 +163,7 @@ public function httpGetJson($url, callable $configurator = null)
      * @param callable|null $configurator
      * @return $this
      */
-    public function httpDelete($url, callable $configurator = null)
+    protected function httpDelete($url, callable $configurator = null)
     {
         return $this->fullHttpRequest($url, $this->modifyConfigurator($configurator), 'DELETE');
     }
@@ -174,7 +174,7 @@ public function httpDelete($url, callable $configurator = null)
      * @param callable|null $configurator
      * @return $this
      */
-    public function httpPost($url, array $post = [], callable $configurator = null)
+    protected function httpPost($url, array $post = [], callable $configurator = null)
     {
         return $this->fullHttpRequest($url, function (Context $context) use ($post, $configurator) {
             $configurator = $this->modifyConfigurator($configurator, static::MODE_JSON);
@@ -183,7 +183,7 @@ public function httpPost($url, array $post = [], callable $configurator = null)
         }, 'POST');
     }
 
-    public function initApp($url = '/', callable $configurator = null, $method = 'GET')
+    protected function initApp($url = '/', callable $configurator = null, $method = 'GET')
     {
         $context = $this->mockFramework($url, $method);
         $environment = $context->get(Environment::class);
@@ -214,7 +214,7 @@ public function initApp($url = '/', callable $configurator = null, $method = 'GE
      * @param callable|null $configurator
      * @param string $method
      */
-    public function fullHttpRequest($url, callable $configurator = null, $method = 'GET')
+    protected function fullHttpRequest($url, callable $configurator = null, $method = 'GET')
     {
         $initialized = $this->initApp($url, $configurator, $method);
         if (!$initialized) {
@@ -248,7 +248,7 @@ public function fullHttpRequest($url, callable $configurator = null, $method = '
     /**
      * @return Context
      */
-    public function getContext()
+    protected function getContext()
     {
         return $this->context;
     }
@@ -257,7 +257,7 @@ public function getContext()
      * @return Response
      * @throws \Exception
      */
-    public function getResponse()
+    protected function getResponse()
     {
         return $this->getContext()->get(Response::class);
     }
@@ -266,7 +266,7 @@ public function getResponse()
      * @return mixed|string|array|null
      * @throws \Exception
      */
-    public function getOutput()
+    protected function getOutput()
     {
         return $this->getResponse()->getOutput();
     }
@@ -275,7 +275,7 @@ public function getOutput()
      * @return mixed|string|array|null
      * @throws \Exception
      */
-    public function getDecodedOutput()
+    protected function getDecodedOutput()
     {
         return json_decode($this->getOutput(), true);
     }
diff --git a/src/Pckg/Framework/Test/Transactions.php b/src/Pckg/Framework/Test/Transactions.php
index e76541c3..a615e8e9 100644
--- a/src/Pckg/Framework/Test/Transactions.php
+++ b/src/Pckg/Framework/Test/Transactions.php
@@ -15,12 +15,12 @@ trait Transactions
      */
     protected $mock;
 
-    public function startTransactions()
+    protected function startTransactions()
     {
         return $this;
     }
 
-    public function dropTransactions()
+    protected function dropTransactions()
     {
         return $this;
     }

From a3838ebe2c605a929e8442c2163ddbdf11c59711 Mon Sep 17 00:00:00 2001
From: Bojan Rajh <schtr4jh@schtr4jh.net>
Date: Tue, 25 May 2021 14:22:49 +0200
Subject: [PATCH 39/66] Update runners path

---
 .../Environment/Command/DefinePathsCest.php   | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/tests/unit/Framework/Environment/Command/DefinePathsCest.php b/tests/unit/Framework/Environment/Command/DefinePathsCest.php
index ff2d091e..cd475108 100644
--- a/tests/unit/Framework/Environment/Command/DefinePathsCest.php
+++ b/tests/unit/Framework/Environment/Command/DefinePathsCest.php
@@ -11,20 +11,21 @@ class DefinePathsCest extends Cest
 
     public function testConfig()
     {
+        $path = codecept_root_dir();
         $paths = [
             'ds' => '/',
-            'root' => '/var/www/html/',
-            'apps' => '/var/www/html/app/',
-            'src' => '/var/www/html/src/',
-            'storage' => '/var/www/html/storage/',
-            'private' => '/var/www/html/storage/private/',
-            'public' => '/var/www/html/storage/public/',
-            'www' => '/var/www/html/www/',
-            'cache' => '/var/www/html/storage/cache/',
-            'tmp' => '/var/www/html/storage/tmp/',
-            'uploads' => '/var/www/html/storage/uploads/',
-            'vendor' => '/var/www/html/vendor/',
-            'build' => '/var/www/html/build/',
+            'root' => $path,
+            'apps' => $path . 'app/',
+            'src' => $path . 'src/',
+            'storage' => $path . 'storage/',
+            'private' => $path . 'storage/private/',
+            'public' => $path . 'storage/public/',
+            'www' => $path . 'www/',
+            'cache' => $path . 'storage/cache/',
+            'tmp' => $path . 'storage/tmp/',
+            'uploads' => $path . 'storage/uploads/',
+            'vendor' => $path . 'vendor/',
+            'build' => $path . 'build/',
         ];
 
         $preRegistered = true;

From e54810fa3534973d3ed8363fff4563a010f5af21 Mon Sep 17 00:00:00 2001
From: Bojan Rajh <schtr4jh@schtr4jh.net>
Date: Tue, 25 May 2021 14:26:07 +0200
Subject: [PATCH 40/66] Composer

---
 composer.lock | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/composer.lock b/composer.lock
index c8cdcc1a..e841112a 100644
--- a/composer.lock
+++ b/composer.lock
@@ -8,16 +8,16 @@
     "packages": [
         {
             "name": "doctrine/cache",
-            "version": "1.11.2",
+            "version": "1.11.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/cache.git",
-                "reference": "9c53086695937c50c47936ed86d96150ffbcf60d"
+                "reference": "3bb5588cec00a0268829cc4a518490df6741af9d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/cache/zipball/9c53086695937c50c47936ed86d96150ffbcf60d",
-                "reference": "9c53086695937c50c47936ed86d96150ffbcf60d",
+                "url": "https://api.github.com/repos/doctrine/cache/zipball/3bb5588cec00a0268829cc4a518490df6741af9d",
+                "reference": "3bb5588cec00a0268829cc4a518490df6741af9d",
                 "shasum": ""
             },
             "require": {
@@ -87,7 +87,7 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/cache/issues",
-                "source": "https://github.com/doctrine/cache/tree/1.11.2"
+                "source": "https://github.com/doctrine/cache/tree/1.11.3"
             },
             "funding": [
                 {
@@ -103,7 +103,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-05-20T14:57:29+00:00"
+            "time": "2021-05-25T09:01:55+00:00"
         },
         {
             "name": "ezyang/htmlpurifier",
@@ -687,17 +687,19 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/pckg/concept.git",
-                "reference": "0dbe6040750553e6986ecce35af6b642e615d91d"
+                "reference": "ad33e34461069df7d0f2084282ca95815b5d6170"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pckg/concept/zipball/0dbe6040750553e6986ecce35af6b642e615d91d",
-                "reference": "0dbe6040750553e6986ecce35af6b642e615d91d",
+                "url": "https://api.github.com/repos/pckg/concept/zipball/ad33e34461069df7d0f2084282ca95815b5d6170",
+                "reference": "ad33e34461069df7d0f2084282ca95815b5d6170",
                 "shasum": ""
             },
             "require-dev": {
                 "pckg-app/frontend-dev": "dev-master",
-                "pckg/framework": "dev-master"
+                "pckg/framework": "dev-master-yoda",
+                "pckg/htmlbuilder": "dev-master",
+                "pckg/manager": "dev-master"
             },
             "default-branch": true,
             "type": "library",
@@ -706,7 +708,8 @@
                     "Pckg": "src\\"
                 },
                 "files": [
-                    "src/Pckg/Concept/Helper/functions.php"
+                    "src/Pckg/Concept/Helper/functions.php",
+                    "src/Pckg/Concept/Helper/functions_bc.php"
                 ]
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -725,7 +728,7 @@
                 "issues": "https://github.com/pckg/concept/issues",
                 "source": "https://github.com/pckg/concept/tree/master"
             },
-            "time": "2021-04-06T14:26:50+00:00"
+            "time": "2021-05-25T12:23:46+00:00"
         },
         {
             "name": "pckg/database",

From b917e1df7f1fc626f131ea5f3361e4453a0c7277 Mon Sep 17 00:00:00 2001
From: Bojan Rajh <schtr4jh@schtr4jh.net>
Date: Wed, 26 May 2021 09:38:35 +0200
Subject: [PATCH 41/66] Move to trait

---
 src/Pckg/Framework/Test/Codeception/Cest.php       |  2 +-
 src/Pckg/Framework/Test/MockRouter.php             | 14 +++-----------
 tests/unit/ConfigCest.php                          |  6 +++++-
 .../Application/Command/InitDatabaseCest.php       |  4 ++--
 .../Command/RegisterApplicationCest.php            |  5 +++--
 .../Application/Console/Command/RunCommandCest.php |  4 ++--
 tests/unit/Framework/Application/ConsoleCest.php   |  4 ++--
 tests/unit/Framework/Application/QueueCest.php     |  4 ++--
 tests/unit/Framework/Application/WebsiteCest.php   |  4 ++--
 .../Framework/Config/Command/InitConfigCest.php    |  4 ++--
 .../Environment/Command/DefinePathsCest.php        |  3 ++-
 tests/unit/Framework/Environment/ConsoleCest.php   |  3 ++-
 .../Framework/Reflect/FrameworkResolverCest.php    |  3 ++-
 .../Framework/Router/Command/ResolveRouteCest.php  |  5 ++---
 tests/unit/RequestDataCest.php                     |  5 ++++-
 15 files changed, 36 insertions(+), 34 deletions(-)

diff --git a/src/Pckg/Framework/Test/Codeception/Cest.php b/src/Pckg/Framework/Test/Codeception/Cest.php
index 65367917..1b4d7b0f 100644
--- a/src/Pckg/Framework/Test/Codeception/Cest.php
+++ b/src/Pckg/Framework/Test/Codeception/Cest.php
@@ -6,7 +6,7 @@
 use Pckg\Framework\Test\MockFramework;
 use UnitTester;
 
-class Cest
+trait Cest
 {
     //use Specify;
     use MockFramework;
diff --git a/src/Pckg/Framework/Test/MockRouter.php b/src/Pckg/Framework/Test/MockRouter.php
index 46b9796c..f24cb70c 100644
--- a/src/Pckg/Framework/Test/MockRouter.php
+++ b/src/Pckg/Framework/Test/MockRouter.php
@@ -13,24 +13,16 @@
  */
 trait MockRouter
 {
-    protected Router $mockedRouter;
-
     protected function mockRouter(): Router
     {
-        if (!isset($this->mockedRouter)) {
-            $this->mockedRouter = new Router($this->context->get(Config::class));
-            $this->context->bind(Router::class, $this->mockedRouter);
-            //$this->mockInContext($this->mockedRouter);
-        }
+        $router = new Router($this->context->get(Config::class));
+        $this->context->bind(Router::class, $router);
 
-        return $this->mockedRouter;
+        return $router;
     }
 
     protected function fetchRouter(): Router
     {
-        if (isset($this->mockedRouter)) {
-            return $this->mockedRouter;
-        }
         if ($this->context->exists(Router::class)) {
             return $this->context->get(Router::class);
         }
diff --git a/tests/unit/ConfigCest.php b/tests/unit/ConfigCest.php
index 14ff122a..863d7eb9 100644
--- a/tests/unit/ConfigCest.php
+++ b/tests/unit/ConfigCest.php
@@ -1,8 +1,12 @@
 <?php
 
-class ConfigCest extends \Pckg\Framework\Test\Codeception\Cest
+use Pckg\Framework\Test\Codeception\Cest;
+
+class ConfigCest
 {
 
+    use Cest;
+
     // tests
     public function defaultConfigTest(UnitTester $I)
     {
diff --git a/tests/unit/Framework/Application/Command/InitDatabaseCest.php b/tests/unit/Framework/Application/Command/InitDatabaseCest.php
index ddd8b171..2118d049 100644
--- a/tests/unit/Framework/Application/Command/InitDatabaseCest.php
+++ b/tests/unit/Framework/Application/Command/InitDatabaseCest.php
@@ -6,9 +6,9 @@
 use Pckg\Framework\Test\Codeception\Cest;
 use Pckg\Framework\Test\ContextDiff;
 
-class InitDatabaseCest extends Cest
+class InitDatabaseCest
 {
-
+    use Cest;
     use ContextDiff;
 
     protected \UnitTester $unitTester;
diff --git a/tests/unit/Framework/Application/Command/RegisterApplicationCest.php b/tests/unit/Framework/Application/Command/RegisterApplicationCest.php
index 4e4a2719..bbf89941 100644
--- a/tests/unit/Framework/Application/Command/RegisterApplicationCest.php
+++ b/tests/unit/Framework/Application/Command/RegisterApplicationCest.php
@@ -2,14 +2,15 @@
 
 namespace Test\Framework\Application\Command;
 
+use Pckg\Framework\Test\Codeception\Cest;
 use Pckg\Framework\Test\ContextDiff;
 use Pckg\Framework\Test\ListenForEvents;
 use Pckg\Framework\Test\MockConfig;
 use Pckg\Framework\Test\MockInContext;
 
-class RegisterApplicationCest extends \Pckg\Framework\Test\Codeception\Cest
+class RegisterApplicationCest
 {
-
+    use Cest;
     use ContextDiff;
     use ListenForEvents;
     use MockConfig;
diff --git a/tests/unit/Framework/Application/Console/Command/RunCommandCest.php b/tests/unit/Framework/Application/Console/Command/RunCommandCest.php
index 69b3cd4d..fa177296 100644
--- a/tests/unit/Framework/Application/Console/Command/RunCommandCest.php
+++ b/tests/unit/Framework/Application/Console/Command/RunCommandCest.php
@@ -14,9 +14,9 @@
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Output\NullOutput;
 
-class RunCommandCest extends Cest
+class RunCommandCest
 {
-
+    use Cest;
     use ContextDiff;
     use ListenForEvents;
     use MockConfig;
diff --git a/tests/unit/Framework/Application/ConsoleCest.php b/tests/unit/Framework/Application/ConsoleCest.php
index bc10ff4f..e78076c7 100644
--- a/tests/unit/Framework/Application/ConsoleCest.php
+++ b/tests/unit/Framework/Application/ConsoleCest.php
@@ -8,9 +8,9 @@
 use Pckg\Framework\Test\MockConfig;
 use Pckg\Framework\Test\MockInContext;
 
-class ConsoleCest extends Cest
+class ConsoleCest
 {
-
+    use Cest;
     use ContextDiff;
     use ListenForEvents;
     use MockConfig;
diff --git a/tests/unit/Framework/Application/QueueCest.php b/tests/unit/Framework/Application/QueueCest.php
index 5842b1cf..fa66dfc1 100644
--- a/tests/unit/Framework/Application/QueueCest.php
+++ b/tests/unit/Framework/Application/QueueCest.php
@@ -8,9 +8,9 @@
 use Pckg\Framework\Test\MockConfig;
 use Pckg\Framework\Test\MockInContext;
 
-class QueueCest extends Cest
+class QueueCest
 {
-
+    use Cest;
     use ContextDiff;
     use ListenForEvents;
     use MockConfig;
diff --git a/tests/unit/Framework/Application/WebsiteCest.php b/tests/unit/Framework/Application/WebsiteCest.php
index 751465f4..ca851290 100644
--- a/tests/unit/Framework/Application/WebsiteCest.php
+++ b/tests/unit/Framework/Application/WebsiteCest.php
@@ -8,9 +8,9 @@
 use Pckg\Framework\Test\MockConfig;
 use Pckg\Framework\Test\MockInContext;
 
-class WebsiteCest extends Cest
+class WebsiteCest
 {
-
+    use Cest;
     use ContextDiff;
     use ListenForEvents;
     use MockConfig;
diff --git a/tests/unit/Framework/Config/Command/InitConfigCest.php b/tests/unit/Framework/Config/Command/InitConfigCest.php
index 84471b79..e32247bf 100644
--- a/tests/unit/Framework/Config/Command/InitConfigCest.php
+++ b/tests/unit/Framework/Config/Command/InitConfigCest.php
@@ -9,9 +9,9 @@
 use Pckg\Framework\Test\MockConfig;
 use Pckg\Framework\Test\MockInContext;
 
-class InitConfigCest extends Cest
+class InitConfigCest
 {
-
+    use Cest;
     use ContextDiff;
     use ListenForEvents;
     use MockConfig;
diff --git a/tests/unit/Framework/Environment/Command/DefinePathsCest.php b/tests/unit/Framework/Environment/Command/DefinePathsCest.php
index cd475108..db5e710e 100644
--- a/tests/unit/Framework/Environment/Command/DefinePathsCest.php
+++ b/tests/unit/Framework/Environment/Command/DefinePathsCest.php
@@ -6,8 +6,9 @@
 use Pckg\Framework\Test\Codeception\Cest;
 use Pckg\Framework\Test\MockConfig;
 
-class DefinePathsCest extends Cest
+class DefinePathsCest
 {
+    use Cest;
 
     public function testConfig()
     {
diff --git a/tests/unit/Framework/Environment/ConsoleCest.php b/tests/unit/Framework/Environment/ConsoleCest.php
index e172400c..a38a107a 100644
--- a/tests/unit/Framework/Environment/ConsoleCest.php
+++ b/tests/unit/Framework/Environment/ConsoleCest.php
@@ -9,8 +9,9 @@
 use Pckg\Framework\Test\ListenForEvents;
 use Pckg\Framework\Test\MockConfig;
 
-class ConsoleCest extends Cest
+class ConsoleCest
 {
+    use Cest;
     use MockConfig;
     use ListenForEvents;
 
diff --git a/tests/unit/Framework/Reflect/FrameworkResolverCest.php b/tests/unit/Framework/Reflect/FrameworkResolverCest.php
index 3d343c2d..f8e14e7b 100644
--- a/tests/unit/Framework/Reflect/FrameworkResolverCest.php
+++ b/tests/unit/Framework/Reflect/FrameworkResolverCest.php
@@ -18,8 +18,9 @@
 use Pckg\Manager\Meta;
 use Pckg\Manager\Seo;
 
-class FrameworkResolverCest extends Cest
+class FrameworkResolverCest
 {
+    use Cest;
 
     protected function createFrameworkResolver(): FrameworkResolver
     {
diff --git a/tests/unit/Framework/Router/Command/ResolveRouteCest.php b/tests/unit/Framework/Router/Command/ResolveRouteCest.php
index 0c5af89d..df20fe5d 100644
--- a/tests/unit/Framework/Router/Command/ResolveRouteCest.php
+++ b/tests/unit/Framework/Router/Command/ResolveRouteCest.php
@@ -2,16 +2,15 @@
 
 namespace Test\Framework\Router\Command;
 
-use Pckg\Framework\Router;
 use Pckg\Framework\Router\Command\ResolveRoute;
 use Pckg\Framework\Test\Codeception\Cest;
 use Pckg\Framework\Test\MockConfig;
 use Pckg\Framework\Test\MockExceptions;
 use Pckg\Framework\Test\MockRouter;
 
-class ResolveRouteCest extends Cest
+class ResolveRouteCest
 {
-
+    use Cest;
     use MockConfig;
     use MockExceptions;
     use MockRouter;
diff --git a/tests/unit/RequestDataCest.php b/tests/unit/RequestDataCest.php
index 1cb6e516..e96e2247 100644
--- a/tests/unit/RequestDataCest.php
+++ b/tests/unit/RequestDataCest.php
@@ -1,7 +1,10 @@
 <?php
 
-class RequestDataCest extends \Pckg\Framework\Test\Codeception\Cest
+use Pckg\Framework\Test\Codeception\Cest;
+
+class RequestDataCest
 {
+    use Cest;
 
     // tests
     public function defaultRequestDataTest(UnitTester $I)

From cb39501a1c0cf744ba78a863fe3ddacd7238b7fe Mon Sep 17 00:00:00 2001
From: Bojan Rajh <schtr4jh@schtr4jh.net>
Date: Wed, 26 May 2021 12:43:02 +0200
Subject: [PATCH 42/66] Update sort

---
 src/Pckg/Framework/Test/Helper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Pckg/Framework/Test/Helper.php b/src/Pckg/Framework/Test/Helper.php
index ade17d20..4f8342b2 100644
--- a/src/Pckg/Framework/Test/Helper.php
+++ b/src/Pckg/Framework/Test/Helper.php
@@ -121,7 +121,7 @@ public function importDatabase($filename)
         }
     }
 
-    public function listenToQueries($type = null, $sort = true)
+    public function listenToQueries($type = null, $sort = false)
     {
         $this->sqls = [];
 

From b0e2f41be57a8d318135d6f26ed028ef70474e4c Mon Sep 17 00:00:00 2001
From: Bojan Rajh <schtr4jh@schtr4jh.net>
Date: Wed, 26 May 2021 12:45:41 +0200
Subject: [PATCH 43/66] Disable fw in env test

---
 tests/unit/Framework/EnvironmentCest.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tests/unit/Framework/EnvironmentCest.php b/tests/unit/Framework/EnvironmentCest.php
index e7a57e19..cdaa78c7 100644
--- a/tests/unit/Framework/EnvironmentCest.php
+++ b/tests/unit/Framework/EnvironmentCest.php
@@ -4,15 +4,18 @@
 
 use Pckg\Framework\Config;
 use Pckg\Framework\Environment;
+use Pckg\Framework\Test\Codeception\Cest;
 use Pckg\Framework\Test\ListenForEvents;
 use Pckg\Framework\Test\MockContext;
 
 class EnvironmentCest
 {
-
+    use Cest;
     use MockContext;
     use ListenForEvents;
 
+    protected $disableFramework = true;
+
     public function testEnvironment(\UnitTester $I)
     {
         $context = $this->mockContext();

From 3ed180fbb4690f921c3bae2460940477103fcaea Mon Sep 17 00:00:00 2001
From: Bojan Rajh <schtr4jh@schtr4jh.net>
Date: Sun, 6 Jun 2021 22:25:02 +0200
Subject: [PATCH 44/66] Update route resolving and server global

---
 .../Command/RegisterApplication.php           |  8 +++--
 .../Framework/Config/Command/InitConfig.php   |  9 +++++-
 src/Pckg/Framework/Environment/Console.php    |  4 ++-
 src/Pckg/Framework/Provider/Framework.php     |  1 +
 .../Router/Command/ResolveDependencies.php    |  6 +++-
 .../Framework/Router/Command/ResolveRoute.php | 11 +++++--
 .../Framework/Router/Console/MatchRoute.php   | 29 +++++++++++++++++++
 7 files changed, 61 insertions(+), 7 deletions(-)
 create mode 100644 src/Pckg/Framework/Router/Console/MatchRoute.php

diff --git a/src/Pckg/Framework/Application/Command/RegisterApplication.php b/src/Pckg/Framework/Application/Command/RegisterApplication.php
index bdb9bb09..b1faf239 100644
--- a/src/Pckg/Framework/Application/Command/RegisterApplication.php
+++ b/src/Pckg/Framework/Application/Command/RegisterApplication.php
@@ -34,9 +34,13 @@ public function execute(callable $next)
         // 0.44 -> 0.97 / 1.03 = 0.53s = 50%
 
         /**
-         * Parse application config.
+         * (Re)Parse application config? Becaaaaause?
+         * @deprecated
+         * If this needs to be reactivated, hook this to EVENT_REGISTERED ?
+         * Do we always want to re-read config and re-localize when providers are registered?
+         * Okay for Localize? No for InitConfig? Shouldn't they be able to change config in runtime?
          */
-        $this->config->parseDir(path('app'));
+        resolve(Config\Command\InitConfig::class)->execute(function() {});
 
         /**
          * Localize any config changes.
diff --git a/src/Pckg/Framework/Config/Command/InitConfig.php b/src/Pckg/Framework/Config/Command/InitConfig.php
index 7252ac93..fe46cc9f 100644
--- a/src/Pckg/Framework/Config/Command/InitConfig.php
+++ b/src/Pckg/Framework/Config/Command/InitConfig.php
@@ -20,7 +20,14 @@ public function __construct(Config $config)
 
     public function execute(callable $next)
     {
-        $this->config->parseDir(path('app'));
+        $path = null;
+        try {
+            $path = path('app');
+        } catch (\Throwable $e) {
+            return $next();
+        }
+
+        $this->config->parseDir($path);
 
         return $next();
     }
diff --git a/src/Pckg/Framework/Environment/Console.php b/src/Pckg/Framework/Environment/Console.php
index e5b947fc..eeabe816 100644
--- a/src/Pckg/Framework/Environment/Console.php
+++ b/src/Pckg/Framework/Environment/Console.php
@@ -4,6 +4,7 @@
 
 use Pckg\Concept\Context;
 use Pckg\Framework\Environment;
+use Pckg\Framework\Request\Data\Server;
 use Whoops\Handler\PlainTextHandler;
 use Whoops\Run;
 use Symfony\Component\Console\Application as SymfonyConsole;
@@ -20,6 +21,7 @@ public function register()
         ini_set("display_errors", "1");
 
         $this->config->parseDir(BASE_PATH);
+        $this->context->bind(Server::class, (new Server())->setFromGlobals());
 
         $this->registerExceptionHandler();
 
@@ -42,7 +44,7 @@ public function createApplication(\Pckg\Framework\Helper\Context $context, $appN
          *  - php console derive
          *  - php console derive migrator:install
          */
-        $argv = $_SERVER['argv'];
+        $argv = server('argv');
         $commandIndex = null;
         foreach ($argv as $key => $arg) {
             if (strpos($arg, ':')) {
diff --git a/src/Pckg/Framework/Provider/Framework.php b/src/Pckg/Framework/Provider/Framework.php
index 583be28d..3d925c30 100644
--- a/src/Pckg/Framework/Provider/Framework.php
+++ b/src/Pckg/Framework/Provider/Framework.php
@@ -33,6 +33,7 @@ public function consoles()
             CreatePckgProject::class,
             ClearCache::class,
             ListRoutes::class,
+            Router\Console\MatchRoute::class,
         ];
     }
 
diff --git a/src/Pckg/Framework/Router/Command/ResolveDependencies.php b/src/Pckg/Framework/Router/Command/ResolveDependencies.php
index a200759e..8ca944a9 100644
--- a/src/Pckg/Framework/Router/Command/ResolveDependencies.php
+++ b/src/Pckg/Framework/Router/Command/ResolveDependencies.php
@@ -2,7 +2,9 @@
 
 namespace Pckg\Framework\Router\Command;
 
+use Pckg\Concept\Resolver;
 use Pckg\Framework\Provider\ResolvesMultiple;
+use Pckg\Framework\Provider\RouteResolver;
 use Pckg\Framework\Router;
 
 class ResolveDependencies
@@ -69,7 +71,9 @@ public function execute()
             }
 
             $k = $data[$urlKey] ?? null;
-            $resolved = $realResolver->resolve(urldecode($k));
+            $resolved = is_object($realResolver) && \Pckg\Concept\Helper\object_implements($realResolver, RouteResolver::class)
+                ? $realResolver->resolve(urldecode($k))
+                : $realResolver;
 
             /**
              * Validate resolved value for access?
diff --git a/src/Pckg/Framework/Router/Command/ResolveRoute.php b/src/Pckg/Framework/Router/Command/ResolveRoute.php
index 476c900e..00862743 100644
--- a/src/Pckg/Framework/Router/Command/ResolveRoute.php
+++ b/src/Pckg/Framework/Router/Command/ResolveRoute.php
@@ -82,8 +82,15 @@ public function execute()
                     }
 
                     // validate method
-                    if (isset($conf['method']) && !empty($conf['method']) && !in_array(strtolower($_SERVER['REQUEST_METHOD']), explode("|", strtolower($conf['method'])))) {
-                        continue;
+                    $methods = $conf['method'] ?? null;
+                    if ($methods && !is_array($methods)) {
+                        $methods = explode('|', $methods);
+                    }
+                    if ($methods) {
+                        $methods = collect($methods)->mapFn('strtolower')->all();
+                        if (!in_array(strtolower(server()->get('REQUEST_METHOD', '')), $methods)) {
+                            continue;
+                        }
                     }
 
                     $arrRoutes = explode("/", substr($conf["url"], 1));
diff --git a/src/Pckg/Framework/Router/Console/MatchRoute.php b/src/Pckg/Framework/Router/Console/MatchRoute.php
new file mode 100644
index 00000000..5bc168a5
--- /dev/null
+++ b/src/Pckg/Framework/Router/Console/MatchRoute.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Pckg\Framework\Router\Console;
+
+use Pckg\Framework\Console\Command;
+use Pckg\Framework\Router\Command\ResolveRoute;
+use Symfony\Component\Console\Helper\Table;
+use Symfony\Component\Console\Helper\TableCell;
+use Symfony\Component\Console\Helper\TableSeparator;
+use Symfony\Component\Console\Input\InputOption;
+
+class MatchRoute extends Command
+{
+
+    protected function configure()
+    {
+        $this->setName('router:match')
+             ->setDescription(
+                 'Match single route'
+             )
+             ->addArgument('route');
+    }
+
+    public function handle()
+    {
+        $resolveRoute = resolve(ResolveRoute::class, ['url' => 'https://localhost' . $this->argument('route')])->execute();
+        ddd($resolveRoute);
+    }
+}

From f2ef8cd4c86bc6183e4f18424c04af9ef3a707ae Mon Sep 17 00:00:00 2001
From: Bojan Rajh <schtr4jh@schtr4jh.net>
Date: Wed, 9 Jun 2021 09:41:28 +0200
Subject: [PATCH 45/66] Forward, cookie delete

---
 src/Pckg/Framework/Helper/functions.php    | 10 ++++++++++
 src/Pckg/Framework/Helper/functions_bc.php |  7 +++++++
 src/Pckg/Framework/Request/Data/Cookie.php |  2 ++
 3 files changed, 19 insertions(+)

diff --git a/src/Pckg/Framework/Helper/functions.php b/src/Pckg/Framework/Helper/functions.php
index b9866f11..e1b5e38e 100644
--- a/src/Pckg/Framework/Helper/functions.php
+++ b/src/Pckg/Framework/Helper/functions.php
@@ -1422,4 +1422,14 @@ function prependIf($prepend, $is)
         return $is ? $prepend . $is : '';
     }
 
+    function forward($input, callable $task)
+    {
+        $task($input);
+
+        return $input;
+    }
+
+    function tryout() {
+
+    }
 }
diff --git a/src/Pckg/Framework/Helper/functions_bc.php b/src/Pckg/Framework/Helper/functions_bc.php
index facc6a85..d1a0daa4 100644
--- a/src/Pckg/Framework/Helper/functions_bc.php
+++ b/src/Pckg/Framework/Helper/functions_bc.php
@@ -965,3 +965,10 @@ function prependIf($prepend, $is)
         return Framework\Helper\prependIf($prepend, $is);
     }
 }
+
+if (!function_exists('forward')) {
+    function forward($input, callable $task)
+    {
+        return Framework\Helper\forward($input, $task);
+    }
+}
diff --git a/src/Pckg/Framework/Request/Data/Cookie.php b/src/Pckg/Framework/Request/Data/Cookie.php
index da14cb88..e0995535 100644
--- a/src/Pckg/Framework/Request/Data/Cookie.php
+++ b/src/Pckg/Framework/Request/Data/Cookie.php
@@ -45,6 +45,8 @@ public function set($name, $value = '', $expiration = self::DURATION_MONTH, $pat
     public function delete($name)
     {
         $this->set($name, null, -1 * static::EXPIRATION);
+        unset($this->data[$name]);
+
         return $this;
     }
 }

From def219702d8304cdb5958df5f7238bda53c95505 Mon Sep 17 00:00:00 2001
From: Bojan Rajh <schtr4jh@schtr4jh.net>
Date: Mon, 21 Jun 2021 17:36:43 +0200
Subject: [PATCH 46/66] Cleanup delimiters

---
 src/Pckg/Framework/public/js/pckg-generic-app-top.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/Pckg/Framework/public/js/pckg-generic-app-top.js b/src/Pckg/Framework/public/js/pckg-generic-app-top.js
index 56f218e6..ff9aa44d 100644
--- a/src/Pckg/Framework/public/js/pckg-generic-app-top.js
+++ b/src/Pckg/Framework/public/js/pckg-generic-app-top.js
@@ -1,7 +1,3 @@
-export const pckgDelimiters = {
-    delimiters: ['${', '}']
-};
-
 export const pckgSpannify = {
     methods: {
         spannify: function (text) {
@@ -259,4 +255,4 @@ export const pckgNativeEvents = {
             $(element).off(callback);
         }
     }
-};
\ No newline at end of file
+};

From d082a85ac218cc3aa6152a8d12e3058b38995e74 Mon Sep 17 00:00:00 2001
From: Bojan Rajh <schtr4jh@schtr4jh.net>
Date: Mon, 28 Jun 2021 13:45:06 +0200
Subject: [PATCH 47/66] Reverse

---
 composer.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 850c79d5..2fd74051 100644
--- a/composer.json
+++ b/composer.json
@@ -42,8 +42,8 @@
       "Pckg": "src\\"
     },
     "files": [
-      "src/Pckg/Framework/Helper/functions.php",
-      "src/Pckg/Framework/Helper/functions_bc.php"
+      "src/Pckg/Framework/Helper/functions_bc.php",
+      "src/Pckg/Framework/Helper/functions.php"
     ]
   },
   "scripts": {

From dade0b89c4aa86f0e8ee4af62e884700bda5b603 Mon Sep 17 00:00:00 2001
From: Bojan Rajh <schtr4jh@schtr4jh.net>
Date: Fri, 2 Jul 2021 13:59:39 +0200
Subject: [PATCH 48/66] Implement randomKey()

---
 src/Pckg/Framework/Helper/functions.php    | 7 ++++++-
 src/Pckg/Framework/Helper/functions_bc.php | 7 +++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/Pckg/Framework/Helper/functions.php b/src/Pckg/Framework/Helper/functions.php
index e1b5e38e..fb9344b3 100644
--- a/src/Pckg/Framework/Helper/functions.php
+++ b/src/Pckg/Framework/Helper/functions.php
@@ -1287,7 +1287,12 @@ function timef($date, $format = null)
 
     function sha1random()
     {
-        return sha1(\Defuse\Crypto\Key::createNewRandomKey()->saveToAsciiSafeString());
+        return sha1(randomKey());
+    }
+
+    function randomKey()
+    {
+        return \Defuse\Crypto\Key::createNewRandomKey()->saveToAsciiSafeString();
     }
 
     function filename($file)
diff --git a/src/Pckg/Framework/Helper/functions_bc.php b/src/Pckg/Framework/Helper/functions_bc.php
index d1a0daa4..84fd1233 100644
--- a/src/Pckg/Framework/Helper/functions_bc.php
+++ b/src/Pckg/Framework/Helper/functions_bc.php
@@ -889,6 +889,13 @@ function sha1random()
     }
 }
 
+if (!function_exists('randomKey')) {
+    function randomKey()
+    {
+        return Framework\Helper\randomKey();
+    }
+}
+
 if (!function_exists('filename')) {
     function filename($file)
     {

From d911199fb153beeb779f6e0fd2b00a613a507ab2 Mon Sep 17 00:00:00 2001
From: Bojan Rajh <schtr4jh@schtr4jh.net>
Date: Sat, 31 Jul 2021 11:03:54 +0200
Subject: [PATCH 49/66] Vue route

---
 src/Pckg/Framework/Helper/functions.php              | 12 ++++--------
 src/Pckg/Framework/Helper/functions_bc.php           |  2 +-
 .../Framework/Provider/Helper/EntityResolver.php     |  2 +-
 src/Pckg/Framework/Router/Route/Group.php            |  3 ++-
 src/Pckg/Framework/Router/Route/VueRoute.php         |  9 +++++++++
 5 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/Pckg/Framework/Helper/functions.php b/src/Pckg/Framework/Helper/functions.php
index fb9344b3..b04976df 100644
--- a/src/Pckg/Framework/Helper/functions.php
+++ b/src/Pckg/Framework/Helper/functions.php
@@ -4,6 +4,8 @@
 
     use Carbon\Carbon;
     use Exception;
+    use Hub\Controller\VendorsApi;
+    use Hub\Resolver\Vendor;
     use Pckg\Auth\Service\Auth;
     use Pckg\Concept\ChainOfResponsibility;
     use Pckg\Concept\Event\AbstractEvent;
@@ -1100,15 +1102,9 @@ function vueRoute(string $route = '', string $component = null, array $tags = []
         ])->children($children);
     }
 
-    function routeGroup($data = [], $routes = [])
+    function routeGroup(array $data, array $routes)
     {
-        $routeGroup = new Group($data);
-
-        if ($routes) {
-            $routeGroup->routes($routes);
-        }
-
-        return $routeGroup;
+        return new Group($data, $routes);
     }
 
     function component($component, array $params = [])
diff --git a/src/Pckg/Framework/Helper/functions_bc.php b/src/Pckg/Framework/Helper/functions_bc.php
index 84fd1233..5826f023 100644
--- a/src/Pckg/Framework/Helper/functions_bc.php
+++ b/src/Pckg/Framework/Helper/functions_bc.php
@@ -771,7 +771,7 @@ function vueRoute(string $route = '', string $component = null, array $tags = []
 }
 
 if (!function_exists('routeGroup')) {
-    function routeGroup($data = [], $routes = [])
+    function routeGroup(array $data, array $routes)
     {
         return Framework\Helper\routeGroup($data, $routes);
     }
diff --git a/src/Pckg/Framework/Provider/Helper/EntityResolver.php b/src/Pckg/Framework/Provider/Helper/EntityResolver.php
index 5fb95eef..aa4c18ba 100644
--- a/src/Pckg/Framework/Provider/Helper/EntityResolver.php
+++ b/src/Pckg/Framework/Provider/Helper/EntityResolver.php
@@ -25,7 +25,7 @@ public function by($field)
 
     public function getBy()
     {
-        return $this->by ?? 'id';
+        return $this->by ?? ($this->e->getAliased() . '.id');
     }
 
     public function parametrize($record)
diff --git a/src/Pckg/Framework/Router/Route/Group.php b/src/Pckg/Framework/Router/Route/Group.php
index f07ccc41..5fbeb370 100644
--- a/src/Pckg/Framework/Router/Route/Group.php
+++ b/src/Pckg/Framework/Router/Route/Group.php
@@ -11,9 +11,10 @@ class Group
 
     protected $groups = [];
 
-    public function __construct($data = [])
+    public function __construct($data = [], array $routes = [])
     {
         $this->data = $data;
+        $this->routes = $routes;
     }
 
     public function routes($routes = [])
diff --git a/src/Pckg/Framework/Router/Route/VueRoute.php b/src/Pckg/Framework/Router/Route/VueRoute.php
index 9286032b..7805f8ee 100644
--- a/src/Pckg/Framework/Router/Route/VueRoute.php
+++ b/src/Pckg/Framework/Router/Route/VueRoute.php
@@ -46,4 +46,13 @@ public function register($parentData)
 
         return [$url, $mergedData, $name];
     }
+    
+    public function seo(array $array = [])
+    {
+        foreach ($array as $key => $val) {
+            $this->data['tags']['seo:' . $key] = $val;
+        }
+
+        return $this;
+    }
 }

From b67064e443a60086ccd6a8c0060f9f38d3e59dfd Mon Sep 17 00:00:00 2001
From: Bojan Rajh <schtr4jh@schtr4jh.net>
Date: Mon, 2 Aug 2021 17:21:34 +0200
Subject: [PATCH 50/66] Download stream

---
 src/Pckg/Framework/Response.php | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/src/Pckg/Framework/Response.php b/src/Pckg/Framework/Response.php
index f1b19dbb..8ca2430f 100644
--- a/src/Pckg/Framework/Response.php
+++ b/src/Pckg/Framework/Response.php
@@ -576,6 +576,26 @@ public function download($file, $filename, callable $then = null)
         $this->readFile($file, $then);
     }
 
+    public function downloadStream($stream, $filename, $length, $close = true, callable $then = null)
+    {
+        $this->sendFileContentTypeHeaders($filename);
+        $this->sendFileDispositionHeader($filename);
+        
+        if ($length) {
+            header('Content-Length: ' . $length);
+        }
+        
+        $limit = 1024 * 1024 * 10;
+        while (!feof($stream)) {
+            echo fread($stream, $limit);
+            flush();
+        }
+
+        $then && $then();
+        fclose($stream);
+        exit;
+    }
+
     public function printFile($file, $filename = null)
     {
         if (!$filename) {

From 04f7809b6dbf40b1ac7e823da25c7dbea054d804 Mon Sep 17 00:00:00 2001
From: Bojan Rajh <schtr4jh@schtr4jh.net>
Date: Sat, 25 Sep 2021 18:37:33 +0200
Subject: [PATCH 51/66] Inherit resolvers

---
 src/Pckg/Framework/Router/Route/Route.php    | 18 ++++++++++++++++++
 src/Pckg/Framework/Router/Route/VueRoute.php |  3 ++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/Pckg/Framework/Router/Route/Route.php b/src/Pckg/Framework/Router/Route/Route.php
index eaf5d69e..8535a28b 100644
--- a/src/Pckg/Framework/Router/Route/Route.php
+++ b/src/Pckg/Framework/Router/Route/Route.php
@@ -110,6 +110,24 @@ public function resolvers($resolvers = [])
         return $this;
     }
 
+    public function getResolvers()
+    {
+        return $this->resolvers;
+    }
+    
+    public function inheritResolvers(Route $route)
+    {
+        foreach ($route->getResolvers() as $key => $resolver) {
+            if (isset($this->resolvers[$key])) {
+                continue;
+            }
+
+            $this->resolvers[$key] = $resolver;
+        }
+
+        return $this;
+    }
+
     public function afterwares($afterwares = [])
     {
         $this->afterwares = $afterwares;
diff --git a/src/Pckg/Framework/Router/Route/VueRoute.php b/src/Pckg/Framework/Router/Route/VueRoute.php
index 7805f8ee..f36266dc 100644
--- a/src/Pckg/Framework/Router/Route/VueRoute.php
+++ b/src/Pckg/Framework/Router/Route/VueRoute.php
@@ -41,12 +41,13 @@ public function register($parentData)
             $childRoute->data['tags'][] = 'vue:route:child';
             $parentData['urlPrefix'] = $url;
             $parentData['namePrefix'] = $name . '.' . $key;
+            $childRoute->inheritResolvers($this);
             $childRoute->register($parentData);
         }
 
         return [$url, $mergedData, $name];
     }
-    
+
     public function seo(array $array = [])
     {
         foreach ($array as $key => $val) {

From c2ec3a2afefe8bd993a87e8a1c1aa4b35efd03c9 Mon Sep 17 00:00:00 2001
From: Bojan Rajh <schtr4jh@schtr4jh.net>
Date: Sun, 26 Sep 2021 11:31:46 +0200
Subject: [PATCH 52/66] Handle self-response

---
 src/Pckg/Framework/Response/Command/ProcessRouteMatch.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Pckg/Framework/Response/Command/ProcessRouteMatch.php b/src/Pckg/Framework/Response/Command/ProcessRouteMatch.php
index a2483118..fc59f0e3 100644
--- a/src/Pckg/Framework/Response/Command/ProcessRouteMatch.php
+++ b/src/Pckg/Framework/Response/Command/ProcessRouteMatch.php
@@ -105,7 +105,9 @@ public function execute()
                  * This is where Resolvers may already Respond with final response.
                  */
                 $response = $this->loadView->set($match['view'], $resolved, $this->controller)->execute();
-                $this->response->setOutput($response);
+                if ($response !== $this->response) {
+                    $this->response->setOutput($response);
+                }
             } else {
                 /**
                  * Vue route or similar?

From 890d35e395f2e9264a99feb5830b4d91538f13a8 Mon Sep 17 00:00:00 2001
From: Bojan Rajh <schtr4jh@schtr4jh.net>
Date: Sun, 3 Oct 2021 09:29:15 +0200
Subject: [PATCH 53/66] Less dependant

---
 src/Pckg/Framework/Application/Website.php             | 1 -
 src/Pckg/Framework/Environment.php                     | 8 +-------
 src/Pckg/Framework/Provider/Helper/Registrator.php     | 8 ++++++++
 tests/unit/Framework/Reflect/FrameworkResolverCest.php | 1 -
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/Pckg/Framework/Application/Website.php b/src/Pckg/Framework/Application/Website.php
index bf4c66a2..59354e9f 100644
--- a/src/Pckg/Framework/Application/Website.php
+++ b/src/Pckg/Framework/Application/Website.php
@@ -44,7 +44,6 @@ public function runs()
     {
         return [
             RunRequest::class,
-            InitLastAssets::class,
             RunResponse::class,
         ];
     }
diff --git a/src/Pckg/Framework/Environment.php b/src/Pckg/Framework/Environment.php
index fe3e2036..57b06d3f 100644
--- a/src/Pckg/Framework/Environment.php
+++ b/src/Pckg/Framework/Environment.php
@@ -7,9 +7,8 @@
 use Pckg\Framework\Environment\Command\DefinePaths;
 use Pckg\Framework\Environment\Development;
 use Pckg\Framework\Environment\Production;
-use Pckg\Manager\Asset\AssetManager;
 
-class Environment implements AssetManager
+class Environment
 {
 
     protected $urlPrefix = '/index.php';
@@ -102,11 +101,6 @@ public function isUnix()
     {
     }
 
-    public function assets()
-    {
-        return [];
-    }
-
     /**
      * @param Helper\Context $context
      * @param                $appName
diff --git a/src/Pckg/Framework/Provider/Helper/Registrator.php b/src/Pckg/Framework/Provider/Helper/Registrator.php
index 4c42b3f2..7e388331 100644
--- a/src/Pckg/Framework/Provider/Helper/Registrator.php
+++ b/src/Pckg/Framework/Provider/Helper/Registrator.php
@@ -235,6 +235,10 @@ public function registerListeners($handlers)
 
     public function registerJobs($jobs)
     {
+        if (!$jobs) {
+            return;
+        }
+
         $jobManager = context()->getOrCreate(Job::class);
 
         foreach ($jobs as $job) {
@@ -248,6 +252,10 @@ public function registerTranslations()
             return;
         }
 
+        if (!class_exists(Translator::class)) {
+            return;
+        }
+
         $translatorService = context()->getOrCreate(Translator::class);
         $translatorService->addDir($this->getTranslationPath());
     }
diff --git a/tests/unit/Framework/Reflect/FrameworkResolverCest.php b/tests/unit/Framework/Reflect/FrameworkResolverCest.php
index f8e14e7b..d2a0b91c 100644
--- a/tests/unit/Framework/Reflect/FrameworkResolverCest.php
+++ b/tests/unit/Framework/Reflect/FrameworkResolverCest.php
@@ -13,7 +13,6 @@
 use Pckg\Framework\Test\Codeception\Cest;
 use Pckg\Locale\Lang;
 use Pckg\Manager\Asset;
-use Pckg\Manager\Asset\AssetManager;
 use Pckg\Manager\Locale;
 use Pckg\Manager\Meta;
 use Pckg\Manager\Seo;

From 56e485e074235c45119899bdb10a5d69d35e9d47 Mon Sep 17 00:00:00 2001
From: Bojan Rajh <schtr4jh@schtr4jh.net>
Date: Wed, 6 Oct 2021 18:16:49 +0200
Subject: [PATCH 54/66] Merge prefixes

---
 src/Pckg/Framework/Router/Route/Group.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Pckg/Framework/Router/Route/Group.php b/src/Pckg/Framework/Router/Route/Group.php
index 5fbeb370..ac52fc44 100644
--- a/src/Pckg/Framework/Router/Route/Group.php
+++ b/src/Pckg/Framework/Router/Route/Group.php
@@ -37,6 +37,9 @@ public function register($parentData = [])
          * Merge parent data with current group data.
          */
         $mergedData = array_merge($parentData, $this->data);
+        if (isset($parentData['urlPrefix']) && isset($this->data['urlPrefix'])) {
+            $mergedData['urlPrefix'] = $parentData['urlPrefix'] . $this->data['urlPrefix'];
+        }
 
         /**
          * Register groups.

From c02e21a62fcaaf53ad185bd4c8f2eac70ec01b2c Mon Sep 17 00:00:00 2001
From: Bojan Rajh <schtr4jh@schtr4jh.net>
Date: Wed, 6 Oct 2021 18:17:52 +0200
Subject: [PATCH 55/66] Cleanup request

---
 src/Pckg/Framework/Request.php | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/src/Pckg/Framework/Request.php b/src/Pckg/Framework/Request.php
index 0470fe9d..d1f4ed2c 100644
--- a/src/Pckg/Framework/Request.php
+++ b/src/Pckg/Framework/Request.php
@@ -40,10 +40,6 @@ class Request extends Message implements RequestInterface, ServerRequestInterfac
 
     const HEAD = 'HEAD';
 
-    protected $router;
-
-    protected $response;
-
     protected $match;
 
     protected $internal = 0;
@@ -59,8 +55,6 @@ class Request extends Message implements RequestInterface, ServerRequestInterfac
 
     public function __construct()
     {
-        Reflect::method($this, 'initDependencies');
-
         $this->server = (new Server())->setFromGlobals();
         $this->request = (new DataRequest())->setFromGlobals();
         $this->post = (new Post())->setFromGlobals();
@@ -97,12 +91,6 @@ public function getHeaders()
         return $this->headers;
     }
 
-    public function initDependencies(Router $router, Response $response)
-    {
-        $this->router = $router;
-        $this->response = $response;
-    }
-
     public function setInternal()
     {
         $this->internal++;

From cd5440ffd1d0e565be7d4334e5999f02fc22d50b Mon Sep 17 00:00:00 2001
From: Bojan Rajh <schtr4jh@schtr4jh.net>
Date: Wed, 6 Oct 2021 18:18:47 +0200
Subject: [PATCH 56/66] Reparse main app config after deep-app registration

---
 src/Pckg/Framework/Provider/Helper/Registrator.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/Pckg/Framework/Provider/Helper/Registrator.php b/src/Pckg/Framework/Provider/Helper/Registrator.php
index 4c42b3f2..c330e70b 100644
--- a/src/Pckg/Framework/Provider/Helper/Registrator.php
+++ b/src/Pckg/Framework/Provider/Helper/Registrator.php
@@ -5,6 +5,7 @@
 use Composer\Autoload\ClassLoader;
 use Pckg\Concept\Event\Dispatcher;
 use Pckg\Concept\Reflect;
+use Pckg\Framework\Provider;
 use Pckg\Framework\Response;
 use Pckg\Framework\Stack;
 use Pckg\Framework\View\Twig;
@@ -50,6 +51,7 @@ public function registerRoutes($routes)
                 $arrProviders->register(
                     [
                         'provider' => get_class($this),
+                        'urlPrefix' => $this->routePrefix,
                     ]
                 );
                 continue;
@@ -57,6 +59,7 @@ public function registerRoutes($routes)
 
             foreach ($arrProviders as $provider => $providerConfig) {
                 if (isset($providerConfig['prefix'])) {
+                    // why reset?
                     $providerConfig['prefix'] = '';
                 }
                 if (is_array($providerConfig)) {
@@ -157,6 +160,11 @@ function () use ($app) {
         if ($stack->getStacks() && !config('app_parent')) {
             config()->set('app_parent', $stack->getStacks() ? $apps[0] : config('app', null));
         }
+
+        // reparse config
+        if ($apps) {
+            $stack->push(fn() => config()->parseDir(path('app')));
+        }
     }
 
     /**

From 6b384ea3428bd341c2a6d5cdcb217f317d4d3eb5 Mon Sep 17 00:00:00 2001
From: Bojan Rajh <schtr4jh@schtr4jh.net>
Date: Wed, 6 Oct 2021 18:19:06 +0200
Subject: [PATCH 57/66] Add toDotted()

---
 src/Pckg/Framework/Config.php | 47 +++++++++++++++++++++++++++--------
 1 file changed, 36 insertions(+), 11 deletions(-)

diff --git a/src/Pckg/Framework/Config.php b/src/Pckg/Framework/Config.php
index e28fd679..e2468635 100644
--- a/src/Pckg/Framework/Config.php
+++ b/src/Pckg/Framework/Config.php
@@ -59,6 +59,31 @@ public function set($key, $val, $merge = true)
         $this->data = $this->setRecursive($keys, $val, $this->data, 0, $merge);
     }
 
+    public function apply(array $config)
+    {
+        $dotted = $this->toDotted($config);
+        foreach ($dotted as $key => $val) {
+            $this->set($key, $val);
+        }
+
+        return $dotted;
+    }
+
+    public function toDotted($config, string $parentKey = null, &$dotted = [])
+    {
+        if (!is_array($config)) {
+            $dotted[$parentKey] = $config;
+            return;
+        }
+
+        foreach ($config as $key => $val) {
+            $newKey = $parentKey ? $parentKey . '.' . $key : $key;
+            $this->toDotted($val, $newKey, $dotted);
+        }
+
+        return $dotted;
+    }
+
     private function setRecursive($keys, $val, $data, $i, $merge = true)
     {
         if (!is_array($data)) {
@@ -136,17 +161,17 @@ protected function parseFiles($files)
 
         foreach (
             [
-                        function ($file) {
-                            return strpos($file, '/defaults.php');
-                        },
-                        function ($file) {
-                            return !strpos($file, '/defaults.php') && !strpos($file, '/env.php') &&
-                                !strpos($file, '/migrations.php');
-                        },
-                        function ($file) {
-                            return strpos($file, '/env.php');
-                        },
-                 ] as $callback
+                function ($file) {
+                    return strpos($file, '/defaults.php');
+                },
+                function ($file) {
+                    return !strpos($file, '/defaults.php') && !strpos($file, '/env.php') &&
+                        !strpos($file, '/migrations.php');
+                },
+                function ($file) {
+                    return strpos($file, '/env.php');
+                },
+            ] as $callback
         ) {
             foreach ($files as $key => $file) {
                 if (!$callback($file)) {

From e3d454be1e8a3c44fd216c30456e35b2523635e2 Mon Sep 17 00:00:00 2001
From: Bojan Rajh <schtr4jh@schtr4jh.net>
Date: Wed, 6 Oct 2021 18:19:19 +0200
Subject: [PATCH 58/66] Disable dev

---
 src/Pckg/Framework/Environment/Development.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Pckg/Framework/Environment/Development.php b/src/Pckg/Framework/Environment/Development.php
index 5de470bc..cb8cad2a 100644
--- a/src/Pckg/Framework/Environment/Development.php
+++ b/src/Pckg/Framework/Environment/Development.php
@@ -28,7 +28,7 @@ public function register()
 
         $this->config->parseDir(BASE_PATH);
 
-        if (false && isHttp() && !implicitDev()) {
+        if (isHttp() && !implicitDev()) {
             die('Unauthorized for dev!');
             exit;
         }

From 676a228ac767141e5dee7c60d9802748904fee88 Mon Sep 17 00:00:00 2001
From: Bojan Rajh <schtr4jh@schtr4jh.net>
Date: Wed, 6 Oct 2021 18:19:36 +0200
Subject: [PATCH 59/66] Require app

---
 src/Pckg/Framework/Config/Command/InitConfig.php | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/Pckg/Framework/Config/Command/InitConfig.php b/src/Pckg/Framework/Config/Command/InitConfig.php
index fe46cc9f..89176cf1 100644
--- a/src/Pckg/Framework/Config/Command/InitConfig.php
+++ b/src/Pckg/Framework/Config/Command/InitConfig.php
@@ -20,14 +20,9 @@ public function __construct(Config $config)
 
     public function execute(callable $next)
     {
-        $path = null;
-        try {
-            $path = path('app');
-        } catch (\Throwable $e) {
-            return $next();
-        }
-
-        $this->config->parseDir($path);
+        $this->config->parseDir(path('app'));
+
+        trigger(InitConfig::class . '.executed');
 
         return $next();
     }

From d4f42948bffb9e74715b7bbeb767bcc78e3797c1 Mon Sep 17 00:00:00 2001
From: Bojan Rajh <schtr4jh@schtr4jh.net>
Date: Wed, 6 Oct 2021 18:20:22 +0200
Subject: [PATCH 60/66] Add InitEvents and split InitRoute

---
 src/Pckg/Framework/Application.php            |  1 +
 .../Application/Command/InitEvents.php        | 28 ++++++
 src/Pckg/Framework/Application/Website.php    |  8 +-
 .../Framework/Request/Command/InitRequest.php | 69 +-------------
 .../Framework/Request/Command/InitRoute.php   | 92 +++++++++++++++++++
 5 files changed, 128 insertions(+), 70 deletions(-)
 create mode 100644 src/Pckg/Framework/Application/Command/InitEvents.php
 create mode 100644 src/Pckg/Framework/Request/Command/InitRoute.php

diff --git a/src/Pckg/Framework/Application.php b/src/Pckg/Framework/Application.php
index 7d55f475..39f9b832 100644
--- a/src/Pckg/Framework/Application.php
+++ b/src/Pckg/Framework/Application.php
@@ -2,6 +2,7 @@
 
 namespace Pckg\Framework;
 
+use Pckg\Framework\Config\Command\InitConfig;
 use Pckg\Framework\Provider\Helper\Registrator;
 
 class Application
diff --git a/src/Pckg/Framework/Application/Command/InitEvents.php b/src/Pckg/Framework/Application/Command/InitEvents.php
new file mode 100644
index 00000000..53d6c4bd
--- /dev/null
+++ b/src/Pckg/Framework/Application/Command/InitEvents.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace Pckg\Framework\Application\Command;
+
+use Pckg\Database\Repository\RepositoryFactory;
+use Pckg\Framework\Application\Website;
+use Pckg\Framework\Config;
+
+class InitEvents
+{
+
+    protected Config $config;
+
+    public function __construct(Config $config)
+    {
+        $this->config = $config;
+    }
+
+    public function execute(callable $next)
+    {
+        $globalEvents = $this->config->get('pckg.dispatcher.events', []);
+        collect($globalEvents)->each(fn($handlers, $event) => collect($handlers)->each(fn($handler) => dispatcher()->listen($event, $handler)));
+
+        trigger(InitEvents::class . '.executed');
+
+        return $next();
+    }
+}
diff --git a/src/Pckg/Framework/Application/Website.php b/src/Pckg/Framework/Application/Website.php
index bf4c66a2..38441ee5 100644
--- a/src/Pckg/Framework/Application/Website.php
+++ b/src/Pckg/Framework/Application/Website.php
@@ -4,10 +4,12 @@
 
 use Pckg\Framework\Application;
 use Pckg\Framework\Application\Command\InitDatabase;
+use Pckg\Framework\Application\Command\InitEvents;
 use Pckg\Framework\Application\Command\RegisterApplication;
 use Pckg\Framework\Application\Website\Command\InitLastAssets;
 use Pckg\Framework\Config\Command\InitConfig;
 use Pckg\Framework\Request\Command\InitRequest;
+use Pckg\Framework\Request\Command\InitRoute;
 use Pckg\Framework\Request\Command\RunRequest;
 use Pckg\Framework\Request\Session\Command\InitSession;
 use Pckg\Framework\Response\Command\InitResponse;
@@ -28,14 +30,16 @@ public function inits()
     {
         return [
             InitConfig::class,
+            InitRequest::class,
+            InitResponse::class,
+            InitEvents::class,
             Localize::class,
             InitRouter::class,
             InitDatabase::class, // can we init it on demand?
 
             RegisterApplication::class,
 
-            InitResponse::class,
-            InitRequest::class,
+            InitRoute::class,
             InitSession::class, // can we init it on demand?
         ];
     }
diff --git a/src/Pckg/Framework/Request/Command/InitRequest.php b/src/Pckg/Framework/Request/Command/InitRequest.php
index 87329786..36da43ba 100644
--- a/src/Pckg/Framework/Request/Command/InitRequest.php
+++ b/src/Pckg/Framework/Request/Command/InitRequest.php
@@ -4,11 +4,7 @@
 
 use Pckg\Concept\AbstractChainOfReponsibility;
 use Pckg\Concept\Context;
-use Pckg\Framework\Middleware\ShowNiceErrorPage;
 use Pckg\Framework\Request;
-use Pckg\Framework\Router;
-use Pckg\Framework\Router\Command\ResolveRoute;
-use Pckg\Framework\View\Twig;
 
 class InitRequest extends AbstractChainOfReponsibility
 {
@@ -17,79 +13,16 @@ class InitRequest extends AbstractChainOfReponsibility
 
     protected $context;
 
-    protected $router;
-
-    public function __construct(Request $request, Context $context, Router $router)
+    public function __construct(Request $request, Context $context)
     {
         $this->request = $request;
         $this->context = $context;
-        $this->router = $router;
     }
 
     public function execute(callable $next)
     {
         $this->context->bind(Request::class, $this->request);
 
-        trigger(Request::class . '.initializing', [$this->request]);
-
-        $url = $this->request->getUrl();
-
-        /**
-         * Check that router has any routes defined.
-         */
-        if (!$this->router->getRoutes()) {
-            if ($this->request->isGet()) {
-                return response()->respond(view('vendor/pckg/framework/src/Pckg/Framework:default/new-project'));
-            }
-            return response()->respond(['success' => false, 'error' => true, 'message' => 'No routes']);
-        }
-
-        $match = (new ResolveRoute($this->router, $url, first(server('HTTP_HOST'), config('domain'))))->execute();
-
-        if (!$match) {
-            /**
-             * Resolve without domain.
-             */
-            message('Match by domain not found, matching without domain');
-            $match = (new ResolveRoute($this->router, $url))->execute();
-        }
-
-        if (!$match) {
-            message('No route match found');
-            response()->code(404);
-            trigger(ResolveRoute::class . '.notFound');
-
-            $match = [
-                'view'      => function () {
-                    if ($output = response()->getOutput()) {
-                        return $output;
-                    }
-
-                    if (request()->isJson() || request()->isAjax()) {
-                        return (new ShowNiceErrorPage())->handleJson(['message' => 'Not found']);
-                    }
-
-                    return (new ShowNiceErrorPage())->handlePartial();
-                },
-                'tags'      => ['layout:frontend'],
-                'name'      => 'error',
-                'url'       => '/#error',
-                'method'    => 'GET',
-                'resolvers' => [],
-            ];
-        }
-
-        $match = array_merge($match['data'] ?? [], $match);
-
-        /**
-         * Do we need to set it in request and router?
-         */
-        $this->router->setData($match);
-        $this->request->setMatch($match);
-        message('Match found ' . json_encode($match));
-
-        trigger(Request::class . '.initialized', [$this->request]);
-
         return $next();
     }
 }
diff --git a/src/Pckg/Framework/Request/Command/InitRoute.php b/src/Pckg/Framework/Request/Command/InitRoute.php
new file mode 100644
index 00000000..4522cdf0
--- /dev/null
+++ b/src/Pckg/Framework/Request/Command/InitRoute.php
@@ -0,0 +1,92 @@
+<?php
+
+namespace Pckg\Framework\Request\Command;
+
+use Pckg\Concept\AbstractChainOfReponsibility;
+use Pckg\Concept\Context;
+use Pckg\Framework\Middleware\ShowNiceErrorPage;
+use Pckg\Framework\Request;
+use Pckg\Framework\Router;
+use Pckg\Framework\Router\Command\ResolveRoute;
+use Pckg\Framework\View\Twig;
+
+class InitRoute extends AbstractChainOfReponsibility
+{
+
+    protected $request;
+
+    protected $context;
+
+    protected $router;
+
+    public function __construct(Request $request, Router $router)
+    {
+        $this->request = $request;
+        $this->router = $router;
+    }
+
+    public function execute(callable $next)
+    {
+        trigger(Request::class . '.initializing', [$this->request]);
+
+        $url = $this->request->getUrl();
+
+        /**
+         * Check that router has any routes defined.
+         */
+        if (!$this->router->getRoutes()) {
+            if ($this->request->isGet()) {
+                return response()->respond(view('vendor/pckg/framework/src/Pckg/Framework:default/new-project'));
+            }
+            return response()->respond(['success' => false, 'error' => true, 'message' => 'No routes']);
+        }
+
+        $match = (new ResolveRoute($this->router, $url, first(server('HTTP_HOST'), config('domain'))))->execute();
+
+        if (!$match) {
+            /**
+             * Resolve without domain.
+             */
+            message('Match by domain not found, matching without domain');
+            $match = (new ResolveRoute($this->router, $url))->execute();
+        }
+
+        if (!$match) {
+            message('No route match found');
+            response()->code(404);
+            trigger(ResolveRoute::class . '.notFound');
+
+            $match = [
+                'view' => function () {
+                    if ($output = response()->getOutput()) {
+                        return $output;
+                    }
+
+                    if (request()->isJson() || request()->isAjax()) {
+                        return (new ShowNiceErrorPage())->handleJson(['message' => 'Not found']);
+                    }
+
+                    return (new ShowNiceErrorPage())->handlePartial();
+                },
+                'tags' => ['layout:frontend'],
+                'name' => 'error',
+                'url' => '/#error',
+                'method' => 'GET',
+                'resolvers' => [],
+            ];
+        }
+
+        $match = array_merge($match['data'] ?? [], $match);
+
+        /**
+         * Do we need to set it in request and router?
+         */
+        $this->router->setData($match);
+        $this->request->setMatch($match);
+        message('Match found ' . json_encode($match));
+
+        trigger(Request::class . '.initialized', [$this->request]);
+
+        return $next();
+    }
+}

From e870cc8c2f5c8332e2d82bc737443a8d57a7b526 Mon Sep 17 00:00:00 2001
From: Bojan Rajh <schtr4jh@schtr4jh.net>
Date: Mon, 1 Nov 2021 15:33:18 +0100
Subject: [PATCH 61/66] Func defaults

---
 src/Pckg/Framework/Helper/functions.php    | 2 +-
 src/Pckg/Framework/Helper/functions_bc.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Pckg/Framework/Helper/functions.php b/src/Pckg/Framework/Helper/functions.php
index b04976df..f0bf6f00 100644
--- a/src/Pckg/Framework/Helper/functions.php
+++ b/src/Pckg/Framework/Helper/functions.php
@@ -1102,7 +1102,7 @@ function vueRoute(string $route = '', string $component = null, array $tags = []
         ])->children($children);
     }
 
-    function routeGroup(array $data, array $routes)
+    function routeGroup(array $data = [], array $routes = [])
     {
         return new Group($data, $routes);
     }
diff --git a/src/Pckg/Framework/Helper/functions_bc.php b/src/Pckg/Framework/Helper/functions_bc.php
index 5826f023..053a7c47 100644
--- a/src/Pckg/Framework/Helper/functions_bc.php
+++ b/src/Pckg/Framework/Helper/functions_bc.php
@@ -771,7 +771,7 @@ function vueRoute(string $route = '', string $component = null, array $tags = []
 }
 
 if (!function_exists('routeGroup')) {
-    function routeGroup(array $data, array $routes)
+    function routeGroup(array $data = [], array $routes = [])
     {
         return Framework\Helper\routeGroup($data, $routes);
     }

From 3d466e362b02d4fe2c8a0ea32a5f031bd1a01350 Mon Sep 17 00:00:00 2001
From: Bojan Rajh <schtr4jh@schtr4jh.net>
Date: Tue, 2 Nov 2021 20:50:34 +0100
Subject: [PATCH 62/66] Pass parameter to resolver

---
 src/Pckg/Framework/Provider/Helper/EntityResolver.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Pckg/Framework/Provider/Helper/EntityResolver.php b/src/Pckg/Framework/Provider/Helper/EntityResolver.php
index aa4c18ba..407859d0 100644
--- a/src/Pckg/Framework/Provider/Helper/EntityResolver.php
+++ b/src/Pckg/Framework/Provider/Helper/EntityResolver.php
@@ -67,7 +67,7 @@ public function resolve($value)
         }
 
         if ($filter = $this->filter) {
-            $filter($this->e, $value);
+            $filter($this->e, $value, $this);
         }
 
         return $this->e->oneOrFail();

From a6c9774fe12dc8f7d9e94a392c58ecb881676be1 Mon Sep 17 00:00:00 2001
From: Bojan Rajh <schtr4jh@schtr4jh.net>
Date: Sat, 13 Nov 2021 12:46:22 +0100
Subject: [PATCH 63/66] Deprecate

---
 src/Pckg/Framework/Provider/Frontend.php      |   1 -
 src/Pckg/Framework/public/js/http.compiled.js | 633 +-----------------
 src/Pckg/Framework/public/js/http.js          | 151 +----
 src/Pckg/Framework/public/js/pckg.compiled.js | 162 -----
 src/Pckg/Framework/public/js/pckg.js          | 118 ----
 5 files changed, 37 insertions(+), 1028 deletions(-)
 delete mode 100644 src/Pckg/Framework/public/js/pckg.compiled.js
 delete mode 100644 src/Pckg/Framework/public/js/pckg.js

diff --git a/src/Pckg/Framework/Provider/Frontend.php b/src/Pckg/Framework/Provider/Frontend.php
index e8bd1d4b..14c4aae1 100644
--- a/src/Pckg/Framework/Provider/Frontend.php
+++ b/src/Pckg/Framework/Provider/Frontend.php
@@ -12,7 +12,6 @@ public function assets()
         return [
             'libraries' => [
                 'js/http.compiled.js',
-                'js/pckg.compiled.js',
             ],
         ];
     }
diff --git a/src/Pckg/Framework/public/js/http.compiled.js b/src/Pckg/Framework/public/js/http.compiled.js
index 5154429e..8dce1967 100644
--- a/src/Pckg/Framework/public/js/http.compiled.js
+++ b/src/Pckg/Framework/public/js/http.compiled.js
@@ -1,632 +1 @@
-var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) {
-    return typeof obj;
-} : function (obj) {
-    return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
-};
-
-var data = data || {};
-var http = {
-
-    formToData: function formToData(vueElement, keys) {
-        var data = {};
-
-        if (typeof keys === 'undefined') {
-            $.each(vueElement.form, function (key, val) {
-                data[key] = val;
-            });
-        } else {
-            $.each(keys, function (i, key) {
-                data[key] = vueElement.form[key];
-            });
-        }
-
-        return data;
-    },
-
-    submitForm: function submitForm(vueElement, fields) {
-        return http.post($(vueElement.$el.attr('action')), http.formToData(vueElement, fields));
-    },
-
-    ajax: function ajax(options, done, error) {
-        let presetBeforeSend = options.beforeSend || null;
-        options.beforeSend = function (request) {
-            if (presetBeforeSend) {
-                presetBeforeSend(request);
-            }
-            http.addLocale(request);
-            http.addCsrf(request);
-        };
-
-        options = Object.assign({
-            dataType: 'JSON'
-        }, options || {});
-
-        let a = $.ajax(options);
-
-        let preError = error || null;
-        error = function (response) {
-            /**
-             * Check for CSRF?
-             */
-            if ($dispatcher && response.responseJSON && ['Cross Site Request Forbidden', 'Cross Site Request Invalid'].indexOf(response.responseJSON.message || '') >= 0) {
-                $dispatcher.$emit('notification:error', 'Your session has expired, please refresh your browser');
-            }
-            
-            if (preError) {
-                preError(response);
-            }
-        };
-
-        if (a.done) {
-            if (done) {
-                a.done(done);
-            }
-            if (error) {
-                a.fail(error);
-            }
-        } else {
-            a.then(done || function(data){ console.log('no success handler', data); }, error || function(data){ console.log('no error handler', data); });
-        }
-
-        return a;
-    },
-
-    get: function (url, whenDone, whenError, options) {
-        return this.ajax(Object.assign({
-            url: url,
-            type: 'GET'
-        }, options || {}), whenDone, whenError);
-    },
-
-    post: function post(url, data, whenDone, whenError) {
-        if (typeof data === 'function') {
-            data = data();
-        }
-
-        data = http.fixUndefined(data);
-
-        return this.ajax({
-            url: url,
-            type: 'POST',
-            data: data
-        }, whenDone, whenError);
-    },
-
-    patch: function post(url, data, whenDone, whenError) {
-        if (typeof data == 'function') {
-            data = data();
-        }
-
-        data = http.fixUndefined(data);
-
-        return this.ajax({
-            url: url,
-            type: 'PATCH',
-            data: data
-        }, whenDone, whenError);
-    },
-
-    put: function post(url, data, whenDone, whenError) {
-        if (typeof data == 'function') {
-            data = data();
-        }
-
-        data = http.fixUndefined(data);
-
-        return this.ajax({
-            url: url,
-            type: 'PATCH',
-            data: data
-        }, whenDone, whenError);
-    },
-
-    search: function get(url, whenDone, whenError, options) {
-        this.ajax(Object.assign({
-            url: url,
-            type: 'SEARCH'
-        }, options || {}), whenDone, whenError);
-    },
-
-    delete: function (url, whenDone, whenError) {
-        return this.deleteJSON(url, whenDone, whenError);
-    },
-
-    deleteJSON: function deleteJSON(url, whenDone, whenError) {
-        return this.ajax({
-            url: url,
-            type: 'DELETE'
-        }, whenDone, whenError);
-    },
-
-    getJSON: function getJSON(url, whenDone, whenError, options) {
-        return this.get(url, whenDone, whenError, options);
-    },
-
-    addCsrf: function(request) {
-        var elements = document.getElementsByName('pckgvdth');
-        if (elements.length === 0) {
-            return;
-        }
-        request.setRequestHeader("X-Pckg-CSRF", elements[0].getAttribute('content'));
-    },
-
-    addLocale: function(request) {
-        if (!Pckg || !Pckg.config || !Pckg.config.locale || !Pckg.config.locale.current) {
-            return;
-        }
-
-        request.setRequestHeader("X-Pckg-Locale", Pckg.config.locale.current);
-    },
-
-    form: function form($form, successCallback) {
-        return http.post($form.attr('action'), $form.serializeArray(), successCallback);
-    },
-
-    fixUndefined: function fixUndefined(data) {
-        if (typeof data === 'string' || typeof data === 'number') {
-            return data;
-        } else if (typeof data === 'undefined') {
-            return null;
-        }
-
-        $.each(data, function (key, val) {
-            if (Array.isArray(val) || (typeof val === 'undefined' ? 'undefined' : _typeof(val)) == 'object') {
-                data[key] = http.fixUndefined(val);
-            } else if (typeof val == 'undefined') {
-                data[key] = '';
-            } else if (val === true) {
-                data[key] = 1;
-            } else if (val === false || val === '' || val === null) {
-                data[key] = null;
-            } else {
-                data[key] = http.fixUndefined(val);
-            }
-        });
-
-        return data;
-    },
-
-    postDone: function postDone(json) {
-        if (typeof json.redirect !== 'undefined') {
-            if (typeof window.parent !== 'undefined' && window.parent.location.href.indexOf(json.redirect)) {
-                parent.postMessage('refresh', window.location.origin);
-            } else {
-                window.location.href = json.redirect;
-            }
-        }
-    },
-
-    postError: function postError(response) {
-    },
-
-    redirect: function redirect(url) {
-        if (!url || typeof url == 'undefined') {
-            url = window.location.href;
-        }
-
-        window.location.href = url;
-    }
-
-};
-
-var locale = {
-
-    price: function price(_price, decimals, currency) {
-        return this.number(_price, decimals) + ' ' + (currency || Pckg.config.locale.currencySign);
-    },
-
-    number: function price(_price, decimals, locale) {
-        if (typeof decimals == 'undefined' || decimals === null) {
-            decimals = Pckg.config.locale.decimals;
-        }
-
-        if (typeof _price == 'undefined' || _price === null) {
-            _price = 0.0;
-        }
-
-        return parseFloat(_price).toLocaleString((locale || Pckg.config.locale.current).replace('_', '-').toLowerCase(), {
-            currency: 'eur',
-            currencyDisplay: 'symbol',
-            maximumFractionDigits: decimals,
-            minimumFractionDigits: decimals
-        });
-    },
-
-    roundPrice: function roundPrice(price, decimals) {
-        if (typeof decimals == 'undefined' || decimals === null) {
-            decimals = Pckg.config.locale.decimals;
-        }
-
-        if (typeof price == 'undefined' || price === null) {
-            price = 0.0;
-        }
-
-        let digits = parseInt(price) == parseFloat(price) ? 0 : (decimals || 2);
-
-        return parseFloat(price).toLocaleString(Pckg.config.locale.current.replace('_', '-').toLowerCase(), {
-            currency: 'eur',
-            currencyDisplay: 'symbol',
-            maximumFractionDigits: digits,
-            minimumFractionDigits: digits
-        }) + ' ' + Pckg.config.locale.currencySign;
-    },
-
-    roundNumber: function(number, decimals){
-        if (typeof decimals == 'undefined' || decimals === null) {
-            decimals = Pckg.config.locale.decimals;
-        }
-
-        if (typeof number == 'undefined' || number === null) {
-            number = 0.0;
-        }
-
-        return parseInt(number) == parseFloat(number) ? parseInt(number) : parseFloat(number).toFixed(decimals || 2)
-    },
-
-    date: function date(_date) {
-        if (!_date) {
-            return null;
-        }
-
-        moment.locale(Pckg.config.locale.current);
-
-        return moment(_date).format(Pckg.config.locale.format.dateMoment);
-    },
-
-    time: function time(_time) {
-        if (!_time) {
-            return null;
-        }
-
-        moment.locale(Pckg.config.locale.current);
-
-        return moment(_time).format(Pckg.config.locale.format.timeMoment);
-    },
-
-    datetime: function datetime(_datetime) {
-        return this.date(_datetime) + ' ' + this.time(_datetime);
-    },
-
-    trans: function trans(_trans, params) {
-        $.each(params, function (key, val) {
-            _trans = _trans.replace('{{ ' + key + ' }}', val);
-        });
-
-        return _trans;
-    }
-
-};
-
-var collection = {
-
-    collect: function(items, of) {
-        return items.map((item) => { return new of(item) });
-    },
-
-    groupBy: function (collection, groupBy) {
-        let groups = {};
-
-        $.each(collection, function (i, item) {
-            let group = groupBy(item, i);
-            if (!groups[group]) {
-                groups[group] = [];
-            }
-            groups[group].push(item);
-        });
-
-        return groups;
-    },
-
-    map: function (items, map) {
-        let mapped = {};
-
-        $.each(items, function (i, item) {
-            mapped[i] = collection.getCallableKey(map, item, i);
-        });
-
-        return mapped;
-    },
-
-    keyBy: function (items, key) {
-        let keyed = {};
-
-        $.each(items, function (i, item) {
-            keyed[collection.getCallableKey(key, item, i)] = item;
-        });
-
-        return keyed;
-    },
-
-    getCallableKey: function(key, item, i) {
-        if (typeof key === 'string') {
-            return item[key];
-        }
-
-        return key(item, i);
-    },
-
-    shuffle: function (unshuffled) {
-        return unshuffled
-            .map(function (a) {
-                return {sort: Math.random(), value: a};
-            })
-            .sort(function (a, b) {
-                return a.sort - b.sort;
-            })
-            .map(function (a) {
-                return a.value;
-            });
-    }
-
-};
-
-var utils = {
-
-    is: function (val) {
-        if (typeof val === 'number') {
-            return val.toString().length > 0;
-        } else if (typeof val === 'boolean') {
-            return val;
-        } else if (typeof val === 'string') {
-            return val.length > 0;
-        }
-
-        return !!val;
-    },
-
-    lcfirst: function (str) {
-        if (!str) {
-            return '';
-        }
-
-        return str.charAt(0).toLowerCase() + str.slice(1);
-    },
-
-    ucfirst: function (str) {
-        if (!str) {
-            return '';
-        }
-
-        return str.charAt(0).toUpperCase() + str.slice(1);
-    },
-
-    toCamelCase: function(str) {
-        return str.replace(/^([A-Z])|\s(\w)/g, function(match, p1, p2, offset) {
-            if (p2) return p2.toUpperCase();
-            return p1.toLowerCase();
-        });
-    },
-
-    isSameDate: function isSameDate(first, second) {
-        return locale.date(first) == locale.date(second);
-    },
-
-    fix: function fix(value) {
-        return value ? value : null;
-    },
-
-    url: function url(_url, params, absolute) {
-        if (!_url) {
-            return;
-        }
-        if (_url.indexOf('@') === 0 && Pckg.router.urls[_url.substring(1)]) {
-            _url = Pckg.router.urls[_url.substring(1)];
-        }
-        if (_url.indexOf('@') === 0 && Pckg.router.urls[_url.substring(1) + ':' + Pckg.config.locale.current.substring(0, 2)]) {
-            _url = Pckg.router.urls[_url.substring(1) + ':' + Pckg.config.locale.current.substring(0, 2)];
-        }
-        if (!_url) {
-            return;
-        }
-        $.each(params, function (key, val) {
-            _url = _url.replace('[' + key + ']', val);
-        });
-
-        if (_url.indexOf('@/') === 0) {
-            _url = _url.substring(1);
-        }
-
-        if (absolute) {
-            _url = (Pckg.site.url || '') + _url;
-        }
-
-        return _url;
-    },
-
-    sluggify: function (str) {
-        return str.replace(/[^a-zA-Z0-9 -]/g, '')
-            .replace(/[ -]+/g, '-')
-            .replace(/^-|-$/g, '')
-            .toLowerCase();
-    },
-
-    nl2br: function nl2br(str, is_xhtml) {
-        var breakTag = is_xhtml || typeof is_xhtml === 'undefined' ? '<br />' : '<br>';
-        return (str + '').replace(/([^>\r\n]?)(\r\n|\n\r|\r|\n)/g, '$1' + breakTag + '$2');
-    },
-
-    html2text: function (html) {
-        let span = document.createElement('span');
-        span.innerHTML = html;
-        return span.textContent || span.innerText;
-    },
-
-    closeIfIframe: function closeIfIframe() {
-        this.sendToParent('popup.close');
-    },
-
-    closeAndRefresh: function closeAndRefresh() {
-        $.magnificPopup.close();
-        http.redirect();
-    },
-
-    sendToParent: function sendToParent(data) {
-        parent.postMessage(data, window.location.origin);
-    },
-
-    isIframe: function isIframe() {
-        return parent.window != window;
-    },
-
-    collect: function collect(item) {
-        return Array.isArray(item) ? item : [item];
-    },
-    prepend: function prepend(value, array) {
-        var newArray = array.slice(0);
-
-        newArray.unshift(value);
-
-        return newArray;
-    },
-    sort: function sort(obj) {
-        var sorted = {};
-        Object.keys(obj).sort().forEach(function (value, key) {
-            sorted[key] = value;
-        });
-
-        return sorted;
-    },
-    mergeObject: function mergeObject(to, from) {
-        $.each(from, function (key, value) {
-            to[key] = value;
-        });
-
-        return to;
-    },
-    pushTo: function pushTo(to, from) {
-        $.each(from, function (key, value) {
-            to.push(value);
-        });
-
-        return to;
-    },
-    firstOf: function firstOf(items, callback) {
-        var first = null;
-
-        $.each(items, function (i, item) {
-            if (callback(item, i)) {
-                first = item;
-                return false;
-            }
-        });
-
-        return first;
-    },
-    lastOf: function lastOf(items, callback) {
-        return this.firstOf(items.reverse(), callback);
-    },
-    last: function last(items) {
-        return items[items.length - 1];
-    },
-    next: function (all, current, noLoop) {
-        let i = all.indexOf(current) + 1;
-        if (i < 0) {
-            i = 0;
-        } else if (i >= all.length) {
-            if (noLoop) {
-                i = all.length - 1;
-            } else {
-                i = 0;
-            }
-        }
-        return all[i];
-    },
-    prev: function (all, current, noLoop) {
-        let i = all.indexOf(current) - 1;
-        if (i < 0) {
-            if (noLoop) {
-                i = 0;
-            } else {
-                i = all.length - 1;
-            }
-        } else if (i >= all.length) {
-            i = all.length - 1;
-        }
-        return all[i];
-    },
-    sortInt: function sortInt(a, b) {
-        return a < b ? -1 : a > b ? 1 : 0;
-    },
-    splice: function splice(collection, item) {
-        let index = collection.indexOf(item);
-        if (index === -1) {
-            return collection;
-        }
-        return collection.splice(index, 1);
-    },
-    toggle: function(items, key){
-        if (items.indexOf(key) >= 0) {
-            utils.splice(items, key);
-        } else {
-            items.push(key);
-        }
-    },
-    groupBy: function (collection, groupBy) {
-        grouped = {};
-        $.each(collection, function (key, val) {
-            grouped[groupBy(val)] ? grouped[groupBy(val)].push(val) : (grouped[groupBy(val)] = [val]);
-        });
-
-        return grouped;
-    },
-
-    lazyTemplate: function (resolve, obj, url) {
-        if (typeof url !== 'string') {
-            url = url(obj);
-        }
-        http.getJSON(url, function (data) {
-            obj.template = data.template;
-            if (data.form) {
-                let originalData = obj.data;
-                obj.data = function () {
-                    let d = originalData ? originalData.call(this) : {};
-                    d.form = data.form;
-                    return d;
-                };
-            }
-            resolve(obj);
-        });
-    },
-
-    base64decode: function(str) {
-        return atob(str);
-    },
-
-    base64encode: function(str) {
-        return btoa(str);
-    }
-
-};
-
-var settings = settings || {};
-settings.vue = settings.vue || {};
-settings.vue.gmaps = {
-    themes: {
-        getOptions: function getOptions(theme) {
-            var themes = settings.vue.gmaps.themes;
-            var options = themes.base;
-
-            // merge with defaults
-            if (typeof themes[theme] != 'undefined') {
-                options = this.mergeOptions(options, themes[theme]);
-            }
-
-            return options;
-        },
-        mergeOptions: function mergeOptions(original, overwrite) {
-            $.each(overwrite, function (i, values) {
-                original[i] = values;
-            });
-
-            return original;
-        },
-        base: {
-            zoom: 10,
-            center: [46.055144, 14.512284]
-        }
-    }
-};
-
-var d = function d(data) {
-    console.log(data);
-};
+var _typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},data=data||{},http={ajax:function(e,t,n){let o=e.beforeSend||null;e.beforeSend=function(e){o&&o(e),http.addLocale(e),http.addCsrf(e)},e=Object.assign({dataType:"JSON"},e||{});let r=$.ajax(e),i=n||null;return n=function(e){$dispatcher&&e.responseJSON&&["Cross Site Request Forbidden","Cross Site Request Invalid"].indexOf(e.responseJSON.message||"")>=0&&$dispatcher.$emit("notification:error","Your session has expired, please refresh your browser"),i&&i(e)},r.done?(t&&r.done(t),n&&r.fail(n)):r.then(t||function(e){console.log("no success handler",e)},n||function(e){console.log("no error handler",e)}),r},get:function(e,t,n,o){return this.ajax(Object.assign({url:e,type:"GET"},o||{}),t,n)},post:function(e,t,n,o){return"function"==typeof t&&(t=t()),t=http.fixUndefined(t),this.ajax({url:e,type:"POST",data:t},n,o)},patch:function(e,t,n,o){return"function"==typeof t&&(t=t()),t=http.fixUndefined(t),this.ajax({url:e,type:"PATCH",data:t},n,o)},put:function(e,t,n,o){return"function"==typeof t&&(t=t()),t=http.fixUndefined(t),this.ajax({url:e,type:"PATCH",data:t},n,o)},search:function(e,t,n,o){this.ajax(Object.assign({url:e,type:"SEARCH"},o||{}),t,n)},delete:function(e,t,n){return this.deleteJSON(e,t,n)},deleteJSON:function(e,t,n){return this.ajax({url:e,type:"DELETE"},t,n)},getJSON:function(e,t,n,o){return this.get(e,t,n,o)},addCsrf:function(e){var t=document.getElementsByName("pckgvdth");0!==t.length&&e.setRequestHeader("X-Pckg-CSRF",t[0].getAttribute("content"))},addLocale:function(e){Pckg&&Pckg.config&&Pckg.config.locale&&Pckg.config.locale.current&&e.setRequestHeader("X-Pckg-Locale",Pckg.config.locale.current)},fixUndefined:function(e){return"string"==typeof e||"number"==typeof e?e:void 0===e?null:($.each(e,function(t,n){Array.isArray(n)||"object"==(void 0===n?"undefined":_typeof(n))?e[t]=http.fixUndefined(n):e[t]=void 0===n?"":!0===n?1:!1===n||""===n||null===n?null:http.fixUndefined(n)}),e)},postDone:function(e){void 0!==e.redirect&&(void 0!==window.parent&&window.parent.location.href.indexOf(e.redirect)?parent.postMessage("refresh",window.location.origin):window.location.href=e.redirect)},postError:function(e){},redirect:function(e){e&&void 0!==e||(e=window.location.href),window.location.href=e}},locale={price:function(e,t,n){return this.number(e,t)+" "+(n||Pckg.config.locale.currencySign)},number:function(e,t,n){return null==t&&(t=Pckg.config.locale.decimals),null==e&&(e=0),parseFloat(e).toLocaleString((n||Pckg.config.locale.current).replace("_","-").toLowerCase(),{currency:"eur",currencyDisplay:"symbol",maximumFractionDigits:t,minimumFractionDigits:t})},roundPrice:function(e,t){null==t&&(t=Pckg.config.locale.decimals),null==e&&(e=0);let n=parseInt(e)==parseFloat(e)?0:t||2;return parseFloat(e).toLocaleString(Pckg.config.locale.current.replace("_","-").toLowerCase(),{currency:"eur",currencyDisplay:"symbol",maximumFractionDigits:n,minimumFractionDigits:n})+" "+Pckg.config.locale.currencySign},roundNumber:function(e,t){return null==t&&(t=Pckg.config.locale.decimals),null==e&&(e=0),parseInt(e)==parseFloat(e)?parseInt(e):parseFloat(e).toFixed(t||2)},date:function(e){return e?(moment.locale(Pckg.config.locale.current),moment(e).format(Pckg.config.locale.format.dateMoment)):null},time:function(e){return e?(moment.locale(Pckg.config.locale.current),moment(e).format(Pckg.config.locale.format.timeMoment)):null},datetime:function(e){return this.date(e)+" "+this.time(e)}},collection={collect:function(e,t){return e.map(e=>new t(e))},groupBy:function(e,t){let n={};return $.each(e,function(e,o){let r=t(o,e);n[r]||(n[r]=[]),n[r].push(o)}),n},map:function(e,t){let n={};return $.each(e,function(e,o){n[e]=collection.getCallableKey(t,o,e)}),n},keyBy:function(e,t){let n={};return $.each(e,function(e,o){n[collection.getCallableKey(t,o,e)]=o}),n},getCallableKey:function(e,t,n){return"string"==typeof e?t[e]:e(t,n)}},utils={is:function(e){return"number"==typeof e?e.toString().length>0:"boolean"==typeof e?e:"string"==typeof e?e.length>0:!!e},lcfirst:function(e){return e?e.charAt(0).toLowerCase()+e.slice(1):""},ucfirst:function(e){return e?e.charAt(0).toUpperCase()+e.slice(1):""},url:function(e,t,n){if(e&&(0===e.indexOf("@")&&Pckg.router.urls[e.substring(1)]&&(e=Pckg.router.urls[e.substring(1)]),0===e.indexOf("@")&&Pckg.router.urls[e.substring(1)+":"+Pckg.config.locale.current.substring(0,2)]&&(e=Pckg.router.urls[e.substring(1)+":"+Pckg.config.locale.current.substring(0,2)]),e))return $.each(t,function(t,n){e=e.replace("["+t+"]",n)}),0===e.indexOf("@/")&&(e=e.substring(1)),n&&(e=(Pckg.site.url||"")+e),e},sluggify:function(e){return e.replace(/[^a-zA-Z0-9 -]/g,"").replace(/[ -]+/g,"-").replace(/^-|-$/g,"").toLowerCase()},nl2br:function(e,t){return(e+"").replace(/([^>\r\n]?)(\r\n|\n\r|\r|\n)/g,"$1"+(t||void 0===t?"<br />":"<br>")+"$2")},html2text:function(e){let t=document.createElement("span");return t.innerHTML=e,t.textContent||t.innerText},isIframe:function(){return parent.window!=window},collect:function(e){return Array.isArray(e)?e:[e]},sort:function(e){var t={};return Object.keys(e).sort().forEach(function(e,n){t[n]=e}),t},next:function(e,t,n){let o=e.indexOf(t)+1;return o<0?o=0:o>=e.length&&(o=n?e.length-1:0),e[o]},prev:function(e,t,n){let o=e.indexOf(t)-1;return o<0?o=n?0:e.length-1:o>=e.length&&(o=e.length-1),e[o]},sortInt:function(e,t){return e<t?-1:e>t?1:0},splice:function(e,t){let n=e.indexOf(t);return-1===n?e:e.splice(n,1)},toggle:function(e,t){e.indexOf(t)>=0?utils.splice(e,t):e.push(t)},groupBy:function(e,t){return grouped={},$.each(e,function(e,n){grouped[t(n)]?grouped[t(n)].push(n):grouped[t(n)]=[n]}),grouped},lazyTemplate:function(e,t,n){"string"!=typeof n&&(n=n(t)),http.getJSON(n,function(n){if(t.template=n.template,n.form){let e=t.data;t.data=function(){let t=e?e.call(this):{};return t.form=n.form,t}}e(t)})},base64decode:function(e){return atob(e)},base64encode:function(e){return btoa(e)}},settings=settings||{};settings.vue=settings.vue||{},settings.vue.gmaps={themes:{getOptions:function(e){var t=settings.vue.gmaps.themes,n=t.base;return void 0!==t[e]&&(n=this.mergeOptions(n,t[e])),n},mergeOptions:function(e,t){return $.each(t,function(t,n){e[t]=n}),e},base:{zoom:10,center:[46.055144,14.512284]}}};var d=function(e){console.log(e)};window.globalScrollTo=function(e,t){e.length<1||(t||(t=80),"parentIFrame"in window?parentIFrame.scrollToOffset(0,e.offset().top-t):(page=$("html,body"),page.on("scroll mousedown wheel DOMMouseScroll mousewheel keyup touchmove",function(){page.stop()}),page.animate({scrollTop:e.offset().top-t},1e3,function(){page.off("scroll mousedown wheel DOMMouseScroll mousewheel keyup touchmove")})))},window.observerOr=function(e,t){return"undefined"==typeof ResizeObserver?t():e()};
diff --git a/src/Pckg/Framework/public/js/http.js b/src/Pckg/Framework/public/js/http.js
index 53a9bc86..b0ee9047 100644
--- a/src/Pckg/Framework/public/js/http.js
+++ b/src/Pckg/Framework/public/js/http.js
@@ -1,28 +1,6 @@
 var data = data || {};
 let http = window.http = {
 
-    formToData: function (vueElement, keys) {
-        var data = {};
-
-        if (typeof keys === 'undefined') {
-            $.each(vueElement.form, function (key, val) {
-                data[key] = val;
-            });
-
-        } else {
-            $.each(keys, function (i, key) {
-                data[key] = vueElement.form[key];
-            });
-
-        }
-
-        return data;
-    },
-
-    submitForm: function (vueElement, fields) {
-        return http.post($(vueElement.$el.attr('action')), http.formToData(vueElement, fields));
-    },
-
     ajax: function ajax(options, done, error) {
         let presetBeforeSend = options.beforeSend || null;
         options.beforeSend = function (request) {
@@ -154,10 +132,6 @@ let http = window.http = {
         request.setRequestHeader("X-Pckg-Locale", Pckg.config.locale.current);
     },
 
-    form: function ($form, successCallback) {
-        return http.post($form.attr('action'), $form.serializeArray(), successCallback);
-    },
-
     fixUndefined: function (data) {
         if (typeof data === 'string' || typeof data === 'number') {
             return data;
@@ -289,14 +263,6 @@ var locale = {
         return this.date(datetime) + ' ' + this.time(datetime);
     },
 
-    trans: function (trans, params) {
-        $.each(params, function (key, val) {
-            trans = trans.replace('{{ ' + key + ' }}', val);
-        });
-
-        return trans;
-    }
-
 };
 
 var collection = {
@@ -347,19 +313,6 @@ var collection = {
         return key(item, i);
     },
 
-    shuffle: function (unshuffled) {
-        return unshuffled
-            .map(function (a) {
-                return {sort: Math.random(), value: a};
-            })
-            .sort(function (a, b) {
-                return a.sort - b.sort;
-            })
-            .map(function (a) {
-                return a.value;
-            });
-    }
-
 };
 
 var utils = {
@@ -392,21 +345,6 @@ var utils = {
         return str.charAt(0).toUpperCase() + str.slice(1);
     },
 
-    toCamelCase: function(str) {
-        return str.replace(/^([A-Z])|\s(\w)/g, function(match, p1, p2, offset) {
-            if (p2) return p2.toUpperCase();
-            return p1.toLowerCase();
-        });
-    },
-
-    isSameDate: function (first, second) {
-        return locale.date(first) == locale.date(second);
-    },
-
-    fix: function (value) {
-        return value ? value : null;
-    },
-
     url: function (url, params, absolute) {
         if (!url) {
             return;
@@ -453,19 +391,6 @@ var utils = {
         return span.textContent || span.innerText;
     },
 
-    closeIfIframe: function () {
-        this.sendToParent('popup.close');
-    },
-
-    closeAndRefresh: function () {
-        $.magnificPopup.close();
-        http.redirect();
-    },
-
-    sendToParent: function (data) {
-        parent.postMessage(data, window.location.origin);
-    },
-
     isIframe: function () {
         return parent.window != window;
     },
@@ -475,13 +400,6 @@ var utils = {
             ? item
             : [item];
     },
-    prepend: function (value, array) {
-        var newArray = array.slice(0);
-
-        newArray.unshift(value);
-
-        return newArray;
-    },
     sort: function (obj) {
         var sorted = {};
         Object.keys(obj).sort().forEach(function (value, key) {
@@ -490,38 +408,6 @@ var utils = {
 
         return sorted;
     },
-    mergeObject: function (to, from) {
-        $.each(from, function (key, value) {
-            to[key] = value;
-        });
-
-        return to;
-    },
-    pushTo: function (to, from) {
-        $.each(from, function (key, value) {
-            to.push(value);
-        });
-
-        return to;
-    },
-    firstOf: function (items, callback) {
-        var first = null;
-
-        $.each(items, function (i, item) {
-            if (callback(item, i)) {
-                first = item;
-                return false;
-            }
-        });
-
-        return first;
-    },
-    lastOf: function (items, callback) {
-        return this.firstOf(items.reverse(), callback);
-    },
-    last: function (items) {
-        return items[items.length - 1];
-    },
     next: function (all, current, noLoop) {
         let i = all.indexOf(current) + 1;
         if (i < 0) {
@@ -635,4 +521,39 @@ settings.vue.gmaps = {
 
 var d = function (data) {
     console.log(data);
-};
\ No newline at end of file
+};
+
+//scroll to function, works on iframe, user can stop it by scrolling
+window.globalScrollTo = function(target, offsetTop)
+{
+    if (target.length < 1) {
+        return;
+    }
+
+    if (!offsetTop) {
+        offsetTop = 80;
+    }
+
+    //scroll if iframe
+    if ('parentIFrame' in window) {
+        parentIFrame.scrollToOffset(0, target.offset().top - offsetTop);
+        //scroll if not iframe
+    } else {
+        page = $('html,body');
+
+        //stop scrolling if user interacts
+        page.on("scroll mousedown wheel DOMMouseScroll mousewheel keyup touchmove", function () {
+            page.stop();
+        });
+
+        page.animate({scrollTop: target.offset().top - offsetTop}, 1000, function () {
+            //stop scrolling if user interacts
+            page.off("scroll mousedown wheel DOMMouseScroll mousewheel keyup touchmove");
+        });
+    }
+}
+
+window.observerOr = function(observer, or) {
+    return typeof ResizeObserver === 'undefined' ? or() : observer();
+}
+
diff --git a/src/Pckg/Framework/public/js/pckg.compiled.js b/src/Pckg/Framework/public/js/pckg.compiled.js
deleted file mode 100644
index 6f4fa845..00000000
--- a/src/Pckg/Framework/public/js/pckg.compiled.js
+++ /dev/null
@@ -1,162 +0,0 @@
-var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
-
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
-
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
-
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
-
-var Pckg = Pckg || {};
-Pckg = Object.assign(Pckg, {
-    Collection: function (_Array) {
-        _inherits(Collection, _Array);
-
-        function Collection() {
-            _classCallCheck(this, Collection);
-
-            return _possibleConstructorReturn(this, (Collection.__proto__ || Object.getPrototypeOf(Collection)).apply(this, arguments));
-        }
-
-        _createClass(Collection, null, [{
-            key: 'collect',
-            value: function collect(items, type) {
-                var collection = new Pckg.Collection();
-
-                $.each(items, function (i, item) {
-                    collection.push(new type(item));
-                }.bind(this));
-
-                return collection;
-            }
-        }]);
-
-        return Collection;
-    }(Array),
-    Database: {
-        Record: function () {
-            function Record(data) {
-                _classCallCheck(this, Record);
-
-                /**
-                 * Set default relations.
-                 */
-                var relations = this.getEntity().getRelations();
-                $.each(relations, function (key, setting) {
-                    if ((typeof setting === 'undefined' ? 'undefined' : _typeof(setting)) == 'object') {
-                        /**
-                         * Relations type is defined by of (class) and/or type (Array/Object)
-                         */
-                        if (setting.type == Array) {
-                            /**
-                             * Array relation
-                             */
-                            data[key] = Pckg.Collection.collect(data[key] || [], setting.of);
-                        } else {
-                            /**
-                             * Object relation
-                             */
-                            data[key] = new setting.of(data[key] || {});
-                        }
-                    } else {
-                        data[key] = data[key] || new value();
-                    }
-                });
-
-                /**
-                 * Set default fields.
-                 */
-                $.each(this.getEntity().getFields(), function (key, value) {
-                    data[key] = data[key] || new value();
-                });
-
-                /**
-                 * Set default fields.
-                 */
-                $.each(this.getEntity().getCollections(), function (key, value) {
-                    data[key] = value;
-                });
-
-                /**
-                 * Bind data to object, set getters and setters for vue.
-                 */
-                $.each(data, function (key, val) {
-                    this[key] = val;
-                }.bind(this));
-            }
-
-            _createClass(Record, [{
-                key: '$set',
-                value: function $set(key, val) {
-                    $vue.$set(this, key, val);
-                }
-            }, {
-                key: 'getData',
-                value: function getData() {
-                    var _this2 = this;
-
-                    var fields = this.getEntity().getFields();
-                    var data = {};
-
-                    $.each(fields, function (field, val) {
-                        return data[field] = _this2[field] || val;
-                    });
-
-                    return data;
-                }
-            }, {
-                key: 'insert',
-                value: function insert(callback) {
-                    var data = this.getData();
-
-                    if (typeof callback == 'undefined') {
-                        callback = function callback(data) {
-                        };
-                    }
-
-                    http.post(this.getUrl('insert'), data, callback);
-                }
-            }, {
-                key: 'getEntity',
-                value: function getEntity() {
-                    return new Pckg.Database.Entity();
-                }
-            }]);
-
-            return Record;
-        }(),
-
-        Entity: function () {
-            function Entity() {
-                _classCallCheck(this, Entity);
-            }
-
-            _createClass(Entity, [{
-                key: 'getFields',
-                value: function getFields() {
-                    return {};
-                }
-            }, {
-                key: 'getRelations',
-                value: function getRelations() {
-                    return {};
-                }
-            }, {
-                key: 'getUrl',
-                value: function getUrl(type, data) {
-                    if (type == 'insert') {
-                        return utils.url();
-                    }
-                }
-            }, {
-                key: 'getCollections',
-                value: function getUrl() {
-                    return {};
-                }
-            }]);
-
-            return Entity;
-        }()
-    }
-});
diff --git a/src/Pckg/Framework/public/js/pckg.js b/src/Pckg/Framework/public/js/pckg.js
deleted file mode 100644
index 3b511f23..00000000
--- a/src/Pckg/Framework/public/js/pckg.js
+++ /dev/null
@@ -1,118 +0,0 @@
-var Pckg = window.Pckg || {};
-Pckg = window.Pckg = Object.assign(Pckg, {
-    Collection: class extends Array {
-
-        static collect(items, type) {
-            var collection = new Pckg.Collection();
-
-            $.each(items, function (i, item) {
-                collection.push(new type(item));
-            }.bind(this));
-
-            return collection;
-        }
-    },
-    Database: {
-        Record: class {
-            constructor(data) {
-                /**
-                 * Set default relations.
-                 */
-                var relations = this.getEntity().getRelations();
-                $.each(relations, function (key, setting) {
-                    if (typeof setting == 'object') {
-                        /**
-                         * Relations type is defined by of (class) and/or type (Array/Object)
-                         */
-                        if (setting.type == Array) {
-                            /**
-                             * Array relation
-                             */
-                            data[key] = Pckg.Collection.collect(data[key] || [], setting.of);
-                        } else {
-                            /**
-                             * Object relation
-                             */
-                            data[key] = new setting.of(data[key] || {});
-                        }
-                    } else {
-                        data[key] = data[key] || new value;
-                    }
-                });
-
-                /**
-                 * Set default fields.
-                 */
-                $.each(this.getEntity().getFields(), function (key, value) {
-                    data[key] = data[key] || new value;
-                });
-
-                /**
-                 * Set default fields.
-                 */
-                $.each(this.getEntity().getCollections(), function (key, value) {
-                    data[key] = value;
-                });
-
-                /**
-                 * Bind data to object, set getters and setters for vue.
-                 */
-                $.each(data, function (key, val) {
-                    this[key] = val;
-                }.bind(this));
-            }
-
-            $set(key, val) {
-                $vue.$set(this, key, val);
-            }
-
-            getData() {
-                var fields = this.getEntity().getFields();
-                var data = {};
-
-                $.each(fields, (field, val) => {
-                    return data[field] = this[field] || val;
-                });
-
-                return data;
-            }
-
-            insert(callback) {
-                var data = this.getData();
-
-                if (typeof callback == 'undefined') {
-                    callback = function (data) {
-                    }
-                }
-
-                http.post(this.getUrl('insert'), data, callback);
-            }
-
-            getEntity() {
-                return new Pckg.Database.Entity();
-            }
-        },
-
-        Entity: class {
-
-            getFields() {
-                return {};
-            }
-
-            getRelations() {
-                return {};
-            }
-
-            getUrl(type, data) {
-                if (type == 'insert') {
-                    return utils.url()
-                }
-            }
-
-            getCollections() {
-                return {};
-            }
-
-        }
-    }
-});
\ No newline at end of file

From a00135c63d8fe42529fe0762bc2ddc7436415a6d Mon Sep 17 00:00:00 2001
From: Bojan Rajh <schtr4jh@schtr4jh.net>
Date: Mon, 7 Mar 2022 10:30:14 +0100
Subject: [PATCH 64/66] Allow empty values

---
 src/Pckg/Framework/public/js/pckg-generic-app-top.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Pckg/Framework/public/js/pckg-generic-app-top.js b/src/Pckg/Framework/public/js/pckg-generic-app-top.js
index ff9aa44d..49070a73 100644
--- a/src/Pckg/Framework/public/js/pckg-generic-app-top.js
+++ b/src/Pckg/Framework/public/js/pckg-generic-app-top.js
@@ -77,7 +77,7 @@ export const pckgTranslations = {
                 let locale = Pckg.config.locale.current.toLowerCase();
                 translation = key[locale] || Object.values(key)[0];
             } else {
-                translation = $store.state.translations[key] || key;
+                translation = typeof $store.state.translations[key] !== 'undefined' ? $store.state.translations[key] : key;
 
                 if (false && Object.keys($store.state.translations).indexOf(key) === -1) {
                     if ($store && $store.getters.isAdmin) {

From 017c446b62a5f8cdf8317de2e71ae78a88aa28ba Mon Sep 17 00:00:00 2001
From: Bojan Rajh <schtr4jh@schtr4jh.net>
Date: Sun, 3 Apr 2022 09:13:05 +0200
Subject: [PATCH 65/66] Conditionally parse config

---
 src/Pckg/Framework/Config/Command/InitConfig.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Pckg/Framework/Config/Command/InitConfig.php b/src/Pckg/Framework/Config/Command/InitConfig.php
index 89176cf1..aea2e9c9 100644
--- a/src/Pckg/Framework/Config/Command/InitConfig.php
+++ b/src/Pckg/Framework/Config/Command/InitConfig.php
@@ -20,7 +20,9 @@ public function __construct(Config $config)
 
     public function execute(callable $next)
     {
-        $this->config->parseDir(path('app'));
+        if ($this->config->get('path.app')) {
+            $this->config->parseDir(path('app'));
+        }
 
         trigger(InitConfig::class . '.executed');
 

From bf6ab33157d299ea670febdaa2f5342a0e8dd00c Mon Sep 17 00:00:00 2001
From: Bojan Rajh <schtr4jh@schtr4jh.net>
Date: Sat, 9 Apr 2022 19:02:03 +0200
Subject: [PATCH 66/66] By path

---
 src/Pckg/Framework/Environment/Production.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Pckg/Framework/Environment/Production.php b/src/Pckg/Framework/Environment/Production.php
index fc9cbe38..367e1f2e 100644
--- a/src/Pckg/Framework/Environment/Production.php
+++ b/src/Pckg/Framework/Environment/Production.php
@@ -168,6 +168,11 @@ public function getApplicationNameFromGlobalRouter()
         $hostname = $_SERVER['HTTP_HOST'] ?? null;
 
         foreach ($apps as $app => $config) {
+            if (isset($config['path'])) {
+                if (!in_array($_SERVER['SCRIPT_URL'], $config['path'])) {
+                    continue;
+                }
+            }
             if (in_array($hostname, $config['host'])) {
                 return $app;
             }