- Update to php 7.4.

- Other fixes.

Author: AbdullahFaqeir

composer.json

@@ -19,6 +19,7 @@
     }
   },
   "require": {
+    "php/php": ">7.4.*",
     "guzzlehttp/guzzle": "^7.0",
     "ext-json": "*"
   }

src/Alias.php

@@ -17,17 +17,17 @@ class Alias
     /**
      * @var \Typesence\Lib\Configuration
      */
-    private $config;
+    private Configuration $config;
 
     /**
      * @var string
      */
-    private $name;
+    private string $name;
 
     /**
      * @var \Typesence\ApiCall
      */
-    private $apiCall;
+    private ApiCall $apiCall;
 
     /**
      * Alias constructor.

src/Aliases.php

@@ -19,17 +19,17 @@ class Aliases implements \ArrayAccess
     /**
      * @var \Typesence\Lib\Configuration
      */
-    private $config;
+    private Configuration $config;
 
     /**
      * @var \Typesence\ApiCall
      */
-    private $apiCall;
+    private ApiCall $apiCall;
 
     /**
      * @var array
      */
-    private $aliases = [];
+    private array $aliases = [];
 
     /**
      * Aliases constructor.
@@ -91,7 +91,6 @@ public function __get($name)
         return $this->aliases[$name];
     }
 
-
     /**
      * @inheritDoc
      */

src/ApiCall.php

@@ -31,27 +31,27 @@ class ApiCall
     /**
      * @var \GuzzleHttp\Client
      */
-    private $client;
+    private \GuzzleHttp\Client $client;
 
     /**
      * @var \Typesence\Lib\Configuration
      */
-    private $config;
+    private Configuration $config;
 
     /**
      * @var array|\Typesence\Lib\Node[]
      */
-    private static $nodes;
+    private static array $nodes;
 
     /**
-     * @var \Typesence\Lib\Node
+     * @var \Typesence\Lib\Node|null
      */
-    private static $nearestNode;
+    private static ?Node $nearestNode;
 
     /**
      * @var int
      */
-    private $nodeIndex;
+    private int $nodeIndex;
 
     /**
      * ApiCall constructor.
@@ -182,14 +182,14 @@ private function makeRequest(string $method, string $endPoint, bool $asJson, arr
 
                 if (!(200 <= $statusCode && $statusCode < 300)) {
                     $errorMessage = json_decode($response->getBody()
-                                                         ->getContents(), true)['message'] ?? 'API error.';
+                                                         ->getContents(), true, 512, JSON_THROW_ON_ERROR)['message'] ?? 'API error.';
                     throw $this->getException($statusCode)
                                ->setMessage($errorMessage);
                 }
 
                 return $asJson ? json_decode($response->getBody()
-                                                      ->getContents(), true) : $response->getBody()
-                                                                                        ->getContents();
+                                                      ->getContents(), true, 512, JSON_THROW_ON_ERROR) : $response->getBody()
+                                                                                                                  ->getContents();
             } catch (ClientException $exception) {
                 if ($exception->getResponse()
                               ->getStatusCode() === 408) {

src/Client.php

@@ -17,17 +17,17 @@ class Client
     /**
      * @var \Typesence\Lib\Configuration
      */
-    private $config;
+    private Configuration $config;
 
     /**
      * @var \Typesence\Collections
      */
-    public $collections;
+    public Collections $collections;
 
     /**
      * @var \Typesence\Aliases
      */
-    public $aliases;
+    public Aliases $aliases;
 
     /**
      * Client constructor.

src/Collection.php

@@ -17,27 +17,27 @@ class Collection
     /**
      * @var \Typesence\Lib\Configuration
      */
-    private $config;
+    private Configuration $config;
 
     /**
      * @var string
      */
-    private $name;
+    private string $name;
 
     /**
      * @var \Typesence\ApiCall
      */
-    private $apiCall;
+    private ApiCall $apiCall;
 
     /**
      * @var \Typesence\Documents
      */
-    public $documents;
+    public Documents $documents;
 
     /**
      * @var \Typesence\Overrides
      */
-    public $overrides;
+    public Overrides $overrides;
 
     /**
      * Collection constructor.

src/Collections.php

@@ -19,17 +19,17 @@ class Collections implements \ArrayAccess
     /**
      * @var \Typesence\Lib\Configuration
      */
-    private $config;
+    private Configuration $config;
 
     /**
      * @var \Typesence\ApiCall
      */
-    private $apiCall;
+    private ApiCall $apiCall;
 
     /**
      * @var array
      */
-    private $collections = [];
+    private array $collections = [];
 
     /**
      * Collections constructor.

src/Document.php

@@ -17,22 +17,22 @@ class Document
     /**
      * @var \Typesence\Lib\Configuration
      */
-    private $config;
+    private Configuration $config;
 
     /**
      * @var string
      */
-    private $collectionName;
+    private string $collectionName;
 
     /**
-     * @var int
+     * @var string
      */
-    private $documentId;
+    private string $documentId;
 
     /**
      * @var \Typesence\ApiCall
      */
-    private $apiCall;
+    private ApiCall $apiCall;
 
     /**
      * Document constructor.

src/Documents.php

@@ -19,22 +19,22 @@ class Documents implements \ArrayAccess
     /**
      * @var \Typesence\Lib\Configuration
      */
-    private $config;
+    private Configuration $config;
 
     /**
      * @var string
      */
-    private $collectionName;
+    private string $collectionName;
 
     /**
      * @var \Typesence\ApiCall
      */
-    private $apiCall;
+    private ApiCall $apiCall;
 
     /**
      * @var array
      */
-    private $documents = [];
+    private array $documents = [];
 
     /**
      * Documents constructor.
@@ -74,13 +74,13 @@ public function create(array $document): array
      * @param  array  $documents
      *
      * @return array
-     * @throws \Typesence\Exceptions\TypesenseClientError|\GuzzleHttp\Exception\GuzzleException
+     * @throws \Typesence\Exceptions\TypesenseClientError|\GuzzleHttp\Exception\GuzzleException|\JsonException
      */
     public function createMany(array $documents): array
     {
-        $res = $this->import(implode("\n", $documents));
+        $res = $this->import(implode("\n", array_map(static fn(array $document) => json_encode($document, JSON_THROW_ON_ERROR), $documents)));
         return array_map(static function ($item) {
-            return json_decode($item, true);
+            return json_decode($item, true, 512, JSON_THROW_ON_ERROR);
         }, explode("\n", $res));
     }
 

src/Key.php

@@ -17,17 +17,17 @@ class Key
     /**
      * @var \Typesence\Lib\Configuration
      */
-    private $config;
+    private Configuration $config;
 
     /**
      * @var \Typesence\ApiCall
      */
-    private $apiCall;
+    private ApiCall $apiCall;
 
     /**
      * @var string
      */
-    private $keyId;
+    private string $keyId;
 
     /**
      * Key constructor.