Merge pull request #14 from LogansUA/feature-refactoring

Refactoring

Author: LogansUA

src/Service/Service.php

@@ -18,18 +18,13 @@ class Service
      */
     protected $blizzardClient;
 
-    /**
-     * @var array $defaultOption Array of default options
-     */
-    protected $defaultOption = [];
-
     /**
      * @var string $serviceParam Service parameter
      */
     protected $serviceParam;
 
     /**
-     * WorldOfWarcraft constructor
+     * Service constructor
      *
      * @param BlizzardClient $blizzardClient Configured blizzard client
      */
@@ -50,11 +45,13 @@ public function __construct(BlizzardClient $blizzardClient)
      */
     protected function request($urlSuffix, array $options)
     {
-        $options = $this->generateQueryOptions($options);
+        $client = new Client([
+            'base_uri' => $this->blizzardClient->getApiUrl(),
+        ]);
 
-        $requestUrl = $this->blizzardClient->getApiUrl().$this->serviceParam.$urlSuffix;
+        $options = $this->generateQueryOptions($options);
 
-        $result = (new Client())->get($requestUrl, $options);
+        $result = $client->get($this->serviceParam.$urlSuffix, $options);
 
         return $result;
     }
@@ -89,11 +86,9 @@ private function generateQueryOptions(array $options = [])
      */
     private function getDefaultOptions()
     {
-        $defaultOption = [
+        return [
             'locale' => $this->blizzardClient->getLocale(),
             'apiKey' => $this->blizzardClient->getApiKey(),
         ];
-
-        return $defaultOption;
     }
 }