From 61cdcbfeb5a56e35060130cb79d2347f9544e703 Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Tue, 20 Dec 2022 14:20:03 +0200 Subject: [PATCH] cs --- .../ActionHistoryRecord/OwnershipChecker.php | 9 ++--- .../Classes/Acl/Attachment/AccessChecker.php | 7 ++-- .../Acl/Attachment/OwnershipChecker.php | 9 ++--- .../Classes/Acl/AuthToken/AccessChecker.php | 16 +++----- .../Espo/Classes/Acl/Email/AccessChecker.php | 21 +++++------ .../Classes/Acl/Email/AssignmentChecker.php | 6 +-- .../Classes/Acl/Email/OwnershipChecker.php | 12 +++--- .../Acl/EmailFilter/OwnershipChecker.php | 8 +--- .../Espo/Classes/Acl/Import/AccessChecker.php | 15 +++----- .../Espo/Classes/Acl/Note/AccessChecker.php | 32 ++++++---------- .../Classes/Acl/Note/OwnershipChecker.php | 4 +- .../Acl/Notification/OwnershipChecker.php | 9 ++--- .../Espo/Classes/Acl/Portal/AccessChecker.php | 23 +++++------- .../Acl/ScheduledJob/AccessChecker.php | 17 ++++----- .../Classes/Acl/Team/OwnershipChecker.php | 9 ++--- .../Espo/Classes/Acl/User/AccessChecker.php | 21 ++++------- .../Classes/Acl/User/OwnershipChecker.php | 11 ++---- .../Classes/Acl/Webhook/AccessChecker.php | 17 +++------ .../AclPortal/Attachment/AccessChecker.php | 37 ++++++++----------- .../AclPortal/Attachment/OwnershipChecker.php | 9 ++--- .../Classes/AclPortal/Email/AccessChecker.php | 20 ++++------ .../AclPortal/Email/OwnershipChecker.php | 9 ++--- .../Classes/AclPortal/Note/AccessChecker.php | 32 ++++++---------- .../AclPortal/Note/OwnershipChecker.php | 4 +- .../Notification/OwnershipChecker.php | 9 ++--- .../AclPortal/User/OwnershipChecker.php | 8 +--- .../Traits/DefaultAccessCheckerDependency.php | 13 ++----- 27 files changed, 142 insertions(+), 245 deletions(-) diff --git a/application/Espo/Classes/Acl/ActionHistoryRecord/OwnershipChecker.php b/application/Espo/Classes/Acl/ActionHistoryRecord/OwnershipChecker.php index 551e546d74..50e471532f 100644 --- a/application/Espo/Classes/Acl/ActionHistoryRecord/OwnershipChecker.php +++ b/application/Espo/Classes/Acl/ActionHistoryRecord/OwnershipChecker.php @@ -29,16 +29,13 @@ namespace Espo\Classes\Acl\ActionHistoryRecord; +use Espo\Entities\ActionHistoryRecord; use Espo\Entities\User; - use Espo\ORM\Entity; - -use Espo\Core\{ - Acl\OwnershipOwnChecker, -}; +use Espo\Core\Acl\OwnershipOwnChecker; /** - * @implements OwnershipOwnChecker<\Espo\Entities\ActionHistoryRecord> + * @implements OwnershipOwnChecker */ class OwnershipChecker implements OwnershipOwnChecker { diff --git a/application/Espo/Classes/Acl/Attachment/AccessChecker.php b/application/Espo/Classes/Acl/Attachment/AccessChecker.php index b0911e9320..9ed5033ded 100644 --- a/application/Espo/Classes/Acl/Attachment/AccessChecker.php +++ b/application/Espo/Classes/Acl/Attachment/AccessChecker.php @@ -31,10 +31,9 @@ namespace Espo\Classes\Acl\Attachment; use Espo\Entities\Attachment; use Espo\Entities\Note; +use Espo\Entities\Settings; use Espo\Entities\User; - use Espo\ORM\Entity; - use Espo\Core\Acl\AccessEntityCREDChecker; use Espo\Core\Acl\DefaultAccessChecker; use Espo\Core\Acl\ScopeData; @@ -66,7 +65,7 @@ class AccessChecker implements AccessEntityCREDChecker { /** @var Attachment $entity */ - if ($entity->get('parentType') === 'Settings') { + if ($entity->get('parentType') === Settings::ENTITY_TYPE) { // Allow the logo. return true; } @@ -94,7 +93,7 @@ class AccessChecker implements AccessEntityCREDChecker return false; } - if ($parent->getEntityType() === 'Note') { + if ($parent->getEntityType() === Note::ENTITY_TYPE) { /** @var Note $parent */ $result = $this->checkEntityReadNoteParent($user, $parent); diff --git a/application/Espo/Classes/Acl/Attachment/OwnershipChecker.php b/application/Espo/Classes/Acl/Attachment/OwnershipChecker.php index 0d96045133..00392ec9d2 100644 --- a/application/Espo/Classes/Acl/Attachment/OwnershipChecker.php +++ b/application/Espo/Classes/Acl/Attachment/OwnershipChecker.php @@ -29,16 +29,13 @@ namespace Espo\Classes\Acl\Attachment; +use Espo\Entities\Attachment; use Espo\Entities\User; - use Espo\ORM\Entity; - -use Espo\Core\{ - Acl\OwnershipOwnChecker, -}; +use Espo\Core\Acl\OwnershipOwnChecker; /** - * @implements OwnershipOwnChecker<\Espo\Entities\Attachment> + * @implements OwnershipOwnChecker */ class OwnershipChecker implements OwnershipOwnChecker { diff --git a/application/Espo/Classes/Acl/AuthToken/AccessChecker.php b/application/Espo/Classes/Acl/AuthToken/AccessChecker.php index e8a3d26240..b5618dadce 100644 --- a/application/Espo/Classes/Acl/AuthToken/AccessChecker.php +++ b/application/Espo/Classes/Acl/AuthToken/AccessChecker.php @@ -29,24 +29,20 @@ namespace Espo\Classes\Acl\AuthToken; +use Espo\Entities\AuthToken; use Espo\Entities\User; - -use Espo\Core\{ - Acl\ScopeData, - Acl\DefaultAccessChecker, - Acl\AccessEntityCREDChecker, - Acl\Traits\DefaultAccessCheckerDependency, -}; +use Espo\Core\Acl\AccessEntityCREDChecker; +use Espo\Core\Acl\DefaultAccessChecker; +use Espo\Core\Acl\ScopeData; +use Espo\Core\Acl\Traits\DefaultAccessCheckerDependency; /** - * @implements AccessEntityCREDChecker<\Espo\Entities\AuthToken> + * @implements AccessEntityCREDChecker */ class AccessChecker implements AccessEntityCREDChecker { use DefaultAccessCheckerDependency; - private $defaultAccessChecker; - public function __construct(DefaultAccessChecker $defaultAccessChecker) { $this->defaultAccessChecker = $defaultAccessChecker; diff --git a/application/Espo/Classes/Acl/Email/AccessChecker.php b/application/Espo/Classes/Acl/Email/AccessChecker.php index 87a6955eb2..6c750e3733 100644 --- a/application/Espo/Classes/Acl/Email/AccessChecker.php +++ b/application/Espo/Classes/Acl/Email/AccessChecker.php @@ -31,19 +31,15 @@ namespace Espo\Classes\Acl\Email; use Espo\Entities\User; use Espo\Entities\Email; - use Espo\ORM\Entity; - -use Espo\Core\{ - Acl\Table, - Acl\ScopeData, - Acl\DefaultAccessChecker, - Acl\AccessEntityCREDSChecker, - Acl\Traits\DefaultAccessCheckerDependency, -}; +use Espo\Core\Acl\AccessEntityCREDSChecker; +use Espo\Core\Acl\DefaultAccessChecker; +use Espo\Core\Acl\ScopeData; +use Espo\Core\Acl\Table; +use Espo\Core\Acl\Traits\DefaultAccessCheckerDependency; /** - * @implements AccessEntityCREDSChecker<\Espo\Entities\Email> + * @implements AccessEntityCREDSChecker */ class AccessChecker implements AccessEntityCREDSChecker { @@ -129,7 +125,10 @@ class AccessChecker implements AccessEntityCREDSChecker return false; } - if ($entity->get('status') !== 'Sent' && $entity->get('status') !== 'Archived') { + if ( + $entity->getStatus() !== Email::STATUS_SENT && + $entity->getStatus() !== Email::STATUS_ARCHIVED + ) { return true; } diff --git a/application/Espo/Classes/Acl/Email/AssignmentChecker.php b/application/Espo/Classes/Acl/Email/AssignmentChecker.php index 6645d44f75..0b56cd9418 100644 --- a/application/Espo/Classes/Acl/Email/AssignmentChecker.php +++ b/application/Espo/Classes/Acl/Email/AssignmentChecker.php @@ -30,12 +30,8 @@ namespace Espo\Classes\Acl\Email; use Espo\Entities\User; - use Espo\ORM\Entity; - -use Espo\Core\{ - Acl\DefaultAssignmentChecker, -}; +use Espo\Core\Acl\DefaultAssignmentChecker; class AssignmentChecker extends DefaultAssignmentChecker { diff --git a/application/Espo/Classes/Acl/Email/OwnershipChecker.php b/application/Espo/Classes/Acl/Email/OwnershipChecker.php index 3fca727773..bf00f402c8 100644 --- a/application/Espo/Classes/Acl/Email/OwnershipChecker.php +++ b/application/Espo/Classes/Acl/Email/OwnershipChecker.php @@ -34,15 +34,13 @@ use Espo\Entities\Email; use Espo\ORM\Entity; -use Espo\Core\{ - Acl\DefaultOwnershipChecker, - Acl\OwnershipOwnChecker, - Acl\OwnershipTeamChecker, -}; +use Espo\Core\Acl\DefaultOwnershipChecker; +use Espo\Core\Acl\OwnershipOwnChecker; +use Espo\Core\Acl\OwnershipTeamChecker; /** - * @implements OwnershipOwnChecker<\Espo\Entities\Email> - * @implements OwnershipTeamChecker<\Espo\Entities\Email> + * @implements OwnershipOwnChecker + * @implements OwnershipTeamChecker */ class OwnershipChecker implements OwnershipOwnChecker, OwnershipTeamChecker { diff --git a/application/Espo/Classes/Acl/EmailFilter/OwnershipChecker.php b/application/Espo/Classes/Acl/EmailFilter/OwnershipChecker.php index 503a1278b3..da288b15c8 100644 --- a/application/Espo/Classes/Acl/EmailFilter/OwnershipChecker.php +++ b/application/Espo/Classes/Acl/EmailFilter/OwnershipChecker.php @@ -32,13 +32,9 @@ namespace Espo\Classes\Acl\EmailFilter; use Espo\Entities\EmailAccount; use Espo\Entities\User; use Espo\Entities\EmailFilter; - use Espo\ORM\Entity; - -use Espo\Core\{ - Acl\OwnershipOwnChecker, - ORM\EntityManager, -}; +use Espo\Core\Acl\OwnershipOwnChecker; +use Espo\Core\ORM\EntityManager; /** * @implements OwnershipOwnChecker diff --git a/application/Espo/Classes/Acl/Import/AccessChecker.php b/application/Espo/Classes/Acl/Import/AccessChecker.php index e6d14635a9..aec5f8b937 100644 --- a/application/Espo/Classes/Acl/Import/AccessChecker.php +++ b/application/Espo/Classes/Acl/Import/AccessChecker.php @@ -29,19 +29,16 @@ namespace Espo\Classes\Acl\Import; +use Espo\Entities\Import; use Espo\Entities\User; - use Espo\ORM\Entity; - -use Espo\Core\{ - Acl\ScopeData, - Acl\AccessEntityReadChecker, - Acl\AccessEntityDeleteChecker, -}; +use Espo\Core\Acl\AccessEntityDeleteChecker; +use Espo\Core\Acl\AccessEntityReadChecker; +use Espo\Core\Acl\ScopeData; /** - * @implements AccessEntityReadChecker<\Espo\Entities\Import> - * @implements AccessEntityDeleteChecker<\Espo\Entities\Import> + * @implements AccessEntityReadChecker + * @implements AccessEntityDeleteChecker */ class AccessChecker implements AccessEntityReadChecker, AccessEntityDeleteChecker { diff --git a/application/Espo/Classes/Acl/Note/AccessChecker.php b/application/Espo/Classes/Acl/Note/AccessChecker.php index e59b41daea..cfe168c79b 100644 --- a/application/Espo/Classes/Acl/Note/AccessChecker.php +++ b/application/Espo/Classes/Acl/Note/AccessChecker.php @@ -31,40 +31,32 @@ namespace Espo\Classes\Acl\Note; use Espo\Entities\Note; use Espo\Entities\User; - use Espo\ORM\Entity; - -use Espo\Core\{ - Acl\ScopeData, - Acl\DefaultAccessChecker, - Acl\AccessEntityCREDChecker, - Acl\Traits\DefaultAccessCheckerDependency, - AclManager, - ORM\EntityManager, - Utils\Config, -}; +use Espo\Core\Acl\AccessEntityCREDChecker; +use Espo\Core\Acl\DefaultAccessChecker; +use Espo\Core\Acl\ScopeData; +use Espo\Core\Acl\Traits\DefaultAccessCheckerDependency; +use Espo\Core\AclManager; +use Espo\Core\ORM\EntityManager; +use Espo\Core\Utils\Config; use DateTime; use Exception; /** - * @implements AccessEntityCREDChecker<\Espo\Entities\Note> + * @implements AccessEntityCREDChecker */ class AccessChecker implements AccessEntityCREDChecker { use DefaultAccessCheckerDependency; private const EDIT_PERIOD = '7 days'; - private const DELETE_PERIOD = '1 month'; - private $defaultAccessChecker; - - private $aclManager; - - private $entityManager; - - private $config; + private DefaultAccessChecker $defaultAccessChecker; + private AclManager $aclManager; + private EntityManager $entityManager; + private Config $config; public function __construct( DefaultAccessChecker $defaultAccessChecker, diff --git a/application/Espo/Classes/Acl/Note/OwnershipChecker.php b/application/Espo/Classes/Acl/Note/OwnershipChecker.php index 9c134109e4..6d449d662f 100644 --- a/application/Espo/Classes/Acl/Note/OwnershipChecker.php +++ b/application/Espo/Classes/Acl/Note/OwnershipChecker.php @@ -31,13 +31,11 @@ namespace Espo\Classes\Acl\Note; use Espo\Entities\Note; use Espo\Entities\User; - use Espo\ORM\Entity; - use Espo\Core\Acl\OwnershipOwnChecker; /** - * @implements OwnershipOwnChecker<\Espo\Entities\Note> + * @implements OwnershipOwnChecker */ class OwnershipChecker implements OwnershipOwnChecker { diff --git a/application/Espo/Classes/Acl/Notification/OwnershipChecker.php b/application/Espo/Classes/Acl/Notification/OwnershipChecker.php index 603df1a8c4..3f3d8e064c 100644 --- a/application/Espo/Classes/Acl/Notification/OwnershipChecker.php +++ b/application/Espo/Classes/Acl/Notification/OwnershipChecker.php @@ -29,16 +29,13 @@ namespace Espo\Classes\Acl\Notification; +use Espo\Entities\Notification; use Espo\Entities\User; - use Espo\ORM\Entity; - -use Espo\Core\{ - Acl\OwnershipOwnChecker, -}; +use Espo\Core\Acl\OwnershipOwnChecker; /** - * @implements OwnershipOwnChecker<\Espo\Entities\Notification> + * @implements OwnershipOwnChecker */ class OwnershipChecker implements OwnershipOwnChecker { diff --git a/application/Espo/Classes/Acl/Portal/AccessChecker.php b/application/Espo/Classes/Acl/Portal/AccessChecker.php index c18ccd5b30..26501c3e87 100644 --- a/application/Espo/Classes/Acl/Portal/AccessChecker.php +++ b/application/Espo/Classes/Acl/Portal/AccessChecker.php @@ -29,27 +29,24 @@ namespace Espo\Classes\Acl\Portal; +use Espo\Entities\Portal; use Espo\Entities\User; - -use Espo\Core\{ - Acl\ScopeData, - Acl\DefaultAccessChecker, - Acl\AccessEntityCREDChecker, - Acl\Traits\DefaultAccessCheckerDependency, - Acl\Table, - AclManager, -}; +use Espo\Core\Acl\AccessEntityCREDChecker; +use Espo\Core\Acl\DefaultAccessChecker; +use Espo\Core\Acl\ScopeData; +use Espo\Core\Acl\Table; +use Espo\Core\Acl\Traits\DefaultAccessCheckerDependency; +use Espo\Core\AclManager; /** - * @implements AccessEntityCREDChecker<\Espo\Entities\Portal> + * @implements AccessEntityCREDChecker */ class AccessChecker implements AccessEntityCREDChecker { use DefaultAccessCheckerDependency; - private $defaultAccessChecker; - - private $aclManager; + private DefaultAccessChecker $defaultAccessChecker; + private AclManager $aclManager; public function __construct(DefaultAccessChecker $defaultAccessChecker, AclManager $aclManager) { diff --git a/application/Espo/Classes/Acl/ScheduledJob/AccessChecker.php b/application/Espo/Classes/Acl/ScheduledJob/AccessChecker.php index 8e85033a50..7bf4e75d42 100644 --- a/application/Espo/Classes/Acl/ScheduledJob/AccessChecker.php +++ b/application/Espo/Classes/Acl/ScheduledJob/AccessChecker.php @@ -29,25 +29,22 @@ namespace Espo\Classes\Acl\ScheduledJob; +use Espo\Entities\ScheduledJob; use Espo\Entities\User; - use Espo\ORM\Entity; - -use Espo\Core\{ - Acl\ScopeData, - Acl\DefaultAccessChecker, - Acl\AccessEntityCREDChecker, - Acl\Traits\DefaultAccessCheckerDependency, -}; +use Espo\Core\Acl\AccessEntityCREDChecker; +use Espo\Core\Acl\DefaultAccessChecker; +use Espo\Core\Acl\ScopeData; +use Espo\Core\Acl\Traits\DefaultAccessCheckerDependency; /** - * @implements AccessEntityCREDChecker<\Espo\Entities\ScheduledJob> + * @implements AccessEntityCREDChecker */ class AccessChecker implements AccessEntityCREDChecker { use DefaultAccessCheckerDependency; - private $defaultAccessChecker; + private DefaultAccessChecker $defaultAccessChecker; public function __construct(DefaultAccessChecker $defaultAccessChecker) { diff --git a/application/Espo/Classes/Acl/Team/OwnershipChecker.php b/application/Espo/Classes/Acl/Team/OwnershipChecker.php index 2c4fc5daaa..5cf1dc2f28 100644 --- a/application/Espo/Classes/Acl/Team/OwnershipChecker.php +++ b/application/Espo/Classes/Acl/Team/OwnershipChecker.php @@ -29,16 +29,13 @@ namespace Espo\Classes\Acl\Team; +use Espo\Entities\Team; use Espo\Entities\User; - use Espo\ORM\Entity; - -use Espo\Core\{ - Acl\OwnershipOwnChecker, -}; +use Espo\Core\Acl\OwnershipOwnChecker; /** - * @implements OwnershipOwnChecker<\Espo\Entities\Team> + * @implements OwnershipOwnChecker */ class OwnershipChecker implements OwnershipOwnChecker { diff --git a/application/Espo/Classes/Acl/User/AccessChecker.php b/application/Espo/Classes/Acl/User/AccessChecker.php index 1eff1e5d54..5de28213ee 100644 --- a/application/Espo/Classes/Acl/User/AccessChecker.php +++ b/application/Espo/Classes/Acl/User/AccessChecker.php @@ -30,17 +30,13 @@ namespace Espo\Classes\Acl\User; use Espo\Entities\User; - use Espo\ORM\Entity; - -use Espo\Core\{ - Acl\Table, - Acl\ScopeData, - Acl\DefaultAccessChecker, - Acl\AccessEntityCREDSChecker, - Acl\Traits\DefaultAccessCheckerDependency, - AclManager, -}; +use Espo\Core\Acl\AccessEntityCREDSChecker; +use Espo\Core\Acl\DefaultAccessChecker; +use Espo\Core\Acl\ScopeData; +use Espo\Core\Acl\Table; +use Espo\Core\Acl\Traits\DefaultAccessCheckerDependency; +use Espo\Core\AclManager; /** * @implements AccessEntityCREDSChecker @@ -49,9 +45,8 @@ class AccessChecker implements AccessEntityCREDSChecker { use DefaultAccessCheckerDependency; - private $defaultAccessChecker; - - private $aclManager; + private DefaultAccessChecker $defaultAccessChecker; + private AclManager $aclManager; public function __construct(DefaultAccessChecker $defaultAccessChecker, AclManager $aclManager) { diff --git a/application/Espo/Classes/Acl/User/OwnershipChecker.php b/application/Espo/Classes/Acl/User/OwnershipChecker.php index 8aa0964aef..23c38b8a99 100644 --- a/application/Espo/Classes/Acl/User/OwnershipChecker.php +++ b/application/Espo/Classes/Acl/User/OwnershipChecker.php @@ -32,15 +32,12 @@ namespace Espo\Classes\Acl\User; use Espo\Entities\User; use Espo\ORM\Entity; use Espo\Core\ORM\Entity as CoreEntity; - -use Espo\Core\{ - Acl\OwnershipOwnChecker, - Acl\OwnershipTeamChecker, -}; +use Espo\Core\Acl\OwnershipOwnChecker; +use Espo\Core\Acl\OwnershipTeamChecker; /** - * @implements OwnershipOwnChecker<\Espo\Entities\User> - * @implements OwnershipTeamChecker<\Espo\Entities\User> + * @implements OwnershipOwnChecker + * @implements OwnershipTeamChecker */ class OwnershipChecker implements OwnershipOwnChecker, OwnershipTeamChecker { diff --git a/application/Espo/Classes/Acl/Webhook/AccessChecker.php b/application/Espo/Classes/Acl/Webhook/AccessChecker.php index 64bde2fe86..e620fdfe67 100644 --- a/application/Espo/Classes/Acl/Webhook/AccessChecker.php +++ b/application/Espo/Classes/Acl/Webhook/AccessChecker.php @@ -30,25 +30,20 @@ namespace Espo\Classes\Acl\Webhook; use Espo\Entities\User; - +use Espo\Entities\Webhook; use Espo\ORM\Entity; - -use Espo\Core\{ - Acl\ScopeData, - Acl\DefaultAccessChecker, - Acl\AccessEntityCREDChecker, - Acl\Traits\DefaultAccessCheckerDependency, -}; +use Espo\Core\Acl\AccessEntityCREDChecker; +use Espo\Core\Acl\DefaultAccessChecker; +use Espo\Core\Acl\ScopeData; +use Espo\Core\Acl\Traits\DefaultAccessCheckerDependency; /** - * @implements AccessEntityCREDChecker<\Espo\Entities\Webhook> + * @implements AccessEntityCREDChecker */ class AccessChecker implements AccessEntityCREDChecker { use DefaultAccessCheckerDependency; - private $defaultAccessChecker; - public function __construct(DefaultAccessChecker $defaultAccessChecker) { $this->defaultAccessChecker = $defaultAccessChecker; diff --git a/application/Espo/Classes/AclPortal/Attachment/AccessChecker.php b/application/Espo/Classes/AclPortal/Attachment/AccessChecker.php index fe6f1f20ba..4256b28b8e 100644 --- a/application/Espo/Classes/AclPortal/Attachment/AccessChecker.php +++ b/application/Espo/Classes/AclPortal/Attachment/AccessChecker.php @@ -29,22 +29,17 @@ namespace Espo\Classes\AclPortal\Attachment; -use Espo\Entities\{ - User, - Note, - Attachment, -}; - +use Espo\Entities\Attachment; +use Espo\Entities\Note; +use Espo\Entities\Settings; +use Espo\Entities\User; use Espo\ORM\Entity; - -use Espo\Core\{ - ORM\EntityManager, - Portal\AclManager, - Acl\ScopeData, - Acl\AccessEntityCREDChecker, - Portal\Acl\DefaultAccessChecker, - Portal\Acl\Traits\DefaultAccessCheckerDependency, -}; +use Espo\Core\Acl\AccessEntityCREDChecker; +use Espo\Core\Acl\ScopeData; +use Espo\Core\ORM\EntityManager; +use Espo\Core\Portal\Acl\DefaultAccessChecker; +use Espo\Core\Portal\Acl\Traits\DefaultAccessCheckerDependency; +use Espo\Core\Portal\AclManager; /** * @implements AccessEntityCREDChecker @@ -53,11 +48,9 @@ class AccessChecker implements AccessEntityCREDChecker { use DefaultAccessCheckerDependency; - private $defaultAccessChecker; - - private $aclManager; - - private $entityManager; + private DefaultAccessChecker $defaultAccessChecker; + private AclManager $aclManager; + private EntityManager $entityManager; public function __construct( DefaultAccessChecker $defaultAccessChecker, @@ -73,7 +66,7 @@ class AccessChecker implements AccessEntityCREDChecker { /** @var Attachment $entity */ - if ($entity->get('parentType') === 'Settings') { + if ($entity->get('parentType') === Settings::ENTITY_TYPE) { // Allow the logo. return true; } @@ -101,7 +94,7 @@ class AccessChecker implements AccessEntityCREDChecker return false; } - if ($parent->getEntityType() === 'Note') { + if ($parent->getEntityType() === Note::ENTITY_TYPE) { /** @var Note $parent */ $result = $this->checkEntityReadNoteParent($user, $parent); diff --git a/application/Espo/Classes/AclPortal/Attachment/OwnershipChecker.php b/application/Espo/Classes/AclPortal/Attachment/OwnershipChecker.php index 006bf9807d..575c9fe222 100644 --- a/application/Espo/Classes/AclPortal/Attachment/OwnershipChecker.php +++ b/application/Espo/Classes/AclPortal/Attachment/OwnershipChecker.php @@ -29,16 +29,13 @@ namespace Espo\Classes\AclPortal\Attachment; +use Espo\Entities\Attachment; use Espo\Entities\User; - use Espo\ORM\Entity; - -use Espo\Core\{ - Acl\OwnershipOwnChecker, -}; +use Espo\Core\Acl\OwnershipOwnChecker; /** - * @implements OwnershipOwnChecker<\Espo\Entities\Attachment> + * @implements OwnershipOwnChecker */ class OwnershipChecker implements OwnershipOwnChecker { diff --git a/application/Espo/Classes/AclPortal/Email/AccessChecker.php b/application/Espo/Classes/AclPortal/Email/AccessChecker.php index 0ac201debd..fe51818d6d 100644 --- a/application/Espo/Classes/AclPortal/Email/AccessChecker.php +++ b/application/Espo/Classes/AclPortal/Email/AccessChecker.php @@ -29,29 +29,23 @@ namespace Espo\Classes\AclPortal\Email; +use Espo\Entities\Email; use Espo\Entities\User; - use Espo\ORM\Entity; - use Espo\Core\ORM\Entity as CoreEntity; - -use Espo\Core\{ - Acl\Table, - Acl\ScopeData, - Acl\AccessEntityCREDSChecker, - Portal\Acl\DefaultAccessChecker, - Portal\Acl\Traits\DefaultAccessCheckerDependency, -}; +use Espo\Core\Acl\AccessEntityCREDSChecker; +use Espo\Core\Acl\ScopeData; +use Espo\Core\Acl\Table; +use Espo\Core\Portal\Acl\DefaultAccessChecker; +use Espo\Core\Portal\Acl\Traits\DefaultAccessCheckerDependency; /** - * @implements AccessEntityCREDSChecker<\Espo\Entities\Email> + * @implements AccessEntityCREDSChecker */ class AccessChecker implements AccessEntityCREDSChecker { use DefaultAccessCheckerDependency; - private $defaultAccessChecker; - public function __construct( DefaultAccessChecker $defaultAccessChecker ) { diff --git a/application/Espo/Classes/AclPortal/Email/OwnershipChecker.php b/application/Espo/Classes/AclPortal/Email/OwnershipChecker.php index fde27a265c..133db40efb 100644 --- a/application/Espo/Classes/AclPortal/Email/OwnershipChecker.php +++ b/application/Espo/Classes/AclPortal/Email/OwnershipChecker.php @@ -29,16 +29,13 @@ namespace Espo\Classes\AclPortal\Email; +use Espo\Entities\Email; use Espo\Entities\User; - use Espo\ORM\Entity; - -use Espo\Core\{ - Acl\OwnershipOwnChecker, -}; +use Espo\Core\Acl\OwnershipOwnChecker; /** - * @implements OwnershipOwnChecker<\Espo\Entities\Email> + * @implements OwnershipOwnChecker */ class OwnershipChecker implements OwnershipOwnChecker { diff --git a/application/Espo/Classes/AclPortal/Note/AccessChecker.php b/application/Espo/Classes/AclPortal/Note/AccessChecker.php index c28447b511..c1ac730fbd 100644 --- a/application/Espo/Classes/AclPortal/Note/AccessChecker.php +++ b/application/Espo/Classes/AclPortal/Note/AccessChecker.php @@ -31,40 +31,32 @@ namespace Espo\Classes\AclPortal\Note; use Espo\Entities\Note; use Espo\Entities\User; - use Espo\ORM\Entity; - -use Espo\Core\{ - Portal\AclManager, - Acl\ScopeData, - Acl\AccessEntityCREDChecker, - Portal\Acl\DefaultAccessChecker, - Portal\Acl\Traits\DefaultAccessCheckerDependency, - ORM\EntityManager, - Utils\Config, -}; +use Espo\Core\Acl\AccessEntityCREDChecker; +use Espo\Core\Acl\ScopeData; +use Espo\Core\ORM\EntityManager; +use Espo\Core\Portal\Acl\DefaultAccessChecker; +use Espo\Core\Portal\Acl\Traits\DefaultAccessCheckerDependency; +use Espo\Core\Portal\AclManager; +use Espo\Core\Utils\Config; use DateTime; use Exception; /** - * @implements AccessEntityCREDChecker<\Espo\Entities\Note> + * @implements AccessEntityCREDChecker */ class AccessChecker implements AccessEntityCREDChecker { use DefaultAccessCheckerDependency; private const EDIT_PERIOD = '7 days'; - private const DELETE_PERIOD = '1 month'; - private $defaultAccessChecker; - - private $aclManager; - - private $entityManager; - - private $config; + private DefaultAccessChecker $defaultAccessChecker; + private AclManager $aclManager; + private EntityManager $entityManager; + private Config $config; public function __construct( DefaultAccessChecker $defaultAccessChecker, diff --git a/application/Espo/Classes/AclPortal/Note/OwnershipChecker.php b/application/Espo/Classes/AclPortal/Note/OwnershipChecker.php index b5b62a70cd..ec47d3f35c 100644 --- a/application/Espo/Classes/AclPortal/Note/OwnershipChecker.php +++ b/application/Espo/Classes/AclPortal/Note/OwnershipChecker.php @@ -31,13 +31,11 @@ namespace Espo\Classes\AclPortal\Note; use Espo\Entities\Note; use Espo\Entities\User; - use Espo\ORM\Entity; - use Espo\Core\Acl\OwnershipOwnChecker; /** - * @implements OwnershipOwnChecker<\Espo\Entities\Note> + * @implements OwnershipOwnChecker */ class OwnershipChecker implements OwnershipOwnChecker { diff --git a/application/Espo/Classes/AclPortal/Notification/OwnershipChecker.php b/application/Espo/Classes/AclPortal/Notification/OwnershipChecker.php index 590ba6ebc3..76cd2757e5 100644 --- a/application/Espo/Classes/AclPortal/Notification/OwnershipChecker.php +++ b/application/Espo/Classes/AclPortal/Notification/OwnershipChecker.php @@ -29,16 +29,13 @@ namespace Espo\Classes\AclPortal\Notification; +use Espo\Entities\Notification; use Espo\Entities\User; - use Espo\ORM\Entity; - -use Espo\Core\{ - Acl\OwnershipOwnChecker, -}; +use Espo\Core\Acl\OwnershipOwnChecker; /** - * @implements OwnershipOwnChecker<\Espo\Entities\Notification> + * @implements OwnershipOwnChecker */ class OwnershipChecker implements OwnershipOwnChecker { diff --git a/application/Espo/Classes/AclPortal/User/OwnershipChecker.php b/application/Espo/Classes/AclPortal/User/OwnershipChecker.php index c816457d4e..61596b02ee 100644 --- a/application/Espo/Classes/AclPortal/User/OwnershipChecker.php +++ b/application/Espo/Classes/AclPortal/User/OwnershipChecker.php @@ -30,15 +30,11 @@ namespace Espo\Classes\AclPortal\User; use Espo\Entities\User; - use Espo\ORM\Entity; - -use Espo\Core\{ - Acl\OwnershipOwnChecker, -}; +use Espo\Core\Acl\OwnershipOwnChecker; /** - * @implements OwnershipOwnChecker<\Espo\Entities\User> + * @implements OwnershipOwnChecker */ class OwnershipChecker implements OwnershipOwnChecker { diff --git a/application/Espo/Core/Acl/Traits/DefaultAccessCheckerDependency.php b/application/Espo/Core/Acl/Traits/DefaultAccessCheckerDependency.php index 09aa39e77c..f5df277865 100644 --- a/application/Espo/Core/Acl/Traits/DefaultAccessCheckerDependency.php +++ b/application/Espo/Core/Acl/Traits/DefaultAccessCheckerDependency.php @@ -30,20 +30,13 @@ namespace Espo\Core\Acl\Traits; use Espo\ORM\Entity; - use Espo\Entities\User; - -use Espo\Core\{ - Acl\ScopeData, - Acl\DefaultAccessChecker, -}; +use Espo\Core\Acl\DefaultAccessChecker; +use Espo\Core\Acl\ScopeData; trait DefaultAccessCheckerDependency { - /** - * @var DefaultAccessChecker - */ - private $defaultAccessChecker; + private DefaultAccessChecker $defaultAccessChecker; public function check(User $user, ScopeData $data): bool {