Update to use the new resolver

src/Context/AppContext.php

@@ -19,7 +19,7 @@ class AppContext extends Context implements Translatable
   protected function _initialize(): void
   {
     parent::_initialize();
-    $cubex = $this->getCubex();
+    $cubex = @$this->getCubex();
 
     //Register the database
     $databaseProvider = DatabaseProvider::instance($this);
@@ -40,14 +40,4 @@ public function linkBuilder(string $path = '', array $query = []): LinkBuilder
   {
     return LinkBuilder::fromRequest($this->request(), $path, $query)->setSubDomain('www');
   }
-
-  public function flash(): FlashMessageProvider
-  {
-    return $this->getCubex()->retrieve(FlashMessageProvider::class);
-  }
-
-  public function seo(): SeoProvider
-  {
-    return $this->getCubex()->retrieve(SeoProvider::class);
-  }
 }

src/Context/Providers/AbstractProvider.php

@@ -19,6 +19,7 @@ abstract class AbstractProvider implements ContextAware, WithContext
    * Returns an instance of the provider
    *
    * @param Context $context
+   * @param mixed   ...$args
    *
    * @return static
    */

src/Http/Controllers/FrontendController.php

@@ -2,14 +2,37 @@
 
 namespace CubexBase\Application\Http\Controllers;
 
+use CubexBase\Application\Context\Providers\FlashMessageProvider;
+use CubexBase\Application\Context\Providers\SeoProvider;
+use CubexBase\Application\Http\Forms\ExampleForm\ExampleForm;
 use CubexBase\Application\Http\Layout\LayoutController;
+use CubexBase\Application\Http\Views\Home\HomeView;
+use Packaged\Http\Responses\RedirectResponse;
 
 class FrontendController extends LayoutController
 {
   protected function _generateRoutes()
   {
-    yield self::_route('$', HomeController::class);
-    yield self::_route('test', TestController::class);
+    yield self::_route('$', 'home');
+    yield self::_route('test', 'test');
     yield self::_route('secure', SecureController::class);
   }
+
+  public function getHome(SeoProvider $seo)
+  {
+    $form = ExampleForm::withContext($this, 'example_form');
+    $form->hydrate($this->request()->request->all());
+    $form->hydrate($this->request()->query->all());
+
+    $seo->meta('description', 'This is the description');
+
+    return HomeView::withContext($this)
+      ->setForm($form);
+  }
+
+  public function getTest(FlashMessageProvider $flash)
+  {
+    $flash->addMessage('success', 'This is a test message');
+    return RedirectResponse::create('/');
+  }
 }

src/Http/Layout/Layout.php → src/Http/Layout/DefaultLayout/Layout.php

@@ -1,7 +1,9 @@
 <?php
-namespace CubexBase\Application\Http\Layout;
+namespace CubexBase\Application\Http\Layout\DefaultLayout;
 
 use CubexBase\Application\Context\AppContext;
+use CubexBase\Application\Context\Providers\FlashMessageProvider;
+use CubexBase\Application\Context\Providers\SeoProvider;
 use CubexBase\Application\Http\Components\Footer\Footer;
 use CubexBase\Application\Http\Components\Header\Header;
 use Packaged\Context\ContextAware;
@@ -24,7 +26,10 @@ class Layout extends Element implements ContextAware, WithContext
   protected mixed $_header;
   protected mixed $_footer;
 
-  public function __construct()
+  public function __construct(
+    public ?SeoProvider          $seoProvider = null,
+    public ?FlashMessageProvider $flash = null
+  )
   {
     // Require default resources
     ResourceManager::resources()->requireCss('main.min.css');

src/Http/Layout/Layout.phtml → src/Http/Layout/DefaultLayout/Layout.phtml

@@ -1,6 +1,6 @@
 <?php
 
-use CubexBase\Application\Http\Layout\Layout;
+use CubexBase\Application\Http\Layout\DefaultLayout\Layout;
 use Packaged\Dispatch\Dispatch;
 use Packaged\Dispatch\ResourceStore;
 
@@ -22,16 +22,16 @@ $store = Dispatch::instance()->store();
   <link type="text/plain" rel="author" href="<?= $ctx->linkBuilder('/humans.txt') ?>">
   <link rel="manifest" href="<?= $ctx->linkBuilder('/site.webmanifest') ?>">
 
-  <?php if($this->getContext()->seo()): ?>
-    <?= $this->getContext()->seo() ?>
+  <?php if($this->seoProvider): ?>
+    <?= $this->seoProvider ?>
   <?php endif; ?>
 
   <?= $store->generateHtmlIncludes() ?>
 </head>
 
 <body class="<?= $this->getPageClass() ?>">
 
-<?php foreach($ctx->flash()->getMessages() as $message): ?>
+<?php foreach($this->flash->getMessages() as $message): ?>
   <div class="alert alert-<?= $message['type'] ?>">
     <p><?= $message['message'] ?></p>
   </div>

src/Http/Layout/LayoutController.php

@@ -2,6 +2,8 @@
 
 namespace CubexBase\Application\Http\Layout;
 
+use Cubex\CubexAware;
+use CubexBase\Application\Http\Layout\DefaultLayout\Layout;
 use CubexBase\Application\Http\Views\AbstractView;
 use CubexBase\Application\MainApplication;
 use Exception;
@@ -32,7 +34,7 @@ protected function _prepareResponse(Context $c, $result, $buffer = null)
       }
     }
 
