feat!: [Datastore] Upgrade to V2

.gitignore

@@ -17,3 +17,6 @@ keys/
 .testing
 .split
 __pycache__
+
+# VS Code local workspace settings
+.vscode

Core/src/GrpcTrait.php

@@ -18,6 +18,7 @@
 namespace Google\Cloud\Core;
 
 use Google\Auth\GetUniverseDomainInterface;
+use Google\ApiCore\ArrayTrait;
 use Google\ApiCore\CredentialsWrapper;
 use Google\Cloud\Core\Exception\NotFoundException;
 use Google\Cloud\Core\Exception\ServiceException;

Core/src/Testing/DatastoreOperationRefreshTrait.php

@@ -17,9 +17,12 @@
 
 namespace Google\Cloud\Core\Testing;
 
-use Google\Cloud\Datastore\Connection\ConnectionInterface;
+use Google\ApiCore\Serializer;
+use Google\Cloud\Core\RequestHandler;
 use Google\Cloud\Datastore\EntityMapper;
 use Google\Cloud\Datastore\Operation;
+use Google\Cloud\Datastore\V1\Client\DatastoreClient;
+use Prophecy\Argument;
 
 /**
  * Refresh Datastore operation class
@@ -33,7 +36,7 @@ trait DatastoreOperationRefreshTrait
      * Refresh the operation property of a given stubbed class.
      *
      * @param mixed $stub
-     * @param ConnectionInterface $connection
+     * @param RequestHandler $requestHandler
      * @param array $options {
      *     Configuration Options
      *
@@ -43,7 +46,7 @@ trait DatastoreOperationRefreshTrait
      * }
      * @return mixed
      */
-    public function refreshOperation($stub, ConnectionInterface $connection, array $options = [])
+    public function refreshOperation($stub, RequestHandler $requestHandler, array $options = [])
     {
         $options += [
             'projectId' => null,
@@ -57,13 +60,97 @@ public function refreshOperation($stub, ConnectionInterface $connection, array $
             $options['returnInt64AsObject']
         );
 
+        $serializer = new Serializer([], [
+            'google.protobuf.Value' => function ($v) {
+                return $this->flattenValue($v);
+            },
+            'google.protobuf.Timestamp' => function ($v) {
+                return $this->formatTimestampFromApi($v);
+            }
+        ], [], [
+            'google.protobuf.Timestamp' => function ($v) {
+                if (is_string($v)) {
+                    $dt = new \DateTime($v);
+                    return ['seconds' => $dt->format('U')];
+                }
+                return $v;
+            }
+        ]);
+
         $stub->___setProperty('operation', new Operation(
-            $connection,
+            $requestHandler,
+            $serializer,
             $options['projectId'],
             $options['returnInt64AsObject'],
             $mapper
         ));
 
         return $stub;
     }
+
+    /**
+     * Helper method for Unit and Snippet test classes. This mocks the
+     * $requestHandler class property present in the Test Class with
+     * given arguments.
+     *
+     * @param string $methodName The method name to mock in RequestHandler::sendRequest
+     * @param array<string, mixed> $params The parameters to look for in the
+     * array equivalent of rpc request.
+     * @param mixed $returnValue The value to be returned by sendRequest mock.
+     * @param null|int $shouldBeCalledTimes Adds a shouldBeCalled prophecy. Defaults to `null`, implying nothing is added.
+     * [
+     *      `0` => `shouldBeCalled`,
+     *      Non zero positive integer $x => `shouldBeCalledTimes($x)`
+     * ]
+     */
+    private function mockSendRequest($methodName, $params, $returnValue, $shouldBeCalledTimes = null)
+    {
+        if (isset($this->serializer)) {
+            $serializer = $this->serializer;
+        } else {
+            $serializer = new Serializer([], [
+                'google.protobuf.Value' => function ($v) {
+                    return $this->flattenValue($v);
+                },
+                'google.protobuf.Timestamp' => function ($v) {
+                    return $this->formatTimestampFromApi($v);
+                }
+            ], [], [
+                'google.protobuf.Timestamp' => function ($v) {
+                    if (is_string($v)) {
+                        $dt = new \DateTime($v);
+                        return ['seconds' => $dt->format('U')];
+                    }
+                    return $v;
+                }
+            ]);
+        }
+
+        $prophecy = $this->requestHandler->sendRequest(
+            DatastoreClient::class,
+            $methodName,
+            Argument::that(function ($arg) use ($methodName, $params, $serializer) {
+                $requestName = ucfirst($methodName . 'Request');
+                $x = explode('\\', get_class($arg));
+                $argName = end($x);
+
+                if ($requestName != $argName) {
+                    return false;
+                }
+                $data = $serializer->encodeMessage($arg);
+                return array_replace_recursive($data, $params) == $data;
+            }),
+            Argument::cetera()
+        );
+
+        if (!is_null($shouldBeCalledTimes)) {
+            if ($shouldBeCalledTimes == 0) {
+                $prophecy->shouldBeCalled();
+            } else {
+                $prophecy->shouldBeCalledTimes($shouldBeCalledTimes);
+            }
+        }
+
+        $prophecy->willReturn($returnValue);
+    }
 }