cleanup from code review

googleapis · Sep 27, 2024 · 07cc2e1 · 07cc2e1
1 parent fa97870
commit 07cc2e1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/Core/src/Testing/TestHelpers.php b/Core/src/Testing/TestHelpers.php
@@ -23,6 +23,7 @@
 use Google\Cloud\Core\Testing\Snippet\Coverage\Coverage;
 use Google\Cloud\Core\Testing\Snippet\Coverage\Scanner;
 use Google\Cloud\Core\Testing\Snippet\Parser\Parser;
+use Google\Cloud\Core\Testing\Snippet\Fixtures;
 use Google\Cloud\Core\Testing\System\SystemTestCase;
 
 /**
@@ -106,7 +107,7 @@ public function call($fn, array $args = []) { return call_user_func_array([$this
      */
     public static function snippetBootstrap()
     {
-        putenv('GOOGLE_APPLICATION_CREDENTIALS='. \Google\Cloud\Core\Testing\Snippet\Fixtures::KEYFILE_STUB_FIXTURE());
+        putenv('GOOGLE_APPLICATION_CREDENTIALS='. Fixtures::KEYFILE_STUB_FIXTURE());
 
         $parser = new Parser;
         $scanner = new Scanner($parser, self::projectRoot(), [

diff --git a/Redis/tests/System/V1/CloudRedisClientTest.php b/Redis/tests/System/V1/CloudRedisClientTest.php
@@ -48,9 +48,11 @@ class CloudRedisClientTest extends TestCase
      */
     public static function setUpTestFixtures()
     {
-        $keyFilePath = getenv('GOOGLE_CLOUD_PHP_TESTS_KEY_PATH');
+        if (!$keyFilePath = getenv('GOOGLE_CLOUD_PHP_TESTS_KEY_PATH')) {
+            self::markTestSkipped('Set the GOOGLE_CLOUD_PHP_TESTS_KEY_PATH environment variable');
+        }
         $keyFileData = json_decode(file_get_contents($keyFilePath), true);
-        $projectId = $keyFileData['project_id'];
+        $projectId = $keyFileData['project_id'] ?? '';
 
         self::$client = new CloudRedisClient([
             'credentials' => $keyFilePath,