Test all PHP versions; fix API Key env

Author: n7studios

.github/workflows/tests.yml

@@ -23,7 +23,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: [ '8.0' ]
+        php-versions: [ '8.0', '8.1', '8.2', '8.3', '8.4' ]
 
     # Steps to install, configure and run tests
     steps:

tests/ConvertKitAPIKeyTest.php

@@ -31,7 +31,7 @@ protected function setUp(): void
 
         // Setup API instances.
         $this->api = new ConvertKit_API(
-            apiKey: $_ENV['CONVERTKIT_API_KEY']
+            apiKey: $_ENV['CONVERTKIT_V4_API_KEY']
         );
 
         // Wait a second to avoid hitting a 429 rate limit.
@@ -49,7 +49,7 @@ public function testDebugEnabled()
     {
         // Setup API with debugging enabled.
         $api = new ConvertKit_API(
-            apiKey: $_ENV['CONVERTKIT_API_KEY'],
+            apiKey: $_ENV['CONVERTKIT_V4_API_KEY'],
             debug: true
         );
 
@@ -75,7 +75,7 @@ public function testDebugEnabledWithCustomLogFile()
 
         // Setup API with debugging enabled.
         $api = new ConvertKit_API(
-            apiKey: $_ENV['CONVERTKIT_API_KEY'],
+            apiKey: $_ENV['CONVERTKIT_V4_API_KEY'],
             debug: true,
             debugLogFileLocation: $this->logFile
         );
@@ -101,21 +101,21 @@ public function testDebugCredentialsAndEmailsAreMasked()
     {
         // Setup API with debugging enabled.
         $api = new ConvertKit_API(
-            apiKey: $_ENV['CONVERTKIT_API_KEY'],
+            apiKey: $_ENV['CONVERTKIT_V4_API_KEY'],
             debug: true
         );
 
         // Create log entries with API Key and Email Address, as if an API method
         // were to log this sensitive data.
-        $this->callPrivateMethod($api, 'create_log', ['API Key: ' . $_ENV['CONVERTKIT_API_KEY']]);
+        $this->callPrivateMethod($api, 'create_log', ['API Key: ' . $_ENV['CONVERTKIT_V4_API_KEY']]);
         $this->callPrivateMethod($api, 'create_log', ['Email: ' . $_ENV['CONVERTKIT_API_SUBSCRIBER_EMAIL']]);
 
         // Confirm that the log includes the masked API Key and Email Address.
         $this->assertStringContainsString(
             str_repeat(
                 '*',
-                (strlen($_ENV['CONVERTKIT_API_KEY']) - 4)
-            ) . substr($_ENV['CONVERTKIT_API_KEY'], -4),
+                (strlen($_ENV['CONVERTKIT_V4_API_KEY']) - 4)
+            ) . substr($_ENV['CONVERTKIT_V4_API_KEY'], -4),
             $this->getLogFileContents()
         );
         $this->assertStringContainsString(
@@ -124,7 +124,7 @@ public function testDebugCredentialsAndEmailsAreMasked()
         );
 
         // Confirm that the log does not include the unmasked API Key or Email Address.
-        $this->assertStringNotContainsString($_ENV['CONVERTKIT_API_KEY'], $this->getLogFileContents());
+        $this->assertStringNotContainsString($_ENV['CONVERTKIT_V4_API_KEY'], $this->getLogFileContents());
         $this->assertStringNotContainsString($_ENV['CONVERTKIT_API_SUBSCRIBER_EMAIL'], $this->getLogFileContents());
     }
 
@@ -158,7 +158,7 @@ public function testRequestHeadersMethod()
         $this->assertEquals($headers['Accept'], 'application/json');
         $this->assertEquals($headers['Content-Type'], 'application/json; charset=utf-8');
         $this->assertEquals($headers['User-Agent'], 'ConvertKitPHPSDK/' . $this->api::VERSION . ';PHP/' . phpversion());
-        $this->assertEquals($headers['X-Kit-Api-Key'], $_ENV['CONVERTKIT_API_KEY']);
+        $this->assertEquals($headers['X-Kit-Api-Key'], $_ENV['CONVERTKIT_V4_API_KEY']);
     }
 
     /**
@@ -181,7 +181,7 @@ public function testRequestHeadersMethodWithType()
         $this->assertEquals($headers['Accept'], 'text/html');
         $this->assertEquals($headers['Content-Type'], 'text/html; charset=utf-8');
         $this->assertEquals($headers['User-Agent'], 'ConvertKitPHPSDK/' . $this->api::VERSION . ';PHP/' . phpversion());
-        $this->assertEquals($headers['X-Kit-Api-Key'], $_ENV['CONVERTKIT_API_KEY']);
+        $this->assertEquals($headers['X-Kit-Api-Key'], $_ENV['CONVERTKIT_V4_API_KEY']);
     }
 
     /**