diff --git a/application/Espo/Classes/FieldValidators/JsonArrayType.php b/application/Espo/Classes/FieldValidators/JsonArrayType.php index 24bad516c4..570a7eb1be 100644 --- a/application/Espo/Classes/FieldValidators/JsonArrayType.php +++ b/application/Espo/Classes/FieldValidators/JsonArrayType.php @@ -31,11 +31,11 @@ namespace Espo\Classes\FieldValidators; use Espo\ORM\Entity; -use StdClass; +use stdClass; class JsonArrayType { - public function rawCheckArray(StdClass $data, string $field): bool + public function rawCheckArray(stdClass $data, string $field): bool { if (isset($data->$field) && !is_array($data->$field)) { return false; diff --git a/application/Espo/Controllers/Action.php b/application/Espo/Controllers/Action.php index f2dfae3962..617a19f221 100644 --- a/application/Espo/Controllers/Action.php +++ b/application/Espo/Controllers/Action.php @@ -35,7 +35,7 @@ use Espo\Core\{ Api\Request, }; -use StdClass; +use stdClass; /** * Action framework. @@ -49,7 +49,7 @@ class Action $this->service = $service; } - public function postActionProcess(Request $request): StdClass + public function postActionProcess(Request $request): stdClass { $body = $request->getParsedBody(); diff --git a/application/Espo/Controllers/LastViewed.php b/application/Espo/Controllers/LastViewed.php index 72cc049377..b469c16491 100644 --- a/application/Espo/Controllers/LastViewed.php +++ b/application/Espo/Controllers/LastViewed.php @@ -36,7 +36,7 @@ use Espo\Core\{ use Espo\Services\LastViewed as Service; -use StdClass; +use stdClass; class LastViewed { @@ -50,7 +50,7 @@ class LastViewed $this->service = $service; } - public function getActionIndex(Request $request): StdClass + public function getActionIndex(Request $request): stdClass { $searchParams = $this->searchParamsFetcher->fetch($request); diff --git a/application/Espo/Controllers/Pdf.php b/application/Espo/Controllers/Pdf.php index a97fd0bf99..c42d01abc2 100644 --- a/application/Espo/Controllers/Pdf.php +++ b/application/Espo/Controllers/Pdf.php @@ -41,7 +41,7 @@ use Espo\Core\{ use Espo\Services\Pdf as Service; -use StdClass; +use stdClass; class Pdf { @@ -55,7 +55,7 @@ class Pdf $this->acl = $acl; } - public function postActionMassPrint(Request $request): StdClass + public function postActionMassPrint(Request $request): stdClass { $data = $request->getParsedBody(); diff --git a/application/Espo/Controllers/Preferences.php b/application/Espo/Controllers/Preferences.php index 82e630a99b..3b0b9586b7 100644 --- a/application/Espo/Controllers/Preferences.php +++ b/application/Espo/Controllers/Preferences.php @@ -36,7 +36,7 @@ use Espo\Core\{ use Espo\Services\Preferences as Service; -use StdClass; +use stdClass; class Preferences { @@ -47,7 +47,7 @@ class Preferences $this->service = $service; } - public function getActionRead(Request $request): StdClass + public function getActionRead(Request $request): stdClass { $userId = $request->getRouteParam('id'); @@ -58,7 +58,7 @@ class Preferences return $this->service->read($userId)->getValueMap(); } - public function deleteActionDelete(Request $request): StdClass + public function deleteActionDelete(Request $request): stdClass { $userId = $request->getRouteParam('id'); @@ -73,7 +73,7 @@ class Preferences ->getValueMap(); } - public function putActionUpdate(Request $request): StdClass + public function putActionUpdate(Request $request): stdClass { $userId = $request->getRouteParam('id'); @@ -88,7 +88,7 @@ class Preferences ->getValueMap(); } - public function postActionResetDashboard(Request $request): StdClass + public function postActionResetDashboard(Request $request): stdClass { $data = $request->getParsedBody(); diff --git a/application/Espo/Controllers/TemplateManager.php b/application/Espo/Controllers/TemplateManager.php index ec40b158a8..bff0f72730 100644 --- a/application/Espo/Controllers/TemplateManager.php +++ b/application/Espo/Controllers/TemplateManager.php @@ -40,7 +40,7 @@ use Espo\Core\{ Api\Request, }; -use StdClass; +use stdClass; class TemplateManager { @@ -64,7 +64,7 @@ class TemplateManager } } - public function getActionGetTemplate(Request $request): StdClass + public function getActionGetTemplate(Request $request): stdClass { $name = $request->getQueryParam('name'); @@ -118,7 +118,7 @@ class TemplateManager return true; } - public function postActionResetTemplate(Request $request): StdClass + public function postActionResetTemplate(Request $request): stdClass { $data = $request->getParsedBody(); diff --git a/application/Espo/Core/Acl/Table/Role.php b/application/Espo/Core/Acl/Table/Role.php index 45044304f9..7fdfc96f8b 100644 --- a/application/Espo/Core/Acl/Table/Role.php +++ b/application/Espo/Core/Acl/Table/Role.php @@ -29,13 +29,13 @@ namespace Espo\Core\Acl\Table; -use StdClass; +use stdClass; interface Role { - public function getScopeTableData(): StdClass; + public function getScopeTableData(): stdClass; - public function getFieldTableData(): StdClass; + public function getFieldTableData(): stdClass; public function getPermissionLevel(string $permission): ?string; } diff --git a/application/Espo/Core/Acl/Table/RoleEntityWrapper.php b/application/Espo/Core/Acl/Table/RoleEntityWrapper.php index 2d714fabb8..2eb1e843b8 100644 --- a/application/Espo/Core/Acl/Table/RoleEntityWrapper.php +++ b/application/Espo/Core/Acl/Table/RoleEntityWrapper.php @@ -31,7 +31,7 @@ namespace Espo\Core\Acl\Table; use Espo\ORM\Entity; -use StdClass; +use stdClass; class RoleEntityWrapper implements Role { @@ -42,12 +42,12 @@ class RoleEntityWrapper implements Role $this->entity = $entity; } - public function getScopeTableData(): StdClass + public function getScopeTableData(): stdClass { return $this->entity->get('data') ?? (object) []; } - public function getFieldTableData(): StdClass + public function getFieldTableData(): stdClass { return $this->entity->get('fieldData') ?? (object) []; } diff --git a/application/Espo/Core/Action/ActionFactory.php b/application/Espo/Core/Action/ActionFactory.php index f3ba251d1e..d3afa558b3 100644 --- a/application/Espo/Core/Action/ActionFactory.php +++ b/application/Espo/Core/Action/ActionFactory.php @@ -39,7 +39,6 @@ use Espo\Core\{ class ActionFactory { private Metadata $metadata; - private InjectableFactory $injectableFactory; public function __construct(Metadata $metadata, InjectableFactory $injectableFactory) diff --git a/application/Espo/Core/MassAction/MassActionFactory.php b/application/Espo/Core/MassAction/MassActionFactory.php index d775cf3cfd..a677ea40f3 100644 --- a/application/Espo/Core/MassAction/MassActionFactory.php +++ b/application/Espo/Core/MassAction/MassActionFactory.php @@ -43,9 +43,7 @@ use Espo\Core\Binding\BindingContainerBuilder; class MassActionFactory { private Metadata $metadata; - private InjectableFactory $injectableFactory; - private AclManager $aclManager; public function __construct(Metadata $metadata, InjectableFactory $injectableFactory, AclManager $aclManager) diff --git a/application/Espo/Core/MassAction/QueryBuilder.php b/application/Espo/Core/MassAction/QueryBuilder.php index be71ca57fa..8c93e44876 100644 --- a/application/Espo/Core/MassAction/QueryBuilder.php +++ b/application/Espo/Core/MassAction/QueryBuilder.php @@ -35,9 +35,8 @@ use Espo\Entities\User; class QueryBuilder { - private $selectBuilderFactory; - - private $user; + private SelectBuilderFactory $selectBuilderFactory; + private User $user; public function __construct(SelectBuilderFactory $selectBuilderFactory, User $user) { diff --git a/application/Espo/Entities/Job.php b/application/Espo/Entities/Job.php index 3a3b389cfc..3dd64721bc 100644 --- a/application/Espo/Entities/Job.php +++ b/application/Espo/Entities/Job.php @@ -31,7 +31,7 @@ namespace Espo\Entities; use Espo\Core\ORM\Entity; -use StdClass; +use stdClass; class Job extends Entity { @@ -104,7 +104,7 @@ class Job extends Entity /** * Get data. */ - public function getData(): StdClass + public function getData(): stdClass { return $this->get('data') ?? (object) []; } diff --git a/application/Espo/Services/PopupNotification.php b/application/Espo/Services/PopupNotification.php index b45820b93d..885e06f679 100644 --- a/application/Espo/Services/PopupNotification.php +++ b/application/Espo/Services/PopupNotification.php @@ -39,7 +39,7 @@ use Espo\{ Entities\User, }; -use StdClass; +use stdClass; use Throwable; class PopupNotification @@ -60,7 +60,7 @@ class PopupNotification $this->log = $log; } - public function getGroupedList(): StdClass + public function getGroupedList(): stdClass { $data = $this->metadata->get(['app', 'popupNotifications']) ?? []; diff --git a/application/Espo/Services/Settings.php b/application/Espo/Services/Settings.php index 37445bec55..cc2d107785 100644 --- a/application/Espo/Services/Settings.php +++ b/application/Espo/Services/Settings.php @@ -53,25 +53,16 @@ use stdClass; class Settings { - private $applicationState; - - private $config; - - private $configWriter; - - private $metadata; - - private $acl; - - private $entityManager; - - private $dataManager; - - private $fieldValidationManager; - - private $injectableFactory; - - private $access; + private ApplicationState $applicationState; + private Config $config; + private ConfigWriter $configWriter; + private Metadata $metadata; + private Acl $acl; + private EntityManager $entityManager; + private DataManager $dataManager; + private FieldValidationManager $fieldValidationManager; + private InjectableFactory $injectableFactory; + private Access $access; public function __construct( ApplicationState $applicationState, diff --git a/application/Espo/Tools/Formula/RunResult.php b/application/Espo/Tools/Formula/RunResult.php index 9d34b37875..eebe8abf77 100644 --- a/application/Espo/Tools/Formula/RunResult.php +++ b/application/Espo/Tools/Formula/RunResult.php @@ -37,11 +37,8 @@ use stdClass; class RunResult { private bool $isSuccess = false; - private ?string $output = null; - private ?string $message = null; - private ?Error $exception = null; private function __construct(bool $isSuccess)