feat: Datastore V2 (#8609)

Author: Hectorhammett

Core/src/ApiHelperTrait.php

@@ -243,6 +243,9 @@ protected function constructGapic($gapicName, array $config)
      */
     private function convertDataToProtos(array $input, array $map): array
     {
+        if (!isset($this->serializer)) {
+            throw new \LogicException('Serializer must be set to use this function');
+        }
         foreach ($map as $key => $className) {
             if (isset($input[$key])) {
                 $input[$key] = $this->serializer->decodeMessage(new $className(), $input[$key]);

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.66",
         "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/owlbot.py

@@ -1,4 +1,4 @@
-# Copyright 2018 Google LLC
+# Copyright 2024 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -30,65 +30,27 @@
 # Added so that we can pass copy_excludes in the owlbot_main() call
 _tracked_paths.add(src)
 
-php.owlbot_main(
-    src=src,
-    dest=dest,
-    copy_excludes=[
-        src / "*/proto/src/Google/Cloud/Datastore/V1/TransactionOptions/ReadOnly.php"
-    ]
-)
+php.owlbot_main(src=src, dest=dest)
 
-
-# Fix class references in gapic samples
-for version in ['V1']:
-    pathExpr = 'src/' + version + '/Gapic/DatastoreGapicClient.php'
-
-    types = {
-        '= new DatastoreClient': r'= new Google\\Cloud\\Datastore\\' + version + r'\\DatastoreClient',
-        '= Mode::': r'= Google\\Cloud\\Datastore\\' + version + r'\\CommitRequest\\Mode::',
-        'new PartitionId': r'new Google\\Cloud\\Datastore\\' + version + r'\\PartitionId',
-    }
-
-    for search, replace in types.items():
-        s.replace(
-            pathExpr,
-            search,
-            replace)
-
-# remove ReadOnly class_alias code
+# remove class_alias code
 s.replace(
-    "src/V*/**/PBReadOnly.php",
-    r"^// Adding a class alias for backwards compatibility with the \"readonly\" keyword.$"
+    "src/V*/**/*.php",
+    r"^// Adding a class alias for backwards compatibility with the previous class name.$"
     + "\n"
-    + r"^class_alias\(PBReadOnly::class, __NAMESPACE__ . '\\ReadOnly'\);$"
+    + r"^class_alias\(.*\);$"
     + "\n",
     '')
 
-### [START] protoc backwards compatibility fixes
-
-# roll back to private properties.
-s.replace(
-    "src/**/V*/**/*.php",
-    r"Generated from protobuf field ([^\n]{0,})\n\s{5}\*/\n\s{4}protected \$",
-    r"""Generated from protobuf field \1
-     */
-    private $""")
-
-# Replace "Unwrapped" with "Value" for method names.
-s.replace(
-    "src/**/V*/**/*.php",
-    r"public function ([s|g]\w{3,})Unwrapped",
-    r"public function \1Value"
-)
-
-### [END] protoc backwards compatibility fixes
-
-# fix relative cloud.google.com links
-s.replace(
-    "src/**/V*/**/*.php",
-    r"(.{0,})\]\((/.{0,})\)",
-    r"\1](https://cloud.google.com\2)"
-)
-
-# Address breaking changes
-subprocess.run('git show 8ada2c97c72ffabf5c3031021378874f8caa8804 | git apply', shell=True)
+# format generated clients
+subprocess.run([
+    'npm',
+    'exec',
+    '--yes',
+    '--package=@prettier/plugin-php@^0.19',
+    '--',
+    'prettier',
+    '**/Client/*',
+    '--write',
+    '--parser=php',
+    '--single-quote',
+    '--print-width=120'])

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>