Merge branch 'master' into magento2.4.x

Author: thomas-kl1

.github/workflows/coding-standard.yml

@@ -0,0 +1,10 @@
+name: M2 Coding Standard
+on: [push, pull_request]
+
+jobs:
+  static:
+    name: M2 Coding Standard
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: extdn/github-actions-m2/magento-coding-standard@master

.github/workflows/mess-detector.yml

@@ -0,0 +1,10 @@
+name: M2 Mess Detector
+on: [push, pull_request]
+
+jobs:
+  phpmd:
+    name: M2 Mess Detector
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: extdn/github-actions-m2/magento-mess-detector@master

.github/workflows/phpstan.yml

@@ -0,0 +1,12 @@
+name: M2 PHPStan
+on: [push, pull_request, workflow_dispatch]
+
+jobs:
+  phpstan:
+    name: M2 PHPStan
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: extdn/github-actions-m2/magento-phpstan@master
+        with:
+          composer_name: opengento/module-gdpr

Model/Action/PerformedBy/Guest.php

@@ -36,8 +36,6 @@ public function get(): string
     {
         $order = $this->coreRegistry->registry('current_order');
 
-        return $order && $order instanceof Order
-            ? $order->getData($this->attributeName)
-            : '';
+        return $order && $order instanceof Order ? $order->getData($this->attributeName) : '';
     }
 }

Model/Entity/EntityIterator.php

@@ -47,7 +47,7 @@ public function iterate(object $entity): void
         $values = $this->hydratorPool->getHydrator($this->typeResolver->resolve($entity))->extract($entity);
 
         foreach ($values as $key => $value) {
-            $this->processor->process($entity, $key, $value);
+            $this->processor->process($key, $value);
         }
     }
 }

Model/ResourceModel/ActionEntity/Validator.php

@@ -9,7 +9,6 @@
 
 use Magento\Framework\Validator\AbstractValidator;
 use Magento\Framework\Validator\ValidatorInterface;
-use function array_merge_recursive;
 
 final class Validator extends AbstractValidator
 {
@@ -26,15 +25,14 @@ public function __construct(
 
     public function isValid($value): bool
     {
-        $isValid = true;
-        $messages = [];
+        $this->_clearMessages();
 
         foreach ($this->validators as $validator) {
-            $isValid = $isValid && $validator->isValid($value);
-            $messages[] = $validator->getMessages();
+            if (!$validator->isValid($value)) {
+                $this->_addMessages($validator->getMessages());
+            }
         }
-        $this->_addMessages(array_merge_recursive(...$messages));
 
-        return $isValid && !$this->hasMessages();
+        return !$this->hasMessages();
     }
 }

Model/ResourceModel/ActionEntity/Validator/StateValidator.php

@@ -33,14 +33,19 @@ public function __construct(
      */
     public function isValid($actionEntity): bool
     {
-        if (!in_array($actionEntity->getState(), array_column($this->actionStates->toOptionArray(), 'value'), true)) {
+        $this->_clearMessages();
+        $isValid = in_array(
+            $actionEntity->getState(),
+            array_column($this->actionStates->toOptionArray(), 'value'),
+            true
+        );
+
+        if (!$isValid) {
             $this->_addMessages([
                 'state' => new Phrase('State "%1" does not exists.', [$actionEntity->getState()])
             ]);
-
-            return false;
         }
 
-        return true;
+        return $isValid;
     }
 }

README.md

@@ -71,18 +71,26 @@ the idle time for the users before they are erase, and the sales information lif
 
 Details:
 
-- [ ] Erasure: delete or anonymize specific data thanks to configurable settings in admin ui.
-- [ ] Configure which order can be erased, regarding their state and life time.
-- [ ] Privacy data will be automatically erased after a delay.
-- [ ] Sales data are safely keeped till the preservation delay expired.
-- [ ] Choose the file name and the format of your choice for the privacy data export.
-- [ ] Choose which data is interpreted as privacy data and will be exported.
-- [ ] Actions related to the GDPR compliance are reported in the admin ui.
-- [ ] Merchants can execute and keep an eye on the performed actions from the admin ui.
-- [ ] Choose the CMS static block to show on the storefront by scope and features.
-- [ ] Enable or disable features for the storefront.
-- [ ] Notify the user when a GDPR action is performed, configure the template and sending settings.
-- [ ] Display the cookie disclosure pop-in and edit its content as you want.
+- [x] Erasure: delete or anonymize specific data thanks to configurable settings in admin ui.
+- [x] Configure which order can be erased, regarding their state and life time.
+- [x] Privacy data will be automatically erased after a delay.
+- [x] Sales data are safely keeped till the preservation delay expired.
+- [x] Choose the file name and the format of your choice for the privacy data export.
+- [x] Choose which data is interpreted as privacy data and will be exported.
+- [x] Actions related to the GDPR compliance are reported in the admin ui.
+- [x] Merchants can execute and keep an eye on the performed actions from the admin ui.
+- [x] Choose the CMS static block to show on the storefront by scope and features.
+- [x] Enable or disable features for the storefront.
+- [x] Notify the user when a GDPR action is performed, configure the template and sending settings.
+- [x] Display the cookie disclosure pop-in and edit its content as you want.
+
+Languages:
+
+- [x] en_US ; English
+- [x] de_DE ; German
+- [x] fr_FR ; French (partial)
+- [ ] nl_NL ; Dutch (partial)
+- [ ] it_IT ; Italian (partial)
 
 ## Settings