Merge pull request #173 from SimoTod/feature/emulator-mode

Feature - emulator mode

Author: tomwalder

.travis.yml

@@ -14,7 +14,7 @@ before_script:
 
 script:
   - mkdir -p build/logs
-  - php vendor/bin/phpunit 
+  - php vendor/bin/phpunit
 
 after_script:
   - php vendor/bin/coveralls -v

src/GDS/Gateway/RESTv1.php

@@ -92,15 +92,18 @@ protected function httpClient()
      */
     protected function initHttpClient()
     {
-
         // Middleware
         $obj_stack = HandlerStack::create();
-        $obj_stack->push(ApplicationDefaultCredentials::getMiddleware(['https://www.googleapis.com/auth/datastore']));
 
         $str_base_url = self::DEFAULT_BASE_URL;
 
-        if (getenv("DATASTORE_EMULATOR_HOST") !== FALSE) {
-            $str_base_url = getenv("DATASTORE_EMULATOR_HOST");
+        $str_emulator_url = getenv("DATASTORE_EMULATOR_HOST");
+        if (false !== $str_emulator_url) {
+            $str_base_url = $str_emulator_url;
+        } else {
+            $obj_stack->push(
+                ApplicationDefaultCredentials::getMiddleware(['https://www.googleapis.com/auth/datastore'])
+            );
         }
 
         // Create the HTTP client
@@ -508,4 +511,4 @@ private function actionUrl($str_action)
         return $this->getBaseUrl() . '/v1/projects/' . $this->str_dataset_id . ':' . $str_action;
     }
 
-}
+}