[Tests] Fixed a type-hinting inconsistency in ContentValidatorStrategyTest

Author: alongosz

tests/lib/Repository/ContentValidator/ContentValidatorStrategyTest.php

@@ -4,35 +4,39 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+declare(strict_types=1);
 
 namespace Ibexa\Tests\Core\Repository\ContentValidator;
 
 use Ibexa\Contracts\Core\Repository\Exceptions\InvalidArgumentException;
 use Ibexa\Contracts\Core\Repository\Validator\ContentValidator;
 use Ibexa\Contracts\Core\Repository\Values\ValueObject;
+use Ibexa\Core\FieldType\ValidationError;
 use Ibexa\Core\Repository\Strategy\ContentValidator\ContentValidatorStrategy;
 use Ibexa\Core\Repository\Values\ObjectState\ObjectState;
 use PHPUnit\Framework\TestCase;
 
-class ContentValidatorStrategyTest extends TestCase
+final class ContentValidatorStrategyTest extends TestCase
 {
     public function testUnknownValidationObject(): void
     {
-        $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('Argument \'$object\' is invalid: Validator for Ibexa\Core\Repository\Values\ObjectState\ObjectState type not found.');
-
         $contentValidatorStrategy = new ContentValidatorStrategy([]);
+
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage(
+            'Argument \'$object\' is invalid: Validator for Ibexa\Core\Repository\Values\ObjectState\ObjectState type not found.'
+        );
         $contentValidatorStrategy->validate(new ObjectState());
     }
 
     public function testKnownValidationObject(): void
     {
         $contentValidatorStrategy = new ContentValidatorStrategy([
-            $this->buildContentValidator(ObjectState::class, ['test']),
+            $this->buildContentValidator(ObjectState::class, [1 => ['eng-GB' => 'test']]),
         ]);
 
         $errors = $contentValidatorStrategy->validate(new ObjectState());
-        self::assertEquals(['test'], $errors);
+        self::assertEquals([1 => ['eng-GB' => new ValidationError('test')]], $errors);
     }
 
     public function testSupportsUnknownValidationObject(): void
@@ -43,10 +47,10 @@ public function testSupportsUnknownValidationObject(): void
         self::assertFalse($supports);
     }
 
-    public function testSuportsKnownValidationObject(): void
+    public function testSupportsKnownValidationObject(): void
     {
         $contentValidatorStrategy = new ContentValidatorStrategy([
-            $this->buildContentValidator(ObjectState::class, ['test']),
+            $this->buildContentValidator(ObjectState::class, [1 => ['eng-GB' => 'test']]),
         ]);
 
         $supports = $contentValidatorStrategy->supports(new ObjectState());
@@ -73,34 +77,31 @@ public function testMergeValidationErrors(): void
 
         $errors = $contentValidatorStrategy->validate(new ObjectState());
         self::assertEquals([
-            123 => ['eng-GB' => '123-eng-GB'],
-            321 => ['pol-PL' => '321-pol-PL'],
+            123 => ['eng-GB' => new ValidationError('123-eng-GB')],
+            321 => ['pol-PL' => new ValidationError('321-pol-PL')],
             456 => [
-                'pol-PL' => '456-pol-PL',
-                'eng-GB' => '456-eng-GB',
+                'pol-PL' => new ValidationError('456-pol-PL'),
+                'eng-GB' => new ValidationError('456-eng-GB'),
             ],
-            2345 => ['eng-GB' => '2345-eng-GB'],
+            2345 => ['eng-GB' => new ValidationError('2345-eng-GB')],
         ], $errors);
     }
 
+    /**
+     * @phpstan-param array<int, array<string, string>> $validationReturn
+     */
     private function buildContentValidator(
         string $classSupport,
         array $validationReturn
     ): ContentValidator {
-        return new class($classSupport, $validationReturn) implements ContentValidator {
-            /** @var string */
-            private $classSupport;
-
-            /** @var array */
-            private $validationReturn;
-
+        return new readonly class($classSupport, $validationReturn) implements ContentValidator {
+            /**
+             * @param array<int, array<string, string>> $validationReturn
+             */
             public function __construct(
-                string $classSupport,
-                array $validationReturn
-            ) {
-                $this->classSupport = $classSupport;
-                $this->validationReturn = $validationReturn;
-            }
+                private string $classSupport,
+                private array $validationReturn
+            ) {}
 
             public function supports(ValueObject $object): bool
             {
@@ -112,7 +113,14 @@ public function validate(
                 array $context = [],
                 ?array $fieldIdentifiers = null
             ): array {
-                return $this->validationReturn;
+                // map validation message string to an expected instance of ValidationError
+                return array_map(
+                    static fn (array $errors): array => array_map(
+                        static fn (string $error): ValidationError => new ValidationError($error),
+                        $errors
+                    ),
+                    $this->validationReturn
+                );
             }
         };
     }