From c427a0f221cf0a41d25c17561dc0ecc22f4eae04 Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Sat, 9 Nov 2024 12:32:38 +0200 Subject: [PATCH] deprecation removal --- application/Espo/Core/AclManager.php | 28 ----- application/Espo/Core/Portal/AclManager.php | 36 ------- application/Espo/ORM/EntityManager.php | 9 -- .../Espo/Resources/defaults/class-aliases.php | 10 +- application/Espo/Services/EmailAccount.php | 63 ----------- application/Espo/Services/InboundEmail.php | 64 ----------- application/Espo/Services/Pdf.php | 101 ------------------ 7 files changed, 3 insertions(+), 308 deletions(-) delete mode 100644 application/Espo/Services/EmailAccount.php delete mode 100644 application/Espo/Services/InboundEmail.php delete mode 100644 application/Espo/Services/Pdf.php diff --git a/application/Espo/Core/AclManager.php b/application/Espo/Core/AclManager.php index 6fe204d801..b1b282a993 100644 --- a/application/Espo/Core/AclManager.php +++ b/application/Espo/Core/AclManager.php @@ -724,34 +724,6 @@ class AclManager return $this->ownerUserFieldProvider->get($entityType); } - /** - * @deprecated As of v7.0. Use `checkOwnershipOwn`. - * @todo Remove in v9.0. - */ - public function checkIsOwner(User $user, Entity $entity): bool - { - return $this->checkOwnershipOwn($user, $entity); - } - - /** - * @deprecated As of v7.0. Use `checkOwnershipTeam`. - * @todo Remove in v9.0. - */ - public function checkInTeam(User $user, Entity $entity): bool - { - return $this->checkOwnershipTeam($user, $entity); - } - - /** - * @deprecated As of v7.0. Access checkers not to be exposed. - * @todo Remove in v9.0. - * @noinspection PhpUnused - */ - public function getImplementation(string $scope): object - { - return $this->getAccessChecker($scope); - } - /** * @deprecated Use `getPermissionLevel` instead. */ diff --git a/application/Espo/Core/Portal/AclManager.php b/application/Espo/Core/Portal/AclManager.php index 4258fcd297..7dc0c5da54 100644 --- a/application/Espo/Core/Portal/AclManager.php +++ b/application/Espo/Core/Portal/AclManager.php @@ -338,40 +338,4 @@ class AclManager extends InternalAclManager { return $this->getPermissionLevel($user, $permission); } - - /** - * @deprecated As of v7.0. Use `checkOwnershipOwn`. - * @todo Remove in v9.0. - */ - public function checkIsOwner(User $user, Entity $entity): bool - { - return $this->checkOwnershipOwn($user, $entity); - } - - /** - * @deprecated As of v7.0. Use `checkOwnershipTeam`. - * @todo Remove in v9.0. - */ - public function checkInTeam(User $user, Entity $entity): bool - { - return $this->checkOwnershipTeam($user, $entity); - } - - /** - * @deprecated As of v7.0. Use `checkOwnershipAccount`. - * @todo Remove in v9.0. - */ - public function checkInAccount(User $user, Entity $entity): bool - { - return $this->checkOwnershipAccount($user, $entity); - } - - /** - * @deprecated As of v7.0. Use `checkOwnershipContact`. - * @todo Remove in v9.0. - */ - public function checkIsOwnContact(User $user, Entity $entity): bool - { - return $this->checkOwnershipContact($user, $entity); - } } diff --git a/application/Espo/ORM/EntityManager.php b/application/Espo/ORM/EntityManager.php index e711c8eaa9..6d179b3d4f 100644 --- a/application/Espo/ORM/EntityManager.php +++ b/application/Espo/ORM/EntityManager.php @@ -467,13 +467,4 @@ class EntityManager { return $this->pdoProvider->get(); } - - /** - * @todo Remove in v9.0. - * @deprecated As of v6.0. Use `getQueryComposer`. - */ - public function getQuery(): QueryComposer - { - return $this->queryComposer; - } } diff --git a/application/Espo/Resources/defaults/class-aliases.php b/application/Espo/Resources/defaults/class-aliases.php index 3258950939..a7658be7c9 100644 --- a/application/Espo/Resources/defaults/class-aliases.php +++ b/application/Espo/Resources/defaults/class-aliases.php @@ -27,14 +27,10 @@ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word. ************************************************************************/ -/** @todo Remove in v9.0. */ - -$map = [ - ['Laminas\\Mail\\Protocol\\Smtp', 'Zend\\Mail\\Protocol\\Smtp'], - ['Laminas\\Mail\\Protocol\\Imap', 'Zend\\Mail\\Protocol\\Imap'], - ['Laminas\\Mail\\Message', 'Zend\\Mail\\Message'], -]; +// To add aliases for backward compatibility. +$map = []; +/** @phpstan-ignore-next-line */ foreach ($map as $item) { $className = $item[0]; $alias = $item[1]; diff --git a/application/Espo/Services/EmailAccount.php b/application/Espo/Services/EmailAccount.php deleted file mode 100644 index 1d9b08a9c0..0000000000 --- a/application/Espo/Services/EmailAccount.php +++ /dev/null @@ -1,63 +0,0 @@ -. - * - * The interactive user interfaces in modified source and object code versions - * of this program must display Appropriate Legal Notices, as required under - * Section 5 of the GNU Affero General Public License version 3. - * - * In accordance with Section 7(b) of the GNU Affero General Public License version 3, - * these Appropriate Legal Notices must retain the display of the "EspoCRM" word. - ************************************************************************/ - -namespace Espo\Services; - -use Espo\Core\Exceptions\Error; -use Espo\Core\Mail\Account\PersonalAccount\AccountFactory; -use Espo\Core\Mail\Exceptions\NoSmtp; -use Espo\Entities\EmailAccount as EmailAccountEntity; - -/** - * @extends Record - */ -class EmailAccount extends Record -{ - /** - * @return ?array - * @throws Error - * @throws NoSmtp - * @internal Left for bc. - * @deprecated As of v7.3. Use Espo\Core\Mail\Account\PersonalAccount. - * @todo Remove in v9.0. - */ - public function getSmtpParamsFromAccount(EmailAccountEntity $emailAccount): ?array - { - $params = $this->injectableFactory - ->create(AccountFactory::class) - ->create($emailAccount->getId()) - ->getSmtpParams(); - - if (!$params) { - return null; - } - - return $params->toArray(); - } -} diff --git a/application/Espo/Services/InboundEmail.php b/application/Espo/Services/InboundEmail.php deleted file mode 100644 index 55a8b56993..0000000000 --- a/application/Espo/Services/InboundEmail.php +++ /dev/null @@ -1,64 +0,0 @@ -. - * - * The interactive user interfaces in modified source and object code versions - * of this program must display Appropriate Legal Notices, as required under - * Section 5 of the GNU Affero General Public License version 3. - * - * In accordance with Section 7(b) of the GNU Affero General Public License version 3, - * these Appropriate Legal Notices must retain the display of the "EspoCRM" word. - ************************************************************************/ - -namespace Espo\Services; - -use Espo\Core\Exceptions\Error; -use Espo\Core\Mail\Account\GroupAccount\AccountFactory; -use Espo\Core\Mail\Exceptions\NoSmtp; -use Espo\Services\Record as RecordService; -use Espo\Entities\InboundEmail as InboundEmailEntity; - -/** - * @extends Record - */ -class InboundEmail extends RecordService -{ - /** - * @return ?array - * @throws Error - * @throws NoSmtp - * @internal Left for bc. - * @deprecated - * @todo Remove in v9.0. - */ - public function getSmtpParamsFromAccount(InboundEmailEntity $emailAccount): ?array - { - $params = $this->injectableFactory - ->create(AccountFactory::class) - ->create($emailAccount->getId()) - ->getSmtpParams(); - - if (!$params) { - return null; - } - - return $params->toArray(); - } -} diff --git a/application/Espo/Services/Pdf.php b/application/Espo/Services/Pdf.php deleted file mode 100644 index 2e7931b52c..0000000000 --- a/application/Espo/Services/Pdf.php +++ /dev/null @@ -1,101 +0,0 @@ -. - * - * The interactive user interfaces in modified source and object code versions - * of this program must display Appropriate Legal Notices, as required under - * Section 5 of the GNU Affero General Public License version 3. - * - * In accordance with Section 7(b) of the GNU Affero General Public License version 3, - * these Appropriate Legal Notices must retain the display of the "EspoCRM" word. - ************************************************************************/ - -namespace Espo\Services; - -use Espo\Core\Exceptions\NotFound; -use Espo\ORM\Entity; -use Espo\Core\Exceptions\Error; -use Espo\Core\Exceptions\Forbidden; -use Espo\Tools\Pdf\Data; -use Espo\Tools\Pdf\Params; -use Espo\Tools\Pdf\Service; -use Espo\Entities\Template; - -/** - * @deprecated Left for bc. - * @todo Remove in v9.0. - */ -class Pdf -{ - private Service $service; - - public function __construct( - Service $service - ) { - $this->service = $service; - } - - /** - * @deprecated - * @throws Error - * @throws Forbidden - */ - public function generate(Entity $entity, Template $template, ?Params $params = null, ?Data $data = null): string - { - $additionalData = null; - - if ($data) { - $additionalData = get_object_vars($data->getAdditionalTemplateData()); - } - - return $this->buildFromTemplate($entity, $template, false, $additionalData); - } - - /** - * @param ?array $additionalData - * @throws Error - * @throws Forbidden - * @throws NotFound - * - * @deprecated - */ - public function buildFromTemplate( - Entity $entity, - Template $template, - bool $displayInline = false, - ?array $additionalData = null - ): string { - - $data = Data::create() - ->withAdditionalTemplateData( - (object) ($additionalData ?? []) - ); - - $contents = $this->service->generate( - $entity->getEntityType(), - $entity->getId(), - $template->getId(), - null, - $data - ); - - return $contents->getString(); - } -}