Applied review remarks

ibexa · Aug 27, 2024 · 1bab293 · 1bab293
1 parent 5ed48da
commit 1bab293
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 21 deletions.
diff --git a/src/bundle/Resources/config/services.yml b/src/bundle/Resources/config/services.yml
@@ -420,17 +420,13 @@ services:
         tags:
             - ibexa.rest.serializer.encoder
 
-    Ibexa\Contracts\Rest\Output\AdapterNormalizer:
+    Ibexa\Contracts\Rest\Output\VisitorAdapterNormalizer:
         arguments:
             $encoder: '@ibexa.rest.serializer.encoder.json'
             $valueObjectVisitorResolver: '@Ibexa\Contracts\Rest\Output\ValueObjectVisitorResolver'
         tags:
             - { name: ibexa.rest.serializer.normalizer, priority: -1000 }
 
-    Ibexa\Rest\Output\Normalizer\TestNormalizer:
-        tags:
-            - ibexa.rest.serializer.normalizer
-
     Ibexa\Contracts\Rest\Output\ValueObjectVisitorResolverInterface: '@Ibexa\Contracts\Rest\Output\ValueObjectVisitor'
 
     Ibexa\Contracts\Rest\Output\ValueObjectVisitorResolver: ~
diff --git a/src/contracts/Output/ValueObjectVisitorResolver.php b/src/contracts/Output/ValueObjectVisitorResolver.php
@@ -18,7 +18,7 @@ final class ValueObjectVisitorResolver implements ValueObjectVisitorResolverInte
     /**
      * @param class-string $visitedClassName
      */
-    public function addVisitor(string $visitedClassName, $visitor): void
+    public function addVisitor(string $visitedClassName, ValueObjectVisitor $visitor): void
     {
         $this->visitors[$visitedClassName] = $visitor;
     }

diff --git a/src/contracts/Output/Visitor.php b/src/contracts/Output/Visitor.php
@@ -9,9 +9,6 @@
 namespace Ibexa\Contracts\Rest\Output;
 
 use Error;
-use Ibexa\Contracts\Core\Repository\LocationService;
-use Ibexa\Rest\Output\Normalizer\TestData;
-use Ibexa\Rest\Server\Values\RestLocation;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Serializer\Encoder\EncoderInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
@@ -36,7 +33,6 @@ public function __construct(
         private readonly NormalizerInterface $normalizer,
         private readonly EncoderInterface $encoder,
         private readonly ValueObjectVisitorResolverInterface $valueObjectVisitorResolver,
-        private readonly ?LocationService $locationService = null, //TODO to remove
     ) {
         $this->response = new Response('', 200);
     }
@@ -74,18 +70,9 @@ public function setStatus($statusCode)
 
     /**
      * Visit struct returned by controllers.
-     *
-     * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function visit(mixed $data)
+    public function visit(mixed $data): Response
     {
-        //TODO to remove
-        $data = new TestData();
-        $data->setName('test test');
-        $location = $this->locationService->loadLocation(2);
-        $location = new RestLocation($location, 2);
-        $data->setLocation($location);
-
         $normalizedData = $this->normalizer->normalize($data);
 
         //@todo Needs refactoring!

diff --git a/src/contracts/Output/AdapterNormalizer.php → ...racts/Output/VisitorAdapterNormalizer.php b/src/contracts/Output/AdapterNormalizer.php → ...racts/Output/VisitorAdapterNormalizer.php
@@ -9,13 +9,14 @@
 namespace Ibexa\Contracts\Rest\Output;
 
 use Ibexa\Rest\Output\Generator\Json;
+use LogicException;
 use Symfony\Component\Serializer\Encoder\EncoderInterface;
 use Symfony\Component\Serializer\Normalizer\ContextAwareNormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerAwareTrait;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
-final class AdapterNormalizer implements NormalizerInterface, NormalizerAwareInterface, ContextAwareNormalizerInterface
+final class VisitorAdapterNormalizer implements NormalizerInterface, NormalizerAwareInterface, ContextAwareNormalizerInterface
 {
     use NormalizerAwareTrait;
 
@@ -60,6 +61,16 @@ public function supportsNormalization(mixed $data, ?string $format = null, array
             return true;
         }
 
+        if (!$this->normalizer instanceof ContextAwareNormalizerInterface) {
+            throw new LogicException(
+                sprintf(
+                    'Normalizer "%s" must be an instance of "%s".',
+                    $this->normalizer::class,
+                    ContextAwareNormalizerInterface::class,
+                )
+            );
+        }
+
         return $this->normalizer->supportsNormalization(
             $data,
             null,