From dd61663653d2169b20c7e27ea14491c803b784e2 Mon Sep 17 00:00:00 2001
From: Tim Carr <tim@n7studios.co.uk>
Date: Tue, 7 Apr 2026 09:11:47 +0800
Subject: [PATCH 01/11] Remove union type declarations

---
 src/class-convertkit-api-traits.php | 48 ++++++++++++++---------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/class-convertkit-api-traits.php b/src/class-convertkit-api-traits.php
index 2c7f035..adf7ba0 100644
--- a/src/class-convertkit-api-traits.php
+++ b/src/class-convertkit-api-traits.php
@@ -144,7 +144,7 @@ public function get_email_stats()
      *
      * @return false|mixed
      */
-    public function get_growth_stats(\DateTime|null $starting = null, \DateTime|null $ending = null)
+    public function get_growth_stats(?\DateTime $starting = null, ?\DateTime $ending = null)
     {
         return $this->get(
             'account/growth_stats',
@@ -344,10 +344,10 @@ public function add_subscriber_to_legacy_form(int $form_id, int $subscriber_id)
     public function get_form_subscriptions(
         int $form_id,
         string $subscriber_state = 'active',
-        \DateTime|null $created_after = null,
-        \DateTime|null $created_before = null,
-        \DateTime|null $added_after = null,
-        \DateTime|null $added_before = null,
+        ?\DateTime $created_after = null,
+        ?\DateTime $created_before = null,
+        ?\DateTime $added_after = null,
+        ?\DateTime $added_before = null,
         bool $include_total_count = false,
         string $after_cursor = '',
         string $before_cursor = '',
@@ -471,10 +471,10 @@ public function add_subscriber_to_sequence(int $sequence_id, int $subscriber_id)
     public function get_sequence_subscriptions(
         int $sequence_id,
         string $subscriber_state = 'active',
-        \DateTime|null $created_after = null,
-        \DateTime|null $created_before = null,
-        \DateTime|null $added_after = null,
-        \DateTime|null $added_before = null,
+        ?\DateTime $created_after = null,
+        ?\DateTime $created_before = null,
+        ?\DateTime $added_after = null,
+        ?\DateTime $added_before = null,
         bool $include_total_count = false,
         string $after_cursor = '',
         string $before_cursor = '',
@@ -737,10 +737,10 @@ public function remove_tag_from_subscriber_by_email(int $tag_id, string $email_a
     public function get_tag_subscriptions(
         int $tag_id,
         string $subscriber_state = 'active',
-        \DateTime|null $created_after = null,
-        \DateTime|null $created_before = null,
-        \DateTime|null $tagged_after = null,
-        \DateTime|null $tagged_before = null,
+        ?\DateTime $created_after = null,
+        ?\DateTime $created_before = null,
+        ?\DateTime $tagged_after = null,
+        ?\DateTime $tagged_before = null,
         bool $include_total_count = false,
         string $after_cursor = '',
         string $before_cursor = '',
@@ -836,10 +836,10 @@ public function get_email_templates(
     public function get_subscribers(
         string $subscriber_state = 'active',
         string $email_address = '',
-        \DateTime|null $created_after = null,
-        \DateTime|null $created_before = null,
-        \DateTime|null $updated_after = null,
-        \DateTime|null $updated_before = null,
+        ?\DateTime $created_after = null,
+        ?\DateTime $created_before = null,
+        ?\DateTime $updated_after = null,
+        ?\DateTime $updated_before = null,
         string $sort_field = 'id',
         string $sort_order = 'desc',
         bool $include_total_count = false,
@@ -1265,8 +1265,8 @@ public function create_broadcast(
         string $content = '',
         string $description = '',
         bool $public = false,
-        \DateTime|null $published_at = null,
-        \DateTime|null $send_at = null,
+        ?\DateTime $published_at = null,
+        ?\DateTime $send_at = null,
         string $email_address = '',
         string $email_template_id = '',
         string $thumbnail_alt = '',
@@ -1437,8 +1437,8 @@ public function update_broadcast(
         string $content = '',
         string $description = '',
         bool $public = false,
-        \DateTime|null $published_at = null,
-        \DateTime|null $send_at = null,
+        ?\DateTime $published_at = null,
+        ?\DateTime $send_at = null,
         string $email_address = '',
         string $email_template_id = '',
         string $thumbnail_alt = '',
@@ -1841,14 +1841,14 @@ public function create_purchase(
         string $transaction_id,
         array $products,
         string $currency = 'USD',
-        string|null $first_name = null,
-        string|null $status = null,
+        ?string $first_name = null,
+        ?string $status = null,
         float $subtotal = 0,
         float $tax = 0,
         float $shipping = 0,
         float $discount = 0,
         float $total = 0,
-        \DateTime|null $transaction_time = null
+        ?\DateTime $transaction_time = null
     ) {
         // Build parameters.
         $options = [

From c7c9c2901ad0011f1440156e08ff12bcaabdb144 Mon Sep 17 00:00:00 2001
From: Tim Carr <tim@n7studios.co.uk>
Date: Tue, 7 Apr 2026 09:11:57 +0800
Subject: [PATCH 02/11] Run tests in PHP 7.4

---
 .github/workflows/tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index c25d543..1401ee6 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -50,7 +50,7 @@ jobs:
       fail-fast: false
       matrix:
         wp-versions: [ 'latest' ] #[ '6.1.1', 'latest' ]
-        php-versions: [ '8.0', '8.1', '8.2', '8.3', '8.4' ] #[ '7.4', '8.0', '8.1', '8.2' ]
+        php-versions: [ '7.4', '8.0', '8.1', '8.2', '8.3', '8.4' ] #[ '7.4', '8.0', '8.1', '8.2' ]
 
     # Steps to install, configure and run tests
     steps:

From 8edce2df4e4d545b75b5aca8797523870d605796 Mon Sep 17 00:00:00 2001
From: Tim Carr <tim@n7studios.co.uk>
Date: Tue, 7 Apr 2026 09:25:30 +0800
Subject: [PATCH 03/11] Add PHPCompatibilityWP to check code compat. with PHP
 7.1+

---
 .github/workflows/coding-standards.yml | 2 +-
 .github/workflows/tests.yml            | 2 +-
 composer.json                          | 4 +++-
 phpcs.xml                              | 7 +++++--
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml
index 65be1c1..0997646 100644
--- a/.github/workflows/coding-standards.yml
+++ b/.github/workflows/coding-standards.yml
@@ -41,7 +41,7 @@ jobs:
     strategy:
       matrix:
         wp-versions: [ 'latest' ] #[ '6.1.1', 'latest' ]
-        php-versions: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4' ] #[ '7.3', '7.4', '8.0', '8.1' ]
+        php-versions: [ '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4' ] #[ '7.3', '7.4', '8.0', '8.1' ]
 
     # Steps to install, configure and run tests
     steps:
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 1401ee6..455580f 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -50,7 +50,7 @@ jobs:
       fail-fast: false
       matrix:
         wp-versions: [ 'latest' ] #[ '6.1.1', 'latest' ]
-        php-versions: [ '7.4', '8.0', '8.1', '8.2', '8.3', '8.4' ] #[ '7.4', '8.0', '8.1', '8.2' ]
+        php-versions: [ '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4' ] #[ '7.4', '8.0', '8.1', '8.2' ]
 
     # Steps to install, configure and run tests
     steps:
diff --git a/composer.json b/composer.json
index 94795b2..3c1ea2c 100644
--- a/composer.json
+++ b/composer.json
@@ -13,9 +13,11 @@
     "require-dev": {
         "php-webdriver/webdriver": "^1.0",
         "wp-coding-standards/wpcs": "^3.0.0",
+        "phpcompatibility/phpcompatibility-wp": "^2.1",
         "phpstan/phpstan": "^1.0 || ^2.0",
         "szepeviktor/phpstan-wordpress": "^1.0 || ^2.0",
-        "lucatume/wp-browser": "^3.0 || ^4.0"
+        "lucatume/wp-browser": "^3.0 || ^4.0",
+        "dealerdirect/phpcodesniffer-composer-installer": "^1.0"
     },
     "minimum-stability": "stable",
     "scripts": {
diff --git a/phpcs.xml b/phpcs.xml
index 11ae28a..3708668 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -11,11 +11,14 @@
 	<!-- Exclude minified Javascript files. -->
 	<exclude-pattern>*.min.js</exclude-pattern>
 
-	<!-- Exclude traits from the PHP SDK. -->
-	<exclude-pattern>class-convertkit-api-traits.php</exclude-pattern>
+	<!-- Minimum supported PHP version. Checked by PHPCompatibilityWP. -->
+	<config name="testVersion" value="7.1-"/>
 
 	<!-- Check that code meets WordPress standards - this includes core, docs and extra. -->
 	<rule ref="WordPress">
+		<!-- Exclude traits from the PHP SDK, as these are supplied upstream. -->
+		<exclude-pattern>class-convertkit-api-traits.php</exclude-pattern>
+
 		<!--
 		We may want a middle ground though. The best way to do this is add the
 		entire ruleset, then rule by rule, remove ones that don't suit a project.

From 49e4078fe5ef8329371445b0759a52115d95c083 Mon Sep 17 00:00:00 2001
From: Tim Carr <tim@n7studios.co.uk>
Date: Tue, 7 Apr 2026 09:42:58 +0800
Subject: [PATCH 04/11] Revert Coding Standards

---
 composer.json | 4 +---
 phpcs.xml     | 7 ++-----
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/composer.json b/composer.json
index 3c1ea2c..94795b2 100644
--- a/composer.json
+++ b/composer.json
@@ -13,11 +13,9 @@
     "require-dev": {
         "php-webdriver/webdriver": "^1.0",
         "wp-coding-standards/wpcs": "^3.0.0",
-        "phpcompatibility/phpcompatibility-wp": "^2.1",
         "phpstan/phpstan": "^1.0 || ^2.0",
         "szepeviktor/phpstan-wordpress": "^1.0 || ^2.0",
-        "lucatume/wp-browser": "^3.0 || ^4.0",
-        "dealerdirect/phpcodesniffer-composer-installer": "^1.0"
+        "lucatume/wp-browser": "^3.0 || ^4.0"
     },
     "minimum-stability": "stable",
     "scripts": {
diff --git a/phpcs.xml b/phpcs.xml
index 3708668..11ae28a 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -11,14 +11,11 @@
 	<!-- Exclude minified Javascript files. -->
 	<exclude-pattern>*.min.js</exclude-pattern>
 
-	<!-- Minimum supported PHP version. Checked by PHPCompatibilityWP. -->
-	<config name="testVersion" value="7.1-"/>
+	<!-- Exclude traits from the PHP SDK. -->
+	<exclude-pattern>class-convertkit-api-traits.php</exclude-pattern>
 
 	<!-- Check that code meets WordPress standards - this includes core, docs and extra. -->
 	<rule ref="WordPress">
-		<!-- Exclude traits from the PHP SDK, as these are supplied upstream. -->
-		<exclude-pattern>class-convertkit-api-traits.php</exclude-pattern>
-
 		<!--
 		We may want a middle ground though. The best way to do this is add the
 		entire ruleset, then rule by rule, remove ones that don't suit a project.

From 4634d202aeeed6c029506cd86e1f06fa9a43d9c1 Mon Sep 17 00:00:00 2001
From: Tim Carr <tim@n7studios.co.uk>
Date: Tue, 7 Apr 2026 09:59:03 +0800
Subject: [PATCH 05/11] Run PHPStan against PHP 7.1 and higher

---
 phpstan.neon.dist                   | 8 +++++---
 src/class-convertkit-api-traits.php | 8 +++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index a129d07..396ca98 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -6,14 +6,17 @@ includes:
 
 # Parameters
 parameters:
+    # Analyse against the minimum supported PHP version.
+    # This flags features (union types, enums, str_contains, etc.) that would
+    # fail on older PHP versions regardless of which PHP version PHPStan runs on.
+    phpVersion: 70100
+
     # Paths to scan
     paths:
         - src/
 
     # Paths to exclude
-    # API Traits are excluded as they are statically analysed in the Kit PHP SDK
     excludePaths:
-        - src/class-convertkit-api-traits.php
         - src/views/
 
     # Location of WordPress Plugins for PHPStan to scan, building symbols.
@@ -22,7 +25,6 @@ parameters:
 
     # Location of constants for PHPStan to scan, building symbols.
     scanFiles:
-        - src/class-convertkit-api-traits.php
         - /home/runner/work/convertkit-wordpress-libraries/convertkit-wordpress-libraries/wordpress/wp-config.php
 
     # Don't report unmatched ignored errors on older PHP versions (7.2, 7.3)
diff --git a/src/class-convertkit-api-traits.php b/src/class-convertkit-api-traits.php
index adf7ba0..c5e6db4 100644
--- a/src/class-convertkit-api-traits.php
+++ b/src/class-convertkit-api-traits.php
@@ -1362,9 +1362,11 @@ public function get_broadcast_link_clicks(
         return $this->get(
             sprintf('broadcasts/%s/clicks', $id),
             $this->build_total_count_and_pagination_params(
-                after_cursor: $after_cursor,
-                before_cursor: $before_cursor,
-                per_page: $per_page
+                [],
+                false,
+                $after_cursor,
+                $before_cursor,
+                $per_page
             )
         );
     }

From 5c9d661ecb86218b10838d5c1370c46cccca3018 Mon Sep 17 00:00:00 2001
From: Tim Carr <tim@n7studios.co.uk>
Date: Tue, 7 Apr 2026 10:28:48 +0800
Subject: [PATCH 06/11] PHPStan compat.

---
 src/class-convertkit-resource-v4.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/class-convertkit-resource-v4.php b/src/class-convertkit-resource-v4.php
index 60f9da0..95a9d2a 100644
--- a/src/class-convertkit-resource-v4.php
+++ b/src/class-convertkit-resource-v4.php
@@ -59,7 +59,7 @@ class ConvertKit_Resource_V4 {
 	 *
 	 * @var     WP_Error|array|bool|null
 	 */
-	public $resources = array();
+	public $resources;
 
 	/**
 	 * The key to use when alphabetically sorting resources.

From 499430cab7cbfecfdfa55474d8e9cbb272845aab Mon Sep 17 00:00:00 2001
From: Tim Carr <tim@n7studios.co.uk>
Date: Tue, 7 Apr 2026 10:30:43 +0800
Subject: [PATCH 07/11] Remove namespace

---
 src/class-convertkit-api-v4.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/class-convertkit-api-v4.php b/src/class-convertkit-api-v4.php
index c105eee..ad3762a 100644
--- a/src/class-convertkit-api-v4.php
+++ b/src/class-convertkit-api-v4.php
@@ -14,7 +14,7 @@
  */
 class ConvertKit_API_V4 {
 
-	use ConvertKit_API\ConvertKit_API_Traits;
+	use ConvertKit_API_Traits;
 
 	/**
 	 * The SDK version.

From 0b0668bfe6a892ec12a7ffd4dcdbc5e5646bbce4 Mon Sep 17 00:00:00 2001
From: Tim Carr <tim@n7studios.co.uk>
Date: Tue, 7 Apr 2026 10:33:10 +0800
Subject: [PATCH 08/11] Run tests against PHP 7.2 and higher

WordPress 6.9.4 requires PHP 7.2 or higher; we cannot test against PHP 7.1
---
 .github/workflows/coding-standards.yml | 2 +-
 .github/workflows/tests.yml            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml
index 0997646..65be1c1 100644
--- a/.github/workflows/coding-standards.yml
+++ b/.github/workflows/coding-standards.yml
@@ -41,7 +41,7 @@ jobs:
     strategy:
       matrix:
         wp-versions: [ 'latest' ] #[ '6.1.1', 'latest' ]
-        php-versions: [ '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4' ] #[ '7.3', '7.4', '8.0', '8.1' ]
+        php-versions: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4' ] #[ '7.3', '7.4', '8.0', '8.1' ]
 
     # Steps to install, configure and run tests
     steps:
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 455580f..5c0b0ce 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -50,7 +50,7 @@ jobs:
       fail-fast: false
       matrix:
         wp-versions: [ 'latest' ] #[ '6.1.1', 'latest' ]
-        php-versions: [ '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4' ] #[ '7.4', '8.0', '8.1', '8.2' ]
+        php-versions: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4' ] #[ '7.4', '8.0', '8.1', '8.2' ]
 
     # Steps to install, configure and run tests
     steps:

From 0efcdeab57e187f12022bbceeb5d7405ee75ccbc Mon Sep 17 00:00:00 2001
From: Tim Carr <tim@n7studios.co.uk>
Date: Tue, 7 Apr 2026 10:33:16 +0800
Subject: [PATCH 09/11] Remove namespace

---
 src/class-convertkit-api-traits.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/class-convertkit-api-traits.php b/src/class-convertkit-api-traits.php
index c5e6db4..1244373 100644
--- a/src/class-convertkit-api-traits.php
+++ b/src/class-convertkit-api-traits.php
@@ -5,8 +5,6 @@
  * @author ConvertKit
  */
 
-namespace ConvertKit_API;
-
 /**
  * ConvertKit API Traits
  */

From c7875752cdaaf58552b83f5b335c296dba31bed0 Mon Sep 17 00:00:00 2001
From: Tim Carr <tim@n7studios.co.uk>
Date: Tue, 7 Apr 2026 10:37:29 +0800
Subject: [PATCH 10/11] Run PHPStan against all PHP versions

---
 .github/workflows/coding-standards.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml
index 65be1c1..e369feb 100644
--- a/.github/workflows/coding-standards.yml
+++ b/.github/workflows/coding-standards.yml
@@ -130,5 +130,4 @@ jobs:
       # Run PHPStan for static analysis.
       - name: Run PHPStan Static Analysis
         working-directory: ${{ env.PLUGIN_DIR }}
-        if: ${{ contains('8.0 8.1 8.2 8.3 8.4', matrix.php-versions) }}
         run: php vendor/bin/phpstan analyse --memory-limit=1250M
\ No newline at end of file

From a6d87eb4edd22445156e1be9e70915f3957fa4c0 Mon Sep 17 00:00:00 2001
From: Tim Carr <tim@n7studios.co.uk>
Date: Tue, 7 Apr 2026 10:43:39 +0800
Subject: [PATCH 11/11] Revert Tests to PHP 8+

---
 .github/workflows/tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 5c0b0ce..c25d543 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -50,7 +50,7 @@ jobs:
       fail-fast: false
       matrix:
         wp-versions: [ 'latest' ] #[ '6.1.1', 'latest' ]
-        php-versions: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4' ] #[ '7.4', '8.0', '8.1', '8.2' ]
+        php-versions: [ '8.0', '8.1', '8.2', '8.3', '8.4' ] #[ '7.4', '8.0', '8.1', '8.2' ]
 
     # Steps to install, configure and run tests
     steps: