Skip to content

Commit 5a89cd4

Browse files
committed
add typehints
1 parent d0d4bb9 commit 5a89cd4

13 files changed

Lines changed: 94 additions & 95 deletions

Spanner/src/ArrayType.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ class ArrayType
6969
/**
7070
* @var StructType|null
7171
*/
72-
private StringType|null $structType;
72+
private StructType|null $structType;
7373

7474
/**
7575
* @param int|string|null|StructType $type A value type code or nested struct

Spanner/src/Batch/BatchClient.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ public function __construct(Operation $operation, $databaseName, array $options
173173
* }
174174
* @return BatchSnapshot
175175
*/
176-
public function snapshot(array $options = [])
176+
public function snapshot(array $options = []): BatchSnapshot
177177
{
178178
$options += [
179179
'transactionOptions' => [],
@@ -219,7 +219,7 @@ public function snapshot(array $options = [])
219219
* @param string $identifier A stringified representation of {@see \Google\Cloud\Spanner\Batch\BatchSnapshot}.
220220
* @return BatchSnapshot
221221
*/
222-
public function snapshotFromString($identifier)
222+
public function snapshotFromString(string $identifier): BatchSnapshot
223223
{
224224
$data = json_decode(base64_decode($identifier), true);
225225
$missing = array_diff(
@@ -254,7 +254,7 @@ public function snapshotFromString($identifier)
254254
* @param string $partition Partition data
255255
* @return PartitionInterface
256256
*/
257-
public function partitionFromString($partition)
257+
public function partitionFromString(string $partition): PartitionInterface
258258
{
259259
$data = json_decode(base64_decode($partition), true);
260260
if (!isset($data[self::PARTITION_TYPE_KEY])) {

Spanner/src/Batch/BatchSnapshot.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ public function close(array $options = [])
131131
* }
132132
* @return ReadPartition[]
133133
*/
134-
public function partitionRead($table, KeySet $keySet, array $columns, array $options = [])
134+
public function partitionRead(string $table, KeySet $keySet, array $columns, array $options = []): array
135135
{
136136
return $this->operation->partitionRead(
137137
$this->session,
@@ -194,7 +194,7 @@ public function partitionRead($table, KeySet $keySet, array $columns, array $opt
194194
* }
195195
* @return QueryPartition[]
196196
*/
197-
public function partitionQuery($sql, array $options = [])
197+
public function partitionQuery(string $sql, array $options = []): array
198198
{
199199
return $this->operation->partitionQuery(
200200
$this->session,
@@ -222,7 +222,7 @@ public function partitionQuery($sql, array $options = [])
222222
* @return Result
223223
* @throws \BadMethodCallException If an invalid partition type is given.
224224
*/
225-
public function executePartition(PartitionInterface $partition, array $options = [])
225+
public function executePartition(PartitionInterface $partition, array $options = []): Result
226226
{
227227
if ($partition instanceof QueryPartition) {
228228
return $this->executeQuery($partition);
@@ -243,7 +243,7 @@ public function executePartition(PartitionInterface $partition, array $options =
243243
*
244244
* @return string
245245
*/
246-
public function serialize()
246+
public function serialize(): string
247247
{
248248
return base64_encode(json_encode([
249249
'sessionName' => $this->session->name(),
@@ -269,7 +269,7 @@ public function __toString()
269269
* @param QueryPartition $partition The partition.
270270
* @return Result
271271
*/
272-
private function executeQuery(QueryPartition $partition)
272+
private function executeQuery(QueryPartition $partition): Result
273273
{
274274
return $this->execute($partition->sql(), [
275275
'partitionToken' => $partition->token()
@@ -282,7 +282,7 @@ private function executeQuery(QueryPartition $partition)
282282
* @param ReadPartition $partition The partition.
283283
* @return Result
284284
*/
285-
private function executeRead(ReadPartition $partition)
285+
private function executeRead(ReadPartition $partition): Result
286286
{
287287
return $this->read($partition->table(), $partition->keySet(), $partition->columns(), [
288288
'partitionToken' => $partition->token()

Spanner/src/Batch/PartitionTrait.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ trait PartitionTrait
2525
/**
2626
* @var string
2727
*/
28-
private $token;
28+
private string $token;
2929

3030
/**
3131
* @var array
3232
*/
33-
private $options;
33+
private array $options;
3434

3535
/**
3636
* Returns the partition token.
@@ -42,7 +42,7 @@ trait PartitionTrait
4242
*
4343
* @return string
4444
*/
45-
public function token()
45+
public function token(): string
4646
{
4747
return $this->token;
4848
}
@@ -57,7 +57,7 @@ public function token()
5757
*
5858
* @return array
5959
*/
60-
public function options()
60+
public function options(): array
6161
{
6262
return $this->options;
6363
}

Spanner/src/Batch/QueryPartition.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ class QueryPartition implements PartitionInterface
6565
/**
6666
* @var string
6767
*/
68-
private $sql;
68+
private string $sql;
6969

7070
/**
7171
* @param string $token The token identifying the partition.
@@ -100,7 +100,7 @@ class QueryPartition implements PartitionInterface
100100
* array type, for instance `[Database::TYPE_ARRAY, Database::TYPE_INT64]`.
101101
* }
102102
*/
103-
public function __construct($token, $sql, $options)
103+
public function __construct(string $token, string $sql, array $options)
104104
{
105105
$this->token = $token;
106106
$this->sql = $sql;

Spanner/src/Batch/ReadPartition.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,17 +62,17 @@ class ReadPartition implements PartitionInterface
6262
/**
6363
* @var string
6464
*/
65-
private $table;
65+
private string $table;
6666

6767
/**
6868
* @var KeySet
6969
*/
70-
private $keySet;
70+
private KeySet $keySet;
7171

7272
/**
7373
* @var array
7474
*/
75-
private $columns;
75+
private array $columns;
7676

7777
/**
7878
* @param string $token The token identifying the partition.
@@ -95,8 +95,8 @@ class ReadPartition implements PartitionInterface
9595
* }
9696
*/
9797
public function __construct(
98-
$token,
99-
$table,
98+
string $token,
99+
string $table,
100100
KeySet $keySet,
101101
array $columns,
102102
array $options

Spanner/src/Database.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
use Google\Cloud\Spanner\Admin\Database\V1\CreateDatabaseRequest;
3636
use Google\Cloud\Spanner\Admin\Database\V1\Database as DatabaseProto;
3737
use Google\Cloud\Spanner\Admin\Database\V1\Database\State;
38-
use Google\Cloud\Spanner\Admin\Database\V1\DatabaseAdminClient;
3938
use Google\Cloud\Spanner\Admin\Database\V1\DatabaseDialect;
4039
use Google\Cloud\Spanner\Admin\Database\V1\DropDatabaseRequest;
4140
use Google\Cloud\Spanner\Admin\Database\V1\GetDatabaseDdlRequest;

0 commit comments

Comments
 (0)