From d2b72aec2bd27758cfe120e972d5e3bee89d74e0 Mon Sep 17 00:00:00 2001
From: Thomas Klein <thomas.klein@mpbio.com>
Date: Thu, 13 May 2021 22:38:35 +0200
Subject: [PATCH] fix #93 always return 1 row array

---
 .../Processor/CustomerDataProcessor.php       |  2 +-
 Service/Anonymize/Anonymizer/ArrayValue.php   | 38 ----------------
 Service/Anonymize/Anonymizer/Street.php       | 43 +++++++++++++++++++
 etc/di.xml                                    |  8 ----
 4 files changed, 44 insertions(+), 47 deletions(-)
 delete mode 100644 Service/Anonymize/Anonymizer/ArrayValue.php
 create mode 100644 Service/Anonymize/Anonymizer/Street.php

diff --git a/Model/Customer/Anonymize/Processor/CustomerDataProcessor.php b/Model/Customer/Anonymize/Processor/CustomerDataProcessor.php
index 1e1ac5c9..526a98cf 100644
--- a/Model/Customer/Anonymize/Processor/CustomerDataProcessor.php
+++ b/Model/Customer/Anonymize/Processor/CustomerDataProcessor.php
@@ -131,7 +131,7 @@ private function anonymizeCustomer(int $customerId): void
         $secureData = $this->customerRegistry->retrieveSecureData($customerId);
         $dateTime = (new DateTime())->setTimestamp(PHP_INT_MAX);
         $secureData->setData('lock_expires', $dateTime->format(DateTimeFormat::DATETIME_PHP_FORMAT));
-        $secureData->setPasswordHash(sha1(uniqid(mt_rand(), true)));
+        $secureData->setPasswordHash(sha1(uniqid((string) mt_rand(), true)));
 
         $this->customerRepository->save(
             $this->anonymizer->anonymize($this->customerRepository->getById($customerId))
diff --git a/Service/Anonymize/Anonymizer/ArrayValue.php b/Service/Anonymize/Anonymizer/ArrayValue.php
deleted file mode 100644
index 0f2f21da..00000000
--- a/Service/Anonymize/Anonymizer/ArrayValue.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Copyright © OpenGento, All rights reserved.
- * See LICENSE bundled with this library for license details.
- */
-declare(strict_types=1);
-
-namespace Opengento\Gdpr\Service\Anonymize\Anonymizer;
-
-use Opengento\Gdpr\Service\Anonymize\AnonymizerInterface;
-use function array_reduce;
-
-final class ArrayValue implements AnonymizerInterface
-{
-    /**
-     * @var AnonymizerInterface[]
-     */
-    private $anonymizers;
-
-    public function __construct(
-        array $anonymizers
-    ) {
-        $this->anonymizers = $anonymizers;
-    }
-
-    public function anonymize($value): array
-    {
-        return array_reduce(
-            $this->anonymizers,
-            static function ($array, AnonymizerInterface $anonymizer) use ($value): array {
-                $array[] = $anonymizer->anonymize($value);
-
-                return $array;
-            },
-            []
-        );
-    }
-}
diff --git a/Service/Anonymize/Anonymizer/Street.php b/Service/Anonymize/Anonymizer/Street.php
new file mode 100644
index 00000000..5dfabaf5
--- /dev/null
+++ b/Service/Anonymize/Anonymizer/Street.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Copyright © OpenGento, All rights reserved.
+ * See LICENSE bundled with this library for license details.
+ */
+declare(strict_types=1);
+
+namespace Opengento\Gdpr\Service\Anonymize\Anonymizer;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Math\Random;
+use Opengento\Gdpr\Service\Anonymize\AnonymizerInterface;
+use function sprintf;
+
+final class Street implements AnonymizerInterface
+{
+    private const STREET_LENGTH = 5;
+    private const MIN_NUM = 0;
+    private const MAX_NUM = 100;
+
+    /**
+     * @var Random
+     */
+    private $random;
+
+    public function __construct(
+        Random $random
+    ) {
+        $this->random = $random;
+    }
+
+    /**
+     * @throws LocalizedException
+     */
+    public function anonymize($value): array
+    {
+        return [sprintf(
+            '%s %s',
+            Random::getRandomNumber(self::MIN_NUM, self::MAX_NUM),
+            $this->random->getRandomString(self::STREET_LENGTH)
+        )];
+    }
+}
diff --git a/etc/di.xml b/etc/di.xml
index e1a15a02..a93f2a25 100644
--- a/etc/di.xml
+++ b/etc/di.xml
@@ -180,14 +180,6 @@
         </arguments>
     </virtualType>
     <!-- Anonymize Management -->
-    <virtualType name="Opengento\Gdpr\Service\Anonymize\Anonymizer\Street" type="Opengento\Gdpr\Service\Anonymize\Anonymizer\ArrayValue">
-        <arguments>
-            <argument name="anonymizers" xsi:type="array">
-                <item name="0" xsi:type="object">Opengento\Gdpr\Service\Anonymize\Anonymizer\Number</item>
-                <item name="1" xsi:type="object">Opengento\Gdpr\Service\Anonymize\Anonymizer\AlphaLower</item>
-            </argument>
-        </arguments>
-    </virtualType>
     <type name="Opengento\Gdpr\Service\Anonymize\AnonymizerFactory">
         <arguments>
             <argument name="anonymizers" xsi:type="array">