sugar syntax

opengento · Jun 27, 2024 · 9350f2f · kpitn · Aug 20, 2024 · 9350f2f
1 parent c64cd7b
commit 9350f2f
Show file tree

Hide file tree

Showing 39 changed files with 68 additions and 115 deletions.
diff --git a/Block/Adminhtml/Config/Form/Field/Select/OptionSourceSelect.php b/Block/Adminhtml/Config/Form/Field/Select/OptionSourceSelect.php
@@ -13,17 +13,11 @@
 
 class OptionSourceSelect extends Select
 {
-    /**
-     * @var OptionSourceInterface
-     */
-    private OptionSourceInterface $optionSource;
-
     public function __construct(
         Context $context,
-        OptionSourceInterface $optionSource,
+        private OptionSourceInterface $optionSource,
         array $data = []
     ) {
-        $this->optionSource = $optionSource;
         parent::__construct($context, $data);
     }
 

diff --git a/Block/Adminhtml/Customer/Edit/EraseButton.php b/Block/Adminhtml/Customer/Edit/EraseButton.php
@@ -17,18 +17,12 @@
 
 class EraseButton extends GenericButton implements ButtonProviderInterface
 {
-    private EraseEntityCheckerInterface $eraseCustomerChecker;
-
-    private Config $config;
-
     public function __construct(
         Context $context,
         Registry $registry,
-        EraseEntityCheckerInterface $eraseCustomerChecker,
-        Config $config
+        private EraseEntityCheckerInterface $eraseCustomerChecker,
+        private Config $config
     ) {
-        $this->eraseCustomerChecker = $eraseCustomerChecker;
-        $this->config = $config;
         parent::__construct($context, $registry);
     }
 

diff --git a/Block/Adminhtml/Customer/Edit/ExportButton.php b/Block/Adminhtml/Customer/Edit/ExportButton.php
@@ -16,14 +16,11 @@
 
 class ExportButton extends GenericButton implements ButtonProviderInterface
 {
-    private Config $config;
-
     public function __construct(
         Context $context,
         Registry $registry,
-        Config $config
+        private Config $config
     ) {
-        $this->config = $config;
         parent::__construct($context, $registry);
     }
 

diff --git a/Block/Adminhtml/Order/Edit/EraseButton.php b/Block/Adminhtml/Order/Edit/EraseButton.php
@@ -16,14 +16,11 @@
 
 class EraseButton extends AbstractBlock
 {
-    private EraseEntityCheckerInterface $eraseEntityChecker;
-
     public function __construct(
         Context $context,
-        EraseEntityCheckerInterface $eraseEntityChecker,
+        private EraseEntityCheckerInterface $eraseEntityChecker,
         array $data = []
     ) {
-        $this->eraseEntityChecker = $eraseEntityChecker;
         parent::__construct($context, $data);
     }
 
@@ -37,7 +34,7 @@ protected function _construct(): void
 
         /** @var View $orderView */
         $orderView = $this->getLayout()->getBlock('sales_order_edit');
-        $orderId = (int) $orderView->getOrderId();
+        $orderId = (int)$orderView->getOrderId();
 
         if ($this->_authorization->isAllowed('Opengento_Gdpr::order_erase') &&
             $this->eraseEntityChecker->canCreate($orderId, 'order')

diff --git a/Block/Adminhtml/Order/Edit/ExportButton.php b/Block/Adminhtml/Order/Edit/ExportButton.php
@@ -24,7 +24,7 @@ protected function _construct(): void
 
         /** @var View $orderView */
         $orderView = $this->getLayout()->getBlock('sales_order_edit');
-        $orderId = (int) $orderView->getOrderId();
+        $orderId = (int)$orderView->getOrderId();
 
         if ($this->_authorization->isAllowed('Opengento_Gdpr::order_export')) {
             $orderView->addButton(

diff --git a/Controller/Privacy/Erase.php b/Controller/Privacy/Erase.php
@@ -41,7 +41,7 @@ protected function isAllowed(): bool
 
     protected function executeAction(): Page|Redirect
     {
-        if ($this->eraseCustomerChecker->exists((int) $this->customerSession->getCustomerId(), 'customer')) {
+        if ($this->eraseCustomerChecker->exists((int)$this->customerSession->getCustomerId(), 'customer')) {
             $this->messageManager->addErrorMessage(new Phrase('Your account is already being removed.'));
             /** @var Redirect $resultRedirect */
             $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);

diff --git a/Cron/EraseEntityScheduler.php b/Cron/EraseEntityScheduler.php
@@ -83,6 +83,6 @@ private function scheduleEntitiesErasure(): void
 
     private function resolveErasureMaxAge(): int
     {
-        return (int) $this->scopeConfig->getValue(self::CONFIG_PATH_ERASURE_MAX_AGE, ScopeInterface::SCOPE_STORE);
+        return (int)$this->scopeConfig->getValue(self::CONFIG_PATH_ERASURE_MAX_AGE, ScopeInterface::SCOPE_STORE);
     }
 }
diff --git a/Model/Config.php b/Model/Config.php
@@ -51,7 +51,7 @@ public function isErasureEnabled(): bool
      */
     public function getAllowedStatesToErase(): array
     {
-        return explode(',', (string) $this->scopeConfig->getValue(
+        return explode(',', (string)$this->scopeConfig->getValue(
             self::CONFIG_PATH_ERASURE_ALLOWED_STATES,
             ScopeInterface::SCOPE_STORE
         ));

diff --git a/Model/Customer/Anonymize/Processor/CustomerDataProcessor.php b/Model/Customer/Anonymize/Processor/CustomerDataProcessor.php
@@ -106,7 +106,7 @@ private function anonymizeCustomer(CustomerInterface $customer): void
         $secureData = $this->customerRegistry->retrieveSecureData($customer->getId());
         $dateTime = (new DateTime())->setTimestamp(PHP_INT_MAX);
         $secureData->setData('lock_expires', $dateTime->format(DateTimeFormat::DATETIME_PHP_FORMAT));
-        $secureData->setPasswordHash(sha1(uniqid((string) mt_rand(), true)));
+        $secureData->setPasswordHash(sha1(uniqid((string)mt_rand(), true)));
 
         $customer = $this->anonymizer->anonymize($customer);
         if ($customer instanceof DataObject) {

diff --git a/Model/Customer/Anonymize/Processor/OrderDataProcessor.php b/Model/Customer/Anonymize/Processor/OrderDataProcessor.php
@@ -58,7 +58,7 @@ public function execute(int $customerId): bool
         foreach ($orderList->getItems() as $order) {
             $lastActive = new DateTime($order->getUpdatedAt());
             $this->salesInformation->isAlive($lastActive)
-                ? $this->salesInformation->scheduleEraseEntity((int) $order->getEntityId(), 'order', $lastActive)
+                ? $this->salesInformation->scheduleEraseEntity((int)$order->getEntityId(), 'order', $lastActive)
                 : $this->anonymize($order);
         }
 

diff --git a/Model/Customer/CustomerChecker.php b/Model/Customer/CustomerChecker.php
@@ -7,46 +7,24 @@
 
 namespace Opengento\Gdpr\Model\Customer;
 
-use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\Sales\Api\Data\OrderInterface;
-use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Sales\Model\ResourceModel\Order\CollectionFactory;
 use Opengento\Gdpr\Model\Config;
 use Opengento\Gdpr\Model\Entity\EntityCheckerInterface;
 
 class CustomerChecker implements EntityCheckerInterface
 {
-    private OrderRepositoryInterface $orderRepository;
-
-    private SearchCriteriaBuilder $criteriaBuilder;
-
-    private Config $config;
-
-    /**
-     * @var bool[]
-     */
-    private array $cache;
-
     public function __construct(
-        OrderRepositoryInterface $orderRepository,
-        SearchCriteriaBuilder $criteriaBuilder,
-        Config $config
-    ) {
-        $this->orderRepository = $orderRepository;
-        $this->criteriaBuilder = $criteriaBuilder;
-        $this->config = $config;
-        $this->cache = [];
-    }
+        private CollectionFactory $collectionFactory,
+        private Config $config
+    ) {}
 
     public function canErase(int $customerId): bool
     {
-        if (!isset($this->cache[$customerId])) {
-            $this->criteriaBuilder->addFilter(OrderInterface::STATE, $this->config->getAllowedStatesToErase(), 'nin');
-            $this->criteriaBuilder->addFilter(OrderInterface::CUSTOMER_ID, $customerId);
-            $orderList = $this->orderRepository->getList($this->criteriaBuilder->create());
-
-            $this->cache[$customerId] = !$orderList->getTotalCount();
-        }
+        $collection = $this->collectionFactory->create();
+        $collection->addFieldToFilter(OrderInterface::CUSTOMER_ID, $customerId);
+        $collection->addFieldToFilter(OrderInterface::STATE, ['nin' => $this->config->getAllowedStatesToErase()]);
 
-        return $this->cache[$customerId];
+        return $collection->getSize() > 0;
     }
 }
diff --git a/Model/Customer/Delete/Processor/OrderDataProcessor.php b/Model/Customer/Delete/Processor/OrderDataProcessor.php
@@ -45,7 +45,7 @@ public function execute(int $customerId): bool
         foreach ($orderList->getItems() as $order) {
             $lastActive = new DateTime($order->getUpdatedAt());
             $this->salesInformation->isAlive($lastActive)
-                ? $this->salesInformation->scheduleEraseEntity((int) $order->getEntityId(), 'order', $lastActive)
+                ? $this->salesInformation->scheduleEraseEntity((int)$order->getEntityId(), 'order', $lastActive)
                 : $this->orderRepository->delete($order);
         }
 

diff --git a/Model/Customer/Notifier/MailSender.php b/Model/Customer/Notifier/MailSender.php
@@ -42,7 +42,7 @@ public function __construct(
      */
     public function send(CustomerInterface $customer): void
     {
-        $storeId = $customer->getStoreId() === null ? null : (int) $customer->getStoreId();
+        $storeId = $customer->getStoreId() === null ? null : (int)$customer->getStoreId();
         $vars = [
             'customer' => $customer,
             'store' => $this->storeManager->getStore($customer->getStoreId()),

diff --git a/Model/Customer/OrigDataRegistry.php b/Model/Customer/OrigDataRegistry.php
@@ -23,6 +23,6 @@ public function get(int $customerId): ?CustomerInterface
 
     public function set(CustomerInterface $customer): void
     {
-        $this->customers[(int) $customer->getId()] = $customer;
+        $this->customers[(int)$customer->getId()] = $customer;
     }
 }
diff --git a/Model/Erase/EraseEntityScheduler.php b/Model/Erase/EraseEntityScheduler.php
@@ -47,7 +47,7 @@ public function schedule(array $entityTypes, Filter $filter): void
          */
         foreach ($this->collectEntityIds($entityTypes, $filter) as $entityType => $entityIds) {
             foreach ($entityIds as $entityId) {
-                $this->eraseManagement->create((int) $entityId, $entityType);
+                $this->eraseManagement->create((int)$entityId, $entityType);
             }
         }
     }

diff --git a/Model/Erase/EraseSalesInformation.php b/Model/Erase/EraseSalesInformation.php
@@ -62,6 +62,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);
+        return (int)$this->scopeConfig->getValue(self::CONFIG_PATH_ERASURE_SALES_MAX_AGE, ScopeInterface::SCOPE_STORE);
     }
 }
diff --git a/Model/EraseEntity.php b/Model/EraseEntity.php
@@ -22,7 +22,7 @@ protected function _construct(): void
 
     public function getEraseId(): int
     {
-        return (int) $this->getId();
+        return (int)$this->getId();
     }
 
     public function setEraseId(int $eraseId): EraseEntityInterface
@@ -32,7 +32,7 @@ public function setEraseId(int $eraseId): EraseEntityInterface
 
     public function getEntityId(): int
     {
-        return (int) $this->_getData(self::ENTITY_ID);
+        return (int)$this->_getData(self::ENTITY_ID);
     }
 
     public function setEntityId($entityId): EraseEntityInterface
@@ -42,7 +42,7 @@ public function setEntityId($entityId): EraseEntityInterface
 
     public function getEntityType(): string
     {
-        return (string) $this->_getData(self::ENTITY_TYPE);
+        return (string)$this->_getData(self::ENTITY_TYPE);
     }
 
     public function setEntityType(string $entityType): EraseEntityInterface
@@ -52,7 +52,7 @@ public function setEntityType(string $entityType): EraseEntityInterface
 
     public function getScheduledAt(): string
     {
-        return (string) $this->_getData(self::SCHEDULED_AT);
+        return (string)$this->_getData(self::SCHEDULED_AT);
     }
 
     public function setScheduledAt(string $scheduledAt): EraseEntityInterface
@@ -62,7 +62,7 @@ public function setScheduledAt(string $scheduledAt): EraseEntityInterface
 
     public function getState(): string
     {
-        return (string) $this->_getData(self::STATE);
+        return (string)$this->_getData(self::STATE);
     }
 
     public function setState(string $state): EraseEntityInterface
@@ -72,7 +72,7 @@ public function setState(string $state): EraseEntityInterface
 
     public function getStatus(): string
     {
-        return (string) $this->_getData(self::STATUS);
+        return (string)$this->_getData(self::STATUS);
     }
 
     public function setStatus(string $status): EraseEntityInterface
@@ -82,7 +82,7 @@ public function setStatus(string $status): EraseEntityInterface
 
     public function getMessage(): ?string
     {
-        return $this->_getData(self::MESSAGE) === null ? null : (string) $this->_getData(self::MESSAGE);
+        return $this->_getData(self::MESSAGE) === null ? null : (string)$this->_getData(self::MESSAGE);
     }
 
     public function setMessage(?string $message): EraseEntityInterface
@@ -92,7 +92,7 @@ public function setMessage(?string $message): EraseEntityInterface
 
     public function getErasedAt(): string
     {
-        return (string) $this->_getData(self::ERASED_AT);
+        return (string)$this->_getData(self::ERASED_AT);
     }
 
     public function setErasedAt(string $erasedAt): EraseEntityInterface

diff --git a/Model/EraseEntityChecker.php b/Model/EraseEntityChecker.php
@@ -33,7 +33,7 @@ public function __construct(
     public function exists(int $entityId, string $entityType): bool
     {
         try {
-            return (bool) $this->eraseRepository->getByEntity($entityId, $entityType)->getEraseId();
+            return (bool)$this->eraseRepository->getByEntity($entityId, $entityType)->getEraseId();
         } catch (NoSuchEntityException $e) {
             return false;
         }

diff --git a/Model/EraseEntityManagement.php b/Model/EraseEntityManagement.php
@@ -122,6 +122,6 @@ private function retrieveScheduledAt(): string
 
     private function resolveErasureDelay(): int
     {
-        return (int) $this->scopeConfig->getValue(self::CONFIG_PATH_ERASURE_DELAY, ScopeInterface::SCOPE_STORE);
+        return (int)$this->scopeConfig->getValue(self::CONFIG_PATH_ERASURE_DELAY, ScopeInterface::SCOPE_STORE);
     }
 }
diff --git a/Model/Export/ExportToFile.php b/Model/Export/ExportToFile.php
@@ -71,7 +71,7 @@ public function export(ExportEntityInterface $exportEntity): string
 
     public function resolveExportRendererCodes(): array
     {
-        return explode(',', (string) $this->scopeConfig->getValue(
+        return explode(',', (string)$this->scopeConfig->getValue(
             self::CONFIG_PATH_EXPORT_RENDERERS,
             ScopeInterface::SCOPE_STORE
         ));