type fixes

This commit is contained in:
Yuri Kuznetsov
2022-03-06 10:03:59 +02:00
parent 7da39f4228
commit 90e435f495
66 changed files with 86 additions and 97 deletions
+17 -17
View File
@@ -54,21 +54,21 @@ use Espo\Core\{
*/
class Base implements AccessChecker, Injectable
{
protected $dependencyList = [];
protected $dependencyList = []; /** @phpstan-ignore-line */
protected $dependencies = [];
protected $dependencies = []; /** @phpstan-ignore-line */
protected $injections = [];
protected $injections = []; /** @phpstan-ignore-line */
protected $entityManager;
protected $entityManager; /** @phpstan-ignore-line */
protected $aclManager;
protected $aclManager; /** @phpstan-ignore-line */
protected $config;
protected $config; /** @phpstan-ignore-line */
protected $scopeChecker;
protected $scopeChecker; /** @phpstan-ignore-line */
protected $defaultChecker;
protected $defaultChecker; /** @phpstan-ignore-line */
public function __construct(
EntityManager $entityManager,
@@ -144,17 +144,17 @@ class Base implements AccessChecker, Injectable
return false;
}
public function checkIsOwner(User $user, Entity $entity)
public function checkIsOwner(User $user, Entity $entity) /** @phpstan-ignore-line */
{
return $this->aclManager->checkOwnershipOwn($user, $entity);
}
public function checkInAccount(User $user, Entity $entity)
public function checkInAccount(User $user, Entity $entity) /** @phpstan-ignore-line */
{
return $this->aclManager->checkOwnershipAccount($user, $entity);
}
public function checkIsOwnContact(User $user, Entity $entity)
public function checkIsOwnContact(User $user, Entity $entity) /** @phpstan-ignore-line */
{
return $this->aclManager->checkOwnershipContact($user, $entity);
}
@@ -174,33 +174,33 @@ class Base implements AccessChecker, Injectable
return $this->aclManager;
}
public function inject($name, $object)
public function inject($name, $object) /** @phpstan-ignore-line */
{
$this->injections[$name] = $object;
}
protected function init()
protected function init() /** @phpstan-ignore-line */
{
}
protected function getInjection($name)
protected function getInjection($name) /** @phpstan-ignore-line */
{
return $this->injections[$name] ?? $this->$name ?? null;
}
protected function addDependencyList(array $list)
protected function addDependencyList(array $list) /** @phpstan-ignore-line */
{
foreach ($list as $item) {
$this->addDependency($item);
}
}
protected function addDependency($name)
protected function addDependency($name) /** @phpstan-ignore-line */
{
$this->dependencyList[] = $name;
}
public function getDependencyList()
public function getDependencyList() /** @phpstan-ignore-line */
{
return array_merge($this->dependencyList, $this->dependencies);
}
@@ -34,6 +34,9 @@ namespace Espo\Core\Application\Runner;
*/
class Params
{
/**
* @var array<string,mixed>
*/
private $data = [];
public function __construct()
@@ -74,6 +77,8 @@ class Params
/**
* Create from an associative array.
*
* @param array<string,mixed> $data
*/
public static function fromArray(array $data): self
{
+1 -1
View File
@@ -33,5 +33,5 @@ use Espo\Core\Acl;
interface AclAware
{
public function setAcl(Acl $acl);
public function setAcl(Acl $acl): void;
}
+1 -1
View File
@@ -33,5 +33,5 @@ use Espo\Core\AclManager;
interface AclManagerAware
{
public function setAclManager(AclManager $aclManager);
public function setAclManager(AclManager $aclManager): void;
}
@@ -38,7 +38,7 @@ trait AclManagerSetter
*/
protected $aclManager;
public function setAclManager(AclManager $aclManager)
public function setAclManager(AclManager $aclManager): void
{
$this->aclManager = $aclManager;
}
+1 -1
View File
@@ -38,7 +38,7 @@ trait AclSetter
*/
protected $acl;
public function setAcl(Acl $acl)
public function setAcl(Acl $acl): void
{
$this->acl = $acl;
}
@@ -33,5 +33,5 @@ use Espo\Core\ApplicationState;
interface ApplicationStateAware
{
public function setApplicationState(ApplicationState $applicationState);
public function setApplicationState(ApplicationState $applicationState): void;
}
@@ -38,7 +38,7 @@ trait ApplicationStateSetter
*/
protected $applicationState;
public function setApplicationState(ApplicationState $applicationState)
public function setApplicationState(ApplicationState $applicationState): void
{
$this->applicationState = $applicationState;
}
+1 -1
View File
@@ -33,5 +33,5 @@ use Espo\Core\Utils\Config;
interface ConfigAware
{
public function setConfig(Config $config);
public function setConfig(Config $config): void;
}
+1 -1
View File
@@ -38,7 +38,7 @@ trait ConfigSetter
*/
protected $config;
public function setConfig(Config $config)
public function setConfig(Config $config): void
{
$this->config = $config;
}
+1 -1
View File
@@ -33,5 +33,5 @@ use Espo\Core\Utils\Crypt;
interface CryptAware
{
public function setCrypt(Crypt $crypt);
public function setCrypt(Crypt $crypt): void;
}
+1 -1
View File
@@ -38,7 +38,7 @@ trait CryptSetter
*/
protected $crypt;
public function setCrypt(Crypt $crypt)
public function setCrypt(Crypt $crypt): void
{
$this->crypt = $crypt;
}
+1 -1
View File
@@ -33,5 +33,5 @@ use Espo\Core\Utils\DataCache;
interface DataCacheAware
{
public function setDataCache(DataCache $dataCache);
public function setDataCache(DataCache $dataCache): void;
}
+1 -1
View File
@@ -38,7 +38,7 @@ trait DataCacheSetter
*/
protected $dataCache;
public function setDataCache(DataCache $dataCache)
public function setDataCache(DataCache $dataCache): void
{
$this->dataCache = $dataCache;
}
@@ -33,5 +33,5 @@ use Espo\Core\DataManager;
interface DataManagerAware
{
public function setDataManager(DataManager $dataManager);
public function setDataManager(DataManager $dataManager): void;
}
@@ -38,7 +38,7 @@ trait DataManagerSetter
*/
protected $dataManager;
public function setDataManager(DataManager $dataManager)
public function setDataManager(DataManager $dataManager): void
{
$this->dataManager = $dataManager;
}
+1 -1
View File
@@ -33,5 +33,5 @@ use Espo\Core\Utils\DateTime;
interface DateTimeAware
{
public function setDateTime(DateTime $dateTime);
public function setDateTime(DateTime $dateTime): void;
}
+1 -1
View File
@@ -38,7 +38,7 @@ trait DateTimeSetter
*/
protected $dateTime;
public function setDateTime(DateTime $dateTime)
public function setDateTime(DateTime $dateTime): void
{
$this->dateTime = $dateTime;
}
@@ -33,5 +33,5 @@ use Espo\Core\Utils\Language;
interface DefaultLanguageAware
{
public function setDefaultLanguage(Language $defaultLanguage);
public function setDefaultLanguage(Language $defaultLanguage): void;
}
@@ -38,7 +38,7 @@ trait DefaultLanguageSetter
*/
protected $defaultLanguage;
public function setDefaultLanguage(Language $defaultLanguage)
public function setDefaultLanguage(Language $defaultLanguage): void
{
$this->defaultLanguage = $defaultLanguage;
}
@@ -33,5 +33,5 @@ use Espo\Core\Utils\EmailFilterManager;
interface EmailFilterManagerAware
{
public function setEmailFilterManager(EmailFilterManager $emailFilterManager);
public function setEmailFilterManager(EmailFilterManager $emailFilterManager): void;
}
@@ -38,7 +38,7 @@ trait EmailFilterManagerSetter
*/
protected $emailFilterManager;
public function setEmailFilterManager(EmailFilterManager $emailFilterManager)
public function setEmailFilterManager(EmailFilterManager $emailFilterManager): void
{
$this->emailFilterManager = $emailFilterManager;
}
@@ -33,5 +33,5 @@ use Espo\Core\Mail\EmailSender as EmailSender;
interface EmailSenderAware
{
public function setEmailSender(EmailSender $emailSender);
public function setEmailSender(EmailSender $emailSender): void;
}
@@ -38,7 +38,7 @@ trait EmailSenderSetter
*/
protected $emailSender;
public function setEmailSender(EmailSender $emailSender)
public function setEmailSender(EmailSender $emailSender): void
{
$this->emailSender = $emailSender;
}
@@ -33,5 +33,5 @@ use Espo\ORM\EntityManager;
interface EntityManagerAware
{
public function setEntityManager(EntityManager $entityManager);
public function setEntityManager(EntityManager $entityManager): void;
}
@@ -38,7 +38,7 @@ trait EntityManagerSetter
*/
protected $entityManager;
public function setEntityManager(EntityManager $entityManager)
public function setEntityManager(EntityManager $entityManager): void
{
$this->entityManager = $entityManager;
}
+1 -1
View File
@@ -33,5 +33,5 @@ use Espo\Core\Utils\FieldUtil;
interface FieldUtilAware
{
public function setFieldUtil(FieldUtil $fieldUtil);
public function setFieldUtil(FieldUtil $fieldUtil): void;
}
+2 -2
View File
@@ -40,12 +40,12 @@ trait FieldUtilSetter
protected $fieldManagerUtil;
public function setFieldUtil(FieldUtil $fieldUtil)
public function setFieldUtil(FieldUtil $fieldUtil): void
{
$this->fieldUtil = $fieldUtil;
// for backward compatibility
// @todo Remove in 6.4.
// @todo Remove.
$this->fieldManagerUtil = $fieldUtil;
}
}
@@ -33,5 +33,5 @@ use Espo\Core\FieldValidation\FieldValidationManager;
interface FieldValidationManagerAware
{
public function setFieldValidationManager(FieldValidationManager $fieldValidationManager);
public function setFieldValidationManager(FieldValidationManager $fieldValidationManager): void;
}
@@ -38,7 +38,7 @@ trait FieldValidationManagerSetter
*/
protected $fieldValidationManager;
public function setFieldValidationManager(FieldValidationManager $fieldValidationManager)
public function setFieldValidationManager(FieldValidationManager $fieldValidationManager): void
{
$this->fieldValidationManager = $fieldValidationManager;
}
@@ -33,5 +33,5 @@ use Espo\Core\Utils\File\Manager as FileManager;
interface FileManagerAware
{
public function setFileManager(FileManager $fileManager);
public function setFileManager(FileManager $fileManager): void;
}
@@ -38,7 +38,7 @@ trait FileManagerSetter
*/
protected $fileManager;
public function setFileManager(FileManager $fileManager)
public function setFileManager(FileManager $fileManager): void
{
$this->fileManager = $fileManager;
}
@@ -33,5 +33,5 @@ use Espo\Core\FileStorage\Manager as FileStorageManager;
interface FileStorageManagerAware
{
public function setFileStorageManager(FileStorageManager $fileStorageManager);
public function setFileStorageManager(FileStorageManager $fileStorageManager): void;
}
@@ -38,7 +38,7 @@ trait FileStorageManagerSetter
*/
protected $fileStorageManager;
public function setFileStorageManager(FileStorageManager $fileStorageManager)
public function setFileStorageManager(FileStorageManager $fileStorageManager): void
{
$this->fileStorageManager = $fileStorageManager;
}
@@ -33,5 +33,5 @@ use Espo\Core\HookManager;
interface HookManagerAware
{
public function setHookManager(HookManager $hookManager);
public function setHookManager(HookManager $hookManager): void;
}
@@ -38,7 +38,7 @@ trait HookManagerSetter
*/
protected $hookManager;
public function setHookManager(HookManager $hookManager)
public function setHookManager(HookManager $hookManager): void
{
$this->hookManager = $hookManager;
}
@@ -33,5 +33,5 @@ use Espo\Core\Htmlizer\HtmlizerFactory as HtmlizerFactory;
interface HtmlizerFactoryAware
{
public function setHtmlizerFactory(HtmlizerFactory $htmlizerFactory);
public function setHtmlizerFactory(HtmlizerFactory $htmlizerFactory): void;
}
@@ -38,7 +38,7 @@ trait HtmlizerFactorySetter
*/
protected $htmlizerFactory;
public function setHtmlizerFactory(HtmlizerFactory $htmlizerFactory)
public function setHtmlizerFactory(HtmlizerFactory $htmlizerFactory): void
{
$this->htmlizerFactory = $htmlizerFactory;
}
@@ -33,5 +33,5 @@ use Espo\Core\InjectableFactory;
interface InjectableFactoryAware
{
public function setInjectableFactory(InjectableFactory $injectableFactory);
public function setInjectableFactory(InjectableFactory $injectableFactory): void;
}
@@ -38,7 +38,7 @@ trait InjectableFactorySetter
*/
protected $injectableFactory;
public function setInjectableFactory(InjectableFactory $injectableFactory)
public function setInjectableFactory(InjectableFactory $injectableFactory): void
{
$this->injectableFactory = $injectableFactory;
}
+1 -1
View File
@@ -33,5 +33,5 @@ use Espo\Core\Utils\Language;
interface LanguageAware
{
public function setLanguage(Language $language);
public function setLanguage(Language $language): void;
}
+1 -1
View File
@@ -38,7 +38,7 @@ trait LanguageSetter
*/
protected $language;
public function setLanguage(Language $language)
public function setLanguage(Language $language): void
{
$this->language = $language;
}
+1 -1
View File
@@ -33,5 +33,5 @@ use Espo\Core\Utils\Log;
interface LogAware
{
public function setLog(Log $log);
public function setLog(Log $log): void;
}
+1 -1
View File
@@ -38,7 +38,7 @@ trait LogSetter
*/
protected $log;
public function setLog(Log $log)
public function setLog(Log $log): void
{
$this->log = $log;
}
+1 -1
View File
@@ -33,5 +33,5 @@ use Espo\Core\Utils\Metadata;
interface MetadataAware
{
public function setMetadata(Metadata $metadata);
public function setMetadata(Metadata $metadata): void;
}
+1 -1
View File
@@ -33,5 +33,5 @@ use Espo\Core\Utils\NumberUtil;
interface NumberAware
{
public function setNumber(NumberUtil $number);
public function setNumber(NumberUtil $number): void;
}
+1 -1
View File
@@ -38,7 +38,7 @@ trait NumberSetter
*/
protected $number;
public function setNumber(NumberUtil $number)
public function setNumber(NumberUtil $number): void
{
$this->number = $number;
}
@@ -33,5 +33,5 @@ use Espo\Entities\Preferences;
interface PreferencesAware
{
public function setPreferences(Preferences $preferences);
public function setPreferences(Preferences $preferences): void;
}
@@ -38,7 +38,7 @@ trait PreferencesSetter
*/
protected $preferences;
public function setPreferences(Preferences $preferences)
public function setPreferences(Preferences $preferences): void
{
$this->preferences = $preferences;
}
@@ -33,5 +33,5 @@ use Espo\Core\Record\ServiceContainer as RecordServiceContainer;
interface RecordServiceContainerAware
{
public function setRecordServiceContainer(RecordServiceContainer $recordServiceContainer);
public function setRecordServiceContainer(RecordServiceContainer $recordServiceContainer): void;
}
@@ -38,7 +38,7 @@ trait RecordServiceContainerSetter
*/
protected $recordServiceContainer;
public function setRecordServiceContainer(RecordServiceContainer $recordServiceContainer)
public function setRecordServiceContainer(RecordServiceContainer $recordServiceContainer): void
{
$this->recordServiceContainer = $recordServiceContainer;
}
@@ -33,5 +33,5 @@ use Espo\Core\Select\SelectBuilderFactory;
interface SelectBuilderFactoryAware
{
public function setSelectBuilderFactory(SelectBuilderFactory $selectBuilderFactory);
public function setSelectBuilderFactory(SelectBuilderFactory $selectBuilderFactory): void;
}
@@ -38,7 +38,7 @@ trait SelectBuilderFactorySetter
*/
protected $selectBuilderFactory;
public function setSelectBuilderFactory(SelectBuilderFactory $selectBuilderFactory)
public function setSelectBuilderFactory(SelectBuilderFactory $selectBuilderFactory): void
{
$this->selectBuilderFactory = $selectBuilderFactory;
}
@@ -33,5 +33,5 @@ use Espo\Core\Select\SelectManagerFactory;
interface SelectManagerFactoryAware
{
public function setSelectManagerFactory(SelectManagerFactory $selectManagerFactory);
public function setSelectManagerFactory(SelectManagerFactory $selectManagerFactory): void;
}
@@ -35,7 +35,7 @@ trait SelectManagerFactorySetter
{
protected $selectManagerFactory;
public function setSelectManagerFactory(SelectManagerFactory $selectManagerFactory)
public function setSelectManagerFactory(SelectManagerFactory $selectManagerFactory): void
{
$this->selectManagerFactory = $selectManagerFactory;
}
@@ -33,5 +33,5 @@ use Espo\Core\ServiceFactory;
interface ServiceFactoryAware
{
public function setServiceFactory(ServiceFactory $serviceFactory);
public function setServiceFactory(ServiceFactory $serviceFactory): void;
}
@@ -38,7 +38,7 @@ trait ServiceFactorySetter
*/
protected $serviceFactory;
public function setServiceFactory(ServiceFactory $serviceFactory)
public function setServiceFactory(ServiceFactory $serviceFactory): void
{
$this->serviceFactory = $serviceFactory;
}
@@ -33,5 +33,5 @@ use Espo\Core\Utils\TemplateFileManager;
interface TemplateFileManagerAware
{
public function setTemplateFileManager(TemplateFileManager $templateFileManager);
public function setTemplateFileManager(TemplateFileManager $templateFileManager): void;
}
@@ -38,7 +38,7 @@ trait TemplateFileManagerSetter
*/
protected $templateFileManager;
public function setTemplateFileManager(TemplateFileManager $templateFileManager)
public function setTemplateFileManager(TemplateFileManager $templateFileManager): void
{
$this->templateFileManager = $templateFileManager;
}
+1 -1
View File
@@ -33,5 +33,5 @@ use Espo\Entities\User;
interface UserAware
{
public function setUser(User $user);
public function setUser(User $user): void;
}
+1 -1
View File
@@ -38,7 +38,7 @@ trait UserSetter
*/
protected $user;
public function setUser(User $user)
public function setUser(User $user): void
{
$this->user = $user;
}
@@ -33,5 +33,5 @@ use Espo\Core\WebSocket\Submission;
interface WebSocketSubmissionAware
{
public function setWebSocketSubmission(Submission $webSocketSubmission);
public function setWebSocketSubmission(Submission $webSocketSubmission): void;
}
@@ -38,7 +38,7 @@ trait WebSocketSubmissionSetter
*/
protected $webSocketSubmission;
public function setWebSocketSubmission(Submission $webSocketSubmission)
public function setWebSocketSubmission(Submission $webSocketSubmission): void
{
$this->webSocketSubmission = $webSocketSubmission;
}
@@ -33,5 +33,5 @@ use Espo\Core\Webhook\Manager;
interface WebhookManagerAware
{
public function setWebhookManager(Manager $webhookManager);
public function setWebhookManager(Manager $webhookManager): void;
}
@@ -38,7 +38,7 @@ trait WebhookManagerSetter
*/
protected $webhookManager;
public function setWebhookManager(Manager $webhookManager)
public function setWebhookManager(Manager $webhookManager): void
{
$this->webhookManager = $webhookManager;
}
-16
View File
@@ -115,22 +115,6 @@ class Record extends RecordService implements
{
}
/**
* @todo Remove.
*/
public function setAcl(Acl $acl)
{
$this->acl = $acl;
}
/**
* @todo Remove.
*/
public function setUser(User $user)
{
$this->user = $user;
}
/**
* @deprecated Use `$this->entityType`.
*/