diff --git a/application/Espo/Core/ORM/DatabaseParamsFactory.php b/application/Espo/Core/ORM/DatabaseParamsFactory.php index 94b722cdce..6a38b626f9 100644 --- a/application/Espo/Core/ORM/DatabaseParamsFactory.php +++ b/application/Espo/Core/ORM/DatabaseParamsFactory.php @@ -31,6 +31,7 @@ namespace Espo\Core\ORM; use Espo\Core\Utils\Config; use Espo\ORM\DatabaseParams; + use RuntimeException; class DatabaseParamsFactory diff --git a/application/Espo/Core/ORM/EntityFactory.php b/application/Espo/Core/ORM/EntityFactory.php index 244ba142b7..0447d23c9c 100644 --- a/application/Espo/Core/ORM/EntityFactory.php +++ b/application/Espo/Core/ORM/EntityFactory.php @@ -45,18 +45,14 @@ use RuntimeException; class EntityFactory implements EntityFactoryInterface { - private ClassFinder $classFinder; - private Helper $helper; - private InjectableFactory $injectableFactory; private ?EntityManager $entityManager = null; private ?ValueAccessorFactory $valueAccessorFactory = null; - public function __construct(ClassFinder $classFinder, Helper $helper, InjectableFactory $injectableFactory) - { - $this->classFinder = $classFinder; - $this->helper = $helper; - $this->injectableFactory = $injectableFactory; - } + public function __construct( + private ClassFinder $classFinder, + private Helper $helper, + private InjectableFactory $injectableFactory + ) {} /** * @return ?class-string diff --git a/application/Espo/Core/ORM/EntityManager.php b/application/Espo/Core/ORM/EntityManager.php index 4855516f5c..be3197e5cb 100644 --- a/application/Espo/Core/ORM/EntityManager.php +++ b/application/Espo/Core/ORM/EntityManager.php @@ -29,11 +29,7 @@ namespace Espo\Core\ORM; -use Espo\ORM\{ - EntityManager as BaseEntityManager, -}; +use Espo\ORM\EntityManager as BaseEntityManager; class EntityManager extends BaseEntityManager -{ - -} +{} diff --git a/application/Espo/Core/ORM/Helper.php b/application/Espo/Core/ORM/Helper.php index 25f9f9b2a7..14f31ee043 100644 --- a/application/Espo/Core/ORM/Helper.php +++ b/application/Espo/Core/ORM/Helper.php @@ -30,17 +30,12 @@ namespace Espo\Core\ORM; use Espo\Core\Utils\Config; - use Espo\ORM\Entity; class Helper { - private $config; - - public function __construct(Config $config) - { - $this->config = $config; - } + public function __construct(private Config $config) + {} public function formatPersonName(Entity $entity, string $field): ?string { diff --git a/application/Espo/Core/ORM/MetadataDataProvider.php b/application/Espo/Core/ORM/MetadataDataProvider.php index 6f17d015cb..a3251e15a0 100644 --- a/application/Espo/Core/ORM/MetadataDataProvider.php +++ b/application/Espo/Core/ORM/MetadataDataProvider.php @@ -29,23 +29,16 @@ namespace Espo\Core\ORM; -use Espo\{ - Core\Utils\Metadata\OrmMetadataData, - Core\Utils\Metadata, - ORM\MetadataDataProvider as MetadataDataProviderInterface, -}; +use Espo\Core\Utils\Metadata; +use Espo\Core\Utils\Metadata\OrmMetadataData; +use Espo\ORM\MetadataDataProvider as MetadataDataProviderInterface; class MetadataDataProvider implements MetadataDataProviderInterface { - private $ormMetadataData; - - private $metadata; - - public function __construct(OrmMetadataData $ormMetadataData, Metadata $metadata) - { - $this->ormMetadataData = $ormMetadataData; - $this->metadata = $metadata; - } + public function __construct( + private OrmMetadataData $ormMetadataData, + private Metadata $metadata + ) {} public function get(): array { diff --git a/application/Espo/Core/ORM/QueryComposer/Part/FunctionConverterFactory.php b/application/Espo/Core/ORM/QueryComposer/Part/FunctionConverterFactory.php index 477bab8fb5..74b2249ffb 100644 --- a/application/Espo/Core/ORM/QueryComposer/Part/FunctionConverterFactory.php +++ b/application/Espo/Core/ORM/QueryComposer/Part/FunctionConverterFactory.php @@ -32,7 +32,6 @@ namespace Espo\Core\ORM\QueryComposer\Part; use Espo\ORM\QueryComposer\Part\FunctionConverterFactory as FunctionConverterFactoryInterface; use Espo\ORM\QueryComposer\Part\FunctionConverter; use Espo\ORM\DatabaseParams; - use Espo\Core\Utils\Metadata; use Espo\Core\InjectableFactory; @@ -40,26 +39,14 @@ use LogicException; class FunctionConverterFactory implements FunctionConverterFactoryInterface { - /** - * @var array - */ + /** @var array */ private $hash = []; - private Metadata $metadata; - - private DatabaseParams $databaseParams; - - private InjectableFactory $injectableFactory; - public function __construct( - Metadata $metadata, - InjectableFactory $injectableFactory, - DatabaseParams $databaseParams - ) { - $this->metadata = $metadata; - $this->injectableFactory = $injectableFactory; - $this->databaseParams = $databaseParams; - } + private Metadata $metadata, + private InjectableFactory $injectableFactory, + private DatabaseParams $databaseParams + ) {} public function create(string $name): FunctionConverter { @@ -69,9 +56,7 @@ class FunctionConverterFactory implements FunctionConverterFactoryInterface throw new LogicException(); } - $converter = $this->injectableFactory->create($className); - - return $converter; + return $this->injectableFactory->create($className); } public function isCreatable(string $name): bool diff --git a/application/Espo/Core/ORM/QueryComposer/QueryComposerFactory.php b/application/Espo/Core/ORM/QueryComposer/QueryComposerFactory.php index 4dd691f803..84151fadde 100644 --- a/application/Espo/Core/ORM/QueryComposer/QueryComposerFactory.php +++ b/application/Espo/Core/ORM/QueryComposer/QueryComposerFactory.php @@ -43,28 +43,14 @@ use RuntimeException; class QueryComposerFactory implements \Espo\ORM\QueryComposer\QueryComposerFactory { - private Metadata $metadata; - private InjectableFactory $injectableFactory; - private PDOProvider $pdoProvider; - private OrmMetadata $ormMetadata; - private EntityFactory $entityFactory; - private FunctionConverterFactory $functionConverterFactory; - public function __construct( - Metadata $metadata, - InjectableFactory $injectableFactory, - PDOProvider $pdoProvider, - OrmMetadata $ormMetadata, - EntityFactory $entityFactory, - FunctionConverterFactory $functionConverterFactory - ) { - $this->metadata = $metadata; - $this->injectableFactory = $injectableFactory; - $this->pdoProvider = $pdoProvider; - $this->ormMetadata = $ormMetadata; - $this->entityFactory = $entityFactory; - $this->functionConverterFactory = $functionConverterFactory; - } + private Metadata $metadata, + private InjectableFactory $injectableFactory, + private PDOProvider $pdoProvider, + private OrmMetadata $ormMetadata, + private EntityFactory $entityFactory, + private FunctionConverterFactory $functionConverterFactory + ) {} public function create(string $platform): QueryComposer { diff --git a/application/Espo/Core/ORM/Repositories/RDB.php b/application/Espo/Core/ORM/Repositories/RDB.php index 707c29ff4c..6165cd4ee6 100644 --- a/application/Espo/Core/ORM/Repositories/RDB.php +++ b/application/Espo/Core/ORM/Repositories/RDB.php @@ -31,15 +31,12 @@ namespace Espo\Core\ORM\Repositories; use Espo\Core\ORM\EntityManager; use Espo\Core\ORM\EntityFactory; - use Espo\Core\Interfaces\Injectable; - -use Espo\Core\{ - Utils\Metadata, - HookManager, - ApplicationState, - Utils\Id\RecordIdGenerator, - Utils\SystemUser}; +use Espo\Core\ApplicationState; +use Espo\Core\HookManager; +use Espo\Core\Utils\Id\RecordIdGenerator; +use Espo\Core\Utils\Metadata; +use Espo\Core\Utils\SystemUser; /** * @deprecated As of v6.0. Not to be extended. Extend Espo\Core\Repositories\Database, or better diff --git a/application/Espo/Core/ORM/Repository/HookMediator.php b/application/Espo/Core/ORM/Repository/HookMediator.php index 62d868b7bf..4b9821d88c 100644 --- a/application/Espo/Core/ORM/Repository/HookMediator.php +++ b/application/Espo/Core/ORM/Repository/HookMediator.php @@ -37,12 +37,8 @@ use Espo\Core\ORM\Repository\Option\SaveOption; class HookMediator extends EmptyHookMediator { - protected HookManager $hookManager; - - public function __construct(HookManager $hookManager) - { - $this->hookManager = $hookManager; - } + public function __construct(protected HookManager $hookManager) + {} /** * @param ?array $columnData @@ -101,7 +97,7 @@ class HookMediator extends EmptyHookMediator } /** - * @param array $options + * @param array $options */ public function afterMassRelate(Entity $entity, string $relationName, Select $query, array $options): void { diff --git a/application/Espo/Core/ORM/RepositoryFactory.php b/application/Espo/Core/ORM/RepositoryFactory.php index 1a978c43aa..1e65a7fa92 100644 --- a/application/Espo/Core/ORM/RepositoryFactory.php +++ b/application/Espo/Core/ORM/RepositoryFactory.php @@ -31,40 +31,31 @@ namespace Espo\Core\ORM; use Espo\Core\Binding\BindingContainerBuilder; use Espo\Core\Binding\ContextualBinder; - use Espo\Core\InjectableFactory; use Espo\Core\Repositories\Database as DatabaseRepository; use Espo\Core\Utils\ClassFinder; - +use Espo\ORM\Entity as OrmEntity; use Espo\ORM\EntityFactory as EntityFactoryInterface; use Espo\ORM\Repository\Repository; use Espo\ORM\Repository\RepositoryFactory as RepositoryFactoryInterface; class RepositoryFactory implements RepositoryFactoryInterface { - /** @var class-string> */ + /** @var class-string> */ protected $defaultClassName = DatabaseRepository::class; - protected EntityFactoryInterface $entityFactory; - protected InjectableFactory $injectableFactory; - protected ClassFinder $classFinder; - public function __construct( - EntityFactoryInterface $entityFactory, - InjectableFactory $injectableFactory, - ClassFinder $classFinder - ) { - $this->entityFactory = $entityFactory; - $this->injectableFactory = $injectableFactory; - $this->classFinder = $classFinder; - } + protected EntityFactoryInterface $entityFactory, + protected InjectableFactory $injectableFactory, + protected ClassFinder $classFinder + ) {} /** - * @return ?class-string> + * @return ?class-string> */ protected function getClassName(string $entityType): ?string { - /** @var ?class-string> */ + /** @var ?class-string> */ return $this->classFinder->find('Repositories', $entityType); } diff --git a/application/Espo/Core/ORM/ValueFactoryFactory.php b/application/Espo/Core/ORM/ValueFactoryFactory.php index 47407645e1..a3bdad91c5 100644 --- a/application/Espo/Core/ORM/ValueFactoryFactory.php +++ b/application/Espo/Core/ORM/ValueFactoryFactory.php @@ -29,33 +29,21 @@ namespace Espo\Core\ORM; -use Espo\Core\{ - Utils\Metadata, - InjectableFactory, -}; - -use Espo\ORM\{ - Value\ValueFactoryFactory as ValueFactoryFactoryInteface, - Value\ValueFactory, - Metadata as OrmMetadata, -}; +use Espo\Core\InjectableFactory; +use Espo\Core\Utils\Metadata; +use Espo\ORM\Metadata as OrmMetadata; +use Espo\ORM\Value\ValueFactory; +use Espo\ORM\Value\ValueFactoryFactory as ValueFactoryFactoryInteface; use RuntimeException; class ValueFactoryFactory implements ValueFactoryFactoryInteface { - private Metadata $metadata; - - private OrmMetadata $ormMetadata; - - private InjectableFactory $injectableFactory; - - public function __construct(Metadata $metadata, OrmMetadata $ormMetadata, InjectableFactory $injectableFactory) - { - $this->metadata = $metadata; - $this->ormMetadata = $ormMetadata; - $this->injectableFactory = $injectableFactory; - } + public function __construct( + private Metadata $metadata, + private OrmMetadata $ormMetadata, + private InjectableFactory $injectableFactory + ) {} public function isCreatable(string $entityType, string $field): bool { diff --git a/application/Espo/Core/Rebuild/Actions/ConfigMetadataCheck.php b/application/Espo/Core/Rebuild/Actions/ConfigMetadataCheck.php index a5b30b1e59..6d081104ed 100644 --- a/application/Espo/Core/Rebuild/Actions/ConfigMetadataCheck.php +++ b/application/Espo/Core/Rebuild/Actions/ConfigMetadataCheck.php @@ -40,12 +40,8 @@ use Espo\Core\Utils\Metadata; */ class ConfigMetadataCheck implements RebuildAction { - private Metadata $metadata; - - public function __construct(Metadata $metadata) - { - $this->metadata = $metadata; - } + public function __construct(private Metadata $metadata) + {} /** * @throws Error diff --git a/application/Espo/Core/Rebuild/Actions/ScheduledJobs.php b/application/Espo/Core/Rebuild/Actions/ScheduledJobs.php index bcbeaf44f8..6a2df62f42 100644 --- a/application/Espo/Core/Rebuild/Actions/ScheduledJobs.php +++ b/application/Espo/Core/Rebuild/Actions/ScheduledJobs.php @@ -30,7 +30,6 @@ namespace Espo\Core\Rebuild\Actions; use Espo\Core\Rebuild\RebuildAction; - use Espo\Core\Utils\Metadata; use Espo\Entities\ScheduledJob; use Espo\ORM\EntityManager; @@ -40,14 +39,10 @@ use Espo\ORM\EntityManager; */ class ScheduledJobs implements RebuildAction { - private Metadata $metadata; - private EntityManager $entityManager; - - public function __construct(Metadata $metadata, EntityManager $entityManager) - { - $this->metadata = $metadata; - $this->entityManager = $entityManager; - } + public function __construct( + private Metadata $metadata, + private EntityManager $entityManager + ) {} public function process(): void { diff --git a/application/Espo/Core/Rebuild/RebuildActionProcessor.php b/application/Espo/Core/Rebuild/RebuildActionProcessor.php index 9fe0628f2e..7e75ecbe8b 100644 --- a/application/Espo/Core/Rebuild/RebuildActionProcessor.php +++ b/application/Espo/Core/Rebuild/RebuildActionProcessor.php @@ -34,15 +34,10 @@ use Espo\Core\Utils\Metadata; class RebuildActionProcessor { - private InjectableFactory $injectableFactory; - - private Metadata $metadata; - - public function __construct(InjectableFactory $injectableFactory, Metadata $metadata) - { - $this->injectableFactory = $injectableFactory; - $this->metadata = $metadata; - } + public function __construct( + private InjectableFactory $injectableFactory, + private Metadata $metadata + ) {} public function process(): void { diff --git a/application/Espo/Core/Record/Collection.php b/application/Espo/Core/Record/Collection.php index 2c41fda6d5..d0205cff8c 100644 --- a/application/Espo/Core/Record/Collection.php +++ b/application/Espo/Core/Record/Collection.php @@ -47,8 +47,10 @@ class Collection /** * @param OrmCollection $collection */ - public function __construct(private OrmCollection $collection, private ?int $total = null) - {} + public function __construct( + private OrmCollection $collection, + private ?int $total = null + ) {} /** * Get a total number of records in DB (that matches applied search parameters). diff --git a/application/Espo/Core/Record/ServiceContainer.php b/application/Espo/Core/Record/ServiceContainer.php index 832247446a..26e068cafd 100644 --- a/application/Espo/Core/Record/ServiceContainer.php +++ b/application/Espo/Core/Record/ServiceContainer.php @@ -44,12 +44,9 @@ class ServiceContainer { /** @var array> */ private $data = []; - private ServiceFactory $serviceFactory; - public function __construct(ServiceFactory $serviceFactory) - { - $this->serviceFactory = $serviceFactory; - } + public function __construct(private ServiceFactory $serviceFactory) + {} /** * Get a record service by an entity class name. diff --git a/application/Espo/Core/Repositories/CategoryTree.php b/application/Espo/Core/Repositories/CategoryTree.php index 942d278144..b25d4daf18 100644 --- a/application/Espo/Core/Repositories/CategoryTree.php +++ b/application/Espo/Core/Repositories/CategoryTree.php @@ -39,7 +39,7 @@ use Espo\ORM\Mapper\BaseMapper; class CategoryTree extends Database { /** - * @param array $options + * @param array $options * @return void */ protected function afterSave(Entity $entity, array $options = []) diff --git a/application/Espo/Core/Repositories/Database.php b/application/Espo/Core/Repositories/Database.php index fb6a0be67d..222021cb24 100644 --- a/application/Espo/Core/Repositories/Database.php +++ b/application/Espo/Core/Repositories/Database.php @@ -34,11 +34,9 @@ use Espo\Core\Utils\SystemUser; use Espo\ORM\BaseEntity; use Espo\ORM\Entity; use Espo\ORM\Repository\RDBRepository; - use Espo\Core\ORM\EntityFactory; use Espo\Core\ORM\EntityManager; use Espo\Core\ORM\Repository\HookMediator; - use Espo\Core\ApplicationState; use Espo\Core\HookManager; use Espo\Core\Utils\DateTime as DateTimeUtil; diff --git a/application/Espo/Core/Repositories/Event.php b/application/Espo/Core/Repositories/Event.php index 07f2a33713..152468a664 100644 --- a/application/Espo/Core/Repositories/Event.php +++ b/application/Espo/Core/Repositories/Event.php @@ -33,7 +33,6 @@ use Espo\Core\ORM\Entity as CoreEntity; use Espo\Modules\Crm\Entities\Meeting; use Espo\Modules\Crm\Entities\Reminder; use Espo\ORM\Entity; - use Espo\Core\Di; use Espo\Core\Utils\DateTime as DateTimeUtil; diff --git a/application/Espo/Core/Sms/SenderFactory.php b/application/Espo/Core/Sms/SenderFactory.php index 28a158a28e..6af489068d 100644 --- a/application/Espo/Core/Sms/SenderFactory.php +++ b/application/Espo/Core/Sms/SenderFactory.php @@ -33,6 +33,7 @@ use Espo\Core\Binding\Factory; use Espo\Core\Utils\Config; use Espo\Core\Utils\Metadata; use Espo\Core\InjectableFactory; + use RuntimeException; /** @@ -40,19 +41,11 @@ use RuntimeException; */ class SenderFactory implements Factory { - private Config $config; - private Metadata $metadata; - private InjectableFactory $injectableFactory; - public function __construct( - Config $config, - Metadata $metadata, - InjectableFactory $injectableFactory - ) { - $this->config = $config; - $this->metadata = $metadata; - $this->injectableFactory = $injectableFactory; - } + private Config $config, + private Metadata $metadata, + private InjectableFactory $injectableFactory + ) {} public function create(): Sender { diff --git a/application/Espo/Core/Sms/SmsFactory.php b/application/Espo/Core/Sms/SmsFactory.php index f5fba61a48..419fa965f7 100644 --- a/application/Espo/Core/Sms/SmsFactory.php +++ b/application/Espo/Core/Sms/SmsFactory.php @@ -37,12 +37,8 @@ use Espo\Entities\Sms as SmsEntity; */ class SmsFactory { - private EntityManager $entityManager; - - public function __construct(EntityManager $entityManager) - { - $this->entityManager = $entityManager; - } + public function __construct(private EntityManager $entityManager) + {} /** * Create an SMS instance. diff --git a/application/Espo/Core/Sms/SmsSender.php b/application/Espo/Core/Sms/SmsSender.php index d5b29dc547..22a74a9241 100644 --- a/application/Espo/Core/Sms/SmsSender.php +++ b/application/Espo/Core/Sms/SmsSender.php @@ -35,15 +35,10 @@ use Espo\Core\Utils\Config; class SmsSender { - private $sender; - - private $config; - - public function __construct(Sender $sender, Config $config) - { - $this->sender = $sender; - $this->config = $config; - } + public function __construct( + private Sender $sender, + private Config $config + ) {} public function send(SmsEntity $sms): void { diff --git a/application/Espo/Core/Templates/Controllers/Base.php b/application/Espo/Core/Templates/Controllers/Base.php index 5aac5edd6d..683fa79e57 100644 --- a/application/Espo/Core/Templates/Controllers/Base.php +++ b/application/Espo/Core/Templates/Controllers/Base.php @@ -29,9 +29,6 @@ namespace Espo\Core\Templates\Controllers; - class Base extends \Espo\Core\Controllers\Record { - } - diff --git a/application/Espo/Core/Templates/Controllers/BasePlus.php b/application/Espo/Core/Templates/Controllers/BasePlus.php index a7d06a0e65..bef8a00b34 100644 --- a/application/Espo/Core/Templates/Controllers/BasePlus.php +++ b/application/Espo/Core/Templates/Controllers/BasePlus.php @@ -29,9 +29,6 @@ namespace Espo\Core\Templates\Controllers; - class BasePlus extends \Espo\Core\Controllers\Record { - } - diff --git a/application/Espo/Core/Templates/Controllers/CategoryTree.php b/application/Espo/Core/Templates/Controllers/CategoryTree.php index e8ae928e4a..ade430e571 100644 --- a/application/Espo/Core/Templates/Controllers/CategoryTree.php +++ b/application/Espo/Core/Templates/Controllers/CategoryTree.php @@ -29,9 +29,6 @@ namespace Espo\Core\Templates\Controllers; - class CategoryTree extends \Espo\Core\Controllers\RecordTree { - } - diff --git a/application/Espo/Core/Templates/Controllers/Company.php b/application/Espo/Core/Templates/Controllers/Company.php index 2593dc6fba..566afd5777 100644 --- a/application/Espo/Core/Templates/Controllers/Company.php +++ b/application/Espo/Core/Templates/Controllers/Company.php @@ -31,5 +31,4 @@ namespace Espo\Core\Templates\Controllers; class Company extends \Espo\Core\Controllers\Record { - } diff --git a/application/Espo/Core/Templates/Controllers/Event.php b/application/Espo/Core/Templates/Controllers/Event.php index 0eef83cf1b..19c547b494 100644 --- a/application/Espo/Core/Templates/Controllers/Event.php +++ b/application/Espo/Core/Templates/Controllers/Event.php @@ -31,6 +31,4 @@ namespace Espo\Core\Templates\Controllers; class Event extends \Espo\Core\Controllers\Record { - } - diff --git a/application/Espo/Core/Templates/Controllers/Person.php b/application/Espo/Core/Templates/Controllers/Person.php index bee7d76957..4486c5e142 100644 --- a/application/Espo/Core/Templates/Controllers/Person.php +++ b/application/Espo/Core/Templates/Controllers/Person.php @@ -29,9 +29,6 @@ namespace Espo\Core\Templates\Controllers; - class Person extends \Espo\Core\Controllers\Record { - } - diff --git a/application/Espo/Core/Templates/Entities/Base.php b/application/Espo/Core/Templates/Entities/Base.php index 445911c3eb..ef83fe94be 100644 --- a/application/Espo/Core/Templates/Entities/Base.php +++ b/application/Espo/Core/Templates/Entities/Base.php @@ -31,6 +31,4 @@ namespace Espo\Core\Templates\Entities; class Base extends \Espo\Core\ORM\Entity { - } - diff --git a/application/Espo/Core/Templates/Entities/BasePlus.php b/application/Espo/Core/Templates/Entities/BasePlus.php index 3466d79ce2..b3c506c85f 100644 --- a/application/Espo/Core/Templates/Entities/BasePlus.php +++ b/application/Espo/Core/Templates/Entities/BasePlus.php @@ -31,6 +31,4 @@ namespace Espo\Core\Templates\Entities; class BasePlus extends \Espo\Core\ORM\Entity { - } - diff --git a/application/Espo/Core/Templates/Entities/CategoryTree.php b/application/Espo/Core/Templates/Entities/CategoryTree.php index cfc1fc2db0..0bcf076c3e 100644 --- a/application/Espo/Core/Templates/Entities/CategoryTree.php +++ b/application/Espo/Core/Templates/Entities/CategoryTree.php @@ -31,6 +31,4 @@ namespace Espo\Core\Templates\Entities; class CategoryTree extends \Espo\Core\Entities\CategoryTreeItem { - } - diff --git a/application/Espo/Core/Templates/Repositories/Base.php b/application/Espo/Core/Templates/Repositories/Base.php index 0ebca6d12e..f0b4e0dd1c 100644 --- a/application/Espo/Core/Templates/Repositories/Base.php +++ b/application/Espo/Core/Templates/Repositories/Base.php @@ -29,9 +29,6 @@ namespace Espo\Core\Templates\Repositories; - class Base extends \Espo\Core\ORM\Repositories\RDB { - } - diff --git a/application/Espo/Core/Templates/Repositories/BasePlus.php b/application/Espo/Core/Templates/Repositories/BasePlus.php index 274bf055af..e02518c4bf 100644 --- a/application/Espo/Core/Templates/Repositories/BasePlus.php +++ b/application/Espo/Core/Templates/Repositories/BasePlus.php @@ -29,9 +29,6 @@ namespace Espo\Core\Templates\Repositories; - class BasePlus extends \Espo\Core\ORM\Repositories\RDB { - } - diff --git a/application/Espo/Core/Templates/Repositories/CategoryTree.php b/application/Espo/Core/Templates/Repositories/CategoryTree.php index 60d6e50c2b..a7efda3819 100644 --- a/application/Espo/Core/Templates/Repositories/CategoryTree.php +++ b/application/Espo/Core/Templates/Repositories/CategoryTree.php @@ -35,5 +35,4 @@ namespace Espo\Core\Templates\Repositories; */ class CategoryTree extends \Espo\Core\Repositories\CategoryTree { - } diff --git a/application/Espo/Core/Templates/Repositories/Company.php b/application/Espo/Core/Templates/Repositories/Company.php index 3dc055bb63..1ba9f22109 100644 --- a/application/Espo/Core/Templates/Repositories/Company.php +++ b/application/Espo/Core/Templates/Repositories/Company.php @@ -31,5 +31,4 @@ namespace Espo\Core\Templates\Repositories; class Company extends \Espo\Core\ORM\Repositories\RDB { - } diff --git a/application/Espo/Core/Templates/Repositories/Person.php b/application/Espo/Core/Templates/Repositories/Person.php index 097588dd4b..c289a11b52 100644 --- a/application/Espo/Core/Templates/Repositories/Person.php +++ b/application/Espo/Core/Templates/Repositories/Person.php @@ -29,9 +29,6 @@ namespace Espo\Core\Templates\Repositories; - class Person extends \Espo\Core\ORM\Repositories\RDB { - } - diff --git a/application/Espo/Core/Templates/Services/CategoryTree.php b/application/Espo/Core/Templates/Services/CategoryTree.php index 0adfcd5e79..cabc704c6e 100644 --- a/application/Espo/Core/Templates/Services/CategoryTree.php +++ b/application/Espo/Core/Templates/Services/CategoryTree.php @@ -34,5 +34,4 @@ namespace Espo\Core\Templates\Services; */ class CategoryTree extends \Espo\Services\RecordTree { - } diff --git a/application/Espo/Core/Templates/Services/Event.php b/application/Espo/Core/Templates/Services/Event.php index cca57f23fc..577cbd1d25 100644 --- a/application/Espo/Core/Templates/Services/Event.php +++ b/application/Espo/Core/Templates/Services/Event.php @@ -29,10 +29,12 @@ namespace Espo\Core\Templates\Services; +use Espo\Services\Record; + /** - * @extends \Espo\Services\Record<\Espo\Core\Templates\Entities\Event> + * @extends Record<\Espo\Core\Templates\Entities\Event> */ -class Event extends \Espo\Services\Record +class Event extends Record { protected $validateRequiredSkipFieldList = [ 'dateEnd' diff --git a/application/Espo/Core/Templates/Services/Person.php b/application/Espo/Core/Templates/Services/Person.php index be36428d4d..c2be25ed1e 100644 --- a/application/Espo/Core/Templates/Services/Person.php +++ b/application/Espo/Core/Templates/Services/Person.php @@ -29,10 +29,10 @@ namespace Espo\Core\Templates\Services; -/** - * @extends \Espo\Services\Record<\Espo\Core\Templates\Entities\Person> - */ -class Person extends \Espo\Services\Record -{ +use Espo\Services\Record; -} +/** + * @extends Record<\Espo\Core\Templates\Entities\Person> + */ +class Person extends Record +{}