mirror of
https://github.com/Karaka-Management/oms-Shop.git
synced 2026-02-16 17:58:42 +00:00
rename http classes
This commit is contained in:
parent
0956a59999
commit
43508660ad
|
|
@ -37,10 +37,10 @@ use phpOMS\DataStorage\Session\HttpSession;
|
||||||
use phpOMS\Dispatcher\Dispatcher;
|
use phpOMS\Dispatcher\Dispatcher;
|
||||||
use phpOMS\Event\EventManager;
|
use phpOMS\Event\EventManager;
|
||||||
use phpOMS\Localization\L11nManager;
|
use phpOMS\Localization\L11nManager;
|
||||||
use phpOMS\Message\Http\Request;
|
use phpOMS\Message\Http\HttpRequest;
|
||||||
use phpOMS\Message\Http\RequestMethod;
|
use phpOMS\Message\Http\RequestMethod;
|
||||||
use phpOMS\Message\Http\RequestStatusCode;
|
use phpOMS\Message\Http\RequestStatusCode;
|
||||||
use phpOMS\Message\Http\Response;
|
use phpOMS\Message\Http\HttpResponse;
|
||||||
use phpOMS\Model\Html\Head;
|
use phpOMS\Model\Html\Head;
|
||||||
use phpOMS\Module\ModuleManager;
|
use phpOMS\Module\ModuleManager;
|
||||||
use phpOMS\Router\RouteVerb;
|
use phpOMS\Router\RouteVerb;
|
||||||
|
|
@ -97,14 +97,14 @@ final class Application
|
||||||
/**
|
/**
|
||||||
* Rendering Shop.
|
* Rendering Shop.
|
||||||
*
|
*
|
||||||
* @param Request $request Request
|
* @param HttpRequest $request Request
|
||||||
* @param Response $response Response
|
* @param HttpResponse $response Response
|
||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*
|
*
|
||||||
* @since 1.0.0
|
* @since 1.0.0
|
||||||
*/
|
*/
|
||||||
public function run(Request $request, Response $response) : void
|
public function run(HttpRequest $request, HttpResponse $response) : void
|
||||||
{
|
{
|
||||||
$pageView = new ShopView($this->l11nManager, $request, $response);
|
$pageView = new ShopView($this->l11nManager, $request, $response);
|
||||||
$head = new Head();
|
$head = new Head();
|
||||||
|
|
@ -240,14 +240,14 @@ final class Application
|
||||||
/**
|
/**
|
||||||
* Get application organization
|
* Get application organization
|
||||||
*
|
*
|
||||||
* @param Request $request Client request
|
* @param HttpRequest $request Client request
|
||||||
* @param array $config App config
|
* @param array $config App config
|
||||||
*
|
*
|
||||||
* @return int Organization id
|
* @return int Organization id
|
||||||
*
|
*
|
||||||
* @since 1.0.0
|
* @since 1.0.0
|
||||||
*/
|
*/
|
||||||
private function getApplicationOrganization(Request $request, array $config) : int
|
private function getApplicationOrganization(HttpRequest $request, array $config) : int
|
||||||
{
|
{
|
||||||
return (int) (
|
return (int) (
|
||||||
$request->getData('u') ?? (
|
$request->getData('u') ?? (
|
||||||
|
|
@ -261,14 +261,14 @@ final class Application
|
||||||
/**
|
/**
|
||||||
* Create 406 response.
|
* Create 406 response.
|
||||||
*
|
*
|
||||||
* @param Response $response Response
|
* @param HttpResponse $response Response
|
||||||
* @param View $pageView View
|
* @param View $pageView View
|
||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*
|
*
|
||||||
* @since 1.0.0
|
* @since 1.0.0
|
||||||
*/
|
*/
|
||||||
private function create406Response(Response $response, View $pageView) : void
|
private function create406Response(HttpResponse $response, View $pageView) : void
|
||||||
{
|
{
|
||||||
$response->getHeader()->setStatusCode(RequestStatusCode::R_406);
|
$response->getHeader()->setStatusCode(RequestStatusCode::R_406);
|
||||||
$pageView->setTemplate('/Web/Shop/Error/406');
|
$pageView->setTemplate('/Web/Shop/Error/406');
|
||||||
|
|
@ -281,14 +281,14 @@ final class Application
|
||||||
/**
|
/**
|
||||||
* Create 406 response.
|
* Create 406 response.
|
||||||
*
|
*
|
||||||
* @param Response $response Response
|
* @param HttpResponse $response Response
|
||||||
* @param View $pageView View
|
* @param View $pageView View
|
||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*
|
*
|
||||||
* @since 1.0.0
|
* @since 1.0.0
|
||||||
*/
|
*/
|
||||||
private function create503Response(Response $response, View $pageView) : void
|
private function create503Response(HttpResponse $response, View $pageView) : void
|
||||||
{
|
{
|
||||||
$response->getHeader()->setStatusCode(RequestStatusCode::R_503);
|
$response->getHeader()->setStatusCode(RequestStatusCode::R_503);
|
||||||
$pageView->setTemplate('/Web/Shop/Error/503');
|
$pageView->setTemplate('/Web/Shop/Error/503');
|
||||||
|
|
@ -323,13 +323,13 @@ final class Application
|
||||||
/**
|
/**
|
||||||
* Load permission
|
* Load permission
|
||||||
*
|
*
|
||||||
* @param Request $request Current request
|
* @param HttpRequest $request Current request
|
||||||
*
|
*
|
||||||
* @return Account
|
* @return Account
|
||||||
*
|
*
|
||||||
* @since 1.0.0
|
* @since 1.0.0
|
||||||
*/
|
*/
|
||||||
private function loadAccount(Request $request) : Account
|
private function loadAccount(HttpRequest $request) : Account
|
||||||
{
|
{
|
||||||
$account = AccountMapper::getWithPermissions($request->getHeader()->getAccount());
|
$account = AccountMapper::getWithPermissions($request->getHeader()->getAccount());
|
||||||
$this->app->accountManager->add($account);
|
$this->app->accountManager->add($account);
|
||||||
|
|
@ -340,14 +340,14 @@ final class Application
|
||||||
/**
|
/**
|
||||||
* Create 406 response.
|
* Create 406 response.
|
||||||
*
|
*
|
||||||
* @param Response $response Response
|
* @param HttpResponse $response Response
|
||||||
* @param View $pageView View
|
* @param View $pageView View
|
||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*
|
*
|
||||||
* @since 1.0.0
|
* @since 1.0.0
|
||||||
*/
|
*/
|
||||||
private function create403Response(Response $response, View $pageView) : void
|
private function create403Response(HttpResponse $response, View $pageView) : void
|
||||||
{
|
{
|
||||||
$response->getHeader()->setStatusCode(RequestStatusCode::R_403);
|
$response->getHeader()->setStatusCode(RequestStatusCode::R_403);
|
||||||
$pageView->setTemplate('/Web/Shop/Error/403');
|
$pageView->setTemplate('/Web/Shop/Error/403');
|
||||||
|
|
@ -360,15 +360,15 @@ final class Application
|
||||||
/**
|
/**
|
||||||
* Initialize response head
|
* Initialize response head
|
||||||
*
|
*
|
||||||
* @param Head $head Head to fill
|
* @param Head $head Head to fill
|
||||||
* @param Request $request Request
|
* @param HttpRequest $request Request
|
||||||
* @param Response $response Response
|
* @param HttpResponse $response Response
|
||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*
|
*
|
||||||
* @since 1.0.0
|
* @since 1.0.0
|
||||||
*/
|
*/
|
||||||
private function initResponseHead(Head $head, Request $request, Response $response) : void
|
private function initResponseHead(Head $head, HttpRequest $request, HttpResponse $response) : void
|
||||||
{
|
{
|
||||||
/* Load assets */
|
/* Load assets */
|
||||||
$head->addAsset(AssetType::CSS, 'Resources/fontawesome/css/font-awesome.min.css');
|
$head->addAsset(AssetType::CSS, 'Resources/fontawesome/css/font-awesome.min.css');
|
||||||
|
|
@ -407,15 +407,15 @@ final class Application
|
||||||
/**
|
/**
|
||||||
* Create logged out response
|
* Create logged out response
|
||||||
*
|
*
|
||||||
* @param Response $response Response
|
* @param HttpResponse $response Response
|
||||||
* @param Head $head Head to fill
|
* @param Head $head Head to fill
|
||||||
* @param View $pageView View
|
* @param View $pageView View
|
||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*
|
*
|
||||||
* @since 1.0.0
|
* @since 1.0.0
|
||||||
*/
|
*/
|
||||||
private function createLoggedOutResponse(Response $response, Head $head, View $pageView) : void
|
private function createLoggedOutResponse(HttpResponse $response, Head $head, View $pageView) : void
|
||||||
{
|
{
|
||||||
$response->getHeader()->setStatusCode(RequestStatusCode::R_403);
|
$response->getHeader()->setStatusCode(RequestStatusCode::R_403);
|
||||||
$pageView->setTemplate('/Web/Shop/login');
|
$pageView->setTemplate('/Web/Shop/login');
|
||||||
|
|
@ -424,15 +424,15 @@ final class Application
|
||||||
/**
|
/**
|
||||||
* Create default page view
|
* Create default page view
|
||||||
*
|
*
|
||||||
* @param Request $request Request
|
* @param HttpRequest $request Request
|
||||||
* @param Response $response Response
|
* @param HttpResponse $response Response
|
||||||
* @param ShopView $pageView View
|
* @param ShopView $pageView View
|
||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*
|
*
|
||||||
* @since 1.0.0
|
* @since 1.0.0
|
||||||
*/
|
*/
|
||||||
private function createDefaultPageView(Request $request, Response $response, ShopView $pageView) : void
|
private function createDefaultPageView(HttpRequest $request, HttpResponse $response, ShopView $pageView) : void
|
||||||
{
|
{
|
||||||
$pageView->setOrganizations(UnitMapper::getAll());
|
$pageView->setOrganizations(UnitMapper::getAll());
|
||||||
$pageView->setProfile(ProfileMapper::getFor($request->getHeader()->getAccount(), 'account'));
|
$pageView->setProfile(ProfileMapper::getFor($request->getHeader()->getAccount(), 'account'));
|
||||||
|
|
@ -444,14 +444,14 @@ final class Application
|
||||||
/**
|
/**
|
||||||
* Create navigation
|
* Create navigation
|
||||||
*
|
*
|
||||||
* @param Request $request Request
|
* @param HttpRequest $request Request
|
||||||
* @param Response $response Response
|
* @param HttpResponse $response Response
|
||||||
*
|
*
|
||||||
* @return View
|
* @return View
|
||||||
*
|
*
|
||||||
* @since 1.0.0
|
* @since 1.0.0
|
||||||
*/
|
*/
|
||||||
private function getNavigation(Request $request, Response $response) : View
|
private function getNavigation(HttpRequest $request, HttpResponse $response) : View
|
||||||
{
|
{
|
||||||
/** @var \Modules\Navigation\Controller\ShopController $navController */
|
/** @var \Modules\Navigation\Controller\ShopController $navController */
|
||||||
$navController = $this->app->moduleManager->get('Navigation');
|
$navController = $this->app->moduleManager->get('Navigation');
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user