Refactor for SOLID compliance - Breaking on getAllIndexes (method return) and Index class (renamed into Indexes)

src/Client.php

@@ -2,89 +2,58 @@
 
 namespace MeiliSearch;
 
-class Client extends HTTPRequest
+use MeiliSearch\Delegates\handlesIndex;
+use MeiliSearch\Delegates\handlesSystem;
+use MeiliSearch\Endpoints\Health;
+use MeiliSearch\Endpoints\Indexes;
+use MeiliSearch\Endpoints\Keys;
+use MeiliSearch\Endpoints\Stats;
+use MeiliSearch\Endpoints\SysInfo;
+use MeiliSearch\Endpoints\Version;
+use Psr\Http\Client\ClientInterface;
+use Psr\Http\Message\RequestFactoryInterface;
+use Psr\Http\Message\StreamFactoryInterface;
+
+class Client
 {
-    // Indexes
-
-    public function getAllIndexes()
-    {
-        return $this->httpGet('/indexes');
-    }
-
-    public function showIndex($uid)
-    {
-        return $this->indexInstance($uid)->show();
-    }
-
-    public function deleteIndex($uid)
-    {
-        return $this->indexInstance($uid)->delete();
-    }
-
-    public function deleteAllIndexes()
-    {
-        foreach ($this->getAllIndexes() as $index) {
-            $this->deleteIndex($index['uid']);
-        }
-    }
-
-    public function getIndex($uid)
-    {
-        return $this->indexInstance($uid);
-    }
-
-    public function createIndex($index_uid, $options = [])
-    {
-        $body = array_merge(
-            $options,
-            ['uid' => $index_uid]
-        );
-        $response = $this->httpPost('/indexes', $body);
-        $uid = $response['uid'];
-
-        return $this->indexInstance($uid);
-    }
-
-    // Health
-
-    public function health()
-    {
-        return $this->httpGet('/health');
-    }
-
-    // Stats
-
-    public function version()
-    {
-        return $this->httpGet('/version');
-    }
-
-    public function sysInfo()
-    {
-        return $this->httpGet('/sys-info');
-    }
-
-    public function prettySysInfo()
-    {
-        return $this->httpGet('/sys-info/pretty');
-    }
-
-    public function stats()
-    {
-        return $this->httpGet('/stats');
-    }
-
-    // Keys
-
-    public function getKeys()
-    {
-        return $this->httpGet('/keys');
-    }
-
-    // Private methods
-
-    private function indexInstance($uid)
-    {
-        return new Index($uid, $this->base_url, $this->api_key);
+    use handlesIndex;
+    use handlesSystem;
+
+    private $http;
+    /**
+     * @var Indexes
+     */
+    private $index;
+
+    /**
+     * @var Health
+     */
+    private $health;
+    /**
+     * @var Version
+     */
+    private $version;
+    /**
+     * @var SysInfo
+     */
+    private $sysInfo;
+    /**
+     * @var Keys
+     */
+    private $keys;
+    /**
+     * @var Stats
+     */
+    private $stats;
+
+    public function __construct($url, $apiKey = null, ClientInterface $httpClient = null, RequestFactoryInterface $requestFactory = null, StreamFactoryInterface $streamFactory = null)
+    {
+        $this->http = new Http\Client($url, $apiKey, $httpClient, $requestFactory, $streamFactory);
+        $this->index = new Indexes($this->http);
+        $this->health = new Health($this->http);
+        $this->version = new Version($this->http);
+        $this->sysInfo = new SysInfo($this->http);
+        $this->stats = new Stats($this->http);
+        $this->keys = new Keys($this->http);
     }
 }

src/Contracts/Endpoint.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace MeiliSearch\Contracts;
+
+abstract class Endpoint
+{
+    /**
+     * @var Http
+     */
+    protected $http;
+
+    public function __construct(Http $http)
+    {
+        $this->http = $http;
+    }
+
+    public function show()
+    {
+        return $this->http->get(static::PATH);
+    }
+}

src/Contracts/Http.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace MeiliSearch\Contracts;
+
+interface Http
+{
+    public function get($path, array $query = []);
+
+    public function post(string $path, $body = null, array $query = []);
+
+    public function put(string $path, $body = null, array $query = []);
+
+    public function patch(string $path, $body = null, array $query = []);
+
+    public function delete($path, array $query = []);
+}

src/Delegates/handlesIndex.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace MeiliSearch\Delegates;
+
+use MeiliSearch\Endpoints\Indexes;
+
+trait handlesIndex
+{
+    public function getAllIndexes()
+    {
+        return $this->index->all();
+    }
+
+    public function showIndex($uid): array
+    {
+        return (new Indexes($this->http, $uid))->show();
+    }
+
+    public function deleteIndex($uid)
+    {
+        return (new Indexes($this->http, $uid))->delete();
+    }
+
+    public function deleteAllIndexes()
+    {
+        $indexes = $this->getAllIndexes();
+        foreach ($indexes as $index) {
+            $index->delete();
+        }
+    }
+
+    public function getIndex($uid): Indexes
+    {
+        return new Indexes($this->http, $uid);
+    }
+
+    public function createIndex($uid, $options = []): Indexes
+    {
+        return $this->index->create($uid, $options);
+    }
+}

src/Delegates/handlesSystem.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace MeiliSearch\Delegates;
+
+trait handlesSystem
+{
+    public function health()
+    {
+        return $this->health->show();
+    }
+
+    // Stats
+
+    public function version()
+    {
+        return $this->version->show();
+    }
+
+    public function sysInfo()
+    {
+        return $this->sysInfo->show();
+    }
+
+    public function prettySysInfo()
+    {
+        return $this->sysInfo->pretty();
+    }
+
+    public function stats()
+    {
+        return $this->stats->show();
+    }
+
+    public function getKeys()
+    {
+        return $this->keys->show();
+    }
+}

src/Endpoints/Delegates/handlesDocuments.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace MeiliSearch\Endpoints\Delegates;
+
+trait handlesDocuments
+{
+    // Documents
+
+    public function getDocument($document_id)
+    {
+        return $this->http->get(self::PATH.'/'.$this->uid.'/documents/'.$document_id);
+    }
+
+    public function getDocuments($query = [])
+    {
+        return $this->http->get(self::PATH.'/'.$this->uid.'/documents', $query);
+    }
+
+    public function addDocuments(array $documents, $primaryKey = null)
+    {
+        return $this->http->post(self::PATH.'/'.$this->uid.'/documents', $documents, ['primaryKey' => $primaryKey]);
+    }
+
+    public function updateDocuments($documents, $primary_key = null)
+    {
+        return $this->http->put(self::PATH.'/'.$this->uid.'/documents', $documents, ['primaryKey' => $primary_key]);
+    }
+
+    public function deleteAllDocuments()
+    {
+        return $this->http->delete(self::PATH.'/'.$this->uid.'/documents');
+    }
+
+    public function deleteDocument($document_id)
+    {
+        return $this->http->delete(self::PATH.'/'.$this->uid.'/documents/'.$document_id);
+    }
+
+    public function deleteDocuments($documents)
+    {
+        return $this->http->post(self::PATH.'/'.$this->uid.'/documents/delete-batch', $documents);
+    }
+}