chore(functions): miscellaneous changes (GoogleCloudPlatform#1314)

Author: bshaffer

functions/helloworld_http/SampleUnitTest.php

@@ -40,7 +40,7 @@ public function testFunction(): void
         $request = new ServerRequest('POST', '/', [], json_encode(['name' => $name]));
         $expected = sprintf('Hello, %s!', $name);
         $actual = helloHttp($request);
-        $this->assertStringContainsString($expected, $actual);
+        $this->assertEquals($expected, $actual);
     }
 }
 

functions/helloworld_pubsub/index.php

@@ -19,19 +19,18 @@
 
 use Google\CloudFunctions\CloudEvent;
 
-function helloworldPubsub(CloudEvent $event): string
+function helloworldPubsub(CloudEvent $event): void
 {
     $log = fopen(getenv('LOGGER_OUTPUT') ?: 'php://stderr', 'wb');
-    
-    $data = $event->getData();
-    if (isset($data['data'])) {
-        $name = htmlspecialchars(base64_decode($data['data']));
+
+    $cloudEventData = $event->getData();
+    if (isset($cloudEventData['data'])) {
+        $name = htmlspecialchars(base64_decode($cloudEventData['data']));
     } else {
         $name = 'World';
     }
 
     $result = 'Hello, ' . $name . '!';
     fwrite($log, $result . PHP_EOL);
-    return $result;
 }
 // [END functions_helloworld_pubsub]

functions/tips_infinite_retries/index.php

@@ -27,7 +27,7 @@
 
 use Google\CloudFunctions\CloudEvent;
 
-function avoidInfiniteRetries(CloudEvent $event): string
+function avoidInfiniteRetries(CloudEvent $event): void
 {
     $log = fopen(getenv('LOGGER_OUTPUT') ?: 'php://stderr', 'wb');
 
@@ -42,7 +42,7 @@ function avoidInfiniteRetries(CloudEvent $event): string
     // Ignore events that are too old
     if ($eventAge > $maxAge) {
         fwrite($log, 'Dropping event ' . $eventId . ' with age ' . $eventAge . ' seconds' . PHP_EOL);
-        return '';
+        return;
     }
 
     // Do what the function is supposed to do
@@ -53,7 +53,5 @@ function avoidInfiniteRetries(CloudEvent $event): string
     if ($failed) {
         throw new Exception('Event ' . $eventId . ' failed; retrying...');
     }
-
-    return '';
 }
 // [END functions_tips_infinite_retries]

functions/tips_retry/index.php

@@ -19,7 +19,7 @@
 
 use Google\CloudFunctions\CloudEvent;
 
-function tipsRetry(CloudEvent $event): string
+function tipsRetry(CloudEvent $event): void
 {
     $data = $event->getData()['data'];
     $data = json_decode(base64_decode($data), true);
@@ -35,15 +35,13 @@ function tipsRetry(CloudEvent $event): string
          * invocation to be re-sent.
          */
         throw new Exception('Intermittent failure occurred; retrying...');
-    } else {
-        /**
-         * If a function with retries enabled encounters a non-retriable
-         * failure, it should return *without* throwing an exception.
-         */
-        $log = fopen(getenv('LOGGER_OUTPUT') ?: 'php://stderr', 'wb');
-        fwrite($log, "Not retrying" . PHP_EOL);
-
-        return "";
     }
+
+    /**
+     * If a function with retries enabled encounters a non-retriable
+     * failure, it should return *without* throwing an exception.
+     */
+    $log = fopen(getenv('LOGGER_OUTPUT') ?: 'php://stderr', 'wb');
+    fwrite($log, "Not retrying" . PHP_EOL);
 }
 // [END functions_tips_retry]