Merge branch 'master' into use-multiphp-container

Author: bshaffer

.github/workflows/lint.yml

@@ -0,0 +1,26 @@
+name: Lint
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+
+jobs:
+  staticanalysis:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Install PHP
+      uses: shivammathur/setup-php@v2
+      with:
+        php-version: '8.0'
+
+    - name: Run Script
+      run: |
+        composer global require phpstan/phpstan
+        for dir in $(find * -type d -name src -not -path 'appengine/*' -not -path '*/vendor/*' -exec dirname {} \;);
+        do
+          composer install --working-dir=$dir --ignore-platform-reqs
+          echo " autoload.php
+          ~/.composer/vendor/bin/phpstan analyse $dir/src --autoload-file=autoload.php
+        done

asset/src/list_assets.php

@@ -25,7 +25,7 @@
  * @param string|array $assetTypes (Optional) Asset types to list for.
  * @param int          $pageSize   (Optional) Size of one result page.
  */
-function list_assets(string $projectId, array $assetTypes = [], int $pageSize)
+function list_assets(string $projectId, array $assetTypes = [], int $pageSize = null)
 {
     // Instantiate a client.
     $client = new AssetServiceClient();

bigtable/src/create_production_instance.php

@@ -30,6 +30,7 @@
 use Google\Cloud\Bigtable\Admin\V2\Instance;
 use Google\Cloud\Bigtable\Admin\V2\Cluster;
 use Google\ApiCore\ApiException;
+use Exception;
 
 /**
  * Create a production Bigtable instance

cloud_sql/mysql/pdo/src/DBInitializer.php

@@ -22,6 +22,7 @@
 use PDO;
 use PDOException;
 use RuntimeException;
+use TypeError;
 
 class DBInitializer
 {

cloud_sql/postgres/pdo/src/DBInitializer.php

@@ -22,6 +22,7 @@
 use PDO;
 use PDOException;
 use RuntimeException;
+use TypeError;
 
 class DBInitializer
 {

cloud_sql/sqlserver/pdo/src/DBInitializer.php

@@ -22,6 +22,7 @@
 use PDO;
 use PDOException;
 use RuntimeException;
+use TypeError;
 
 class DBInitializer
 {

datastore/api/src/functions/concepts.php

@@ -803,7 +803,7 @@ function transactional_retry(
     for ($i = 0; $i < $retries; $i++) {
         try {
             transfer_funds($datastore, $fromKey, $toKey, 10);
-        } catch (Google\Cloud\Exception\ConflictException $e) {
+        } catch (\Google\Cloud\Core\Exception\ConflictException $e) {
             // if $i >= $retries, the failure is final
             continue;
         }

iap/src/make_iap_request.php

@@ -33,8 +33,6 @@
  *
  * @param string $url The Identity-Aware Proxy-protected URL to fetch.
  * @param string $clientId The client ID used by Identity-Aware Proxy.
- *
- * @return The response body.
  */
 function make_iap_request($url, $clientId)
 {

logging/src/log_entry_functions.php

@@ -17,7 +17,6 @@
 
 namespace Google\Cloud\Samples\Logging;
 
-use Google\Cloud\Core\Iterator\ItemIterator;
 // [START logging_write_log_entry]
 // [START logging_list_log_entries]
 // [START logging_delete_log]
@@ -52,11 +51,11 @@ function write_log($projectId, $loggerName, $message)
 // [END logging_write_log_entry]
 
 // [START logging_list_log_entries]
-/** Return an iterator for listing log entries.
+/**
+ * Print the timestamp and entry for the project and logger.
  *
  * @param string $projectId The Google project ID.
  * @param string $loggerName The name of the logger.
- * @return ItemIterator
  */
 function list_entries($projectId, $loggerName)
 {

logging/src/sink_functions.php

@@ -17,7 +17,6 @@
 
 namespace Google\Cloud\Samples\Logging;
 
-use Google\Cloud\Core\Iterator\ItemIterator;
 // [START logging_use]
 use Google\Cloud\Logging\LoggingClient;
 
@@ -62,7 +61,6 @@ function delete_sink($projectId, $sinkName)
  * List log sinks.
  *
  * @param string $projectId
- * @return ItemIterator
  */
 function list_sinks($projectId)
 {

monitoring/src/update_uptime_check.php

@@ -39,7 +39,7 @@ function update_uptime_checks($projectId, $configName, $newDisplayName = null, $
         'projectId' => $projectId,
     ]);
 
-    $uptimeCheck = $uptimeCheckClient->getUptimeCheckConfig($displayName);
+    $uptimeCheck = $uptimeCheckClient->getUptimeCheckConfig($configName);
     $fieldMask = new FieldMask();
     if ($newDisplayName) {
         $fieldMask->getPaths()[] = 'display_name';