diff --git a/application/Espo/Core/Field/Currency/CurrencyConverter.php b/application/Espo/Core/Field/Currency/CurrencyConverter.php deleted file mode 100644 index 7a8d8bcb94..0000000000 --- a/application/Espo/Core/Field/Currency/CurrencyConverter.php +++ /dev/null @@ -1,36 +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\Core\Field\Currency; - -/** - * @deprecated As of v7.1.0. Use `Espo\Core\Currency\Converter`. - * @todo Remove in v9.0. - */ -class CurrencyConverter extends \Espo\Core\Currency\Converter {} diff --git a/application/Espo/Modules/Crm/Services/Opportunity.php b/application/Espo/Modules/Crm/Services/Opportunity.php deleted file mode 100644 index ba181f30e8..0000000000 --- a/application/Espo/Modules/Crm/Services/Opportunity.php +++ /dev/null @@ -1,42 +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\Modules\Crm\Services; - -use Espo\ORM\Entity; -use Espo\Services\Record; - -/** - * For backward compatibility. - * @todo Remove in v9.0. - * @deprecated As of v8.2. - * @extends Record - */ -class Opportunity extends Record -{} diff --git a/application/Espo/Modules/Crm/Services/TargetList.php b/application/Espo/Modules/Crm/Services/TargetList.php deleted file mode 100644 index d727e46258..0000000000 --- a/application/Espo/Modules/Crm/Services/TargetList.php +++ /dev/null @@ -1,56 +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\Modules\Crm\Services; - -use Espo\Core\Exceptions\BadRequest; -use Espo\Core\Exceptions\Forbidden; -use Espo\Core\Exceptions\NotFound; -use Espo\Modules\Crm\Tools\TargetList\RecordService; -use Espo\ORM\Entity; -use Espo\Services\Record; - -/** - * For backward compatibility. - * @todo Remove in v9.0. - * @deprecated As of v8.2. - * @extends Record - */ -class TargetList extends Record -{ - /** - * @throws BadRequest - * @throws Forbidden - * @throws NotFound - */ - public function unlinkAll(string $id, string $link): void - { - $this->injectableFactory->create(RecordService::class)->unlinkAll($id, $link); - } -} diff --git a/application/Espo/Services/EmailTemplate.php b/application/Espo/Services/EmailTemplate.php deleted file mode 100644 index c3bfb1836c..0000000000 --- a/application/Espo/Services/EmailTemplate.php +++ /dev/null @@ -1,123 +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\Forbidden; -use Espo\Tools\EmailTemplate\Processor; -use Espo\Tools\EmailTemplate\Params; -use Espo\Tools\EmailTemplate\Data; -use Espo\Entities\EmailTemplate as EmailTemplateEntity; -use Espo\Core\Exceptions\NotFound; -use Espo\Core\Di; - -/** - * @deprecated For bc. Use `Espo\Tools\EmailTemplate\Service`. - * - * @extends Record<\Espo\Entities\EmailTemplate> - */ -class EmailTemplate extends Record implements - - Di\FieldUtilAware -{ - use Di\FieldUtilSetter; - - /** - * @deprecated For bc. Use `Espo\Tools\EmailTemplate\Processor`. - * @todo Remove in v9.0. - * - * @param array $params - * @return array{ - * subject: string, - * body: string, - * isHtml: bool, - * attachmentsIds: string[], - * attachmentsNames: \stdClass, - * } - */ - public function parseTemplate( - EmailTemplateEntity $emailTemplate, - array $params = [], - bool $copyAttachments = false, - bool $skipAcl = false - ): array { - - $paramsInternal = Params::create() - ->withApplyAcl(!$skipAcl) - ->withCopyAttachments($copyAttachments); - - $data = Data::create() - ->withEmailAddress($params['emailAddress'] ?? null) - ->withEntityHash($params['entityHash'] ?? []) - ->withParent($params['parent'] ?? null) - ->withParentId($params['parentId'] ?? null) - ->withParentType($params['parentType'] ?? null) - ->withRelatedId($params['relatedId'] ?? null) - ->withRelatedType($params['relatedType'] ?? null) - ->withUser($this->user); - - $result = $this->createProcessor()->process($emailTemplate, $paramsInternal, $data); - - /** @var array{ - * subject: string, - * body: string, - * isHtml: bool, - * attachmentsIds: string[], - * attachmentsNames: \stdClass, - * } - */ - return get_object_vars($result->getValueMap()); - } - - /** - * @deprecated For bc. Use `Espo\Tools\EmailTemplate\Service`. - * @todo Remove in v9.0. - * - * @param array $params - * @return array - * @throws Forbidden - * @throws NotFound - */ - public function parse(string $id, array $params = [], bool $copyAttachments = false): array - { - /** @var EmailTemplateEntity|null $emailTemplate */ - $emailTemplate = $this->getEntity($id); - - if (empty($emailTemplate)) { - throw new NotFound(); - } - - return $this->parseTemplate($emailTemplate, $params, $copyAttachments); - } - - private function createProcessor(): Processor - { - return $this->injectableFactory->create(Processor::class); - } -} diff --git a/application/Espo/Services/ExternalAccount.php b/application/Espo/Services/ExternalAccount.php index 5fd6e7a994..ae600bf38f 100644 --- a/application/Espo/Services/ExternalAccount.php +++ b/application/Espo/Services/ExternalAccount.php @@ -71,11 +71,7 @@ class ExternalAccount extends Record implements Di\HookManagerAware ->create($integration, $id); } - /** - * @deprecated As of v8.2. - * @todo Make private in v9.0. - */ - public function getExternalAccountEntity(string $integration, string $userId): ?ExternalAccountEntity + private function getExternalAccountEntity(string $integration, string $userId): ?ExternalAccountEntity { $id = $integration . '__' . $userId;