From 2a7a12f58cdff42c3203377c35d5353d232b8649 Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Sat, 18 Feb 2023 22:49:43 +0200 Subject: [PATCH] cs --- application/Espo/ORM/Collection.php | 2 +- application/Espo/ORM/Defs/AttributeDefs.php | 10 ++--- application/Espo/ORM/Defs/IndexDefs.php | 2 +- application/Espo/ORM/Locker/MysqlLocker.php | 7 ++- application/Espo/ORM/Mapper/BaseMapper.php | 43 +++++-------------- application/Espo/ORM/Mapper/Helper.php | 8 +--- .../Espo/ORM/Query/BaseBuilderTrait.php | 2 +- application/Espo/ORM/Query/BaseTrait.php | 11 +++-- application/Espo/ORM/Query/Delete.php | 2 +- application/Espo/ORM/Query/Insert.php | 2 +- application/Espo/ORM/Query/LockTable.php | 2 +- application/Espo/ORM/Query/Query.php | 2 +- .../Espo/ORM/Query/SelectingBuilderTrait.php | 12 +++--- application/Espo/ORM/Query/SelectingQuery.php | 4 +- application/Espo/ORM/Query/Union.php | 2 +- application/Espo/ORM/QueryBuilder.php | 21 ++++----- .../Espo/ORM/Repository/EmptyHookMediator.php | 6 +-- .../ORM/Value/GeneralAttributeExtractor.php | 6 +-- .../Espo/ORM/Value/GeneralValueFactory.php | 12 ++---- application/Espo/ORM/Value/ValueAccessor.php | 24 +++-------- .../Espo/ORM/Value/ValueAccessorFactory.php | 19 ++------ 21 files changed, 63 insertions(+), 136 deletions(-) diff --git a/application/Espo/ORM/Collection.php b/application/Espo/ORM/Collection.php index c6308a4812..60cd5ded9e 100644 --- a/application/Espo/ORM/Collection.php +++ b/application/Espo/ORM/Collection.php @@ -36,7 +36,7 @@ use stdClass; * A collection of entities. * * @template TEntity of Entity - * @extends Traversable + * @extends Traversable */ interface Collection extends Traversable { diff --git a/application/Espo/ORM/Defs/AttributeDefs.php b/application/Espo/ORM/Defs/AttributeDefs.php index 5925252e52..71b1956d44 100644 --- a/application/Espo/ORM/Defs/AttributeDefs.php +++ b/application/Espo/ORM/Defs/AttributeDefs.php @@ -34,19 +34,15 @@ namespace Espo\ORM\Defs; */ class AttributeDefs { - /** - * @var array - */ + /** @var array */ private array $data; - private string $name; private function __construct() - { - } + {} /** - * @param array $raw + * @param array $raw */ public static function fromRaw(array $raw, string $name): self { diff --git a/application/Espo/ORM/Defs/IndexDefs.php b/application/Espo/ORM/Defs/IndexDefs.php index 5fd51ef7b7..8b8317e25f 100644 --- a/application/Espo/ORM/Defs/IndexDefs.php +++ b/application/Espo/ORM/Defs/IndexDefs.php @@ -42,7 +42,7 @@ class IndexDefs {} /** - * @param array $raw + * @param array $raw */ public static function fromRaw(array $raw, string $name): self { diff --git a/application/Espo/ORM/Locker/MysqlLocker.php b/application/Espo/ORM/Locker/MysqlLocker.php index bf8e15f53d..dd2124dbd5 100644 --- a/application/Espo/ORM/Locker/MysqlLocker.php +++ b/application/Espo/ORM/Locker/MysqlLocker.php @@ -42,7 +42,6 @@ use RuntimeException; */ class MysqlLocker implements Locker { - private PDO $pdo; private MysqlQueryComposer $queryComposer; /** @phpstan-ignore-next-line */ private TransactionManager $transactionManager; @@ -50,17 +49,17 @@ class MysqlLocker implements Locker private bool $isLocked = false; public function __construct( - PDO $pdo, + private PDO $pdo, QueryComposer $queryComposer, TransactionManager $transactionManager ) { + $this->transactionManager = $transactionManager; + if (!$queryComposer instanceof MysqlQueryComposer) { throw new RuntimeException(); } - $this->pdo = $pdo; $this->queryComposer = $queryComposer; - $this->transactionManager = $transactionManager; } /** diff --git a/application/Espo/ORM/Mapper/BaseMapper.php b/application/Espo/ORM/Mapper/BaseMapper.php index d5adeb2120..6949beb970 100644 --- a/application/Espo/ORM/Mapper/BaseMapper.php +++ b/application/Espo/ORM/Mapper/BaseMapper.php @@ -59,35 +59,16 @@ class BaseMapper implements RDBMapper { protected const ATTRIBUTE_DELETED = 'deleted'; - protected PDO $pdo; - - protected EntityFactory $entityFactory; - - protected CollectionFactory $collectionFactory; - - protected QueryComposer $queryComposer; - - protected Metadata $metadata; - - protected SqlExecutor $sqlExecutor; - protected Helper $helper; public function __construct( - PDO $pdo, - EntityFactory $entityFactory, - CollectionFactory $collectionFactory, - QueryComposer $queryComposer, - Metadata $metadata, - SqlExecutor $sqlExecutor + protected PDO $pdo, + protected EntityFactory $entityFactory, + protected CollectionFactory $collectionFactory, + protected QueryComposer $queryComposer, + protected Metadata $metadata, + protected SqlExecutor $sqlExecutor ) { - $this->pdo = $pdo; - $this->queryComposer = $queryComposer; - $this->entityFactory = $entityFactory; - $this->collectionFactory = $collectionFactory; - $this->metadata = $metadata; - $this->sqlExecutor = $sqlExecutor; - $this->helper = new Helper($metadata); } @@ -295,7 +276,6 @@ class BaseMapper implements RDBMapper } $entityType = $entity->getEntityType(); - $relType = $entity->getRelationType($relationName); $relEntityType = $this->getRelationParam($entity, $relationName, 'entity'); @@ -311,8 +291,7 @@ class BaseMapper implements RDBMapper if ($relType !== Entity::BELONGS_TO_PARENT) { if (!$relEntityType) { throw new LogicException( - "Missing 'entity' in definition for relationship '{$relationName}' in {entityType} entity." - ); + "Missing 'entity' in definition for relationship '{$relationName}' in {entityType} entity."); } $relEntity = $this->entityFactory->create($relEntityType); @@ -1326,7 +1305,7 @@ class BaseMapper implements RDBMapper $update = null; if ($onDuplicateUpdateAttributeList !== null && count($onDuplicateUpdateAttributeList)) { - $update = $onDuplicateSetMap = $this->getInsertOnDuplicateSetMap($entity, $onDuplicateUpdateAttributeList); + $update = $this->getInsertOnDuplicateSetMap($entity, $onDuplicateUpdateAttributeList); } $sql = $this->queryComposer->composeInsert( @@ -1660,8 +1639,8 @@ class BaseMapper implements RDBMapper } /** - * @param array|null $conditions - * @return array{string,string,array} + * @param array|null $conditions + * @return array{string, string, array} */ protected function getManyManyJoin(Entity $entity, string $relationName, ?array $conditions = null): array { @@ -1708,7 +1687,7 @@ class BaseMapper implements RDBMapper } /** - * @return array + * @return array */ protected function getManyManyAdditionalSelect(Entity $entity, string $relationName): array { diff --git a/application/Espo/ORM/Mapper/Helper.php b/application/Espo/ORM/Mapper/Helper.php index 7dee81ed58..0eeefa4377 100644 --- a/application/Espo/ORM/Mapper/Helper.php +++ b/application/Espo/ORM/Mapper/Helper.php @@ -36,12 +36,8 @@ use RuntimeException; class Helper { - private Metadata $metadata; - - public function __construct(Metadata $metadata) - { - $this->metadata = $metadata; - } + public function __construct(private Metadata $metadata) + {} /** * @return array{ diff --git a/application/Espo/ORM/Query/BaseBuilderTrait.php b/application/Espo/ORM/Query/BaseBuilderTrait.php index 309085908b..7b0ead6515 100644 --- a/application/Espo/ORM/Query/BaseBuilderTrait.php +++ b/application/Espo/ORM/Query/BaseBuilderTrait.php @@ -36,7 +36,7 @@ trait BaseBuilderTrait /** * Must be protected for compatibility reasons. * - * @var array + * @var array */ protected $params = []; diff --git a/application/Espo/ORM/Query/BaseTrait.php b/application/Espo/ORM/Query/BaseTrait.php index 6014b2b79f..18404e3b1d 100644 --- a/application/Espo/ORM/Query/BaseTrait.php +++ b/application/Espo/ORM/Query/BaseTrait.php @@ -32,14 +32,14 @@ namespace Espo\ORM\Query; trait BaseTrait { /** - * @var array + * @var array */ private $params = []; /** * Get parameters in RAW format. * - * @return array + * @return array */ public function getRaw(): array { @@ -49,7 +49,7 @@ trait BaseTrait /** * Create from RAW params. * - * @param array $params + * @param array $params */ public static function fromRaw(array $params): self { @@ -63,9 +63,8 @@ trait BaseTrait } /** - * @param array $params + * @param array $params */ private function validateRawParams(array $params): void - { - } + {} } diff --git a/application/Espo/ORM/Query/Delete.php b/application/Espo/ORM/Query/Delete.php index b10f1804bb..e64d3b9e09 100644 --- a/application/Espo/ORM/Query/Delete.php +++ b/application/Espo/ORM/Query/Delete.php @@ -66,7 +66,7 @@ class Delete implements Query } /** - * @param array $params + * @param array $params */ private function validateRawParams(array $params): void { diff --git a/application/Espo/ORM/Query/Insert.php b/application/Espo/ORM/Query/Insert.php index a108e32ac3..c3fe544c0a 100644 --- a/application/Espo/ORM/Query/Insert.php +++ b/application/Espo/ORM/Query/Insert.php @@ -41,7 +41,7 @@ class Insert implements Query use BaseTrait; /** - * @param array $params + * @param array $params */ private function validateRawParams(array $params): void { diff --git a/application/Espo/ORM/Query/LockTable.php b/application/Espo/ORM/Query/LockTable.php index ecc0c6ef07..18cc209e93 100644 --- a/application/Espo/ORM/Query/LockTable.php +++ b/application/Espo/ORM/Query/LockTable.php @@ -44,7 +44,7 @@ class LockTable implements Query public const MODE_EXCLUSIVE = 'EXCLUSIVE'; /** - * @param array $params + * @param array $params */ protected function validateRawParams(array $params): void { diff --git a/application/Espo/ORM/Query/Query.php b/application/Espo/ORM/Query/Query.php index 004c8f764e..aa1945961a 100644 --- a/application/Espo/ORM/Query/Query.php +++ b/application/Espo/ORM/Query/Query.php @@ -37,7 +37,7 @@ interface Query /** * Get parameters in RAW format. * - * @return array + * @return array */ public function getRaw(): array; } diff --git a/application/Espo/ORM/Query/SelectingBuilderTrait.php b/application/Espo/ORM/Query/SelectingBuilderTrait.php index 52a576fb65..6887ffdd62 100644 --- a/application/Espo/ORM/Query/SelectingBuilderTrait.php +++ b/application/Espo/ORM/Query/SelectingBuilderTrait.php @@ -49,7 +49,7 @@ trait SelectingBuilderTrait * * `where(array $clause)` * * `where(string $key, string $value)` * - * @param WhereItem|array|string $clause A key or where clause. + * @param WhereItem|array|string $clause A key or where clause. * @param mixed[]|scalar|null $value A value. Omitted if the first argument is not string. */ public function where($clause, $value = null): self @@ -60,7 +60,7 @@ trait SelectingBuilderTrait } /** - * @param WhereItem|array|string $clause A key or where clause. + * @param WhereItem|array|string $clause A key or where clause. * @param mixed[]|scalar|null $value A value. Omitted if the first argument is not string. */ private function applyWhereClause(string $type, $clause, $value): void @@ -159,7 +159,7 @@ trait SelectingBuilderTrait * @param Join|string $target * A relation name or table. A relation name should be in camelCase, a table in CamelCase. * @param ?string $alias An alias. - * @param WhereItem|array|null $conditions Join conditions. + * @param WhereItem|array|null $conditions Join conditions. */ public function join($target, ?string $alias = null, $conditions = null): self { @@ -172,7 +172,7 @@ trait SelectingBuilderTrait * @param Join|string $target * A relation name or table. A relation name should be in camelCase, a table in CamelCase. * @param ?string $alias An alias. - * @param WhereItem|array|null $conditions Join conditions. + * @param WhereItem|array|null $conditions Join conditions. */ public function leftJoin($target, ?string $alias = null, $conditions = null): self { @@ -302,7 +302,7 @@ trait SelectingBuilderTrait /** * @param array $itemList - * @return array + * @return array */ private function normalizeExpressionItemArray(array $itemList): array { @@ -316,7 +316,7 @@ trait SelectingBuilderTrait } if (!is_array($item) || !count($item) || !$item[0] instanceof Expression) { - /** @var array{0:string,1?:string} $item */ + /** @var array{0:string, 1?:string} $item */ $resultList[] = $item; continue; diff --git a/application/Espo/ORM/Query/SelectingQuery.php b/application/Espo/ORM/Query/SelectingQuery.php index fb3aa47719..0adae9f9b4 100644 --- a/application/Espo/ORM/Query/SelectingQuery.php +++ b/application/Espo/ORM/Query/SelectingQuery.php @@ -30,6 +30,4 @@ namespace Espo\ORM\Query; interface SelectingQuery extends Query -{ - -} +{} diff --git a/application/Espo/ORM/Query/Union.php b/application/Espo/ORM/Query/Union.php index dcaeb3d25b..8a258f0ce9 100644 --- a/application/Espo/ORM/Query/Union.php +++ b/application/Espo/ORM/Query/Union.php @@ -41,7 +41,7 @@ class Union implements SelectingQuery use BaseTrait; /** - * @param array $params + * @param array $params */ private function validateRawParams(array $params): void { diff --git a/application/Espo/ORM/QueryBuilder.php b/application/Espo/ORM/QueryBuilder.php index 336f38f14e..770b99ebec 100644 --- a/application/Espo/ORM/QueryBuilder.php +++ b/application/Espo/ORM/QueryBuilder.php @@ -29,17 +29,14 @@ namespace Espo\ORM; -use Espo\ORM\{ - Query\SelectBuilder, - Query\UpdateBuilder, - Query\DeleteBuilder, - Query\InsertBuilder, - Query\UnionBuilder, - Query\Query, - Query\Builder, - Query\Part\Expression, - Query\Part\Selection, -}; +use Espo\ORM\Query\DeleteBuilder; +use Espo\ORM\Query\InsertBuilder; +use Espo\ORM\Query\Part\Expression; +use Espo\ORM\Query\Part\Selection; +use Espo\ORM\Query\Query; +use Espo\ORM\Query\SelectBuilder; +use Espo\ORM\Query\UnionBuilder; +use Espo\ORM\Query\UpdateBuilder; use ReflectionClass; use RuntimeException; @@ -112,7 +109,7 @@ class QueryBuilder * @return SelectBuilder|UpdateBuilder|DeleteBuilder|InsertBuilder|UnionBuilder * @throws RuntimeException */ - public function clone(Query $query): Builder + public function clone(Query $query): SelectBuilder|UpdateBuilder|DeleteBuilder|InsertBuilder|UnionBuilder { $class = new ReflectionClass($query); diff --git a/application/Espo/ORM/Repository/EmptyHookMediator.php b/application/Espo/ORM/Repository/EmptyHookMediator.php index f133532077..9c75d6f789 100644 --- a/application/Espo/ORM/Repository/EmptyHookMediator.php +++ b/application/Espo/ORM/Repository/EmptyHookMediator.php @@ -29,10 +29,8 @@ namespace Espo\ORM\Repository; -use Espo\ORM\{ - Entity, - Query\Select, -}; +use Espo\ORM\Entity; +use Espo\ORM\Query\Select; class EmptyHookMediator implements HookMediator { diff --git a/application/Espo/ORM/Value/GeneralAttributeExtractor.php b/application/Espo/ORM/Value/GeneralAttributeExtractor.php index 270881517c..f1076da037 100644 --- a/application/Espo/ORM/Value/GeneralAttributeExtractor.php +++ b/application/Espo/ORM/Value/GeneralAttributeExtractor.php @@ -33,13 +33,11 @@ use stdClass; class GeneralAttributeExtractor { - /** - * @var AttributeExtractorFactory - */ + /** @var AttributeExtractorFactory */ private AttributeExtractorFactory $factory; /** - * @var array> + * @var array> */ private $cache = []; diff --git a/application/Espo/ORM/Value/GeneralValueFactory.php b/application/Espo/ORM/Value/GeneralValueFactory.php index d1bc0411a2..9d9f8eae05 100644 --- a/application/Espo/ORM/Value/GeneralValueFactory.php +++ b/application/Espo/ORM/Value/GeneralValueFactory.php @@ -35,17 +35,11 @@ use RuntimeException; class GeneralValueFactory { - private ValueFactoryFactory $valueFactoryFactory; - - /** - * @var array - */ + /** @var array */ private array $factoryCache = []; - public function __construct(ValueFactoryFactory $valueFactoryFactory) - { - $this->valueFactoryFactory = $valueFactoryFactory; - } + public function __construct(private ValueFactoryFactory $valueFactoryFactory) + {} /** * Whether a field value object can be created from an entity. diff --git a/application/Espo/ORM/Value/ValueAccessor.php b/application/Espo/ORM/Value/ValueAccessor.php index d4379505fe..7868a56670 100644 --- a/application/Espo/ORM/Value/ValueAccessor.php +++ b/application/Espo/ORM/Value/ValueAccessor.php @@ -29,29 +29,15 @@ namespace Espo\ORM\Value; -use Espo\ORM\{ - Entity, - Value\GeneralValueFactory, - Value\GeneralAttributeExtractor, -}; +use Espo\ORM\Entity; class ValueAccessor { - private $entity; - - private $valueFactory; - - private $extractor; - public function __construct( - Entity $entity, - GeneralValueFactory $valueFactory, - GeneralAttributeExtractor $extractor - ) { - $this->entity = $entity; - $this->valueFactory = $valueFactory; - $this->extractor = $extractor; - } + private Entity $entity, + private GeneralValueFactory $valueFactory, + private GeneralAttributeExtractor $extractor + ) {} /** * Get a field value object. diff --git a/application/Espo/ORM/Value/ValueAccessorFactory.php b/application/Espo/ORM/Value/ValueAccessorFactory.php index c6038539f7..491d066113 100644 --- a/application/Espo/ORM/Value/ValueAccessorFactory.php +++ b/application/Espo/ORM/Value/ValueAccessorFactory.php @@ -35,29 +35,16 @@ use Espo\ORM\EventDispatcher; class ValueAccessorFactory { private ?GeneralValueFactory $generalValueFactory = null; - private ?GeneralAttributeExtractor $generalAttributeExtractor = null; - private ValueFactoryFactory $valueFactoryFactory; - - /** - * @var AttributeExtractorFactory - */ - private AttributeExtractorFactory $attributeExtractorFactory; - - private EventDispatcher $eventDispatcher; - /** * @param AttributeExtractorFactory $attributeExtractorFactory */ public function __construct( - ValueFactoryFactory $valueFactoryFactory, - AttributeExtractorFactory $attributeExtractorFactory, - EventDispatcher $eventDispatcher + private ValueFactoryFactory $valueFactoryFactory, + private AttributeExtractorFactory $attributeExtractorFactory, + private EventDispatcher $eventDispatcher ) { - $this->valueFactoryFactory = $valueFactoryFactory; - $this->attributeExtractorFactory = $attributeExtractorFactory; - $this->eventDispatcher = $eventDispatcher; $this->subscribeToMetadataUpdate(); }