consistency with constructor options

Author: bshaffer

Spanner/src/Backup.php

@@ -55,6 +55,8 @@ class Backup
     const STATE_READY = State::READY;
     const STATE_CREATING = State::CREATING;
 
+    private array $info;
+
     /**
      * Create an object representing a Backup.
      *
@@ -66,17 +68,22 @@ class Backup
      * @param Instance $instance The instance in which the backup exists.
      * @param string $projectId The project ID.
      * @param string $name The backup name or ID.
-     * @param array $info [optional] An array representing the backup resource.
+     * @param array $options [Optional] {
+     *     Backup options.
+
+     *     @type array $backup The backup info.
+     * }
      */
     public function __construct(
         private DatabaseAdminClient $databaseAdminClient,
         private Serializer $serializer,
         private Instance $instance,
         private string $projectId,
         private string $name,
-        private array $info = []
+        array $options = []
     ) {
         $this->name = $this->fullyQualifiedBackupName($name);
+        $this->info = $options['info'] ?? [];
         $this->optionsValidator = new OptionsValidator($serializer);
     }
 

Spanner/src/Instance.php

@@ -67,6 +67,7 @@ class Instance
     private bool $routeToLeader;
     private string $projectName;
     private bool $returnInt64AsObject;
+    private array $info;
 
     /**
      * Create an object representing a Cloud Spanner instance.
@@ -91,8 +92,8 @@ class Instance
      *     @type bool $returnInt64AsObject If true, 64 bit integers will be
      *           returned as a {@see \Google\Cloud\Core\Int64} object for 32 bit platform
      *           compatibility. **Defaults to** false.
+     *     @type array $instance An array representation of the instance object.
      * }
-     * @param array $info A representation of the instance object.
      */
     public function __construct(
         private GapicSpannerClient $spannerClient,
@@ -102,13 +103,13 @@ public function __construct(
         private string $projectId,
         private string $name,
         array $options = [],
-        private array $info = [],
     ) {
         $this->name = $this->fullyQualifiedInstanceName($name, $projectId);
         $this->directedReadOptions = $options['directedReadOptions'] ?? [];
         $this->routeToLeader = $options['routeToLeader'] ?? true;
         $this->defaultQueryOptions = $options['defaultQueryOptions'] ?? [];
         $this->returnInt64AsObject = $options['returnInt64AsObject'] ?? false;
+        $this->info = $options['instance'] ?? [];
         $this->projectName = InstanceAdminClient::projectName($projectId);
         $this->optionsValidator = new OptionsValidator($serializer);
     }
@@ -582,7 +583,7 @@ public function backup(string $name, array $backup = []): Backup
             $this,
             $this->projectId,
             $name,
-            $backup
+            ['backup' => $backup]
         );
     }
 
@@ -892,8 +893,8 @@ private function instanceResultFunction(): Closure
                     'routeToLeader' => $this->routeToLeader,
                     'defaultQueryOptions' => $this->defaultQueryOptions,
                     'returnInt64AsObject' => $this->returnInt64AsObject,
+                    'instance' => $result,
                 ],
-                $result,
             );
         };
     }

Spanner/src/InstanceConfiguration.php

@@ -54,6 +54,8 @@ class InstanceConfiguration
 {
     use RequestTrait;
 
+    private array $info;
+
     /**
      * Create an instance configuration object.
      *
@@ -63,17 +65,21 @@ class InstanceConfiguration
      * @param Serializer $serializer The serializer instance to encode/decode messages.
      * @param string $projectId The current project ID.
      * @param string $name The configuration name or ID.
-     * @param array $info [optional] A service representation of the
-     *        configuration.
+     * @param array $options [Optional] {
+     *     Instance Configuration options.
+
+     *     @type array $instanceConfig The instance configuration info.
+     * }
      */
     public function __construct(
         private InstanceAdminClient $instanceAdminClient,
         private Serializer $serializer,
         private string $projectId,
         private string $name,
-        private array $info = []
+        private array $options = [],
     ) {
         $this->name = $this->fullyQualifiedConfigName($name, $projectId);
+        $this->info = $options['instanceConfig'] ?? [];
         $this->optionsValidator = new OptionsValidator($serializer);
     }
 
@@ -411,7 +417,7 @@ private function instanceConfigResultFunction(): Closure
                 $this->serializer,
                 $this->projectId,
                 $name['instance_config'],
-                $result
+                ['instanceConfig' => $result],
             );
         };
     }

Spanner/src/SpannerClient.php

@@ -443,7 +443,7 @@ public function instanceConfiguration($name, array $info = []): InstanceConfigur
             $this->serializer,
             $this->projectId,
             $name,
-            $info
+            ['instanceConfig' => $info]
         );
     }
 
@@ -561,8 +561,8 @@ public function instance(string $name, array $instance = []): Instance
                 'routeToLeader' => $this->routeToLeader,
                 'defaultQueryOptions' => $this->defaultQueryOptions,
                 'returnInt64AsObject' => $this->returnInt64AsObject,
+                'instance' => $instance,
             ],
-            $instance,
         );
     }
 

Spanner/tests/Snippet/InstanceConfigurationTest.php

@@ -62,7 +62,6 @@ public function setUp(): void
             $this->serializer,
             self::PROJECT,
             self::CONFIG,
-            [],
         );
     }
 
@@ -95,7 +94,6 @@ public function testCreate()
             $this->serializer,
             self::PROJECT,
             self::CONFIG,
-            []
         );
         $snippet->addLocal('baseConfig', $baseConfig);
         $snippet->addLocal('options', []);

Spanner/tests/Unit/BackupTest.php

@@ -258,7 +258,7 @@ public function testReload()
             $this->instance->reveal(),
             self::PROJECT_ID,
             self::BACKUP,
-            ['name' => 'different-name']
+            ['backup' => ['name' => 'different-name']]
         );
 
         $info = $backup->reload();

Spanner/tests/Unit/InstanceConfigurationTest.php

@@ -90,7 +90,7 @@ public function testInfo()
             $this->serializer,
             self::PROJECT_ID,
             self::NAME,
-            $info
+            ['instanceConfig' => $info],
         );
 
         $this->assertEquals($info, $instanceConfig->info());
@@ -173,7 +173,7 @@ public function testReload()
             $this->serializer,
             self::PROJECT_ID,
             self::NAME,
-            $expected1
+            ['instanceConfig' => $expected1],
         );
 
         $info1 = $instanceConfig->info();