From 1121d7feb76dc4a1493a644d083994457e97b020 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Wed, 12 Jun 2024 10:30:50 -0700 Subject: [PATCH 1/2] Update test workflows Signed-off-by: Matt Friedman --- .github/workflows/tests.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 4aa79b21..ff677362 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -21,7 +21,7 @@ on: jobs: # START Basic Checks Job (EPV, code sniffer, images check, etc.) basic-checks: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 strategy: matrix: include: @@ -33,14 +33,14 @@ jobs: steps: - name: Checkout phpBB - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: phpbb/phpbb ref: ${{ env.PHPBB_BRANCH }} path: phpBB3 - name: Checkout extension - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: phpBB3/phpBB/ext/${{ env.EXTNAME }} @@ -89,7 +89,7 @@ jobs: # START MySQL and MariaDB Job mysql-tests: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 strategy: matrix: include: @@ -156,14 +156,14 @@ jobs: steps: - name: Checkout phpBB - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: phpbb/phpbb ref: ${{ env.PHPBB_BRANCH }} path: phpBB3 - name: Checkout extension - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: phpBB3/phpBB/ext/${{ env.EXTNAME }} @@ -240,7 +240,7 @@ jobs: # START PostgreSQL Job postgres-tests: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 strategy: matrix: include: @@ -301,14 +301,14 @@ jobs: steps: - name: Checkout phpBB - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: phpbb/phpbb ref: ${{ env.PHPBB_BRANCH }} path: phpBB3 - name: Checkout extension - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: phpBB3/phpBB/ext/${{ env.EXTNAME }} @@ -354,7 +354,7 @@ jobs: # START Other Tests Job (SQLite 3 and mssql) other-tests: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 strategy: matrix: include: @@ -396,14 +396,14 @@ jobs: steps: - name: Checkout phpBB - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: phpbb/phpbb ref: ${{ env.PHPBB_BRANCH }} path: phpBB3 - name: Checkout extension - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: phpBB3/phpBB/ext/${{ env.EXTNAME }} From 2f768c296b4d5627aa28c633fb1f7016779e9c57 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Wed, 12 Jun 2024 10:31:45 -0700 Subject: [PATCH 2/2] Update version constraints Signed-off-by: Matt Friedman --- composer.json | 4 ++-- ext.php | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index b82a65c5..3550f62d 100644 --- a/composer.json +++ b/composer.json @@ -3,7 +3,7 @@ "type": "phpbb-extension", "description": "An extension which allows you to create a set of rules for your phpBB forum", "homepage": "https://www.phpbb.com/customise/db/extension/boardrules/", - "version": "3.0.1", + "version": "3.0.2-dev", "keywords": ["phpbb", "extension", "rules"], "license": "GPL-2.0-only", "authors": [ @@ -38,7 +38,7 @@ "extra": { "display-name": "Board Rules", "soft-require": { - "phpbb/phpbb": ">=3.3.2" + "phpbb/phpbb": ">=3.3.2,<4.0.0@dev" }, "version-check": { "host": "www.phpbb.com", diff --git a/ext.php b/ext.php index 3a4b025d..9fdf22a8 100644 --- a/ext.php +++ b/ext.php @@ -32,13 +32,15 @@ class ext extends \phpbb\extension\base * the minimum version required by this extension: * * Requires phpBB 3.3.2 due to using role_exists check in permission migration. + * Not compatible with phpBB4 due to use of deprecated or changed functions, classes and Icons * * @return bool * @access public */ public function is_enableable() { - return phpbb_version_compare(PHPBB_VERSION, '3.3.2', '>='); + return phpbb_version_compare(PHPBB_VERSION, '3.3.2', '>=') + && phpbb_version_compare(PHPBB_VERSION, '4.0.0-dev', '<'); } /**