From 7eb9b9926922a97eda613d44471ac88a3fa70117 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Fri, 5 Jul 2024 16:16:36 -0700 Subject: [PATCH 1/2] Add PHP 8.4 to testing Signed-off-by: Matt Friedman --- .github/workflows/tests.yml | 4 ++++ skeleton/.github/workflows/tests.yml.twig | 12 ++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index a168a1b..db38639 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -127,6 +127,8 @@ jobs: db: "mysql:5.7" - php: '8.3' db: "mysql:5.7" + - php: '8.4' + db: "mysql:5.7" name: PHP ${{ matrix.php }} - ${{ matrix.db_alias != '' && matrix.db_alias || matrix.db }} @@ -270,6 +272,8 @@ jobs: db: "postgres:14" - php: '8.3' db: "postgres:14" + - php: '8.4' + db: "postgres:14" name: PHP ${{ matrix.php }} - ${{ matrix.db }} diff --git a/skeleton/.github/workflows/tests.yml.twig b/skeleton/.github/workflows/tests.yml.twig index 905b6d8..ec42c0b 100644 --- a/skeleton/.github/workflows/tests.yml.twig +++ b/skeleton/.github/workflows/tests.yml.twig @@ -125,8 +125,10 @@ jobs: db: "mysql:5.7" - php: '8.2' db: "mysql:5.7" - - php: '8.3' - db: "mysql:5.7" + - php: '8.3' + db: "mysql:5.7" + - php: '8.4' + db: "mysql:5.7" name: PHP ${{ '{{' }} matrix.php }} - ${{ '{{' }} matrix.db_alias != '' && matrix.db_alias || matrix.db }} @@ -237,8 +239,10 @@ jobs: db: "postgres:14" - php: '8.2' db: "postgres:14" - - php: '8.3' - db: "postgres:14" + - php: '8.3' + db: "postgres:14" + - php: '8.4' + db: "postgres:14" name: PHP ${{ '{{' }} matrix.php }} - ${{ '{{' }} matrix.db }} From f56e4f980130d47146428da257b53404466f2d70 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Fri, 5 Jul 2024 16:17:05 -0700 Subject: [PATCH 2/2] Use less expensive version compare Signed-off-by: Matt Friedman --- ext.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext.php b/ext.php index 286023e..dc6c9b0 100644 --- a/ext.php +++ b/ext.php @@ -64,7 +64,7 @@ protected function phpbb_requirement() */ protected function php_requirement() { - if (phpbb_version_compare(PHP_VERSION, '5.6.0', '<')) + if (PHP_VERSION_ID < 50600) { $this->errors[] = 'PHP_VERSION_ERROR'; }