feat: Update Datastore to V2

Core/src/ApiHelperTrait.php

@@ -293,7 +293,12 @@ private function validateOptions(array $options, array|Message|string ...$option
                 );
                 $messageOptions = $this->pluckArray($messageKeys, $options);
                 if ($optionType instanceof Message) {
-                    $optionType->mergeFromJsonString(json_encode($messageOptions, JSON_FORCE_OBJECT));
+                    if (!empty($this->serializer)) {
+                        $optionType = $this->serializer->decodeMessage($optionType, $messageOptions);
+                    } else {
+                        $optionType->mergeFromJsonString(json_encode($messageOptions, JSON_FORCE_OBJECT));
+                    }
+
                     $validatedOptionGroup = $optionType;
                 } else {
                     $validatedOptionGroup = $messageOptions;

Core/tests/Snippet/ServiceBuilderTest.php

@@ -51,7 +51,6 @@ public function serviceBuilderMethods()
     {
         return [
             ['bigQuery', BigQueryClient::class, 'bigQuery'],
-            ['datastore', DatastoreClient::class, 'datastore'],
             ['firestore', FirestoreClient::class, 'firestore', true],
             ['logging', LoggingClient::class, 'logging'],
             ['language', LanguageClient::class, 'language'],

Core/tests/Unit/ServiceBuilderTest.php

@@ -20,7 +20,6 @@
 use Google\Cloud\Core\ServiceBuilder;
 use Google\Cloud\Core\Testing\CheckForClassTrait;
 use Google\Cloud\Core\Testing\GrpcTestTrait;
-use Google\Cloud\Datastore\DatastoreClient;
 use Google\Cloud\Firestore\FirestoreClient;
 use Google\Cloud\Language\LanguageClient;
 use Google\Cloud\Logging\LoggingClient;
@@ -147,10 +146,7 @@ public function serviceProvider()
             [
                 'bigQuery',
                 BigQueryClient::class
-            ], [
-                'datastore',
-                DatastoreClient::class
-            ], [
+            ],[
                 'firestore',
                 FirestoreClient::class,
                 [],

Datastore/composer.json

@@ -5,7 +5,7 @@
     "minimum-stability": "stable",
     "require": {
         "php": "^8.1",
-        "google/cloud-core": "^1.63.0",
+        "google/cloud-core": "^1.65",
         "google/gax": "^1.38.0"
     },
     "require-dev": {
@@ -14,7 +14,8 @@
         "squizlabs/php_codesniffer": "2.*",
         "phpdocumentor/reflection": "^5.3.3||^6.0",
         "phpdocumentor/reflection-docblock": "^5.3",
-        "erusev/parsedown": "^1.6"
+        "erusev/parsedown": "^1.6",
+        "dg/bypass-finals": "^1.9"
     },
     "extra": {
         "component": {

Datastore/phpunit.xml.dist

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" colors="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="tests/Unit/bootstrap.php" colors="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
   <coverage>
     <include>
       <directory suffix=".php">src</directory>