diff --git a/application/Espo/Core/Portal/Acl/Traits/DefaultAccessCheckerDependency.php b/application/Espo/Core/Portal/Acl/Traits/DefaultAccessCheckerDependency.php index ed56db8d30..4492930575 100644 --- a/application/Espo/Core/Portal/Acl/Traits/DefaultAccessCheckerDependency.php +++ b/application/Espo/Core/Portal/Acl/Traits/DefaultAccessCheckerDependency.php @@ -30,20 +30,13 @@ namespace Espo\Core\Portal\Acl\Traits; use Espo\ORM\Entity; - use Espo\Entities\User; - -use Espo\Core\{ - Acl\ScopeData, - Portal\Acl\DefaultAccessChecker, -}; +use Espo\Core\Acl\ScopeData; +use Espo\Core\Portal\Acl\DefaultAccessChecker; trait DefaultAccessCheckerDependency { - /** - * @var DefaultAccessChecker - */ - private $defaultAccessChecker; + private DefaultAccessChecker $defaultAccessChecker; public function check(User $user, ScopeData $data): bool { diff --git a/application/Espo/Modules/Crm/Classes/Acl/Call/AccessChecker.php b/application/Espo/Modules/Crm/Classes/Acl/Call/AccessChecker.php index 6c7fe50a57..c87702c75d 100644 --- a/application/Espo/Modules/Crm/Classes/Acl/Call/AccessChecker.php +++ b/application/Espo/Modules/Crm/Classes/Acl/Call/AccessChecker.php @@ -30,11 +30,9 @@ namespace Espo\Modules\Crm\Classes\Acl\Call; use Espo\Entities\User; - +use Espo\Modules\Crm\Entities\Call; use Espo\ORM\Entity; - use Espo\Core\ORM\Entity as CoreEntity; - use Espo\Core\Acl\AccessEntityCREDSChecker; use Espo\Core\Acl\DefaultAccessChecker; use Espo\Core\Acl\ScopeData; @@ -42,14 +40,12 @@ use Espo\Core\Acl\Table; use Espo\Core\Acl\Traits\DefaultAccessCheckerDependency; /** - * @implements AccessEntityCREDSChecker<\Espo\Modules\Crm\Entities\Call> + * @implements AccessEntityCREDSChecker */ class AccessChecker implements AccessEntityCREDSChecker { use DefaultAccessCheckerDependency; - private $defaultAccessChecker; - public function __construct(DefaultAccessChecker $defaultAccessChecker) { $this->defaultAccessChecker = $defaultAccessChecker; diff --git a/application/Espo/Modules/Crm/Classes/Acl/Meeting/AccessChecker.php b/application/Espo/Modules/Crm/Classes/Acl/Meeting/AccessChecker.php index 06b4e52e4b..daddf1ceb8 100644 --- a/application/Espo/Modules/Crm/Classes/Acl/Meeting/AccessChecker.php +++ b/application/Espo/Modules/Crm/Classes/Acl/Meeting/AccessChecker.php @@ -30,11 +30,9 @@ namespace Espo\Modules\Crm\Classes\Acl\Meeting; use Espo\Entities\User; - +use Espo\Modules\Crm\Entities\Meeting; use Espo\ORM\Entity; - use Espo\Core\ORM\Entity as CoreEntity; - use Espo\Core\Acl\AccessEntityCREDSChecker; use Espo\Core\Acl\DefaultAccessChecker; use Espo\Core\Acl\ScopeData; @@ -42,14 +40,12 @@ use Espo\Core\Acl\Table; use Espo\Core\Acl\Traits\DefaultAccessCheckerDependency; /** - * @implements AccessEntityCREDSChecker<\Espo\Modules\Crm\Entities\Meeting> + * @implements AccessEntityCREDSChecker */ class AccessChecker implements AccessEntityCREDSChecker { use DefaultAccessCheckerDependency; - private $defaultAccessChecker; - public function __construct(DefaultAccessChecker $defaultAccessChecker) { $this->defaultAccessChecker = $defaultAccessChecker; diff --git a/application/Espo/Modules/Crm/Classes/AclPortal/KnowledgeBaseArticle/AccessChecker.php b/application/Espo/Modules/Crm/Classes/AclPortal/KnowledgeBaseArticle/AccessChecker.php index 3a83010f8c..67de96bc6f 100644 --- a/application/Espo/Modules/Crm/Classes/AclPortal/KnowledgeBaseArticle/AccessChecker.php +++ b/application/Espo/Modules/Crm/Classes/AclPortal/KnowledgeBaseArticle/AccessChecker.php @@ -30,27 +30,21 @@ namespace Espo\Modules\Crm\Classes\AclPortal\KnowledgeBaseArticle; use Espo\Entities\User; - +use Espo\Modules\Crm\Entities\KnowledgeBaseArticle; use Espo\ORM\Entity; - use Espo\Core\ORM\Entity as CoreEntity; - -use Espo\Core\{ - Acl\ScopeData, - Acl\AccessEntityCREDChecker, - Portal\Acl\DefaultAccessChecker, - Portal\Acl\Traits\DefaultAccessCheckerDependency, -}; +use Espo\Core\Acl\AccessEntityCREDChecker; +use Espo\Core\Acl\ScopeData; +use Espo\Core\Portal\Acl\DefaultAccessChecker; +use Espo\Core\Portal\Acl\Traits\DefaultAccessCheckerDependency; /** - * @implements AccessEntityCREDChecker<\Espo\Modules\Crm\Entities\KnowledgeBaseArticle> + * @implements AccessEntityCREDChecker */ class AccessChecker implements AccessEntityCREDChecker { use DefaultAccessCheckerDependency; - private $defaultAccessChecker; - public function __construct(DefaultAccessChecker $defaultAccessChecker) { $this->defaultAccessChecker = $defaultAccessChecker; @@ -62,7 +56,7 @@ class AccessChecker implements AccessEntityCREDChecker return false; } - if ($entity->get('status') !== 'Published') { + if ($entity->get('status') !== KnowledgeBaseArticle::STATUS_PUBLISHED) { return false; }