Omit model if not set (#344)

googleapis · Feb 22, 2017 · 447fbed · 447fbed
1 parent 4ac28cf
commit 447fbed
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 5 deletions.
diff --git a/src/Translate/TranslateClient.php b/src/Translate/TranslateClient.php
@@ -203,7 +203,7 @@ public function translate($string, array $options = [])
      *           either plain-text or HTML. Acceptable values are `html` or
      *           `text`. **Defaults to** `"html"`.
      *     @type string $model The model to use for the translation request. May
-     *           be `nmt` or `base`. **Defaults to** an empty string.
+     *           be `nmt` or `base`. **Defaults to** null.
      * }
      * @return array A set of translation results. Each result includes a
      *         `source` key containing the detected or provided language of the
@@ -213,15 +213,19 @@ public function translate($string, array $options = [])
     public function translateBatch(array $strings, array $options = [])
     {
         $options += [
-            'model' => '',
+            'model' => null,
         ];
 
-        $response = $this->connection->listTranslations($options + [
+        $options = array_filter($options + [
             'q' => $strings,
             'key' => $this->key,
             'target' => $this->targetLanguage,
             'model' => $options['model']
-        ]);
+        ], function ($opt) {
+            return !is_null($opt);
+        });
+
+        $response = $this->connection->listTranslations($options);
 
         $translations = [];
         $strings = array_values($strings);

diff --git a/tests/unit/Translate/TranslateClientTest.php b/tests/unit/Translate/TranslateClientTest.php
@@ -41,7 +41,7 @@ public function testWithNoKey()
         $client = new TranslateTestClient();
 
         $this->connection->listTranslations(Argument::that(function($args) {
-            if (!is_null($args['key'])) {
+            if (isset($args['key'])) {
                 return false;
             }
 
@@ -53,6 +53,24 @@ public function testWithNoKey()
         $client->translate('foo');
     }
 
+    public function testTranslateModel()
+    {
+        $this->connection->listTranslations(Argument::that(function ($args) {
+            if (isset($args['model'])) return false;
+        }));
+
+        $this->client->setConnection($this->connection->reveal());
+
+        $this->client->translate('foo bar');
+
+        $this->connection->listTranslations(Argument::that(function ($args) {
+            if ($args['model'] !== 'base') return false;
+        }));
+
+        $this->client->setConnection($this->connection->reveal());
+        $this->client->translate('foo bar', ['model' => 'base']);
+    }
+
     public function testTranslate()
     {
         $expected = $this->getTranslateExpectedData('translate', 'translated', 'en');