Merge branch 'master' into 1.x

codefyphp · Oct 12, 2023 · 278bfc8 · 278bfc8
2 parents 48d67ad + c321526
commit 278bfc8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/Application.php b/Application.php
@@ -30,7 +30,7 @@ class Application extends Container
 {
     use InvokerAware;
 
-    public const APP_VERSION = '1.0.2';
+    public const APP_VERSION = '1.0.3';
 
     public const MIN_PHP_VERSION = '8.2';
 
@@ -656,8 +656,11 @@ protected function coreAliases(): array
                 => \Symfony\Component\Console\Input\ArgvInput::class,
                 \Symfony\Component\Console\Output\OutputInterface::class
                 => \Symfony\Component\Console\Output\ConsoleOutput::class,
-                \Qubus\Http\Cookies\Factory\HttpCookieFactory::class => \Qubus\Http\Cookies\Factory\CookieFactory::class,
-                \Qubus\Http\Session\Storage\SessionStorage::class => \Qubus\Http\Session\Storage\SimpleCacheStorage::class,
+                \Qubus\Http\Cookies\Factory\HttpCookieFactory::class
+                => \Qubus\Http\Cookies\Factory\CookieFactory::class,
+                \Qubus\Http\Session\Storage\SessionStorage::class
+                => \Qubus\Http\Session\Storage\SimpleCacheStorage::class,
+                \Qubus\Http\Session\HttpSession::class => \Qubus\Http\Session\SessionData::class,
             ]
         ];
     }

diff --git a/Http/BaseController.php b/Http/BaseController.php
@@ -7,6 +7,7 @@
 use Codefy\Framework\Contracts\RoutingController;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
+use Qubus\Http\Session\HttpSession;
 use Qubus\Routing\Controller\Controller;
 use Qubus\Routing\Router;
 use Qubus\View\Native\NativeLoader;
@@ -22,7 +23,7 @@ public function __construct(
         protected ?ResponseInterface $response = null,
         protected ?Router $router = null,
         protected ?Renderer $view = null,
-
+        protected ?HttpSession $httpSession = null,
     ) {
         $this->setRequest($request ?? app(name: ServerRequestInterface::class));
         $this->response = $response ?? app(name: ResponseInterface::class);

diff --git a/Http/Kernel.php b/Http/Kernel.php
@@ -7,6 +7,7 @@
 use Codefy\Framework\Application;
 use Codefy\Framework\Contracts\Kernel as HttpKernel;
 use Exception;
+use Laminas\HttpHandlerRunner\Emitter\SapiEmitter;
 use Qubus\Error\Handlers\DebugErrorHandler;
 use Qubus\Error\Handlers\ErrorHandler;
 use Qubus\Error\Handlers\ProductionErrorHandler;
@@ -62,7 +63,7 @@ protected function dispatchRouter(): bool
                     files: $_FILES
                 )
             ),
-            emitter: null
+            emitter: new SapiEmitter()
         );
     }