feat: fix emulator config for datastore, firestore, and pubsub (#5250)

* feat: fix emulator config for datastore, firestore, and pubsub * revert datastore so tests dont fail
googleapis · May 3, 2022 · 6c7650c · 6c7650c
1 parent 9548180
commit 6c7650c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/Firestore/src/Connection/Grpc.php b/Firestore/src/Connection/Grpc.php
@@ -101,7 +101,10 @@ public function __construct(array $config = [])
         $config += ['emulatorHost' => null];
         if ((bool) $config['emulatorHost']) {
             $this->isUsingEmulator = true;
-            $grpcConfig += $this->emulatorGapicConfig($config['emulatorHost']);
+            $grpcConfig = array_merge(
+                $grpcConfig,
+                $this->emulatorGapicConfig($config['emulatorHost'])
+            );
         }
         //@codeCoverageIgnoreEnd
 

diff --git a/PubSub/src/Connection/Grpc.php b/PubSub/src/Connection/Grpc.php
@@ -115,7 +115,10 @@ public function __construct(array $config = [])
         }
 
         if ((bool) $config['emulatorHost']) {
-            $grpcConfig += $this->emulatorGapicConfig($config['emulatorHost']);
+            $grpcConfig = array_merge(
+                $grpcConfig,
+                $this->emulatorGapicConfig($config['emulatorHost'])
+            );
         }
         //@codeCoverageIgnoreEnd