From c1a63391084a9cb55bba53cb341049428aa3a1c0 Mon Sep 17 00:00:00 2001
From: Marcus Bointon <marcus@synchromedia.co.uk>
Date: Thu, 25 Nov 2021 17:14:55 +0100
Subject: [PATCH] Enable PHP 8.1

---
 .github/workflows/tests.yml | 22 +++++++++++-----------
 changelog.md                |  1 +
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 18808995..7cacbc9c 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -19,7 +19,7 @@ jobs:
       - name: Set up PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.0'
+          php-version: '8.1'
           coverage: none
           tools: cs2pr
 
@@ -39,10 +39,10 @@ jobs:
     runs-on: ubuntu-18.04
     strategy:
       matrix:
-        php: ['5.5', '7.2', '8.0']
+        php: ['5.5', '7.2', '8.0', '8.1']
         experimental: [false]
         include:
-          - php: '8.1'
+          - php: '8.2'
             experimental: true
 
     name: "Lint: PHP ${{ matrix.php }}"
@@ -65,11 +65,11 @@ jobs:
         uses: "ramsey/composer-install@v1"
 
       - name: Lint against parse errors
-        if: ${{ matrix.php != '8.1' }}
+        if: ${{ matrix.php != '8.2' }}
         run: composer lint -- --checkstyle | cs2pr
 
-      - name: Lint against parse errors (PHP 8.1)
-        if: ${{ matrix.php == '8.1' }}
+      - name: Lint against future parse errors (PHP 8.2)
+        if: ${{ matrix.php == '8.2' }}
         run: composer lint
 
   test:
@@ -77,7 +77,7 @@ jobs:
     runs-on: ubuntu-18.04
     strategy:
       matrix:
-        php: ['5.6', '7.0', '7.1', '7.2', '7.3', '7.4']
+        php: ['5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0']
         coverage: [false]
         experimental: [false]
         include:
@@ -85,12 +85,12 @@ jobs:
           - php: '5.5'
             coverage: true
             experimental: false
-          - php: '8.0'
+          - php: '8.1'
             coverage: true
             experimental: false
 
           # Experimental builds. These are allowed to fail.
-          - php: '8.1'
+          - php: '8.2'
             coverage: false
             experimental: true
 
@@ -122,11 +122,11 @@ jobs:
       # Install dependencies and handle caching in one go.
       # @link https://github.com/marketplace/actions/install-composer-dependencies
       - name: Install PHP packages - normal
-        if: ${{ matrix.php != '8.1' }}
+        if: ${{ matrix.php != '8.2' }}
         uses: "ramsey/composer-install@v1"
 
       - name: Install PHP packages - ignore-platform-reqs
-        if: ${{ matrix.php == '8.1' }}
+        if: ${{ matrix.php == '8.2' }}
         uses: "ramsey/composer-install@v1"
         with:
           composer-options: --ignore-platform-reqs
diff --git a/changelog.md b/changelog.md
index 8ce369e1..0a6bcf0e 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,6 +1,7 @@
 # PHPMailer Change Log
 
 ## Work In Progress
+* Enable official support for PHP 8.1
 * Fix for PHP 5.6
 * Fix for incorrect options for punyencoding IDNs