Moved ClusterHosts inside ClientConfig and restore 2 constructors

julienbourdeau · julienbourdeau · commit d60e743d1508 · 2018-08-20T11:07:45.000+02:00
diff --git a/src/Analytics.php b/src/Analytics.php
@@ -20,12 +20,10 @@ public function __construct(ApiWrapper $api)
         $this->api = $api;
     }
 
-    public static function create($appId, $apiKey)
+    public static function create($appId = null, $apiKey = null)
     {
-        $config = new ClientConfig(array(
-            'appId' => $appId,
-            'apiKey' => $apiKey,
-        ));
+        $config = new ClientConfig($appId, $apiKey);
+        $config->setHosts(ClusterHosts::createForAnalytics());
 
         return static::createWithConfig($config);
     }
@@ -34,8 +32,7 @@ public static function createWithConfig(ClientConfig $config)
     {
         $apiWrapper = new ApiWrapper(
             Config::getHttpClient(),
-            $config,
-            ClusterHosts::createForAnalytics()
+            $config
         );
 
         return new static($apiWrapper);
diff --git a/src/Client.php b/src/Client.php
@@ -36,33 +36,13 @@ public static function get()
         return static::$client;
     }
 
-    public static function create($appId = null, $apiKey = null, ClientConfig $config = null)
+    public static function create($appId = null, $apiKey = null)
     {
-        if (null === $config) {
-            $config = new ClientConfig();
-        }
-
-        if (null !== $appId) {
-            $config->setAppId($appId);
-        }
-
-        if (null !== $apiKey) {
-            $config->setApiKey($apiKey);
-        }
-
-        $hosts = $config->getHosts();
-        if (!$hosts) {
-            $hosts = ClusterHosts::createFromAppId($config->getAppId());
-        } elseif (is_string($hosts)) {
-            $hosts = new ClusterHosts(array($hosts));
-        } elseif (is_array($hosts)) {
-            $hosts = new ClusterHosts($hosts);
-        }
+        $config = new ClientConfig($appId, $apiKey);
 
         $apiWrapper = new ApiWrapper(
             Config::getHttpClient(),
-            $config,
-            $hosts
+            $config
         );
 
         return new static($apiWrapper);
diff --git a/src/Internals/ApiWrapper.php b/src/Internals/ApiWrapper.php
@@ -23,11 +23,6 @@ class ApiWrapper
      */
     private $config;
 
-    /**
-     * @var ClusterHosts
-     */
-    private $clusterHosts;
-
     /**
      * @var RequestOptionsFactory
      */
@@ -36,12 +31,10 @@ class ApiWrapper
     public function __construct(
         HttpClientInterface $http,
         ClientConfig $config,
-        ClusterHosts $clusterHosts,
         RequestOptionsFactory $RqstOptsFactory = null
     ) {
         $this->http = $http;
         $this->config = $config;
-        $this->clusterHosts = $clusterHosts;
         $this->requestOptionsFactory = $RqstOptsFactory ? $RqstOptsFactory : new RequestOptionsFactory($config);
     }
 
@@ -57,7 +50,7 @@ public function read($method, $path, $requestOptions = array(), $defaults = arra
             $method,
             $path,
             $requestOptions,
-            $this->clusterHosts->read(),
+            $this->config->getHosts()->read(),
             $requestOptions->getReadTimeout()
         );
     }
@@ -75,7 +68,7 @@ public function write($method, $path, $data = array(), $requestOptions = array()
             $method,
             $path,
             $requestOptions,
-            $this->clusterHosts->write(),
+            $this->config->getHosts()->write(),
             $requestOptions->getWriteTimeout(),
             $data
         );
@@ -86,7 +79,7 @@ public function send($method, $path, $requestOptions = array(), $hosts = null)
         $requestOptions = $this->requestOptionsFactory->create($requestOptions);
 
         if (null === $hosts) {
-            $hosts = $this->clusterHosts->write();
+            $hosts = $this->config->getHosts()->write();
         } elseif (!is_array($hosts)) {
             $hosts = array($hosts);
         }
@@ -131,7 +124,7 @@ private function request($method, $path, RequestOptions $requestOptions, $hosts,
                     Debug::handle("The host [$host] failed, retrying with another host.");
                 }
 
-                $this->clusterHosts->failed($host);
+                $this->config->getHosts()->failed($host);
             } catch (BadRequestException $e) {
                 if (Debug::isEnabled()) {
                     Debug::handle("The following request returned a 4xx error: ", $request);
diff --git a/src/Places.php b/src/Places.php
@@ -12,19 +12,17 @@ final class Places
     /**
      * @var ApiWrapper
      */
-    private $apiWrapper;
+    private $api;
 
     public function __construct(ApiWrapper $apiWrapper)
     {
-        $this->apiWrapper = $apiWrapper;
+        $this->api = $apiWrapper;
     }
 
     public static function create($appId = null, $apiKey = null)
     {
-        $config = new ClientConfig(array(
-            'appId' => $appId,
-            'apiKey' => $apiKey,
-        ));
+        $config = new ClientConfig($appId, $apiKey);
+        $config->setHosts(ClusterHosts::createForPlaces());
 
         return static::createWithConfig($config);
     }
@@ -33,8 +31,7 @@ public static function createWithConfig(ClientConfig $config)
     {
         $apiWrapper = new ApiWrapper(
             Config::getHttpClient(),
-            $config,
-            ClusterHosts::createForPlaces()
+            $config
         );
 
         return new static($apiWrapper);
diff --git a/src/Support/ClientConfig.php b/src/Support/ClientConfig.php
@@ -2,29 +2,36 @@
 
 namespace Algolia\AlgoliaSearch\Support;
 
+use Algolia\AlgoliaSearch\Internals\ClusterHosts;
+
 class ClientConfig
 {
     private $config;
 
     public function __construct($appId = null, $apiKey = null)
     {
-        $config = array();
+        $config = $this->getDefaultConfig();
+
         if (null !== $appId) {
             $config['appId'] = $appId;
         }
         if (null !== $apiKey) {
             $config['apiKey'] = $apiKey;
         }
 
-        $this->config = $config + $this->getDefaultConfig();
+        if (null === $config['hosts']) {
+            $config['hosts'] = ClusterHosts::createFromAppId($config['appId']);
+        }
+
+        $this->config = $config;
     }
 
     private function getDefaultConfig()
     {
         return array(
             'appId' => getenv('ALGOLIA_APP_ID'),
             'apiKey' => getenv('ALGOLIA_API_KEY'),
-            'hosts' => array(),
+            'hosts' => null,
             'waitTaskRetry' => Config::$waitTaskRetry,
             'readTimeout' => Config::getReadTimeout(),
             'writeTimeout' => Config::getWriteTimeout(),
@@ -59,7 +66,7 @@ public function getHosts()
         return $this->config['hosts'];
     }
 
-    public function setHosts($hosts)
+    public function setHosts(ClusterHosts $hosts)
     {
         $this->config['hosts'] = $hosts;
         return $this;
diff --git a/tests/Unit/RequestOptionsFactoryTest.php b/tests/Unit/RequestOptionsFactoryTest.php
@@ -14,10 +14,9 @@ class RequestOptionsFactoryTest extends TestCase
 
     public function setUp()
     {
-        $this->factory = new RequestOptionsFactory(new ClientConfig(array(
-            'appId' => 'Algolia-Id',
-            'apiKey' => 'Algolia-Key',
-        )));
+        $this->factory = new RequestOptionsFactory(
+            new ClientConfig('Algolia-Id', 'Algolia-Key'
+        ));
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -20,12 +20,10 @@ public function __construct(ApiWrapper $api)`
`20`	`20`	`$this->api = $api;`
`21`	`21`	`}`
`22`	`22`
`23`		`- public static function create($appId, $apiKey)`
	`23`	`+ public static function create($appId = null, $apiKey = null)`
`24`	`24`	`{`
`25`		`- $config = new ClientConfig(array(`
`26`		`- 'appId' => $appId,`
`27`		`- 'apiKey' => $apiKey,`
`28`		`- ));`
	`25`	`+ $config = new ClientConfig($appId, $apiKey);`
	`26`	`+ $config->setHosts(ClusterHosts::createForAnalytics());`
`29`	`27`
`30`	`28`	`return static::createWithConfig($config);`
`31`	`29`	`}`
`@@ -34,8 +32,7 @@ public static function createWithConfig(ClientConfig $config)`
`34`	`32`	`{`
`35`	`33`	`$apiWrapper = new ApiWrapper(`
`36`	`34`	`Config::getHttpClient(),`
`37`		`- $config,`
`38`		`- ClusterHosts::createForAnalytics()`
	`35`	`+ $config`
`39`	`36`	`);`
`40`	`37`
`41`	`38`	`return new static($apiWrapper);`
Original file line number	Diff line number	Diff line change
`@@ -12,19 +12,17 @@ final class Places`
`12`	`12`	`/**`
`13`	`13`	`* @var ApiWrapper`
`14`	`14`	`*/`
`15`		`- private $apiWrapper;`
	`15`	`+ private $api;`
`16`	`16`
`17`	`17`	`public function __construct(ApiWrapper $apiWrapper)`
`18`	`18`	`{`
`19`		`- $this->apiWrapper = $apiWrapper;`
	`19`	`+ $this->api = $apiWrapper;`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`public static function create($appId = null, $apiKey = null)`
`23`	`23`	`{`
`24`		`- $config = new ClientConfig(array(`
`25`		`- 'appId' => $appId,`
`26`		`- 'apiKey' => $apiKey,`
`27`		`- ));`
	`24`	`+ $config = new ClientConfig($appId, $apiKey);`
	`25`	`+ $config->setHosts(ClusterHosts::createForPlaces());`
`28`	`26`
`29`	`27`	`return static::createWithConfig($config);`
`30`	`28`	`}`
`@@ -33,8 +31,7 @@ public static function createWithConfig(ClientConfig $config)`
`33`	`31`	`{`
`34`	`32`	`$apiWrapper = new ApiWrapper(`
`35`	`33`	`Config::getHttpClient(),`
`36`		`- $config,`
`37`		`- ClusterHosts::createForPlaces()`
	`34`	`+ $config`
`38`	`35`	`);`
`39`	`36`
`40`	`37`	`return new static($apiWrapper);`
Original file line number	Diff line number	Diff line change
`@@ -2,29 +2,36 @@`
`2`	`2`
`3`	`3`	`namespace Algolia\AlgoliaSearch\Support;`
`4`	`4`
	`5`	`+use Algolia\AlgoliaSearch\Internals\ClusterHosts;`
	`6`	`+`
`5`	`7`	`class ClientConfig`
`6`	`8`	`{`
`7`	`9`	`private $config;`
`8`	`10`
`9`	`11`	`public function __construct($appId = null, $apiKey = null)`
`10`	`12`	`{`
`11`		`- $config = array();`
	`13`	`+ $config = $this->getDefaultConfig();`
	`14`	`+`
`12`	`15`	`if (null !== $appId) {`
`13`	`16`	`$config['appId'] = $appId;`
`14`	`17`	`}`
`15`	`18`	`if (null !== $apiKey) {`
`16`	`19`	`$config['apiKey'] = $apiKey;`
`17`	`20`	`}`
`18`	`21`
`19`		`- $this->config = $config + $this->getDefaultConfig();`
	`22`	`+ if (null === $config['hosts']) {`
	`23`	`+ $config['hosts'] = ClusterHosts::createFromAppId($config['appId']);`
	`24`	`+ }`
	`25`	`+`
	`26`	`+ $this->config = $config;`
`20`	`27`	`}`
`21`	`28`
`22`	`29`	`private function getDefaultConfig()`
`23`	`30`	`{`
`24`	`31`	`return array(`
`25`	`32`	`'appId' => getenv('ALGOLIA_APP_ID'),`
`26`	`33`	`'apiKey' => getenv('ALGOLIA_API_KEY'),`
`27`		`- 'hosts' => array(),`
	`34`	`+ 'hosts' => null,`
`28`	`35`	`'waitTaskRetry' => Config::$waitTaskRetry,`
`29`	`36`	`'readTimeout' => Config::getReadTimeout(),`
`30`	`37`	`'writeTimeout' => Config::getWriteTimeout(),`
`@@ -59,7 +66,7 @@ public function getHosts()`
`59`	`66`	`return $this->config['hosts'];`
`60`	`67`	`}`
`61`	`68`
`62`		`- public function setHosts($hosts)`
	`69`	`+ public function setHosts(ClusterHosts $hosts)`
`63`	`70`	`{`
`64`	`71`	`$this->config['hosts'] = $hosts;`
`65`	`72`	`return $this;`
Original file line number	Diff line number	Diff line change
`@@ -14,10 +14,9 @@ class RequestOptionsFactoryTest extends TestCase`
`14`	`14`
`15`	`15`	`public function setUp()`
`16`	`16`	`{`
`17`		`- $this->factory = new RequestOptionsFactory(new ClientConfig(array(`
`18`		`- 'appId' => 'Algolia-Id',`
`19`		`- 'apiKey' => 'Algolia-Key',`
`20`		`- )));`
	`17`	`+ $this->factory = new RequestOptionsFactory(`
	`18`	`+ new ClientConfig('Algolia-Id', 'Algolia-Key'`
	`19`	`+ ));`
`21`	`20`	`}`
`22`	`21`
`23`	`22`	`/**`