From 4c265dbae1a7ef488672b6d26e5b5ef3c3ffa646 Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Fri, 17 Feb 2023 17:32:17 +0200 Subject: [PATCH] cs --- .../Espo/Core/Action/ActionFactory.php | 24 ++++----- .../Espo/Core/Action/Actions/Merge.php | 1 - .../Espo/Core/Action/Actions/Merge/Merger.php | 49 ++++++------------- application/Espo/Core/Action/Data.php | 2 +- application/Espo/Core/Action/Params.php | 10 +--- application/Espo/Core/Action/Service.php | 38 +++++--------- .../Espo/Core/Api/AuthBuilderFactory.php | 7 +-- application/Espo/Core/Api/RequestWrapper.php | 11 ++--- application/Espo/Core/Api/ResponseWrapper.php | 12 ++--- .../Core/Api/Route/RouteParamsFetcher.php | 4 +- application/Espo/Core/MassAction/Data.php | 4 +- .../Core/MassAction/MassActionFactory.php | 20 ++++---- application/Espo/Core/MassAction/Params.php | 4 +- .../Espo/Core/MassAction/QueryBuilder.php | 18 ++++--- application/Espo/Core/MassAction/Result.php | 3 ++ .../Espo/Core/MassAction/ServiceParams.php | 20 +++----- .../Espo/Core/MassAction/ServiceResult.php | 16 ++---- .../AssignmentNotificatorFactory.php | 15 ++---- .../DefaultAssignmentNotificator.php | 15 ++---- .../Core/Notification/UserEnabledChecker.php | 12 ++--- 20 files changed, 99 insertions(+), 186 deletions(-) diff --git a/application/Espo/Core/Action/ActionFactory.php b/application/Espo/Core/Action/ActionFactory.php index e87637c007..a6975a3a07 100644 --- a/application/Espo/Core/Action/ActionFactory.php +++ b/application/Espo/Core/Action/ActionFactory.php @@ -29,24 +29,20 @@ namespace Espo\Core\Action; -use Espo\Core\{ - Exceptions\NotFound, - Exceptions\Forbidden, - Utils\Metadata, - InjectableFactory, -}; +use Espo\Core\Exceptions\Forbidden; +use Espo\Core\Exceptions\NotFound; +use Espo\Core\InjectableFactory; +use Espo\Core\Utils\Metadata; class ActionFactory { - private Metadata $metadata; - private InjectableFactory $injectableFactory; - - public function __construct(Metadata $metadata, InjectableFactory $injectableFactory) - { - $this->metadata = $metadata; - $this->injectableFactory = $injectableFactory; - } + public function __construct(private Metadata $metadata, private InjectableFactory $injectableFactory) + {} + /** + * @throws Forbidden + * @throws NotFound + */ public function create(string $action, ?string $entityType = null): Action { $className = $this->getClassName($action, $entityType); diff --git a/application/Espo/Core/Action/Actions/Merge.php b/application/Espo/Core/Action/Actions/Merge.php index 4e10f2df2f..295c10097f 100644 --- a/application/Espo/Core/Action/Actions/Merge.php +++ b/application/Espo/Core/Action/Actions/Merge.php @@ -42,7 +42,6 @@ use stdClass; class Merge implements Action { - public function __construct(private Acl $acl, private Merger $merger) {} diff --git a/application/Espo/Core/Action/Actions/Merge/Merger.php b/application/Espo/Core/Action/Actions/Merge/Merger.php index 3b29d21b00..011194dc2d 100644 --- a/application/Espo/Core/Action/Actions/Merge/Merger.php +++ b/application/Espo/Core/Action/Actions/Merge/Merger.php @@ -29,48 +29,31 @@ namespace Espo\Core\Action\Actions\Merge; -use Espo\Core\{ - Exceptions\Forbidden, - Exceptions\NotFound, - Action\Params, - Acl, - Acl\Table, - ORM\EntityManager, - Utils\Metadata, - Utils\ObjectUtil, - Record\ServiceContainer, -}; +use Espo\Core\Acl; +use Espo\Core\Acl\Table; +use Espo\Core\Action\Params; +use Espo\Core\Exceptions\Forbidden; +use Espo\Core\Exceptions\NotFound; +use Espo\Core\ORM\EntityManager; +use Espo\Core\Record\ServiceContainer; +use Espo\Core\Utils\Metadata; +use Espo\Core\Utils\ObjectUtil; use Espo\ORM\Entity; -use Espo\Entities\{ - PhoneNumber, - EmailAddress, -}; +use Espo\Entities\EmailAddress; +use Espo\Entities\PhoneNumber; use stdClass; class Merger { - private Acl $acl; - - private Metadata $metadata; - - private EntityManager $entityManager; - - private ServiceContainer $serviceContainer; - public function __construct( - Acl $acl, - Metadata $metadata, - EntityManager $entityManager, - ServiceContainer $serviceContainer - ) { - $this->acl = $acl; - $this->metadata = $metadata; - $this->entityManager = $entityManager; - $this->serviceContainer = $serviceContainer; - } + private Acl $acl, + private Metadata $metadata, + private EntityManager $entityManager, + private ServiceContainer $serviceContainer + ) {} /** * @param string[] $sourceIdList diff --git a/application/Espo/Core/Action/Data.php b/application/Espo/Core/Action/Data.php index 1ce118e560..c887809e1e 100644 --- a/application/Espo/Core/Action/Data.php +++ b/application/Espo/Core/Action/Data.php @@ -35,7 +35,7 @@ use stdClass; class Data { - private $data; + private stdClass $data; private function __construct() { diff --git a/application/Espo/Core/Action/Params.php b/application/Espo/Core/Action/Params.php index 4ba2174c45..2039a1cb3a 100644 --- a/application/Espo/Core/Action/Params.php +++ b/application/Espo/Core/Action/Params.php @@ -36,16 +36,8 @@ use RuntimeException; */ class Params { - private string $entityType; - private string $id; - - /** - * @throws RuntimeException - */ - public function __construct(string $entityType, string $id) + public function __construct(private string $entityType, private string $id) { - $this->entityType = $entityType; - $this->id = $id; if (!$entityType || !$id) { throw new RuntimeException(); diff --git a/application/Espo/Core/Action/Service.php b/application/Espo/Core/Action/Service.php index bb42ea828f..8494e73264 100644 --- a/application/Espo/Core/Action/Service.php +++ b/application/Espo/Core/Action/Service.php @@ -29,15 +29,13 @@ namespace Espo\Core\Action; -use Espo\Core\{ - Exceptions\Forbidden, - Exceptions\ForbiddenSilent, - Exceptions\BadRequest, - Exceptions\NotFound, - Record\ServiceContainer as RecordServiceContainer, - Record\ReadParams, - Acl, -}; +use Espo\Core\Acl; +use Espo\Core\Exceptions\BadRequest; +use Espo\Core\Exceptions\Forbidden; +use Espo\Core\Exceptions\ForbiddenSilent; +use Espo\Core\Exceptions\NotFound; +use Espo\Core\Record\ReadParams; +use Espo\Core\Record\ServiceContainer as RecordServiceContainer; use Espo\ORM\Entity; @@ -45,21 +43,11 @@ use stdClass; class Service { - private $factory; - - private $acl; - - private $recordServiceContainer; - public function __construct( - ActionFactory $factory, - Acl $acl, - RecordServiceContainer $recordServiceContainer - ) { - $this->factory = $factory; - $this->acl = $acl; - $this->recordServiceContainer = $recordServiceContainer; - } + private ActionFactory $factory, + private Acl $acl, + private RecordServiceContainer $recordServiceContainer + ) {} /** * Perform an action. @@ -89,8 +77,6 @@ class Service $service = $this->recordServiceContainer->get($entityType); - $entity = $service->read($id, ReadParams::create()); - - return $entity; + return $service->read($id, ReadParams::create()); } } diff --git a/application/Espo/Core/Api/AuthBuilderFactory.php b/application/Espo/Core/Api/AuthBuilderFactory.php index 0ae7c9c283..cd486f1c36 100644 --- a/application/Espo/Core/Api/AuthBuilderFactory.php +++ b/application/Espo/Core/Api/AuthBuilderFactory.php @@ -33,12 +33,9 @@ use Espo\Core\InjectableFactory; class AuthBuilderFactory { - private InjectableFactory $injectableFactory; - public function __construct(InjectableFactory $injectableFactory) - { - $this->injectableFactory = $injectableFactory; - } + public function __construct(private InjectableFactory $injectableFactory) + {} public function create(): AuthBuilder { diff --git a/application/Espo/Core/Api/RequestWrapper.php b/application/Espo/Core/Api/RequestWrapper.php index 4c8118aa33..799e81e4de 100644 --- a/application/Espo/Core/Api/RequestWrapper.php +++ b/application/Espo/Core/Api/RequestWrapper.php @@ -31,14 +31,11 @@ namespace Espo\Core\Api; use Espo\Core\Utils\Json; use Espo\Core\Exceptions\BadRequest; - -use Psr\Http\Message\{ - ServerRequestInterface as Psr7Request, - UriInterface, -}; - use Espo\Core\Api\Request as ApiRequest; +use Psr\Http\Message\ServerRequestInterface as Psr7Request; +use Psr\Http\Message\UriInterface; + use stdClass; /** @@ -53,7 +50,7 @@ class RequestWrapper implements ApiRequest private array $routeParams; /** - * @param array $routeParams + * @param array $routeParams */ public function __construct(Psr7Request $request, string $basePath = '', array $routeParams = []) { diff --git a/application/Espo/Core/Api/ResponseWrapper.php b/application/Espo/Core/Api/ResponseWrapper.php index e8cb3bb7cd..e9f0d63b6c 100644 --- a/application/Espo/Core/Api/ResponseWrapper.php +++ b/application/Espo/Core/Api/ResponseWrapper.php @@ -29,10 +29,8 @@ namespace Espo\Core\Api; -use Psr\Http\Message\{ - ResponseInterface as Psr7Response, - StreamInterface, -}; +use Psr\Http\Message\ResponseInterface as Psr7Response; +use Psr\Http\Message\StreamInterface; use Espo\Core\Api\Response as ApiResponse; @@ -41,12 +39,8 @@ use Espo\Core\Api\Response as ApiResponse; */ class ResponseWrapper implements ApiResponse { - private Psr7Response $response; - - public function __construct(Psr7Response $response) + public function __construct(private Psr7Response $response) { - $this->response = $response; - // Slim adds Authorization header. It's not needed. $this->response = $this->response->withoutHeader('Authorization'); } diff --git a/application/Espo/Core/Api/Route/RouteParamsFetcher.php b/application/Espo/Core/Api/Route/RouteParamsFetcher.php index dc79bf700a..8aec932d29 100644 --- a/application/Espo/Core/Api/Route/RouteParamsFetcher.php +++ b/application/Espo/Core/Api/Route/RouteParamsFetcher.php @@ -34,8 +34,8 @@ use Espo\Core\Api\Route; class RouteParamsFetcher { /** - * @param array $args - * @return array + * @param array $args + * @return array */ public function fetch(Route $item, array $args): array { diff --git a/application/Espo/Core/MassAction/Data.php b/application/Espo/Core/MassAction/Data.php index b41f45be80..ae4e3810ef 100644 --- a/application/Espo/Core/MassAction/Data.php +++ b/application/Espo/Core/MassAction/Data.php @@ -35,7 +35,7 @@ use stdClass; class Data { - private $data; + private stdClass $data; private function __construct() { @@ -68,7 +68,6 @@ class Data public static function fromRaw(stdClass $data): self { $obj = new self(); - $obj->data = $data; return $obj; @@ -82,7 +81,6 @@ class Data public function with(string $name, $value): self { $obj = clone $this; - $obj->data->$name = $value; return $obj; diff --git a/application/Espo/Core/MassAction/MassActionFactory.php b/application/Espo/Core/MassAction/MassActionFactory.php index e8558a4224..4490134f03 100644 --- a/application/Espo/Core/MassAction/MassActionFactory.php +++ b/application/Espo/Core/MassAction/MassActionFactory.php @@ -37,22 +37,20 @@ use Espo\Core\Utils\Metadata; use Espo\Core\InjectableFactory; use Espo\Core\AclManager; use Espo\Core\Acl; - 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) - { - $this->metadata = $metadata; - $this->injectableFactory = $injectableFactory; - $this->aclManager = $aclManager; - } + public function __construct( + private Metadata $metadata, + private InjectableFactory $injectableFactory, + private AclManager $aclManager + ) {} + /** + * @throws Forbidden + * @throws NotFound + */ public function create(string $action, string $entityType): MassAction { $className = $this->getClassName($action, $entityType); diff --git a/application/Espo/Core/MassAction/Params.php b/application/Espo/Core/MassAction/Params.php index fbc648a052..76f3ea4c46 100644 --- a/application/Espo/Core/MassAction/Params.php +++ b/application/Espo/Core/MassAction/Params.php @@ -39,9 +39,7 @@ use RuntimeException; class Params { private string $entityType; - /** - * @var ?string[] - */ + /** @var ?string[] */ private $ids = null; private ?SearchParams $searchParams = null; diff --git a/application/Espo/Core/MassAction/QueryBuilder.php b/application/Espo/Core/MassAction/QueryBuilder.php index 5babefc013..c45aa53039 100644 --- a/application/Espo/Core/MassAction/QueryBuilder.php +++ b/application/Espo/Core/MassAction/QueryBuilder.php @@ -29,21 +29,23 @@ namespace Espo\Core\MassAction; +use Espo\Core\Exceptions\BadRequest; +use Espo\Core\Exceptions\Error; +use Espo\Core\Exceptions\Forbidden; use Espo\ORM\Query\Select; use Espo\Core\Select\SelectBuilderFactory; use Espo\Entities\User; class QueryBuilder { - private SelectBuilderFactory $selectBuilderFactory; - private User $user; - - public function __construct(SelectBuilderFactory $selectBuilderFactory, User $user) - { - $this->selectBuilderFactory = $selectBuilderFactory; - $this->user = $user; - } + public function __construct(private SelectBuilderFactory $selectBuilderFactory, private User $user) + {} + /** + * @throws BadRequest + * @throws Forbidden + * @throws Error + */ public function build(Params $params): Select { $builder = $this->selectBuilderFactory diff --git a/application/Espo/Core/MassAction/Result.php b/application/Espo/Core/MassAction/Result.php index 741ff075dd..4336b2bc4b 100644 --- a/application/Espo/Core/MassAction/Result.php +++ b/application/Espo/Core/MassAction/Result.php @@ -31,6 +31,9 @@ namespace Espo\Core\MassAction; use RuntimeException; +/** + * @immutable + */ class Result { private ?int $count = null; diff --git a/application/Espo/Core/MassAction/ServiceParams.php b/application/Espo/Core/MassAction/ServiceParams.php index 0445939fc6..53f1dc1e92 100644 --- a/application/Espo/Core/MassAction/ServiceParams.php +++ b/application/Espo/Core/MassAction/ServiceParams.php @@ -29,22 +29,15 @@ namespace Espo\Core\MassAction; +/** + * @immutable + */ class ServiceParams { - /** - * @var Params - */ - private $params; + private bool $isIdle = false; - /** - * @var bool - */ - private $isIdle = false; - - private function __construct(Params $params) - { - $this->params = $params; - } + private function __construct(private Params $params) + {} public static function create(Params $params): self { @@ -64,7 +57,6 @@ class ServiceParams public function withIsIdle(bool $isIdle = true): self { $obj = clone $this; - $obj->isIdle = $isIdle; return $obj; diff --git a/application/Espo/Core/MassAction/ServiceResult.php b/application/Espo/Core/MassAction/ServiceResult.php index 1b3ff3bac1..9a642d6496 100644 --- a/application/Espo/Core/MassAction/ServiceResult.php +++ b/application/Espo/Core/MassAction/ServiceResult.php @@ -29,17 +29,13 @@ namespace Espo\Core\MassAction; +/** + * @immutable + */ class ServiceResult { - /** - * @var ?Result - */ - private $result = null; - - /** - * @var ?string - */ - private $id = null; + private ?Result $result = null; + private ?string $id = null; private function __construct() {} @@ -61,7 +57,6 @@ class ServiceResult public static function createWithId(string $id): self { $obj = new self; - $obj->id = $id; return $obj; @@ -70,7 +65,6 @@ class ServiceResult public static function createWithResult(Result $result): self { $obj = new self; - $obj->result = $result; return $obj; diff --git a/application/Espo/Core/Notification/AssignmentNotificatorFactory.php b/application/Espo/Core/Notification/AssignmentNotificatorFactory.php index a0c070d1b0..8c826d580f 100644 --- a/application/Espo/Core/Notification/AssignmentNotificatorFactory.php +++ b/application/Espo/Core/Notification/AssignmentNotificatorFactory.php @@ -40,16 +40,11 @@ class AssignmentNotificatorFactory /** @var class-string> */ protected string $defaultClassName = DefaultAssignmentNotificator::class; - private InjectableFactory $injectableFactory; - private ClassFinder $classFinder; - private Metadata $metadata; - - public function __construct(InjectableFactory $injectableFactory, ClassFinder $classFinder, Metadata $metadata) - { - $this->injectableFactory = $injectableFactory; - $this->classFinder = $classFinder; - $this->metadata = $metadata; - } + public function __construct( + private InjectableFactory $injectableFactory, + private ClassFinder $classFinder, + private Metadata $metadata + ) {} /** * @template T of Entity diff --git a/application/Espo/Core/Notification/DefaultAssignmentNotificator.php b/application/Espo/Core/Notification/DefaultAssignmentNotificator.php index 0717bf1847..865db01cdf 100644 --- a/application/Espo/Core/Notification/DefaultAssignmentNotificator.php +++ b/application/Espo/Core/Notification/DefaultAssignmentNotificator.php @@ -41,16 +41,11 @@ use Espo\Core\Notification\AssignmentNotificator\Params; */ class DefaultAssignmentNotificator implements AssignmentNotificator { - protected User $user; - protected EntityManager $entityManager; - protected UserEnabledChecker $userChecker; - - public function __construct(User $user, EntityManager $entityManager, UserEnabledChecker $userChecker) - { - $this->user = $user; - $this->entityManager = $entityManager; - $this->userChecker = $userChecker; - } + public function __construct( + protected User $user, + protected EntityManager $entityManager, + protected UserEnabledChecker $userChecker + ) {} public function process(Entity $entity, Params $params): void { diff --git a/application/Espo/Core/Notification/UserEnabledChecker.php b/application/Espo/Core/Notification/UserEnabledChecker.php index fd6aa969b5..5d6adcd4e8 100644 --- a/application/Espo/Core/Notification/UserEnabledChecker.php +++ b/application/Espo/Core/Notification/UserEnabledChecker.php @@ -33,17 +33,11 @@ use Espo\Core\ORM\EntityManager; class UserEnabledChecker { - /** - * @var array - */ + /** @var array */ private $assignmentCache = []; - private EntityManager $entityManager; - - public function __construct(EntityManager $entityManager) - { - $this->entityManager = $entityManager; - } + public function __construct(private EntityManager $entityManager) + {} public function checkAssignment(string $entityType, string $userId): bool {