feat!: Spanner V2

googleapis · Nov 12, 2024 · 1f6b5e4 · 1f6b5e4
1 parent ca2ba78
commit 1f6b5e4
Show file tree

Hide file tree

Showing 267 changed files with 8,122 additions and 13,038 deletions.
diff --git a/Core/src/ApiHelperTrait.php b/Core/src/ApiHelperTrait.php
@@ -261,8 +261,8 @@ private function splitOptionalArgs(array $input, array $extraAllowedKeys = []) :
         $callOptionFields = array_keys((new CallOptions([]))->toArray());
         $keys = array_merge($callOptionFields, $extraAllowedKeys);
 
-        $optionalArgs = $this->pluckArray($keys, $input);
+        $callOptions = $this->pluckArray($keys, $input);
 
-        return [$input, $optionalArgs];
+        return [$input, $callOptions];
     }
 }
diff --git a/Core/src/Iam/Iam.php b/Core/src/Iam/Iam.php
@@ -34,7 +34,7 @@
  *
  * use Google\Cloud\Spanner\SpannerClient;
  *
- * $spanner = new SpannerClient();
+ * $spanner = new SpannerClient(['projectId' => 'my-project']);
  * $instance = $spanner->instance('my-new-instance');
  *
  * $iam = $instance->iam();

diff --git a/Core/src/RequestHandler.php b/Core/src/RequestHandler.php
@@ -45,11 +45,11 @@ class RequestHandler
      */
     private Serializer $serializer;
 
-    private array $clients;
+    private array $clients = [];
 
     /**
      * @param Serializer $serializer
-     * @param array $clientClasses
+     * @param array<string|object> $clientClasses
      * @param array $clientConfig
      */
     public function __construct(
@@ -76,11 +76,14 @@ public function __construct(
             );
         }
         //@codeCoverageIgnoreEnd
-        
+
         // Initialize the client classes and store them in memory
-        $this->clients = [];
-        foreach ($clientClasses as $className) {
-            $this->clients[$className] = new $className($clientConfig);
+        foreach ($clientClasses as $client) {
+            if (is_object($client)) {
+                $this->clients[get_class($client)] = $client;
+            } else {
+                $this->clients[$client] = new $client($clientConfig);
+            }
         }
     }
 
@@ -135,7 +138,7 @@ public function sendRequest(
      * @param $clientClass The client class whose object we need.
      * @return mixed
      */
-    private function getClientObject(string $clientClass)
+    public function getClientObject(string $clientClass)
     {
         return $this->clients[$clientClass] ?? null;
     }

diff --git a/Core/src/RequestProcessorTrait.php b/Core/src/RequestProcessorTrait.php
@@ -25,6 +25,7 @@
 use \Google\Protobuf\Internal\Message;
 use Google\Rpc\RetryInfo;
 use Google\Rpc\BadRequest;
+use GuzzleHttp\Promise\PromiseInterface;
 
 /**
  * @internal
@@ -45,7 +46,7 @@ trait RequestProcessorTrait
      * Serializes a gRPC response.
      *
      * @param mixed $response
-     * @return \Generator|OperationResponse|array|null
+     * @return \Generator|OperationResponse|array|PromiseInterface|null
      */
     private function handleResponse($response)
     {
@@ -57,7 +58,7 @@ private function handleResponse($response)
             return $this->serializer->encodeMessage($response);
         }
 
-        if ($response instanceof OperationResponse) {
+        if ($response instanceof OperationResponse || $response instanceof PromiseInterface) {
             return $response;
         }
 

diff --git a/Core/src/ServiceBuilder.php b/Core/src/ServiceBuilder.php
@@ -249,7 +249,7 @@ public function pubsub(array $config = [])
      *
      * Example:
      * ```
-     * $spanner = $cloud->spanner();
+     * $spanner = $cloud->spanner(['projectId' => 'my-project']);
      * ```
      *
      * @param array $config [optional] {

diff --git a/Core/tests/Snippet/Iam/IamManagerTest.php b/Core/tests/Snippet/Iam/IamManagerTest.php
@@ -36,7 +36,7 @@ class IamManagerTest extends SnippetTestCase
     private $policyData;
     private $resource;
 
-    private $requestHandler;
+    private $spannerClient;
     private $serializer;
     private $iam;
 

diff --git a/Core/tests/Snippet/Iam/IamTest.php b/Core/tests/Snippet/Iam/IamTest.php
@@ -19,6 +19,7 @@
 
 use Google\Cloud\Core\Testing\Snippet\SnippetTestCase;
 use Google\Cloud\Core\Iam\Iam;
+use Google\Cloud\Core\Iam\IamManager;
 use Google\Cloud\Core\Iam\IamConnectionInterface;
 use Google\Cloud\Core\Testing\TestHelpers;
 use Google\Cloud\Spanner\SpannerClient;
@@ -55,7 +56,7 @@ public function testClass()
         ]);
         $res = $snippet->invoke('iam');
 
-        $this->assertInstanceOf(Iam::class, $res->returnVal());
+        $this->assertInstanceOf(IamManager::class, $res->returnVal());
     }
 
     public function testPolicy()