chore: fix language PHPStan errors and address review feedback

cloud_sql/sqlserver/pdo/Dockerfile

@@ -6,19 +6,21 @@ WORKDIR /var/www/html
 COPY . .
 
 RUN apt-get update && \
-    apt-get -y install gnupg2 curl ca-certificates && \
+    apt-get -y install --no-install-recommends gnupg2 curl ca-certificates && \
     curl -fsSL https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor -o /usr/share/keyrings/microsoft-prod.gpg && \
-    curl -fsSL https://packages.microsoft.com/config/debian/12/prod.list > /etc/apt/sources.list.d/mssql-release.list
+    curl -fsSL https://packages.microsoft.com/config/debian/12/prod.list > /etc/apt/sources.list.d/mssql-release.list && \
+    rm -rf /var/lib/apt/lists/*
 
 RUN apt-get update && \
-    ACCEPT_EULA=Y apt-get -y install \
+    ACCEPT_EULA=Y apt-get -y install --no-install-recommends \
         autoconf \
         build-essential \
         msodbcsql18 \
         unixodbc-dev \
-        unzip
+        unzip && \
+    rm -rf /var/lib/apt/lists/*
 
 RUN pecl install pdo_sqlsrv && \
     docker-php-ext-enable pdo_sqlsrv
 RUN sed -i 's/80/8080/g' /etc/apache2/sites-available/000-default.conf /etc/apache2/ports.conf
-RUN composer update
+RUN composer install --no-dev --no-interaction --optimize-autoloader

dialogflow/src/detect_intent_stream.php

@@ -89,7 +89,9 @@ function detect_intent_stream($projectId, $path, $sessionId, $languageCode = 'en
             $transcript = $recognitionResult->getTranscript();
             printf('Intermediate transcript: %s' . PHP_EOL, $transcript);
         }
-        $queryResult = $response->getQueryResult() ?: $queryResult;
+        if ($response->hasQueryResult()) {
+            $queryResult = $response->getQueryResult();
+        }
     }
 
     // get final response and relevant info

endpoints/getting-started/Dockerfile.custom

@@ -7,6 +7,7 @@ COPY --from=composer:latest-bin /composer /usr/local/bin/composer
 WORKDIR /var/www/html
 COPY . .
 
-RUN apt-get update && apt-get -y install unzip && \
-    composer install --no-dev && \
+RUN apt-get update && apt-get -y install --no-install-recommends unzip && \
+    rm -rf /var/lib/apt/lists/* && \
+    composer install --no-dev --no-interaction --optimize-autoloader && \
     sed -i 's/80/8080/g' /etc/apache2/sites-available/000-default.conf /etc/apache2/ports.conf

language/src/analyze_all.php

@@ -63,11 +63,13 @@ function analyze_all(string $text): void
         printf('Name: %s' . PHP_EOL, $entity->getName());
         printf('Type: %s' . PHP_EOL, EntityType::name($entity->getType()));
         printf('Salience: %s' . PHP_EOL, $entity->getSalience());
-        if ($entity->getMetadata()->offsetExists('wikipedia_url')) {
-            printf('Wikipedia URL: %s' . PHP_EOL, $entity->getMetadata()->offsetGet('wikipedia_url'));
+        /** @var array<string, string> $metadata */
+        $metadata = $entity->getMetadata();
+        if (isset($metadata['wikipedia_url'])) {
+            printf('Wikipedia URL: %s' . PHP_EOL, $metadata['wikipedia_url']);
         }
