EspoCRM – Open Source CRM Application
PHP calendarcontactscrmcrm-platformcrm-systemcustomer-portalcustomer-supportcustomizabledocumentsemail-marketingkanbanleadsopen-sourcephpplatformsales-automationsingle-page-applicationsupport
CS
Yuriib423dc4a7a6e
diff --git a/application/Espo/Core/Api/Route.php b/application/Espo/Core/Api/Route.phpindex d26d10c750..fd966726ee 100644--- a/application/Espo/Core/Api/Route.php+++ b/application/Espo/Core/Api/Route.php@@ -43,7 +43,7 @@ class Routeprivate string $adjustedRoute,private array $params,private bool $noAuth,- private ?string $actionClassName+ private ?string $actionClassName,) {$this->method = strtoupper($method);}diff --git a/application/Espo/Core/Api/RouteProcessor.php b/application/Espo/Core/Api/RouteProcessor.phpindex 53c7c48fa1..622e3aca7d 100644--- a/application/Espo/Core/Api/RouteProcessor.php+++ b/application/Espo/Core/Api/RouteProcessor.php@@ -62,13 +62,13 @@ class RouteProcessorprivate ApplicationUser $applicationUser,private ControllerActionProcessor $actionProcessor,private MiddlewareProvider $middlewareProvider,- private InjectableFactory $injectableFactory+ private InjectableFactory $injectableFactory,) {}public function process(ProcessData $processData,Psr7Request $request,- Psr7Response $response+ Psr7Response $response,): Psr7Response {$requestWrapped = new RequestWrapper($request, $processData->getBasePath(), $processData->getRouteParams());@@ -76,17 +76,17 @@ class RouteProcessortry {return $this->processInternal(- $processData,- $request,- $requestWrapped,- $responseWrapped+ processData: $processData,+ psrRequest: $request,+ request: $requestWrapped,+ response: $responseWrapped,);} catch (Exception $exception) {$this->handleException(- $exception,- $requestWrapped,- $responseWrapped,- $processData->getRoute()->getAdjustedRoute()+ exception: $exception,+ request: $requestWrapped,+ response: $responseWrapped,+ route: $processData->getRoute()->getAdjustedRoute(),);return $responseWrapped->toPsr7();@@ -100,7 +100,7 @@ class RouteProcessorProcessData $processData,Psr7Request $psrRequest,RequestWrapper $request,- ResponseWrapper $response+ ResponseWrapper $response,): Psr7Response {$authRequired = !$processData->getRoute()->noAuth();@@ -136,13 +136,18 @@ class RouteProcessorprivate function processAfterAuth(ProcessData $processData,Psr7Request $request,- ResponseWrapper $responseWrapped+ ResponseWrapper $responseWrapped,): Psr7Response {$actionClassName = $processData->getRoute()->getActionClassName();if ($actionClassName) {- return $this->processAction($actionClassName, $processData, $request, $responseWrapped);+ return $this->processAction(+ actionClassName: $actionClassName,+ processData: $processData,+ request: $request,+ responseWrapped: $responseWrapped,+ );}return $this->processControllerAction($processData, $request, $responseWrapped);@@ -155,10 +160,9 @@ class RouteProcessorstring $actionClassName,ProcessData $processData,Psr7Request $request,- ResponseWrapper $responseWrapped+ ResponseWrapper $responseWrapped,): Psr7Response {- /** @var Action $action */$action = $this->injectableFactory->create($actionClassName);$handler = new ActionHandler(@@ -189,7 +193,7 @@ class RouteProcessorprivate function processControllerAction(ProcessData $processData,Psr7Request $request,- ResponseWrapper $responseWrapped+ ResponseWrapper $responseWrapped,): Psr7Response {$controller = $this->getControllerName($processData);@@ -236,11 +240,16 @@ class RouteProcessorException $exception,Request $request,Response $response,- string $route+ string $route,): void {try {- $this->errorOutput->process($request, $response, $exception, $route);+ $this->errorOutput->process(+ request: $request,+ response: $response,+ exception: $exception,+ route: $route,+ );} catch (Throwable $exceptionAnother) {$this->log->error($exceptionAnother->getMessage());@@ -255,18 +264,20 @@ class RouteProcessorMiddlewareDispatcher $dispatcher,string $method,string $controller,- string $action+ string $action,): void {- $controllerActionMiddlewareList = $this->middlewareProvider- ->getControllerActionMiddlewareList($method, $controller, $action);+ $controllerActionMiddlewareList = $this->middlewareProvider->getControllerActionMiddlewareList(+ method: $method,+ controller: $controller,+ action: $action,+ );foreach ($controllerActionMiddlewareList as $middleware) {$dispatcher->addMiddleware($middleware);}- $controllerMiddlewareList = $this->middlewareProvider- ->getControllerMiddlewareList($controller);+ $controllerMiddlewareList = $this->middlewareProvider->getControllerMiddlewareList($controller);foreach ($controllerMiddlewareList as $middleware) {$dispatcher->addMiddleware($middleware);diff --git a/application/Espo/Core/Portal/Utils/Route.php b/application/Espo/Core/Portal/Utils/Route.phpindex 06691cec5f..0cff63316a 100644--- a/application/Espo/Core/Portal/Utils/Route.php+++ b/application/Espo/Core/Portal/Utils/Route.php@@ -50,12 +50,12 @@ class Route extends BaseRoute$path = '/{portalId}' . $path;$newRoute = new RouteItem(- $route->getMethod(),- $route->getRoute(),- $path,- $route->getParams(),- $route->noAuth(),- $route->getActionClassName()+ method: $route->getMethod(),+ route: $route->getRoute(),+ adjustedRoute: $path,+ params: $route->getParams(),+ noAuth: $route->noAuth(),+ actionClassName: $route->getActionClassName(),);$newRouteList[] = $newRoute;diff --git a/application/Espo/Core/Utils/Route.php b/application/Espo/Core/Utils/Route.phpindex 9d0d0a6262..42020367b6 100644--- a/application/Espo/Core/Utils/Route.php+++ b/application/Espo/Core/Utils/Route.php@@ -32,7 +32,6 @@ namespace Espo\Core\Utils;use Espo\Core\Api\Action;use Espo\Core\Api\Route as RouteItem;use Espo\Core\Binding\Attributes\Qualify;-use Espo\Core\Exceptions\BadRequest;use Espo\Core\Utils\Config\SystemConfig;use Espo\Core\Utils\File\Manager as FileManager;use Espo\Core\Utils\Resource\PathProvider;@@ -79,12 +78,12 @@ class Routereturn array_map(function (array $item): RouteItem {return new RouteItem(- $item['method'],- $item['route'],- $item['adjustedRoute'],- $item['params'] ?? [],- $item['noAuth'] ?? false,- $item['actionClassName'] ?? null+ method: $item['method'],+ route: $item['route'],+ adjustedRoute: $item['adjustedRoute'],+ params: $item['params'] ?? [],+ noAuth: $item['noAuth'] ?? false,+ actionClassName: $item['actionClassName'] ?? null,);},$this->data