Skip to content

Commit 278bfc8

Browse files
committed
Merge branch 'master' into 1.x
2 parents 48d67ad + c321526 commit 278bfc8

File tree

3 files changed

+10
-5
lines changed

3 files changed

+10
-5
lines changed

Application.php

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class Application extends Container
3030
{
3131
use InvokerAware;
3232

33-
public const APP_VERSION = '1.0.2';
33+
public const APP_VERSION = '1.0.3';
3434

3535
public const MIN_PHP_VERSION = '8.2';
3636

@@ -656,8 +656,11 @@ protected function coreAliases(): array
656656
=> \Symfony\Component\Console\Input\ArgvInput::class,
657657
\Symfony\Component\Console\Output\OutputInterface::class
658658
=> \Symfony\Component\Console\Output\ConsoleOutput::class,
659-
\Qubus\Http\Cookies\Factory\HttpCookieFactory::class => \Qubus\Http\Cookies\Factory\CookieFactory::class,
660-
\Qubus\Http\Session\Storage\SessionStorage::class => \Qubus\Http\Session\Storage\SimpleCacheStorage::class,
659+
\Qubus\Http\Cookies\Factory\HttpCookieFactory::class
660+
=> \Qubus\Http\Cookies\Factory\CookieFactory::class,
661+
\Qubus\Http\Session\Storage\SessionStorage::class
662+
=> \Qubus\Http\Session\Storage\SimpleCacheStorage::class,
663+
\Qubus\Http\Session\HttpSession::class => \Qubus\Http\Session\SessionData::class,
661664
]
662665
];
663666
}

Http/BaseController.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
use Codefy\Framework\Contracts\RoutingController;
88
use Psr\Http\Message\ResponseInterface;
99
use Psr\Http\Message\ServerRequestInterface;
10+
use Qubus\Http\Session\HttpSession;
1011
use Qubus\Routing\Controller\Controller;
1112
use Qubus\Routing\Router;
1213
use Qubus\View\Native\NativeLoader;
@@ -22,7 +23,7 @@ public function __construct(
2223
protected ?ResponseInterface $response = null,
2324
protected ?Router $router = null,
2425
protected ?Renderer $view = null,
25-
26+
protected ?HttpSession $httpSession = null,
2627
) {
2728
$this->setRequest($request ?? app(name: ServerRequestInterface::class));
2829
$this->response = $response ?? app(name: ResponseInterface::class);

Http/Kernel.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
use Codefy\Framework\Application;
88
use Codefy\Framework\Contracts\Kernel as HttpKernel;
99
use Exception;
10+
use Laminas\HttpHandlerRunner\Emitter\SapiEmitter;
1011
use Qubus\Error\Handlers\DebugErrorHandler;
1112
use Qubus\Error\Handlers\ErrorHandler;
1213
use Qubus\Error\Handlers\ProductionErrorHandler;
@@ -62,7 +63,7 @@ protected function dispatchRouter(): bool
6263
files: $_FILES
6364
)
6465
),
65-
emitter: null
66+
emitter: new SapiEmitter()
6667
);
6768
}
6869

0 commit comments

Comments
 (0)