From 02c211bca90c11755a7f6985f6458e3e526080d4 Mon Sep 17 00:00:00 2001 From: Thomas Klein Date: Mon, 26 Aug 2024 22:44:35 +0200 Subject: [PATCH] Remove deprecated code --- Model/Erase/EraseSalesInformation.php | 5 +---- etc/adminhtml/system/erasure.xml | 2 +- view/frontend/templates/account/erase.phtml | 2 -- view/frontend/templates/account/privacy/erase.phtml | 2 -- view/frontend/templates/account/privacy/export.phtml | 2 -- view/frontend/templates/account/settings.phtml | 2 -- view/frontend/templates/order/info/buttons/download.phtml | 2 -- view/frontend/templates/order/info/buttons/erase.phtml | 2 -- view/frontend/templates/order/info/buttons/export.phtml | 2 -- view/frontend/templates/order/info/erase.phtml | 2 -- view/frontend/templates/order/info/export.phtml | 2 -- 11 files changed, 2 insertions(+), 23 deletions(-) diff --git a/Model/Erase/EraseSalesInformation.php b/Model/Erase/EraseSalesInformation.php index ca641ca1..a924e970 100644 --- a/Model/Erase/EraseSalesInformation.php +++ b/Model/Erase/EraseSalesInformation.php @@ -13,7 +13,6 @@ use Magento\Framework\App\Config\ScopeConfigInterface; use Magento\Framework\Exception\CouldNotSaveException; use Magento\Framework\Stdlib\DateTime; -use Magento\Store\Model\ScopeInterface; use Opengento\Gdpr\Api\Data\EraseEntityInterface; use Opengento\Gdpr\Api\Data\EraseEntityInterfaceFactory; use Opengento\Gdpr\Api\EraseEntityRepositoryInterface; @@ -30,7 +29,6 @@ public function __construct( ) {} /** - * @inheritdoc * @throws CouldNotSaveException */ public function scheduleEraseEntity(int $entityId, string $entityType, DateTimeInterface $lastActive): EraseEntityInterface @@ -52,7 +50,6 @@ public function scheduleEraseEntity(int $entityId, string $entityType, DateTimeI } /** - * @inheritdoc * @throws Exception */ public function isAlive(DateTimeInterface $lastActive): bool @@ -62,6 +59,6 @@ public function isAlive(DateTimeInterface $lastActive): bool private function resolveErasureSalesMaxAge(): int { - return (int)$this->scopeConfig->getValue(self::CONFIG_PATH_ERASURE_SALES_MAX_AGE, ScopeInterface::SCOPE_STORE);//Todo scope website + return (int)$this->scopeConfig->getValue(self::CONFIG_PATH_ERASURE_SALES_MAX_AGE); } } diff --git a/etc/adminhtml/system/erasure.xml b/etc/adminhtml/system/erasure.xml index 0d948ed0..00135518 100644 --- a/etc/adminhtml/system/erasure.xml +++ b/etc/adminhtml/system/erasure.xml @@ -59,7 +59,7 @@ gdpr/erasure/entity_max_age_schedule - + The time is in days. validate-number validate-number-range number-range-0-3650 diff --git a/view/frontend/templates/account/erase.phtml b/view/frontend/templates/account/erase.phtml index 0dea7a27..467f6178 100755 --- a/view/frontend/templates/account/erase.phtml +++ b/view/frontend/templates/account/erase.phtml @@ -11,8 +11,6 @@ use Opengento\Gdpr\ViewModel\Customer\Privacy\SettingsDataProvider; /** @var Template $block */ /** @var Escaper $escaper */ -$escaper = $escaper ?? $block; - /** @var SettingsDataProvider $settingsDataProvider */ $settingsDataProvider = $block->getData('settingsDataProvider'); ?> diff --git a/view/frontend/templates/account/privacy/erase.phtml b/view/frontend/templates/account/privacy/erase.phtml index 3f6100ea..19d7f582 100755 --- a/view/frontend/templates/account/privacy/erase.phtml +++ b/view/frontend/templates/account/privacy/erase.phtml @@ -12,8 +12,6 @@ use Opengento\Gdpr\ViewModel\Customer\Privacy\EraseDataProvider; /** @var Template $block */ /** @var Escaper $escaper */ -$escaper = $escaper ?? $block; - /** @var EraseDataProvider $eraseDataProvider */ $eraseDataProvider = $block->getData('eraseDataProvider'); /** @var EraseCustomerDataProvider $eraseCustomerDataProvider */ diff --git a/view/frontend/templates/account/privacy/export.phtml b/view/frontend/templates/account/privacy/export.phtml index 5af9dd66..04c07931 100755 --- a/view/frontend/templates/account/privacy/export.phtml +++ b/view/frontend/templates/account/privacy/export.phtml @@ -12,8 +12,6 @@ use Opengento\Gdpr\ViewModel\Customer\Privacy\ExportDataProvider; /** @var Template $block */ /** @var Escaper $escaper */ -$escaper = $escaper ?? $block; - /** @var ExportDataProvider $exportDataProvider */ $exportDataProvider = $block->getData('exportDataProvider'); /** @var ExportCustomerDataProvider $exportCustomerDataProvider */ diff --git a/view/frontend/templates/account/settings.phtml b/view/frontend/templates/account/settings.phtml index 4c9b26fc..9ef424e1 100755 --- a/view/frontend/templates/account/settings.phtml +++ b/view/frontend/templates/account/settings.phtml @@ -11,8 +11,6 @@ use Opengento\Gdpr\ViewModel\Customer\Privacy\SettingsDataProvider; /** @var Template $block */ /** @var Escaper $escaper */ -$escaper = $escaper ?? $block; - /** @var SettingsDataProvider $settingsDataProvider */ $settingsDataProvider = $block->getData('settingsDataProvider'); ?> diff --git a/view/frontend/templates/order/info/buttons/download.phtml b/view/frontend/templates/order/info/buttons/download.phtml index 75f04dc4..2426e29f 100644 --- a/view/frontend/templates/order/info/buttons/download.phtml +++ b/view/frontend/templates/order/info/buttons/download.phtml @@ -11,8 +11,6 @@ use Opengento\Gdpr\ViewModel\Customer\Guest\ExportDataProvider; /** @var Template $block */ /** @var Escaper $escaper */ -$escaper = $escaper ?? $block; - /** @var ExportDataProvider $exportDataProvider */ $exportDataProvider = $block->getData('exportDataProvider'); ?> diff --git a/view/frontend/templates/order/info/buttons/erase.phtml b/view/frontend/templates/order/info/buttons/erase.phtml index 3248a10e..3d6c2476 100644 --- a/view/frontend/templates/order/info/buttons/erase.phtml +++ b/view/frontend/templates/order/info/buttons/erase.phtml @@ -11,8 +11,6 @@ use Opengento\Gdpr\ViewModel\Customer\Guest\EraseDataProvider; /** @var Template $block */ /** @var Escaper $escaper */ -$escaper = $escaper ?? $block; - /** @var EraseDataProvider $eraseDataProvider */ $eraseDataProvider = $block->getData('eraseDataProvider'); ?> diff --git a/view/frontend/templates/order/info/buttons/export.phtml b/view/frontend/templates/order/info/buttons/export.phtml index f54a9477..34310fb6 100644 --- a/view/frontend/templates/order/info/buttons/export.phtml +++ b/view/frontend/templates/order/info/buttons/export.phtml @@ -11,8 +11,6 @@ use Opengento\Gdpr\ViewModel\Customer\Guest\ExportDataProvider; /** @var Template $block */ /** @var Escaper $escaper */ -$escaper = $escaper ?? $block; - /** @var ExportDataProvider $exportDataProvider */ $exportDataProvider = $block->getData('exportDataProvider'); ?> diff --git a/view/frontend/templates/order/info/erase.phtml b/view/frontend/templates/order/info/erase.phtml index f9f8aebc..9d3a6b65 100644 --- a/view/frontend/templates/order/info/erase.phtml +++ b/view/frontend/templates/order/info/erase.phtml @@ -11,8 +11,6 @@ use Opengento\Gdpr\ViewModel\Customer\Privacy\EraseDataProvider; /** @var Template $block */ /** @var Escaper $escaper */ -$escaper = $escaper ?? $block; - /** @var EraseDataProvider $eraseDataProvider */ $eraseDataProvider = $block->getData('eraseDataProvider'); ?> diff --git a/view/frontend/templates/order/info/export.phtml b/view/frontend/templates/order/info/export.phtml index 7126aa11..ca7fe610 100644 --- a/view/frontend/templates/order/info/export.phtml +++ b/view/frontend/templates/order/info/export.phtml @@ -11,8 +11,6 @@ use Opengento\Gdpr\ViewModel\Customer\Privacy\ExportDataProvider; /** @var Template $block */ /** @var Escaper $escaper */ -$escaper = $escaper ?? $block; - /** @var ExportDataProvider $exportDataProvider */ $exportDataProvider = $block->getData('exportDataProvider'); ?>