Skip to content

Commit dd1e1ad

Browse files
committed
Merge branch 'spanner-v2-refactor' of github.com:googleapis/google-cloud-php into spanner-v2-refactor
2 parents 7a84853 + 234bdec commit dd1e1ad

File tree

2 files changed

+16
-6
lines changed

2 files changed

+16
-6
lines changed

Spanner/src/Operation.php

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -877,7 +877,8 @@ public function partitionRead(
877877
* @see https://cloud.google.com/spanner/reference/rpc/google.spanner.v1#google.spanner.v1.BeginTransactionRequest BeginTransactionRequest
878878
*
879879
* @param Session $session The session to start the snapshot in.
880-
* @param array $options [optional] Configuration options.
880+
* @param BeginTransactionRequest $beginTransaction
881+
* @param array $callOptions
881882
*
882883
* @return array
883884
*/
@@ -1083,7 +1084,9 @@ private function formatTransactionOptions(array $transactionOptions): array
10831084
}
10841085

10851086
/**
1086-
* @param array $args
1087+
* @param string $databaseName
1088+
* @param ExecuteSqlRequest $executeSqlRequest
1089+
* @param array $callOptions
10871090
* @return \Generator
10881091
*/
10891092
private function executeStreamingSql(string $databaseName, ExecuteSqlRequest $executeSqlRequest, array $callOptions): \Generator
@@ -1100,7 +1103,9 @@ private function executeStreamingSql(string $databaseName, ExecuteSqlRequest $ex
11001103
}
11011104

11021105
/**
1103-
* @param array $args
1106+
* @param string $databaseName
1107+
* @param ReadRequest $readRequest
1108+
* @param array $callOptions
11041109
* @return \Generator
11051110
*/
11061111
private function streamingRead(string $databaseName, ReadRequest $readRequest, array $callOptions): \Generator

Spanner/src/TransactionConfigurationTrait.php

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,10 @@ private function transactionOptions(array &$options, ?PBReadOnly $transactionLev
102102
$transactionOptions = $id;
103103
} elseif ($context === SessionPoolInterface::CONTEXT_READ) {
104104
$options += ['singleUse' => null];
105-
$transactionOptions = $this->configureReadOnlyTransactionOptions($options, $transactionLevelReadOnlyOptions);
105+
$transactionOptions = $this->configureReadOnlyTransactionOptions(
106+
$options,
107+
$transactionLevelReadOnlyOptions
108+
);
106109
} elseif ($context === SessionPoolInterface::CONTEXT_READWRITE) {
107110
$transactionOptions = $this->configureReadWriteTransactionOptions(
108111
// TODO: Find out when $begin is a bool and fix it
@@ -189,8 +192,10 @@ private function configureReadWriteTransactionOptions(array|TransactionOptions $
189192
* @param PBReadOnly $transactionLevelReadOnlyOptions Previously given call options (for single-use snapshots).
190193
* @return array
191194
*/
192-
private function configureReadOnlyTransactionOptions(array $options, ?PBReadOnly $transactionLevelReadOnlyOptions = null): array
193-
{
195+
private function configureReadOnlyTransactionOptions(
196+
array $options,
197+
?PBReadOnly $transactionLevelReadOnlyOptions = null
198+
): array {
194199
// select only the PBReadOnly fields from $options
195200
$readOnly = array_intersect_key($options, array_flip([
196201
'minReadTimestamp',

0 commit comments

Comments
 (0)