EspoCRM – Open Source CRM Application
PHP calendarcontactscrmcrm-platformcrm-systemcustomer-portalcustomer-supportcustomizabledocumentsemail-marketingkanbanleadsopen-sourcephpplatformsales-automationsingle-page-applicationsupport
Ref
Yurii8cc5d830ba00
diff --git a/application/Espo/Controllers/UserSecurity.php b/application/Espo/Controllers/UserSecurity.phpindex 929c0cbf26..5d4c53167b 100644--- a/application/Espo/Controllers/UserSecurity.php+++ b/application/Espo/Controllers/UserSecurity.php@@ -32,28 +32,22 @@ namespace Espo\Controllers;use Espo\Core\Exceptions\Error;use Espo\Core\Exceptions\Forbidden;use Espo\Core\Exceptions\BadRequest;-use Espo\Core\Api\Request;-use Espo\Core\Exceptions\NotFound;use Espo\Tools\UserSecurity\Service as Service;-use Espo\Entities\User;use stdClass;class UserSecurity{- private Service $service;- private User $user;-/*** @throws Forbidden*/- public function __construct(Service $service, User $user)- {- $this->service = $service;- $this->user = $user;+ public function __construct(+ private Service $service,+ private User $user,+ ) {if (!$this->user->isAdmin() &&diff --git a/application/Espo/Entities/UserData.php b/application/Espo/Entities/UserData.phpindex 79d16cdbf2..6fe531b973 100644--- a/application/Espo/Entities/UserData.php+++ b/application/Espo/Entities/UserData.php@@ -29,9 +29,11 @@namespace Espo\Entities;-class UserData extends \Espo\Core\ORM\Entity+use Espo\Core\ORM\Entity;++class UserData extends Entity{- public const ENTITY_TYPE = 'UserData';+ public const string ENTITY_TYPE = 'UserData';public function getAuth2FA(): bool{diff --git a/application/Espo/Repositories/UserData.php b/application/Espo/Repositories/UserData.phpindex c49112599e..fd7748555d 100644--- a/application/Espo/Repositories/UserData.php+++ b/application/Espo/Repositories/UserData.php@@ -42,7 +42,6 @@ class UserData extends Database{public function getByUserId(string $userId): ?UserDataEntity{- /** @var ?UserDataEntity $userData */$userData = $this->where(['userId' => $userId])->findOne();