diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 03563d4..99da3bf 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,28 +89,26 @@ jobs: # START MySQL and MariaDB Job mysql-tests: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 strategy: matrix: include: - - php: '7.1' + - php: '7.2' db: "mariadb:10.1" - - php: '7.1' + - php: '7.2' db: "mariadb:10.2" - - php: '7.1' + - php: '7.2' db: "mariadb:10.3" - - php: '7.1' + - php: '7.2' db: "mariadb:10.4" - - php: '7.1' + - php: '7.2' db: "mariadb:10.5" - - php: '7.1' + - php: '7.2' db: "mysql:5.6" db_alias: "MyISAM Tests" MYISAM: 1 - - php: '7.1' + - php: '7.2' db: "mysql:5.6" - - php: '7.1' - db: "mysql:5.7" - php: '7.2' db: "mysql:5.7" COVERAGE: 1 @@ -127,6 +125,10 @@ jobs: db: "mysql:5.7" - php: '8.2' 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 }} @@ -156,14 +158,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,22 +242,20 @@ jobs: # START PostgreSQL Job postgres-tests: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 strategy: matrix: include: - - php: '7.1' + - php: '7.2' db: "postgres:9.5" - - php: '7.1' + - php: '7.2' db: "postgres:9.6" - - php: '7.1' + - php: '7.2' db: "postgres:10" - - php: '7.1' + - php: '7.2' db: "postgres:11" - - php: '7.1' + - php: '7.2' db: "postgres:12" - - php: '7.1' - db: "postgres:13" - php: '7.2' db: "postgres:13" - php: '7.3' @@ -270,6 +270,10 @@ jobs: db: "postgres:14" - php: '8.2' db: "postgres:14" + - php: '8.3' + db: "postgres:14" + - php: '8.4' + db: "postgres:14" name: PHP ${{ matrix.php }} - ${{ matrix.db }} @@ -301,14 +305,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,11 +358,11 @@ jobs: # START Other Tests Job (SQLite 3 and mssql) other-tests: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 strategy: matrix: include: - - php: '7.1' + - php: '7.2' db: "sqlite3" - php: '7.2' db: "mcr.microsoft.com/mssql/server:2017-latest" @@ -396,14 +400,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 }} diff --git a/composer.json b/composer.json index 65dea40..b46a835 100644 --- a/composer.json +++ b/composer.json @@ -44,7 +44,7 @@ "extra": { "display-name": "Google Analytics", "soft-require": { - "phpbb/phpbb": ">=3.2.0" + "phpbb/phpbb": ">=3.2.0,<4.0.0@dev" }, "version-check": { "host": "www.phpbb.com", diff --git a/ext.php b/ext.php index dede459..75220f6 100644 --- a/ext.php +++ b/ext.php @@ -19,6 +19,7 @@ class ext extends base */ public function is_enableable() { - return phpbb_version_compare(PHPBB_VERSION, '3.2.0', '>='); + return phpbb_version_compare(PHPBB_VERSION, '3.2.0', '>=') + && phpbb_version_compare(PHPBB_VERSION, '4.0.0-dev', '<'); } }