OPENEUROPA-1917: Temp commit #7.

openeuropa · Aug 22, 2019 · 8743fda · 8743fda
1 parent 4a3c075
commit 8743fda
Show file tree

Hide file tree

Showing 9 changed files with 880 additions and 17 deletions.
diff --git a/composer.json b/composer.json
@@ -11,6 +11,7 @@
         "drupal/search_api_solr": "^3.3",
         "http-interop/http-factory-guzzle": "^1.0",
         "symfony/property-access": "^4.3",
+        "symfony/property-info": "^4.3",
         "symfony/serializer": "^3.4"
     },
     "require-dev": {

diff --git a/lib/src/Api/ApiBase.php b/lib/src/Api/ApiBase.php
@@ -8,7 +8,10 @@
 use OpenEuropa\EnterpriseSearchClient\ClientInterface;
 use Psr\Http\Message\StreamInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\PropertyInfo\Extractor\PhpDocExtractor;
+use Symfony\Component\PropertyInfo\Extractor\ReflectionExtractor;
 use Symfony\Component\Serializer\Encoder\JsonEncoder;
+use Symfony\Component\Serializer\Normalizer\ArrayDenormalizer;
 use Symfony\Component\Serializer\Normalizer\ObjectNormalizer;
 use Symfony\Component\Serializer\Serializer;
 use Symfony\Component\Serializer\SerializerInterface;
@@ -151,7 +154,8 @@ protected function getMultipartStream(array $elements): StreamInterface {
   protected function getSerializer(): SerializerInterface {
     if ($this->serializer === NULL) {
       $this->serializer = new Serializer([
-        new ObjectNormalizer(),
+        new ObjectNormalizer(null, null, null, new PhpDocExtractor()),
+        new ArrayDenormalizer(),
       ], [
         new JsonEncoder(),
       ]);

diff --git a/lib/src/Api/SearchApi.php b/lib/src/Api/SearchApi.php
@@ -4,11 +4,12 @@
 
 namespace OpenEuropa\EnterpriseSearchClient\Api;
 
+use OpenEuropa\EnterpriseSearchClient\Model\Search;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class SearchApi extends ApiBase {
 
-  public function search(array $parameters = []) {
+  public function search(array $parameters = []): Search {
     $resolver = $this->getOptionResolver();
 
     $resolver->setRequired('text')
@@ -21,6 +22,11 @@ public function search(array $parameters = []) {
     $queryParameters = array_intersect_key($parameters, $queryKeys);
     $bodyParameters = array_diff_key($parameters, $queryKeys);
     $response = $this->send('POST', 'rest/search', $queryParameters, $bodyParameters, true);
+
+    /** @var Search $search */
+    $search = $this->getSerializer()->deserialize((string) $response->getBody(), Search::class, 'json');
+
+    return $search;
   }
 
   /**