-        if ($entity->getMetadata()->offsetExists('mid')) {
-            printf('Knowledge Graph MID: %s' . PHP_EOL, $entity->getMetadata()->offsetGet('mid'));
+        if (isset($metadata['mid'])) {
+            printf('Knowledge Graph MID: %s' . PHP_EOL, $metadata['mid']);
         }
         printf('Mentions:' . PHP_EOL);
         foreach ($entity->getMentions() as $mention) {

language/src/analyze_all_from_file.php

@@ -64,11 +64,13 @@ function analyze_all_from_file(string $uri): void
         printf('Name: %s' . PHP_EOL, $entity->getName());
         printf('Type: %s' . PHP_EOL, EntityType::name($entity->getType()));
         printf('Salience: %s' . PHP_EOL, $entity->getSalience());
-        if ($entity->getMetadata()->offsetExists('wikipedia_url')) {
-            printf('Wikipedia URL: %s' . PHP_EOL, $entity->getMetadata()->offsetGet('wikipedia_url'));
+        /** @var array<string, string> $metadata */
+        $metadata = $entity->getMetadata();
+        if (isset($metadata['wikipedia_url'])) {
+            printf('Wikipedia URL: %s' . PHP_EOL, $metadata['wikipedia_url']);
         }
-        if ($entity->getMetadata()->offsetExists('mid')) {
-            printf('Knowledge Graph MID: %s' . PHP_EOL, $entity->getMetadata()->offsetGet('mid'));
+        if (isset($metadata['mid'])) {
+            printf('Knowledge Graph MID: %s' . PHP_EOL, $metadata['mid']);
         }
         printf('Mentions:' . PHP_EOL);
         foreach ($entity->getMentions() as $mention) {

language/src/analyze_entities.php

@@ -53,11 +53,13 @@ function analyze_entities(string $text): void
         printf('Name: %s' . PHP_EOL, $entity->getName());
         printf('Type: %s' . PHP_EOL, EntityType::name($entity->getType()));
         printf('Salience: %s' . PHP_EOL, $entity->getSalience());
-        if ($entity->getMetadata()->offsetExists('wikipedia_url')) {
-            printf('Wikipedia URL: %s' . PHP_EOL, $entity->getMetadata()->offsetGet('wikipedia_url'));
+        /** @var array<string, string> $metadata */
+        $metadata = $entity->getMetadata();
+        if (isset($metadata['wikipedia_url'])) {
+            printf('Wikipedia URL: %s' . PHP_EOL, $metadata['wikipedia_url']);
         }
-        if ($entity->getMetadata()->offsetExists('mid')) {
-            printf('Knowledge Graph MID: %s' . PHP_EOL, $entity->getMetadata()->offsetGet('mid'));
+        if (isset($metadata['mid'])) {
+            printf('Knowledge Graph MID: %s' . PHP_EOL, $metadata['mid']);
         }
         printf(PHP_EOL);
     }

language/src/analyze_entities_from_file.php

@@ -53,11 +53,13 @@ function analyze_entities_from_file(string $uri): void
         printf('Name: %s' . PHP_EOL, $entity->getName());
         printf('Type: %s' . PHP_EOL, EntityType::name($entity->getType()));
         printf('Salience: %s' . PHP_EOL, $entity->getSalience());
-        if ($entity->getMetadata()->offsetExists('wikipedia_url')) {
-            printf('Wikipedia URL: %s' . PHP_EOL, $entity->getMetadata()->offsetGet('wikipedia_url'));
+        /** @var array<string, string> $metadata */
+        $metadata = $entity->getMetadata();
+        if (isset($metadata['wikipedia_url'])) {
+            printf('Wikipedia URL: %s' . PHP_EOL, $metadata['wikipedia_url']);
         }
-        if ($entity->getMetadata()->offsetExists('mid')) {
-            printf('Knowledge Graph MID: %s' . PHP_EOL, $entity->getMetadata()->offsetGet('mid'));
+        if (isset($metadata['mid'])) {
+            printf('Knowledge Graph MID: %s' . PHP_EOL, $metadata['mid']);
         }
         printf(PHP_EOL);
     }

parametermanager/src/create_param_template.php

@@ -48,7 +48,7 @@ function create_param_template(string $projectId, string $templateId, string $fo
 
     // Build the template.
     $template = (new Template())
-        ->setFormat(TemplateFormat::value('TEMPLATE_FORMAT_' . $format));
+        ->setFormat(TemplateFormat::value('TEMPLATE_FORMAT_' . strtoupper($format)));
 
     // Build the request.
     $request = (new CreateTemplateRequest())

parametermanager/src/create_regional_param_template.php

@@ -52,7 +52,7 @@ function create_regional_param_template(string $projectId, string $locationId, s
 
     // Build the template.
     $template = (new Template())
-        ->setFormat(TemplateFormat::value('TEMPLATE_FORMAT_' . $format));
+        ->setFormat(TemplateFormat::value('TEMPLATE_FORMAT_' . strtoupper($format)));
 
     // Build the request.
     $request = (new CreateTemplateRequest())

parametermanager/src/get_param_template_version.php

@@ -53,7 +53,8 @@ function get_param_template_version(string $projectId, string $templateId, strin
 
     // Print the template version details.
     printf('Got template version %s' . PHP_EOL, $templateVersion->getName());
-    printf('Payload: %s' . PHP_EOL, $templateVersion->getPayload()->getData());
+    $payload = $templateVersion->getPayload();
+    printf('Payload: %s' . PHP_EOL, $payload ? $payload->getData() : '');
 }
 // [END parametermanager_get_param_template_version]
 

parametermanager/src/get_param_version_verify_checksum.php

@@ -56,6 +56,9 @@ function get_param_version_verify_checksum(string $projectId, string $parameterI
 
     // Verify the payload checksum.
     $payload = $parameterVersion->getPayload();
+    if ($payload === null) {
+        throw new \UnexpectedValueException(sprintf('No payload found for %s', $parameterVersion->getName()));
+    }
     if (hexdec(hash('crc32c', $payload->getData())) !== $payload->getDataCrc32C()) {
         throw new \UnexpectedValueException(sprintf('Checksum mismatch for %s: data corrupted', $parameterVersion->getName()));
     }

parametermanager/src/get_regional_param_template_version.php

@@ -57,7 +57,8 @@ function get_regional_param_template_version(string $projectId, string $location
 
     // Print the template version details.
     printf('Got regional template version %s' . PHP_EOL, $templateVersion->getName());
-    printf('Payload: %s' . PHP_EOL, $templateVersion->getPayload()->getData());
+    $payload = $templateVersion->getPayload();
+    printf('Payload: %s' . PHP_EOL, $payload ? $payload->getData() : '');
 }
 // [END parametermanager_get_regional_param_template_version]
 

parametermanager/src/get_regional_param_version_verify_checksum.php

@@ -60,6 +60,9 @@ function get_regional_param_version_verify_checksum(string $projectId, string $l
 
     // Verify the payload checksum.
     $payload = $parameterVersion->getPayload();
+    if ($payload === null) {
+        throw new \UnexpectedValueException(sprintf('No payload found for %s', $parameterVersion->getName()));
+    }
     if (hexdec(hash('crc32c', $payload->getData())) !== $payload->getDataCrc32C()) {
         throw new \UnexpectedValueException(sprintf('Checksum mismatch for %s: data corrupted', $parameterVersion->getName()));
     }

parametermanager/src/render_param_template_version.php

@@ -58,7 +58,8 @@ function render_param_template_version(string $projectId, string $templateId, st
     $response = $client->renderTemplateVersion($request);
 
     // Print the template payload and the rendered payload.
-    printf('Template payload: %s' . PHP_EOL, $response->getPayload()->getData());
+    $payload = $response->getPayload();
+    printf('Template payload: %s' . PHP_EOL, $payload ? $payload->getData() : '');
     printf('Rendered payload: %s' . PHP_EOL, $response->getRenderedPayload());
 }
 // [END parametermanager_render_param_template_version]

parametermanager/src/render_regional_param_template_version.php

@@ -62,7 +62,8 @@ function render_regional_param_template_version(string $projectId, string $locat
     $response = $client->renderTemplateVersion($request);
 
     // Print the template payload and the rendered payload.
-    printf('Template payload: %s' . PHP_EOL, $response->getPayload()->getData());
+    $payload = $response->getPayload();
+    printf('Template payload: %s' . PHP_EOL, $payload ? $payload->getData() : '');
     printf('Rendered payload: %s' . PHP_EOL, $response->getRenderedPayload());
 }
 // [END parametermanager_render_regional_param_template_version]

storage/src/delete_object_contexts.php

@@ -54,7 +54,7 @@ function delete_object_contexts(string $bucketName, string $objectName): void
             'custom' => null,
         ],
     ], [
-        'ifMetagenerationMatch' => $info['metageneration'],
+        'ifMetagenerationMatch' => $info['metageneration'] ?? null,
     ]);
 
     printf('Deleted object contexts for object %s in bucket %s.' . PHP_EOL, $objectName, $bucketName);

testing/composer.json

@@ -4,7 +4,7 @@
     },
     "require-dev": {
         "bshaffer/phpunit-retry-annotations": "^0.3.0",
-        "google/auth": "^1.12",
+        "google/auth": "^1.45",
         "google/cloud-tools": "dev-main",
         "guzzlehttp/guzzle": "^8.0",
         "phpunit/phpunit": "^9.0",