misc cleanup for readability

Author: bshaffer

spanner/composer.json

@@ -1,7 +1,6 @@
 {
     "require": {
-        "google/cloud-spanner": "1.200",
-        "google/gax": "dev-result-function as 1.40.0"
+        "google/cloud-spanner": "1.200"
     },
     "autoload": {
         "psr-4": {

spanner/src/create_database_with_proto_columns.php

@@ -43,14 +43,17 @@ function create_database_with_proto_columns(
     string $instanceId,
     string $databaseId
 ): void {
+    // The result of running `protoc` with `--descriptor_set_out` on your proto file(s)
+    $fileDescriptorSet = file_get_contents('data/user.pb');
+
     $databaseAdminClient = new DatabaseAdminClient();
     $instance = $databaseAdminClient->instanceName($projectId, $instanceId);
 
     $operation = $databaseAdminClient->createDatabase(
         new CreateDatabaseRequest([
             'parent' => $instance,
             'create_statement' => sprintf('CREATE DATABASE `%s`', $databaseId),
-            'proto_descriptors' => file_get_contents('data/user.pb'),
+            'proto_descriptors' => $fileDescriptorSet,
             'extra_statements' => [
                 'CREATE PROTO BUNDLE (' .
                     'testing.data.User,' .
@@ -69,8 +72,7 @@ function create_database_with_proto_columns(
     print('Waiting for operation to complete...' . PHP_EOL);
     $operation->pollUntilComplete();
 
-    printf('Created database %s on instance %s' . PHP_EOL,
-        $databaseId, $instanceId);
+    printf('Created database %s on instance %s' . PHP_EOL, $databaseId, $instanceId);
 }
 // [END spanner_create_database_with_proto_columns]
 

spanner/src/insert_data_with_proto_columns.php

@@ -49,14 +49,14 @@ function insert_data_with_proto_columns(
     int $userId = 1,
 ): void {
     $spanner = new SpannerClient();
-    $instance = $spanner->instance($instanceId);
-    $database = $instance->database($databaseId);
-    $user = new User();
-    $user->setName('Test User ' . $userId);
-    $address = new User\Address();
-    $address->setCity('San Francisco');
-    $address->setState('CA');
-    $user->setAddress($address);
+    $database = $spanner->instance($instanceId)->database($databaseId);
+
+    $address = (new User\Address())
+        ->setCity('San Francisco')
+        ->setState('CA');
+    $user = (new User())
+        ->setName('Test User ' . $userId)
+        ->setAddress($address);
 
     $book1 = new Book(['title' => 'Book 1', 'author' => 'Author 1']);
     $book2 = new Book(['title' => 'Book 2', 'author' => 'Author 2']);

spanner/src/query_data_with_proto_columns.php

@@ -44,11 +44,10 @@ function query_data_with_proto_columns(
     string $databaseId,
     int $userId = 1
 ): void {
+    // [START spanner_query_data_with_proto_columns]
     $spanner = new SpannerClient();
-    $instance = $spanner->instance($instanceId);
-    $database = $instance->database($databaseId);
+    $database = $spanner->instance($instanceId)->database($databaseId);
 
-    // [START spanner_query_data_with_proto_columns]
     $userProto = (new User())
         ->setName('Test User ' . $userId);
 
@@ -71,7 +70,7 @@ function query_data_with_proto_columns(
         /** @var Proto<Book> $book */
         foreach ($row['Books'] ?? [] as $book) {
             // Print the raw row value
-            printf('Book: %s' . PHP_EOL, $book->getValue());
+            printf('Book: %s (%s)' . PHP_EOL, $book->getValue(), $book->getProtoTypeFqn());
         }
     }
     // [END spanner_query_data_with_proto_columns]