More improvements

composer.json

@@ -17,8 +17,10 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "Ibexa\\Tests\\Search\\": "tests/lib/",
             "Ibexa\\Tests\\Bundle\\Search\\": "tests/bundle/",
+            "Ibexa\\Tests\\Contracts\\Search\\": "tests/contracts/",
+            "Ibexa\\Tests\\Search\\": "tests/lib/",
+            "Ibexa\\Platform\\Tests\\Contracts\\Search\\": "tests/contracts/",
             "Ibexa\\Platform\\Tests\\Bundle\\Search\\": "tests/bundle/",
             "Ibexa\\Platform\\Tests\\Search\\": "tests/lib/"
         }

src/bundle/Controller/SuggestionController.php

@@ -9,31 +9,32 @@
 namespace Ibexa\Bundle\Search\Controller;
 
 use Ibexa\Search\Model\SuggestionQuery;
+use Ibexa\Search\Serializer\SuggestionSerializer;
 use Ibexa\Search\Service\SuggestionService;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\JsonResponse;
-use Symfony\Component\Serializer\SerializerInterface;
 
 final class SuggestionController extends AbstractController
 {
     private SuggestionService $suggestionService;
 
-    private SerializerInterface $serializer;
-
     public function __construct(
-        SerializerInterface $serializer,
         SuggestionService $suggestionService
     ) {
         $this->suggestionService = $suggestionService;
-        $this->serializer = $serializer;
+    }
+
+    public static function getSubscribedServices(): array
+    {
+        return array_merge(parent::getSubscribedServices(), [
+            'serializer' => SuggestionSerializer::class,
+        ]);
     }
 
     public function suggestAction(SuggestionQuery $suggestionQuery): JsonResponse
     {
         $result = $this->suggestionService->suggest($suggestionQuery);
 
-        $serializedResults = $this->serializer->serialize($result, 'json');
-
-        return (new JsonResponse(null, 200))->setJson($serializedResults);
+        return $this->json($result);
     }
 }

src/bundle/Resources/config/services.yaml

@@ -45,3 +45,5 @@ services:
     Ibexa\Search\Provider\ParentLocationProvider: ~
 
     Ibexa\Contracts\Search\Provider\ParentLocationProvider: '@Ibexa\Search\Provider\ParentLocationProvider'
+
+    Ibexa\Search\Serializer\SuggestionSerializer: ~

src/lib/Serializer/SuggestionSerializer.php

@@ -8,17 +8,46 @@
 
 namespace Ibexa\Search\Serializer;
 
+use Symfony\Component\Serializer\Encoder\JsonEncoder;
+use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
+use Symfony\Component\Serializer\Normalizer\ObjectNormalizer;
+use Symfony\Component\Serializer\Serializer;
 use Symfony\Component\Serializer\SerializerInterface;
 
 final class SuggestionSerializer implements SerializerInterface
 {
-    public function serialize($data, string $format, array $context = [])
+    private SerializerInterface $serializer;
+
+    public function __construct()
+    {
+        $encoders = [new JsonEncoder()];
+
+        $defaultContext = [
+            AbstractNormalizer::CIRCULAR_REFERENCE_HANDLER => static function ($object) {
+                return $object->getId();
+            },
+        ];
+
+        $normalizers = [new ObjectNormalizer(null, null, null, null, null, null, $defaultContext)];
+
+        $this->serializer = new Serializer($normalizers, $encoders);
+    }
+
+    /**
+     * @param mixed $data
+     * @param array<mixed> $context
+     */
+    public function serialize($data, string $format, array $context = []): string
     {
-        // TODO: Implement serialize() method.
+        return $this->serializer->serialize($data, $format, $context);
     }
 
+    /**
+     * @param mixed $data
+     * @param array<mixed> $context
+     */
     public function deserialize($data, string $type, string $format, array $context = [])
     {
-        // TODO: Implement deserialize() method.
+        return $this->serializer->deserialize($data, $type, $format, $context);
     }
 }

tests/contracts/EventDispatcher/Event/SuggestionEventTest.php

@@ -13,7 +13,7 @@
 use Ibexa\Search\Model\SuggestionQuery;
 use PHPUnit\Framework\TestCase;
 
-class SuggestionEventTest extends TestCase
+final class SuggestionEventTest extends TestCase
 {
     public function testConstruct(): void
     {