Skip to content

Commit f04dc5a

Browse files
authored
Merge pull request #149 from iMattPro/updates
Maintenance
2 parents 8f502a8 + a6a89f3 commit f04dc5a

3 files changed

Lines changed: 6 additions & 2 deletions

File tree

.github/workflows/tests.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,8 @@ jobs:
127127
db: "mysql:5.7"
128128
- php: '8.3'
129129
db: "mysql:5.7"
130+
- php: '8.4'
131+
db: "mysql:5.7"
130132

131133
name: PHP ${{ matrix.php }} - ${{ matrix.db_alias != '' && matrix.db_alias || matrix.db }}
132134

@@ -270,6 +272,8 @@ jobs:
270272
db: "postgres:14"
271273
- php: '8.3'
272274
db: "postgres:14"
275+
- php: '8.4'
276+
db: "postgres:14"
273277

274278
name: PHP ${{ matrix.php }} - ${{ matrix.db }}
275279

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
"extra": {
4141
"display-name": "phpBB Ideas",
4242
"soft-require": {
43-
"phpbb/phpbb": ">=3.3.0"
43+
"phpbb/phpbb": ">=3.3.0,<4.0.0@dev"
4444
}
4545
}
4646
}

ext.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public static function status_name($id)
6767
*/
6868
public function is_enableable()
6969
{
70-
if (PHP_VERSION_ID < 70100 || phpbb_version_compare(PHPBB_VERSION, '3.3.0', '<'))
70+
if (PHP_VERSION_ID < 70100 || phpbb_version_compare(PHPBB_VERSION, '3.3.0', '<') || phpbb_version_compare(PHPBB_VERSION, '4.0.0-dev', '>='))
7171
{
7272
return false;
7373
}

0 commit comments

Comments
 (0)