Merge branch 'b-7.4.x-multiple-error-messages-OXDEV-8786' into b-7.4.x

Author: tkcreateit

src/PasswordPolicy/Intrastructure/ExceptionFactory.php

@@ -10,26 +10,43 @@
 namespace OxidEsales\SecurityModule\PasswordPolicy\Intrastructure;
 
 use OxidEsales\Eshop\Core\Exception\InputException;
+use OxidEsales\Eshop\Core\Language;
+use OxidEsales\SecurityModule\PasswordPolicy\Validation\Exception\PasswordCollectionException;
 use OxidEsales\SecurityModule\PasswordPolicy\Validation\Exception\PasswordValidateException;
 
-class ExceptionFactory implements ExceptionFactoryInterface
+readonly class ExceptionFactory implements ExceptionFactoryInterface
 {
     public function __construct(
-        private readonly \OxidEsales\Eshop\Core\Language $language
+        private Language $language
     ) {
     }
 
     public function create(PasswordValidateException $exception): InputException
     {
-        $exception = oxNew(
-            InputException::class,
-            sprintf(
-                /** @phpstan-ignore-next-line */
-                $this->language->translateString($exception->getMessage()),
-                ...$exception->getTranslationParameters()
-            )
-        );
+        if ($exception instanceof PasswordCollectionException) {
+            return $this->createCollection($exception);
+        }
+
+        return oxNew(InputException::class, $this->formatExceptionMessage($exception));
+    }
+
+    private function createCollection(PasswordCollectionException $collection): InputException
+    {
+        $lines = [];
+        foreach ($collection->getValidationExceptions() as $exception) {
+            $lines[] = $this->formatExceptionMessage($exception);
+        }
+        $message = '<ul><li>' . implode('</li><li>', $lines) . '</li></ul>';
 
-        return $exception;
+        return oxNew(InputException::class, $message);
+    }
+
+    private function formatExceptionMessage(PasswordValidateException $exception): string
+    {
+        return sprintf(
+            /** @phpstan-ignore-next-line */
+            $this->language->translateString($exception->getMessage()),
+            ...$exception->getTranslationParameters()
+        );
     }
 }

src/PasswordPolicy/Validation/Exception/PasswordCollectionException.php

@@ -9,9 +9,7 @@
 
 namespace OxidEsales\SecurityModule\PasswordPolicy\Validation\Exception;
 
-use OxidEsales\Eshop\Core\Exception\InputException;
-
-class PasswordCollectionException extends InputException
+class PasswordCollectionException extends PasswordValidateException
 {
     /**
      * @var PasswordValidateException[]
@@ -20,6 +18,7 @@ class PasswordCollectionException extends InputException
 
     public function __construct(array $exceptions)
     {
+        parent::__construct();
         $this->exceptions = $exceptions;
     }
 

src/Shared/Core/InputValidator.php

@@ -39,16 +39,11 @@ public function checkPassword($user, $newPassword, $confirmationPassword, $shoul
             $passwordValidator->validatePassword($newPassword);
         } catch (PasswordCollectionException $e) {
             $exceptionFactory = $this->getService(ExceptionFactoryInterface::class);
-            foreach ($e->getValidationExceptions() as $key => $error) {
-                if ($key === count($e->getValidationExceptions()) - 1) {
-                    return $this->addValidationError(
-                        "oxuser__oxpassword",
-                        $exceptionFactory->create($error)
-                    );
-                }
-
-                Registry::getUtilsView()->addErrorToDisplay($exceptionFactory->create($error));
-            }
+
+            return $this->addValidationError(
+                "oxuser__oxpassword",
+                $exceptionFactory->create($e)
+            );
         }
 
         return parent::checkPassword($user, $newPassword, $confirmationPassword, $shouldCheckPasswordLength);

tests/Integration/Shared/Core/InputValidatorTest.php

@@ -32,7 +32,7 @@ public function testInputValidationError($password, $expectedException): void
         $exception = $validator->checkPassword($userModelMock, $password, $password);
 
         $this->assertInstanceOf(InputException::class, $exception);
-        $this->assertSame($expectedException, $exception->getMessage());
+        $this->assertStringContainsString($expectedException, $exception->getMessage());
     }
 
     public static function dataProviderPasswordError(): iterable