Address comments

Author: ace-n

functions/slack_slash_command/index.php

@@ -28,11 +28,6 @@
  */
 function isValidSlackWebhook(ServerRequestInterface $request): bool
 {
-    /**
-     * Unlike most other Cloud Functions languages, PHP does not preserve
-     * global values between requests. Since we don't use this value elsewhere
-     * in the sample, it's easiest to declare it within this method itself.
-     */
     $SLACK_SECRET = getenv('SLACK_SECRET');
 
     // Check for headers
@@ -108,11 +103,6 @@ function formatSlackMessage(Google_Service_Kgsearch_SearchResponse $kgResponse,
  */
 function searchKnowledgeGraph(string $query): Google_Service_Kgsearch_SearchResponse
 {
-    /**
-     * Unlike most other Cloud Functions languages, PHP does not preserve
-     * global values between requests. Since we don't use this value elsewhere
-     * in the sample, it's easiest to declare it within this method itself.
-     */
     $API_KEY = getenv("KG_API_KEY");
 
     $apiClient = new Google\Client();

functions/slack_slash_command/test/DeployTest.php

@@ -37,7 +37,7 @@ class DeployTest extends TestCase
     use CloudFunctionDeploymentTrait;
     use TestCasesTrait;
 
-    private static $name = 'receiveRequest';
+    private static $entryPoint = 'receiveRequest';
 
     /**
       * @dataProvider cases
@@ -50,6 +50,9 @@ public function testFunction(
         $statusCode,
         $headers
     ): void {
+        $this->requireEnv('SLACK_SECRET');
+        $this->requireEnv('KG_API_KEY');
+
         $response = $this->client->request(
             $method,
             '',
@@ -67,13 +70,12 @@ public function testFunction(
         }
     }
 
-    protected static function deployFlags(array $flags = []): array
+    private static function doDeploy()
     {
         // Forward required env variables to Cloud Functions
         $envVars = 'SLACK_SECRET=' . getenv('SLACK_SECRET') . ',';
         $envVars .= 'KG_API_KEY=' . getenv('KG_API_KEY');
 
-        $flags['--update-env-vars'] = '"' . $envVars . '"';
-        return $flags;
+        self::$fn->deploy(['--update-env-vars' => $envVars]);
     }
 }

functions/slack_slash_command/test/LocalTest.php renamed to functions/slack_slash_command/test/IntegrationTest.php

@@ -25,14 +25,14 @@
 require_once __DIR__ . '/TestCasesTrait.php';
 
 /**
- * Class SystemTest.
+ * Class IntegrationTest.
  */
-class SystemTest extends TestCase
+class IntegrationTest extends TestCase
 {
     use CloudFunctionLocalTestTrait;
     use TestCasesTrait;
 
-    private static $name = 'receiveRequest';
+    private static $entryPoint = 'receiveRequest';
 
     /**
       * @dataProvider cases
@@ -45,6 +45,9 @@ public function testFunction(
         $statusCode,
         $headers
     ): void {
+        $this->requireEnv('SLACK_SECRET');
+        $this->requireEnv('KG_API_KEY');
+
         $response = $this->client->request(
             $method,
             '/',

functions/slack_slash_command/test/TestCasesTrait.php

@@ -20,7 +20,6 @@
 
 function _valid_headers($body): array
 {
-
     // Calculate test case signature
     $key = getenv('SLACK_SECRET');
     $plaintext = 'v0:0:' . $body;

functions/slack_slash_command/test/UnitTest.php

@@ -30,7 +30,7 @@ class UnitTest extends TestCase
 {
     use TestCasesTrait;
 
-    private static $name = 'receiveRequest';
+    private static $entryPoint = 'receiveRequest';
 
     public static function setUpBeforeClass(): void
     {
@@ -49,7 +49,7 @@ public function testFunction(
         $headers
     ): void {
         $request = new ServerRequest($method, '/', $headers, $body);
-        $response = $this->runFunction(self::$name, [$request]);
+        $response = $this->runFunction(self::$entryPoint, [$request]);
 
         $this->assertEquals(
             $statusCode,