revert translation changes from commit 3032bd4

ecamp · Dec 22, 2023 · 2bb6fbc · 2bb6fbc
1 parent aeb5335
commit 2bb6fbc
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/api/config/services.yaml b/api/config/services.yaml
@@ -75,7 +75,7 @@ services:
     App\Serializer\Normalizer\TranslationConstraintViolationListNormalizer:
         arguments:
             - '@api_platform.hydra.normalizer.constraint_violation_list'
-            - '@api_platform.hal.normalizer.constraint_violation_list'
+            - '@api_platform.problem.normalizer.constraint_violation_list'
 
     App\Serializer\SerializerContextBuilder:
         decorates: 'api_platform.serializer.context_builder'

diff --git a/api/src/Serializer/Normalizer/TranslationConstraintViolationListNormalizer.php b/api/src/Serializer/Normalizer/TranslationConstraintViolationListNormalizer.php
@@ -15,7 +15,7 @@
 class TranslationConstraintViolationListNormalizer implements NormalizerInterface {
     public function __construct(
         private readonly AbstractConstraintViolationListNormalizer $hydraNormalizer,
-        private readonly AbstractConstraintViolationListNormalizer $halNormalizer,
+        private readonly AbstractConstraintViolationListNormalizer $problemNormalizer,
         private readonly TranslationInfoOfConstraintViolation $translationInfoOfConstraintViolation,
         private readonly TranslateToAllLocalesService $translateToAllLocalesService
     ) {}
@@ -33,7 +33,7 @@ public function normalize(mixed $object, string $format = null, array $context =
 
         /** @var ConstraintViolationList $object */
         foreach ($object as $violation) {
-            foreach ($result as &$resultItem) {
+            foreach ($result['violations'] as &$resultItem) {
                 $code = $resultItem['code'] ?? null;
                 $propertyPath = $resultItem['propertyPath'];
                 $message = $resultItem['message'] ?? null;
@@ -80,6 +80,6 @@ public function getSupportedTypes(?string $format): array {
     }
 
     private function getNormalizerCollection(): ArrayCollection {
-        return new ArrayCollection([$this->hydraNormalizer, $this->halNormalizer]);
+        return new ArrayCollection([$this->hydraNormalizer, $this->problemNormalizer]);
     }
 }
diff --git a/...ion/Serializer/Normalizer/TranslationConstraintViolationListNormalizerIntegrationTest.php b/...ion/Serializer/Normalizer/TranslationConstraintViolationListNormalizerIntegrationTest.php
@@ -2,7 +2,7 @@
 
 namespace App\Tests\Integration\Serializer\Normalizer;
 
-use ApiPlatform\Hal\Serializer\ConstraintViolationListNormalizer as HalConstraintViolationListNormalizer;
+use ApiPlatform\Problem\Serializer\ConstraintViolationListNormalizer as JsonProblemConstraintViolationListNormalizer;
 use ApiPlatform\Hydra\Serializer\ConstraintViolationListNormalizer as HydraConstraintViolationListNormalizer;
 use ApiPlatform\Symfony\Bundle\Test\ApiTestAssertionsTrait;
 use App\Entity\CampCollaboration;
@@ -51,7 +51,7 @@ public function testAddsTranslationKeyAndParameters(string $format) {
             []
         );
 
-        self::assertArraySubset([
+        self::assertArraySubset(['violations' => [
             [
                 'i18n' => [
                     'key' => 'app.validator.allowtransition.assertallowtransitions',
@@ -81,7 +81,7 @@ public function testAddsTranslationKeyAndParameters(string $format) {
                     'parameters' => [],
                 ],
             ],
-        ], $result);
+        ]], $result);
     }
 
     /**
@@ -99,7 +99,7 @@ public function testAddsTranslations(string $format) {
             []
         );
 
-        self::assertArraySubset([
+        self::assertArraySubset(['violations' => [
             [
                 'i18n' => [
                     'translations' => [
@@ -146,12 +146,12 @@ public function testAddsTranslations(string $format) {
                     ],
                 ],
             ],
-        ], $result);
+        ]], $result);
     }
 
     public static function getFormats() {
         $hydra = HydraConstraintViolationListNormalizer::FORMAT;
-        $problem = HalConstraintViolationListNormalizer::FORMAT;
+        $problem = JsonProblemConstraintViolationListNormalizer::FORMAT;
 
         return [
             $hydra => [$hydra],