Merge pull request #6 from babeuloula/use-httplug

Use HTTPlug instead of Guzzle

Author: jasonbosco

README.md

@@ -16,6 +16,8 @@ Read the documentation here: [https://typesense.org/api/](https://typesense.org/
 
 Here are some examples that walk you through how to use the client: [doc/examples](examples)
 
+Typesense use [HTTPlug](http://httplug.io/). List of clients & adapters [here](http://docs.php-http.org/en/latest/clients.html)
+
 ## Compatibility
 
 | Typesense Server | typesense-php |

composer.json

@@ -31,17 +31,31 @@
   },
   "require": {
     "php": ">=7.4",
-    "guzzlehttp/guzzle": "^7.0",
     "ext-json": "*",
-    "monolog/monolog": "^1.0"
+    "monolog/monolog": "^1.0|^2.1",
+    "nyholm/psr7": "^1.3",
+    "php-http/client-common": "^1.0",
+    "php-http/discovery": "^1.0",
+    "php-http/httplug": "^1.0",
+    "php-http/message-factory": "^1.0",
+    "psr/http-client-implementation": "^1.0",
+    "psr/http-message": "^1.0"
   },
   "require-dev": {
-    "squizlabs/php_codesniffer": "3.*"
+    "squizlabs/php_codesniffer": "3.*",
+    "symfony/http-client": "^5.2"
+  },
+  "config": {
+    "optimize-autoloader": true,
+    "preferred-install": {
+      "*": "dist"
+    },
+    "sort-packages": true
   },
   "scripts": {
     "typesenseServer": [
       "Composer\\Config::disableProcessTimeout",
-      "docker run -i -p 8108:8108 -v/tmp/typesense-server-data-1c/:/data typesense/typesense:0.17.0 --data-dir /data --api-key=xyz --listen-port 8108 --enable-cors"
+      "docker-compose up"
     ],
     "lint": "phpcs -v",
     "lint:fix": "phpcbf"

docker-compose.yml

@@ -0,0 +1,13 @@
+version: '3.5'
+
+services:
+    typesense:
+        image: typesense/typesense:0.17.0
+        environment:
+            TYPESENSE_DATA_DIR: /data
+            TYPESENSE_API_KEY: xyz
+        volumes:
+            - /tmp/typesense-server-data:/data
+        ports:
+            - 8108:8108
+        restart: "no"

examples/alias_operations.php

@@ -4,6 +4,7 @@
 
 include '../vendor/autoload.php';
 
+use Symfony\Component\HttpClient\HttplugClient;
 use Typesense\Client;
 
 try {
@@ -17,7 +18,7 @@
                     'protocol' => 'http',
                 ],
             ],
-            'connection_timeout_seconds' => 2,
+            'client' => new HttplugClient(),
         ]
     );
     echo '<pre>';

examples/collection_operations.php

@@ -4,6 +4,7 @@
 
 include '../vendor/autoload.php';
 
+use Symfony\Component\HttpClient\HttplugClient;
 use Typesense\Client;
 
 try {
@@ -17,7 +18,7 @@
                     'protocol' => 'http',
                 ],
             ],
-            'connection_timeout_seconds' => 2,
+            'client' => new HttplugClient(),
         ]
     );
     echo '<pre>';

examples/curation_operations.php

@@ -2,6 +2,7 @@
 
 include '../vendor/autoload.php';
 
+use Symfony\Component\HttpClient\HttplugClient;
 use Typesense\Client;
 
 try {
@@ -15,7 +16,7 @@
                     'protocol' => 'http',
                 ],
             ],
-            'connection_timeout_seconds' => 2,
+            'client' => new HttplugClient(),
         ]
     );
     echo '<pre>';

examples/info_operations.php

@@ -4,6 +4,7 @@
 
 include '../vendor/autoload.php';
 
+use Symfony\Component\HttpClient\HttplugClient;
 use Typesense\Client;
 
 try {
@@ -17,7 +18,7 @@
                     'protocol' => 'http',
                 ],
             ],
-            'connection_timeout_seconds' => 2,
+            'client' => new HttplugClient(),
         ]
     );
     echo '<pre>';

examples/keys_operations.php

@@ -2,6 +2,7 @@
 
 include '../vendor/autoload.php';
 
+use Symfony\Component\HttpClient\HttplugClient;
 use Typesense\Client;
 
 try {
@@ -15,7 +16,7 @@
                     'protocol' => 'http',
                 ],
             ],
-            'connection_timeout_seconds' => 2,
+            'client' => new HttplugClient(),
         ]
     );
     echo '<pre>';
@@ -123,8 +124,7 @@
                     'port' => '8108',
                     'protocol' => 'http',
                 ],
-            ],
-            'connection_timeout_seconds' => 2,
+            ]
         ]
     );
 

src/Alias.php

@@ -2,7 +2,7 @@
 
 namespace Typesense;
 
-use GuzzleHttp\Exception\GuzzleException;
+use Http\Client\Exception as HttpClientException;
 use Typesense\Exceptions\TypesenseClientError;
 
 /**
@@ -47,7 +47,7 @@ public function endPointPath(): string
 
     /**
      * @return array
-     * @throws TypesenseClientError|GuzzleException
+     * @throws TypesenseClientError|HttpClientException
      */
     public function retrieve(): array
     {
@@ -56,7 +56,7 @@ public function retrieve(): array
 
     /**
      * @return array
-     * @throws TypesenseClientError|GuzzleException
+     * @throws TypesenseClientError|HttpClientException
      */
     public function delete(): array
     {

src/Aliases.php

@@ -2,7 +2,7 @@
 
 namespace Typesense;
 
-use GuzzleHttp\Exception\GuzzleException;
+use Http\Client\Exception as HttpClientException;
 use Typesense\Exceptions\TypesenseClientError;
 
 /**
@@ -44,15 +44,15 @@ public function __construct(ApiCall $apiCall)
      */
     public function endPointPath(string $aliasName): string
     {
-        return sprintf('%s/%s', self::RESOURCE_PATH, $aliasName);
+        return sprintf('%s/%s', static::RESOURCE_PATH, $aliasName);
     }
 
     /**
      * @param string $name
      * @param array $mapping
      *
      * @return array
-     * @throws TypesenseClientError|GuzzleException
+     * @throws TypesenseClientError|HttpClientException
      */
     public function upsert(string $name, array $mapping): array
     {
@@ -61,11 +61,11 @@ public function upsert(string $name, array $mapping): array
 
     /**
      * @return array
-     * @throws TypesenseClientError|GuzzleException
+     * @throws TypesenseClientError|HttpClientException
      */
     public function retrieve(): array
     {
-        return $this->apiCall->get(self::RESOURCE_PATH, []);
+        return $this->apiCall->get(static::RESOURCE_PATH, []);
     }
 
     /**