Skip to content

Commit e3b168e

Browse files
committed
revert composer change, fix styles
1 parent df3ffb6 commit e3b168e

5 files changed

Lines changed: 11 additions & 25 deletions

File tree

Spanner/composer.json

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -63,17 +63,5 @@
6363
"@test-snippets",
6464
"@test-system"
6565
]
66-
},
67-
"repositories": {
68-
"local": {
69-
"type": "path",
70-
"url": "../Core",
71-
"options": {
72-
"versions": {
73-
"google/cloud-core": "1.100"
74-
}
75-
},
76-
"canonical": false
77-
}
7866
}
7967
}

Spanner/tests/System/BatchTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public static function setUpTestFixtures(): void
5757
self::$tableName
5858
))->pollUntilComplete();
5959

60-
if (self::$database->info()['databaseDialect'] == DatabaseDialect::POSTGRESQL) {
60+
if (self::$database->info()['databaseDialect'] == DatabaseDialect::GOOGLE_STANDARD_SQL) {
6161
$statements = [
6262
sprintf('CREATE ROLE %s', self::$dbRole),
6363
sprintf('CREATE ROLE %s', self::$restrictiveDbRole),

Spanner/tests/System/pcntl/AbortedErrorCausesRetry.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public function __construct(
1818
private int $id,
1919
private int $delay,
2020
) {
21-
self::$dbName = $dbName;
21+
self::$dbName = $dbName;
2222
}
2323

2424
public function run(): int
@@ -62,11 +62,10 @@ public function run(): int
6262
$t->update($this->tableName, $row);
6363
$t->commit();
6464
});
65-
}
65+
}
6666

6767
return 0;
6868
}
6969
};
7070

7171
exit($abortedErrorRetry->run());
72-

Spanner/tests/System/pcntl/ConcurrentTransactionsIncrementValueWithExecute.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ public function run(): int
4646
$transaction->commit();
4747
});
4848

49-
updateIterationTracker($this->tmpFile, $iterations);
49+
updateIterationTracker($this->tmpFile, $iterations);
5050

51-
return 0;
51+
return 0;
5252
}
5353
};
5454

@@ -71,4 +71,3 @@ public function run(): int
7171

7272
exit($concurrentExecute->run());
7373
}
74-

Spanner/tests/System/pcntl/ConcurrentTransactionsIncrementValueWithRead.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919

2020
public function __construct(
2121
string $dbName,
22-
private KeySet $keyset,
23-
private array $columns,
24-
private string $tableName,
25-
private string $tmpFile
22+
private KeySet $keyset,
23+
private array $columns,
24+
private string $tableName,
25+
private string $tmpFile
2626
) {
2727
self::$dbName = $dbName;
2828
}
@@ -46,9 +46,9 @@ public function run(): int
4646
$transaction->commit();
4747
});
4848

49-
updateIterationTracker($this->tmpFile, $iterations);
49+
updateIterationTracker($this->tmpFile, $iterations);
5050

51-
return 0;
51+
return 0;
5252
}
5353
};
5454

0 commit comments

Comments
 (0)