diff --git a/application/Espo/Core/Field/LinkMultiple.php b/application/Espo/Core/Field/LinkMultiple.php index 42a50c16a4..19c5bdec8c 100644 --- a/application/Espo/Core/Field/LinkMultiple.php +++ b/application/Espo/Core/Field/LinkMultiple.php @@ -38,17 +38,12 @@ use RuntimeException; */ class LinkMultiple { - private $list = []; - /** * @param LinkMultipleItem[] $list - * * @throws RuntimeException */ - public function __construct(array $list = []) + public function __construct(private array $list = []) { - $this->list = $list; - $this->validateList(); } diff --git a/application/Espo/Core/FieldProcessing/LinkMultiple/ListLoader.php b/application/Espo/Core/FieldProcessing/LinkMultiple/ListLoader.php index 26c5eea554..b7b7926268 100644 --- a/application/Espo/Core/FieldProcessing/LinkMultiple/ListLoader.php +++ b/application/Espo/Core/FieldProcessing/LinkMultiple/ListLoader.php @@ -41,15 +41,11 @@ use Espo\ORM\Defs as OrmDefs; */ class ListLoader implements LoaderInterface { - private OrmDefs $ormDefs; - /** @var array */ - private $fieldListCacheMap = []; + private array $fieldListCacheMap = []; - public function __construct(OrmDefs $ormDefs) - { - $this->ormDefs = $ormDefs; - } + public function __construct(private OrmDefs $ormDefs) + {} public function process(Entity $entity, Params $params): void { diff --git a/application/Espo/Core/FieldProcessing/Loader/Params.php b/application/Espo/Core/FieldProcessing/Loader/Params.php index 5349215b6a..6c033839b6 100644 --- a/application/Espo/Core/FieldProcessing/Loader/Params.php +++ b/application/Espo/Core/FieldProcessing/Loader/Params.php @@ -34,10 +34,8 @@ namespace Espo\Core\FieldProcessing\Loader; */ class Params { - /** - * @var ?string[] - */ - private $select = null; + /** @var ?string[] */ + private ?array $select = null; public function __construct() {} diff --git a/application/Espo/Core/FieldProcessing/ReadLoadProcessor.php b/application/Espo/Core/FieldProcessing/ReadLoadProcessor.php index 61350fdf74..fb6272ffc8 100644 --- a/application/Espo/Core/FieldProcessing/ReadLoadProcessor.php +++ b/application/Espo/Core/FieldProcessing/ReadLoadProcessor.php @@ -41,7 +41,7 @@ use Espo\Core\Utils\Metadata; class ReadLoadProcessor { /** @var array[]> */ - private $loaderListMapCache = []; + private array $loaderListMapCache = []; public function __construct( private InjectableFactory $injectableFactory, diff --git a/application/Espo/Core/FieldValidation/FieldValidationManager.php b/application/Espo/Core/FieldValidation/FieldValidationManager.php index e8cc3b9627..14eca5a6aa 100644 --- a/application/Espo/Core/FieldValidation/FieldValidationManager.php +++ b/application/Espo/Core/FieldValidation/FieldValidationManager.php @@ -46,9 +46,9 @@ use ReflectionClass; class FieldValidationManager { /** @var array */ - private $checkerCache = []; + private array $checkerCache = []; /** @var array> */ - private $validatorCache = []; + private array $validatorCache = []; private CheckerFactory $checkerFactory; diff --git a/application/Espo/Core/MassAction/Jobs/Process.php b/application/Espo/Core/MassAction/Jobs/Process.php index ab30a8f6b1..596cfb9867 100644 --- a/application/Espo/Core/MassAction/Jobs/Process.php +++ b/application/Espo/Core/MassAction/Jobs/Process.php @@ -35,9 +35,7 @@ use Espo\Core\Job\Job\Data as JobData; use Espo\Core\MassAction\MassActionFactory; use Espo\Core\MassAction\Result; use Espo\Core\Utils\Language; - use Espo\ORM\EntityManager; - use Espo\Entities\MassAction as MassActionEntity; use Espo\Entities\Notification; use Espo\Entities\User; @@ -46,21 +44,11 @@ use Throwable; class Process implements Job { - private $entityManager; - - private $factory; - - private $language; - public function __construct( - EntityManager $entityManager, - MassActionFactory $factory, - Language $language - ) { - $this->entityManager = $entityManager; - $this->factory = $factory; - $this->language = $language; - } + private EntityManager $entityManager, + private MassActionFactory $factory, + private Language $language + ) {} public function run(JobData $data): void { diff --git a/application/Espo/Core/MassAction/Params.php b/application/Espo/Core/MassAction/Params.php index 95a68338ba..336b3bc696 100644 --- a/application/Espo/Core/MassAction/Params.php +++ b/application/Espo/Core/MassAction/Params.php @@ -40,7 +40,7 @@ class Params { private string $entityType; /** @var ?string[] */ - private $ids = null; + private ?array $ids = null; private ?SearchParams $searchParams = null; private function __construct() {} diff --git a/application/Espo/Core/Record/Service.php b/application/Espo/Core/Record/Service.php index 223076c104..79d970e717 100644 --- a/application/Espo/Core/Record/Service.php +++ b/application/Espo/Core/Record/Service.php @@ -185,10 +185,8 @@ class Service implements Crud, protected $selectBuilderFactory; /** @var RecordHookManager */ protected $recordHookManager; - /** @var ?ListLoadProcessor */ - private $listLoadProcessor = null; - /** @var ?DuplicateFinder */ - private $duplicateFinder = null; + private ?ListLoadProcessor $listLoadProcessor = null; + private ?DuplicateFinder $duplicateFinder = null; private ?LinkCheck $linkCheck = null; protected const MAX_SELECT_TEXT_ATTRIBUTE_LENGTH = 10000; diff --git a/application/Espo/Core/Utils/Database/Orm/Converter.php b/application/Espo/Core/Utils/Database/Orm/Converter.php index 72731d9c2e..e60fb83d25 100644 --- a/application/Espo/Core/Utils/Database/Orm/Converter.php +++ b/application/Espo/Core/Utils/Database/Orm/Converter.php @@ -46,7 +46,7 @@ use LogicException; class Converter { /** @var ?array */ - private $entityDefs = null; + private ?array $entityDefs = null; private string $defaultAttributeType = Entity::VARCHAR; @@ -54,7 +54,7 @@ class Converter private const INDEX_TYPE_INDEX = 'index'; /** @var array */ - private $defaultLengthMap = [ + private array $defaultLengthMap = [ Entity::VARCHAR => 255, Entity::INT => 11, ]; @@ -64,7 +64,7 @@ class Converter * * @var array */ - private $paramMap = [ + private array $paramMap = [ 'type' => 'type', 'dbType' => 'dbType', 'maxLength' => 'len', @@ -90,14 +90,14 @@ class Converter ]; /** @var array */ - private $idParams = []; + private array $idParams = []; /** * Permitted entityDefs parameters which will be copied to ormMetadata. * * @var string[] */ - private $permittedEntityOptions = [ + private array $permittedEntityOptions = [ 'indexes', 'additionalTables', ]; diff --git a/application/Espo/Core/Utils/Metadata/Helper.php b/application/Espo/Core/Utils/Metadata/Helper.php index c4d69ebbed..d4ad0b4fa9 100644 --- a/application/Espo/Core/Utils/Metadata/Helper.php +++ b/application/Espo/Core/Utils/Metadata/Helper.php @@ -44,7 +44,7 @@ class Helper * * @var string[] */ - private $copiedDefParams = [ + private array $copiedDefParams = [ 'readOnly', 'disabled', 'notStorable',