From db2c7f2c7bc16c03488c26ba6d83428848a79c38 Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Fri, 11 Mar 2022 16:51:18 +0200 Subject: [PATCH] type fixes --- application/Espo/Repositories/ActionHistoryRecord.php | 5 +++-- application/Espo/Repositories/ArrayValue.php | 3 +++ application/Espo/Repositories/AuthFailLogRecord.php | 5 +++-- application/Espo/Repositories/AuthLogRecord.php | 5 +++-- application/Espo/Repositories/AuthToken.php | 5 +++-- application/Espo/Repositories/EmailAddress.php | 3 +++ application/Espo/Repositories/EmailFolder.php | 9 +++++++-- application/Espo/Repositories/EmailTemplateCategory.php | 3 +++ application/Espo/Repositories/Extension.php | 3 +++ application/Espo/Repositories/Import.php | 6 ++++++ application/Espo/Repositories/Job.php | 3 +++ application/Espo/Repositories/LayoutSet.php | 3 +++ application/Espo/Repositories/NextNumber.php | 5 +++-- application/Espo/Repositories/Portal.php | 3 +++ application/Espo/Repositories/ScheduledJob.php | 7 ++++++- application/Espo/Repositories/Sms.php | 3 +++ 16 files changed, 58 insertions(+), 13 deletions(-) diff --git a/application/Espo/Repositories/ActionHistoryRecord.php b/application/Espo/Repositories/ActionHistoryRecord.php index 26d59c69aa..cca5183390 100644 --- a/application/Espo/Repositories/ActionHistoryRecord.php +++ b/application/Espo/Repositories/ActionHistoryRecord.php @@ -29,8 +29,9 @@ namespace Espo\Repositories; -use Espo\ORM\Entity; - +/** + * @extends \Espo\Core\Repositories\Database<\Espo\Entities\ActionHistoryRecord> + */ class ActionHistoryRecord extends \Espo\Core\Repositories\Database { protected $hooksDisabled = true; diff --git a/application/Espo/Repositories/ArrayValue.php b/application/Espo/Repositories/ArrayValue.php index b98e25d9c8..ff892a973b 100644 --- a/application/Espo/Repositories/ArrayValue.php +++ b/application/Espo/Repositories/ArrayValue.php @@ -37,6 +37,9 @@ use Espo\Core\{ Repositories\Database, }; +/** + * @extends Database<\Espo\Entities\ArrayValue> + */ class ArrayValue extends Database { protected $hooksDisabled = true; diff --git a/application/Espo/Repositories/AuthFailLogRecord.php b/application/Espo/Repositories/AuthFailLogRecord.php index 1ea33803e3..5ae1e73af7 100644 --- a/application/Espo/Repositories/AuthFailLogRecord.php +++ b/application/Espo/Repositories/AuthFailLogRecord.php @@ -29,8 +29,9 @@ namespace Espo\Repositories; -use Espo\ORM\Entity; - +/** + * @extends \Espo\Core\Repositories\Database<\Espo\Entities\AuthFailLogRecord> + */ class AuthFailLogRecord extends \Espo\Core\Repositories\Database { protected $hooksDisabled = true; diff --git a/application/Espo/Repositories/AuthLogRecord.php b/application/Espo/Repositories/AuthLogRecord.php index 69d5a9d243..67d224bc79 100644 --- a/application/Espo/Repositories/AuthLogRecord.php +++ b/application/Espo/Repositories/AuthLogRecord.php @@ -29,8 +29,9 @@ namespace Espo\Repositories; -use Espo\ORM\Entity; - +/** + * @extends \Espo\Core\Repositories\Database<\Espo\Entities\AuthLogRecord> + */ class AuthLogRecord extends \Espo\Core\Repositories\Database { protected $hooksDisabled = true; diff --git a/application/Espo/Repositories/AuthToken.php b/application/Espo/Repositories/AuthToken.php index 08b6ce35ce..e6bea1cab4 100644 --- a/application/Espo/Repositories/AuthToken.php +++ b/application/Espo/Repositories/AuthToken.php @@ -29,8 +29,9 @@ namespace Espo\Repositories; -use Espo\ORM\Entity; - +/** + * @extends \Espo\Core\Repositories\Database<\Espo\Entities\AuthToken> + */ class AuthToken extends \Espo\Core\Repositories\Database { protected $hooksDisabled = true; diff --git a/application/Espo/Repositories/EmailAddress.php b/application/Espo/Repositories/EmailAddress.php index d043b43ce4..64ef6bd133 100644 --- a/application/Espo/Repositories/EmailAddress.php +++ b/application/Espo/Repositories/EmailAddress.php @@ -35,6 +35,9 @@ use Espo\Entities\EmailAddress as EmailAddressEntity; use Espo\Core\Di; +/** + * @extends \Espo\Core\Repositories\Database<\Espo\Entities\EmailAddress> + */ class EmailAddress extends \Espo\Core\Repositories\Database implements Di\ApplicationStateAware, Di\AclManagerAware diff --git a/application/Espo/Repositories/EmailFolder.php b/application/Espo/Repositories/EmailFolder.php index 2dcfd4e325..1d83fa84a0 100644 --- a/application/Espo/Repositories/EmailFolder.php +++ b/application/Espo/Repositories/EmailFolder.php @@ -31,8 +31,9 @@ namespace Espo\Repositories; use Espo\ORM\Entity; -use Espo\Core\Exceptions\Error; - +/** + * @extends \Espo\Core\Repositories\Database<\Espo\Entities\EmailFolder> + */ class EmailFolder extends \Espo\Core\Repositories\Database { protected function beforeSave(Entity $entity, array $options = []) @@ -40,12 +41,16 @@ class EmailFolder extends \Espo\Core\Repositories\Database parent::beforeSave($entity, $options); $order = $entity->get('order'); + if (is_null($order)) { $order = $this->max('order'); + if (!$order) { $order = 0; } + $order++; + $entity->set('order', $order); } } diff --git a/application/Espo/Repositories/EmailTemplateCategory.php b/application/Espo/Repositories/EmailTemplateCategory.php index c101e892aa..74eb8649ee 100644 --- a/application/Espo/Repositories/EmailTemplateCategory.php +++ b/application/Espo/Repositories/EmailTemplateCategory.php @@ -29,6 +29,9 @@ namespace Espo\Repositories; +/** + * @extends \Espo\Core\Repositories\CategoryTree<\Espo\Entities\EmailTemplateCategory> + */ class EmailTemplateCategory extends \Espo\Core\Repositories\CategoryTree { } diff --git a/application/Espo/Repositories/Extension.php b/application/Espo/Repositories/Extension.php index ef14e1425c..eee1388196 100644 --- a/application/Espo/Repositories/Extension.php +++ b/application/Espo/Repositories/Extension.php @@ -29,6 +29,9 @@ namespace Espo\Repositories; +/** + * @extends \Espo\Core\Repositories\Database<\Espo\Entities\Extension> + */ class Extension extends \Espo\Core\Repositories\Database { protected $hooksDisabled = true; diff --git a/application/Espo/Repositories/Import.php b/application/Espo/Repositories/Import.php index 8dfe8739ba..b9e2dd00cb 100644 --- a/application/Espo/Repositories/Import.php +++ b/application/Espo/Repositories/Import.php @@ -39,8 +39,14 @@ use Espo\ORM\{ use Espo\Core\Repositories\Database; +/** + * @extends Database<\Espo\Entities\Import> + */ class Import extends Database { + /** + * @return Collection + */ public function findResultRecords(ImportEntity $entity, string $relationName, Query $query): Collection { $entityType = $entity->get('entityType'); diff --git a/application/Espo/Repositories/Job.php b/application/Espo/Repositories/Job.php index bc1ea35757..ae362052b0 100644 --- a/application/Espo/Repositories/Job.php +++ b/application/Espo/Repositories/Job.php @@ -33,6 +33,9 @@ use Espo\ORM\Entity; use Espo\Core\Di; +/** + * @extends \Espo\Core\Repositories\Database<\Espo\Entities\Job> + */ class Job extends \Espo\Core\Repositories\Database implements Di\ConfigAware { diff --git a/application/Espo/Repositories/LayoutSet.php b/application/Espo/Repositories/LayoutSet.php index 6b207eba4f..84793c14f6 100644 --- a/application/Espo/Repositories/LayoutSet.php +++ b/application/Espo/Repositories/LayoutSet.php @@ -31,6 +31,9 @@ namespace Espo\Repositories; use Espo\ORM\Entity; +/** + * @extends \Espo\Core\Repositories\Database<\Espo\Entities\LayoutSet> + */ class LayoutSet extends \Espo\Core\Repositories\Database { protected function afterSave(Entity $entity, array $options = []) diff --git a/application/Espo/Repositories/NextNumber.php b/application/Espo/Repositories/NextNumber.php index d69b70b366..0e5d200be6 100644 --- a/application/Espo/Repositories/NextNumber.php +++ b/application/Espo/Repositories/NextNumber.php @@ -29,8 +29,9 @@ namespace Espo\Repositories; -use Espo\ORM\Entity; - +/** + * @extends \Espo\Core\Repositories\Database<\Espo\Entities\NextNumber> + */ class NextNumber extends \Espo\Core\Repositories\Database { protected $hooksDisabled = true; diff --git a/application/Espo/Repositories/Portal.php b/application/Espo/Repositories/Portal.php index f14aeb823e..e51553d0bb 100644 --- a/application/Espo/Repositories/Portal.php +++ b/application/Espo/Repositories/Portal.php @@ -35,6 +35,9 @@ use Espo\Core\Repositories\Database; use Espo\Core\Di; +/** + * @extends Database<\Espo\Entities\Portal> + */ class Portal extends Database implements Di\ConfigAware diff --git a/application/Espo/Repositories/ScheduledJob.php b/application/Espo/Repositories/ScheduledJob.php index 23f0d833f8..f3b5a99303 100644 --- a/application/Espo/Repositories/ScheduledJob.php +++ b/application/Espo/Repositories/ScheduledJob.php @@ -33,7 +33,12 @@ use Espo\ORM\Entity; use Espo\Core\Job\Job\Status; -class ScheduledJob extends \Espo\Core\Repositories\Database +use Espo\Core\Repositories\Database; + +/** + * @extends Database<\Espo\Entities\ScheduledJob> + */ +class ScheduledJob extends Database { protected $hooksDisabled = true; diff --git a/application/Espo/Repositories/Sms.php b/application/Espo/Repositories/Sms.php index c60c0d682d..7bd95a3a02 100644 --- a/application/Espo/Repositories/Sms.php +++ b/application/Espo/Repositories/Sms.php @@ -34,6 +34,9 @@ use Espo\Entities\PhoneNumber; use Espo\Core\Repositories\Database; +/** + * @extends Database<\Espo\Entities\Sms> + */ class Sms extends Database { public function loadFromField(SmsEntity $entity): void