Enable PHP 8.1

This commit is contained in:
Marcus Bointon 2021-11-25 17:14:55 +01:00
parent 2649f9d70f
commit c1a6339108
No known key found for this signature in database
GPG Key ID: DE31CD6EB646AA24
2 changed files with 12 additions and 11 deletions

View File

@ -19,7 +19,7 @@ jobs:
- name: Set up PHP - name: Set up PHP
uses: shivammathur/setup-php@v2 uses: shivammathur/setup-php@v2
with: with:
php-version: '8.0' php-version: '8.1'
coverage: none coverage: none
tools: cs2pr tools: cs2pr
@ -39,10 +39,10 @@ jobs:
runs-on: ubuntu-18.04 runs-on: ubuntu-18.04
strategy: strategy:
matrix: matrix:
php: ['5.5', '7.2', '8.0'] php: ['5.5', '7.2', '8.0', '8.1']
experimental: [false] experimental: [false]
include: include:
- php: '8.1' - php: '8.2'
experimental: true experimental: true
name: "Lint: PHP ${{ matrix.php }}" name: "Lint: PHP ${{ matrix.php }}"
@ -65,11 +65,11 @@ jobs:
uses: "ramsey/composer-install@v1" uses: "ramsey/composer-install@v1"
- name: Lint against parse errors - name: Lint against parse errors
if: ${{ matrix.php != '8.1' }} if: ${{ matrix.php != '8.2' }}
run: composer lint -- --checkstyle | cs2pr run: composer lint -- --checkstyle | cs2pr
- name: Lint against parse errors (PHP 8.1) - name: Lint against future parse errors (PHP 8.2)
if: ${{ matrix.php == '8.1' }} if: ${{ matrix.php == '8.2' }}
run: composer lint run: composer lint
test: test:
@ -77,7 +77,7 @@ jobs:
runs-on: ubuntu-18.04 runs-on: ubuntu-18.04
strategy: strategy:
matrix: 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] coverage: [false]
experimental: [false] experimental: [false]
include: include:
@ -85,12 +85,12 @@ jobs:
- php: '5.5' - php: '5.5'
coverage: true coverage: true
experimental: false experimental: false
- php: '8.0' - php: '8.1'
coverage: true coverage: true
experimental: false experimental: false
# Experimental builds. These are allowed to fail. # Experimental builds. These are allowed to fail.
- php: '8.1' - php: '8.2'
coverage: false coverage: false
experimental: true experimental: true
@ -122,11 +122,11 @@ jobs:
# Install dependencies and handle caching in one go. # Install dependencies and handle caching in one go.
# @link https://github.com/marketplace/actions/install-composer-dependencies # @link https://github.com/marketplace/actions/install-composer-dependencies
- name: Install PHP packages - normal - name: Install PHP packages - normal
if: ${{ matrix.php != '8.1' }} if: ${{ matrix.php != '8.2' }}
uses: "ramsey/composer-install@v1" uses: "ramsey/composer-install@v1"
- name: Install PHP packages - ignore-platform-reqs - name: Install PHP packages - ignore-platform-reqs
if: ${{ matrix.php == '8.1' }} if: ${{ matrix.php == '8.2' }}
uses: "ramsey/composer-install@v1" uses: "ramsey/composer-install@v1"
with: with:
composer-options: --ignore-platform-reqs composer-options: --ignore-platform-reqs

View File

@ -1,6 +1,7 @@
# PHPMailer Change Log # PHPMailer Change Log
## Work In Progress ## Work In Progress
* Enable official support for PHP 8.1
* Fix for PHP 5.6 * Fix for PHP 5.6
* Fix for incorrect options for punyencoding IDNs * Fix for incorrect options for punyencoding IDNs