-    $theme = Layout::withContext($this);
+    $theme = $this->getTheme();
     $theme->setContent($result);
 
     if($result instanceof AbstractView)
@@ -62,4 +64,14 @@ protected function _isAppropriateResponse($result): bool
   {
     return $result instanceof Element || $result instanceof HtmlElement || is_scalar($result) || is_array($result);
   }
+
+  public function getTheme()
+  {
+    $ctx = $this->getContext();
+    if($ctx instanceof CubexAware)
+    {
+      return $ctx->getCubex()->resolve(Layout::class);
+    }
+    return Layout::withContext($this);
+  }
 }

src/Http/Layout/WithErrorController.php

@@ -3,6 +3,8 @@
 namespace CubexBase\Application\Http\Layout;
 
 use Cubex\Controller\AuthedController;
+use Cubex\Cubex;
+use Cubex\CubexAware;
 use Cubex\I18n\GetTranslatorTrait;
 use CubexBase\Application\Context\AppContext;
 use CubexBase\Application\Http\Middleware\WithMiddlewareTrait;
@@ -29,6 +31,20 @@ protected function _getHandler(Context $context): callable|string|Handler
     return $handler ?: 'error';
   }
 
+  protected function _processHandler(Context $c, $handler, &$response): bool
+  {
+    while(is_callable($handler))
+    {
+      /** @var Cubex $cubex */
+      if($c instanceof CubexAware)
+      {
+        $cubex = @$c->getCubex();
+        $handler = $cubex->resolveMethod($handler[0], $handler[1]);
+      }
+    }
+    return parent::_processHandler($c, $handler, $response);
+  }
+
   protected function _makeCubexResponse($content): Response
   {
     $result = parent::_makeCubexResponse($content);

src/Http/Views/Home/HomeView.phtml

@@ -1,8 +1,6 @@
 <?php
 
-use CubexBase\Application\Http\Components\Button\Button;
 use CubexBase\Application\Http\Views\Home\HomeView;
-use Packaged\SafeHtml\SafeHtml;
 
 /**
  * @var HomeView $this

src/MainApplication.php

@@ -7,6 +7,7 @@
 use Cubex\Events\Handle\ResponsePreSendHeadersEvent;
 use Cubex\Sitemap\SitemapListener;
 use CubexBase\Application\Context\AppContext;
+use CubexBase\Application\Context\Providers\FlashMessageProvider;
 use Exception;
 use MrEssex\FileCache\AbstractCache;
 use MrEssex\FileCache\ApcuCache;
@@ -36,10 +37,11 @@ class MainApplication extends Application
 
   public function __construct(Cubex $cubex)
   {
-    parent::__construct($cubex);
     $cache = new ApcuCache(); //new FileCache();
     $cache->setTtl(30);
     self::$_cache = $cache;
+
+    parent::__construct($cubex);
   }
 
   public function handle(Context $c): SResponse
@@ -62,6 +64,15 @@ protected function _initialize(): void
   {
     parent::_initialize();
     $this->_initDispatch();
+
+    $cubex = @$this->getCubex();
+    $cubex->aliasAbstract(AppContext::class, Context::class);
+    $cubex->onAfterResolve(function ($inst) {
+      if($inst instanceof Context)
+      {
+        $inst->setContext($this->getContext());
+      }
+    });
   }
 
   /**
@@ -217,7 +228,7 @@ protected function _setupCookies(ResponsePreSendHeadersEvent $event)
     $ctx = $event->getContext();
 
     // Add flash messages to cookies
-    $flash = $ctx->flash();
+    $flash = $ctx->getCubex()->retrieve(FlashMessageProvider::class);
     if($flash->hasMessages())
     {
       $response->headers->setCookie(