Address comments

Author: ace-n

functions/tips_scopes/composer.json

@@ -1,5 +1,5 @@
 {
     "require": {
-        "google/cloud-functions-framework": "^0.6"
+        "google/cloud-functions-framework": "^0.7.1"
     }
 }

functions/tips_scopes/index.php

@@ -40,19 +40,22 @@ function scopeDemo(ServerRequestInterface $request): string
     // https://packagist.org/providers/psr/cache-implementation
     $cachePath = sys_get_temp_dir() . '/cached_value.txt';
 
+    $response = '';
     if (file_exists($cachePath)) {
         // Read cached value from file
+        $response .= "Reading cached value." . PHP_EOL;
         $instanceVar = file_get_contents($cachePath);
     } else {
         // Compute cached value + write to file
+        $response .= "Cache empty, computing value." . PHP_EOL;
         $instanceVar = _heavyComputation();
         file_put_contents($cachePath, $instanceVar);
     }
 
     // Lighter computations can re-run on each function invocation.
     $functionVar = _lightComputation();
 
-    $response = 'Per instance: ' . $instanceVar . PHP_EOL;
+    $response .= 'Per instance: ' . $instanceVar . PHP_EOL;
     $response .= 'Per function: ' . $functionVar . PHP_EOL;
 
     return $response;

functions/tips_scopes/test/DeployTest.php

@@ -39,17 +39,28 @@ class DeployTest extends TestCase
     public function testFunction(): void
     {
         // Send a request to the function.
-        $resp = $this->client->post('', [
+        $firstResp = $this->client->post('', [
             // Uncomment and CURLOPT_VERBOSE debug content will be sent to stdout.
             // 'debug' => true
         ]);
+        $secondResp = $this->client->post('', [
+            // Uncomment and CURLOPT_VERBOSE debug content will be sent to stdout.
+            // 'debug' => true
+        ]);
+
+        // Assert status codes.
+        $this->assertEquals('200', $firstResp->getStatusCode());
+        $this->assertEquals('200', $secondResp->getStatusCode());
+
+        $firstOutput = trim((string) $firstResp->getBody());
+        $secondOutput = trim((string) $secondResp->getBody());
 
-        // Assert status code.
-        $this->assertEquals('200', $resp->getStatusCode());
+        // Assert generic function output.
+        $this->assertContains('Per instance: 120', $firstOutput);
+        $this->assertContains('Per function: 15', $firstOutput);
 
-        // Assert function output.
-        $output = trim((string) $resp->getBody());
-        $this->assertContains('Per instance: 120', $output);
-        $this->assertContains('Per function: 15', $output);
+        // Assert caching behavior.
+        $this->assertContains('Cache empty', $firstOutput);
+        $this->assertContains('Reading cached value', $secondOutput);
     }
 }

functions/tips_scopes/test/IntegrationTest.php

@@ -30,12 +30,15 @@ class IntegrationTest extends TestCase
 
     private static $entryPoint = 'scopeDemo';
 
-    public function testFunction() : void
+    public function testFunction(): void
     {
-        // Send a request to the function.
-        $resp = $this->client->post('/');
+        // Send two requests to the function.
+        // (This tests cross-request caching behavior.)
+        $firstResp = $this->client->post('/');
+        $secondResp = $this->client->post('/');
 
-        // Assert status code.
-        $this->assertEquals('200', $resp->getStatusCode());
+        // Assert status codes.
+        $this->assertEquals('200', $firstResp->getStatusCode());
+        $this->assertEquals('200', $secondResp->getStatusCode());
     }
 }

functions/tips_scopes/test/UnitTest.php

@@ -28,20 +28,20 @@ class UnitTest extends TestCase
 {
     private static $entryPoint = 'scopeDemo';
 
-    public static function setUpBeforeClass() : void
+    public static function setUpBeforeClass(): void
     {
         require_once __DIR__ . '/../index.php';
     }
 
-    public function testFunction() : void
+    public function testFunction(): void
     {
         $request = new ServerRequest('POST', '/');
         $output = $this->runFunction(self::$entryPoint, [$request]);
         $this->assertContains('Per instance: 120', $output);
         $this->assertContains('Per function: 15', $output);
     }
 
-    private static function runFunction($functionName, array $params = []) : string
+    private static function runFunction($functionName, array $params = []): string
     {
         return call_user_func_array($functionName, $params);
     }