Guzzle Client injected

eko · Jan 31, 2017 · 5435578 · 5435578
1 parent 622195c
commit 5435578
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 10 deletions.
diff --git a/Resources/config/methods.xml b/Resources/config/methods.xml
@@ -21,19 +21,26 @@
             <tag name="eko.google_translate.method" />
 
             <argument>%eko_google_translate.api_key%</argument>
+            <argument type="service" id="eko.guzzle_client" />
         </service>
 
         <service id="eko.google_translate.languages" class="Eko\GoogleTranslateBundle\Translate\Method\Languages">
             <tag name="eko.google_translate.method" />
 
             <argument>%eko_google_translate.api_key%</argument>
+            <argument type="service" id="eko.guzzle_client" />
         </service>
 
         <service id="eko.google_translate.translator" class="Eko\GoogleTranslateBundle\Translate\Method\Translator">
             <tag name="eko.google_translate.method" />
 
             <argument>%eko_google_translate.api_key%</argument>
+            <argument type="service" id="eko.guzzle_client" />
             <argument type="service" id="eko.google_translate.detector" />
         </service>
+
+        <service id="eko.guzzle_client" class="GuzzleHttp\Client">
+
+        </service>
     </services>
 </container>
diff --git a/Translate/Method.php b/Translate/Method.php
@@ -54,15 +54,16 @@ class Method
     protected $counter = 1;
 
     /**
-     * Constructor.
+     * Method constructor.
      *
-     * @param string    $apiKey    API key retrieved from configuration
-     * @param Stopwatch $stopwatch Symfony profiler Stopwatch service
+     * @param string       $apiKey    API key retrieved from configuration
+     * @param GuzzleClient $client
+     * @param Stopwatch    $stopwatch Symfony profiler Stopwatch service
      */
-    public function __construct($apiKey, Stopwatch $stopwatch = null)
+    public function __construct($apiKey, GuzzleClient $client, Stopwatch $stopwatch = null)
     {
         $this->apiKey = $apiKey;
-        $this->client = new GuzzleClient();
+        $this->client = $client;
 
         $this->stopwatch = $stopwatch;
     }

diff --git a/Translate/Method/Translator.php b/Translate/Method/Translator.php
@@ -12,6 +12,7 @@
 
 use Eko\GoogleTranslateBundle\Translate\Method;
 use Eko\GoogleTranslateBundle\Translate\MethodInterface;
+use GuzzleHttp\Client as GuzzleClient;
 use Symfony\Component\Stopwatch\Stopwatch;
 
 /**
@@ -49,15 +50,16 @@ class Translator extends Method implements MethodInterface
     /**
      * Constructor.
      *
-     * @param string    $apiKey    Google Translate API key
-     * @param Detector  $detector  A Detector service
-     * @param Stopwatch $stopwatch Symfony profiler stopwatch service
+     * @param string       $apiKey    Google Translate API key
+     * @param GuzzleClient $client
+     * @param Detector     $detector  A Detector service
+     * @param Stopwatch    $stopwatch Symfony profiler stopwatch service
      */
-    public function __construct($apiKey, Detector $detector, Stopwatch $stopwatch = null)
+    public function __construct($apiKey, GuzzleClient $client, Detector $detector, Stopwatch $stopwatch = null)
     {
         $this->detector = $detector;
 
-        return parent::__construct($apiKey, $stopwatch);
+        return parent::__construct($apiKey, $client, $stopwatch);
     }
 
     /**