Skip to content

Commit d13a6f1

Browse files
iMattProiMattPro
authored
Merge pull request #144 from iMattPro/updates
Version constraint updates
2 parents e9cf1b6 + 89b7bbf commit d13a6f1

File tree

5 files changed

+34
-28
lines changed

5 files changed

+34
-28
lines changed

‎.github/workflows/tests.yml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ on:
2121
jobs:
2222
# START Basic Checks Job (EPV, code sniffer, images check, etc.)
2323
basic-checks:
24-
runs-on: ubuntu-20.04
24+
runs-on: ubuntu-22.04
2525
strategy:
2626
matrix:
2727
include:
@@ -33,14 +33,14 @@ jobs:
3333

3434
steps:
3535
- name: Checkout phpBB
36-
uses: actions/checkout@v3
36+
uses: actions/checkout@v4
3737
with:
3838
repository: phpbb/phpbb
3939
ref: ${{ env.PHPBB_BRANCH }}
4040
path: phpBB3
4141

4242
- name: Checkout extension
43-
uses: actions/checkout@v3
43+
uses: actions/checkout@v4
4444
with:
4545
path: phpBB3/phpBB/ext/${{ env.EXTNAME }}
4646

@@ -89,7 +89,7 @@ jobs:
8989

9090
# START MySQL and MariaDB Job
9191
mysql-tests:
92-
runs-on: ubuntu-20.04
92+
runs-on: ubuntu-22.04
9393
strategy:
9494
matrix:
9595
include:
@@ -156,14 +156,14 @@ jobs:
156156

157157
steps:
158158
- name: Checkout phpBB
159-
uses: actions/checkout@v3
159+
uses: actions/checkout@v4
160160
with:
161161
repository: phpbb/phpbb
162162
ref: ${{ env.PHPBB_BRANCH }}
163163
path: phpBB3
164164

165165
- name: Checkout extension
166-
uses: actions/checkout@v3
166+
uses: actions/checkout@v4
167167
with:
168168
path: phpBB3/phpBB/ext/${{ env.EXTNAME }}
169169

@@ -240,7 +240,7 @@ jobs:
240240

241241
# START PostgreSQL Job
242242
postgres-tests:
243-
runs-on: ubuntu-20.04
243+
runs-on: ubuntu-22.04
244244
strategy:
245245
matrix:
246246
include:
@@ -301,14 +301,14 @@ jobs:
301301

302302
steps:
303303
- name: Checkout phpBB
304-
uses: actions/checkout@v3
304+
uses: actions/checkout@v4
305305
with:
306306
repository: phpbb/phpbb
307307
ref: ${{ env.PHPBB_BRANCH }}
308308
path: phpBB3
309309

310310
- name: Checkout extension
311-
uses: actions/checkout@v3
311+
uses: actions/checkout@v4
312312
with:
313313
path: phpBB3/phpBB/ext/${{ env.EXTNAME }}
314314

@@ -354,7 +354,7 @@ jobs:
354354

355355
# START Other Tests Job (SQLite 3 and mssql)
356356
other-tests:
357-
runs-on: ubuntu-20.04
357+
runs-on: ubuntu-22.04
358358
strategy:
359359
matrix:
360360
include:
@@ -396,14 +396,14 @@ jobs:
396396

397397
steps:
398398
- name: Checkout phpBB
399-
uses: actions/checkout@v3
399+
uses: actions/checkout@v4
400400
with:
401401
repository: phpbb/phpbb
402402
ref: ${{ env.PHPBB_BRANCH }}
403403
path: phpBB3
404404

405405
- name: Checkout extension
406-
uses: actions/checkout@v3
406+
uses: actions/checkout@v4
407407
with:
408408
path: phpBB3/phpBB/ext/${{ env.EXTNAME }}
409409

‎composer.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"type": "phpbb-extension",
44
"description": "The official phpBB skeleton extension generator.",
55
"homepage": "https://www.phpbb.com/customise/db/official_tool/ext_skeleton/",
6-
"version": "1.1.11",
6+
"version": "1.1.12-dev",
77
"license": "GPL-2.0-only",
88
"authors": [
99
{
@@ -28,7 +28,7 @@
2828
"extra": {
2929
"display-name": "phpBB Skeleton Extension",
3030
"soft-require": {
31-
"phpbb/phpbb": ">=3.2.3"
31+
"phpbb/phpbb": ">=3.2.3,<4.0.0@dev"
3232
},
3333
"version-check": {
3434
"host": "www.phpbb.com",

‎ext.php‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,12 @@ protected function phpbb_requirement()
4848
{
4949
if (phpbb_version_compare(PHPBB_VERSION, '3.2.3', '<'))
5050
{
51-
$this->errors[] = 'PHPBB_VERSION_ERROR';
51+
$this->errors[] = 'PHPBB_VERSION_MIN_ERROR';
52+
}
53+
54+
else if (phpbb_version_compare(PHPBB_VERSION, '4.0.0-dev', '>='))
55+
{
56+
$this->errors[] = 'PHPBB_VERSION_MAX_ERROR';
5257
}
5358
}
5459

‎language/en/common.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,5 +156,6 @@
156156

157157
'NO_ZIPARCHIVE_ERROR' => 'The ZipArchive class is required, but was not found in your PHP configuration.',
158158
'PHP_VERSION_ERROR' => 'PHP 5.6 or newer is required to use this extension.',
159-
'PHPBB_VERSION_ERROR' => 'phpBB 3.2.3 or newer is required to use this extension.',
159+
'PHPBB_VERSION_MIN_ERROR' => 'phpBB 3.2.3 or newer is required to use this extension.',
160+
'PHPBB_VERSION_MAX_ERROR' => 'phpBB 4 is not supported with this version of the extension. Please check for a newer version of this extension.'
160161
]);

‎skeleton/.github/workflows/tests.yml.twig‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ on:
2323
jobs:
2424
# START Basic Checks Job (EPV, code sniffer, images check, etc.)
2525
basic-checks:
26-
runs-on: ubuntu-20.04
26+
runs-on: ubuntu-22.04
2727
strategy:
2828
matrix:
2929
include:
@@ -35,14 +35,14 @@ jobs:
3535

3636
steps:
3737
- name: Checkout phpBB
38-
uses: actions/checkout@v3
38+
uses: actions/checkout@v4
3939
with:
4040
repository: phpbb/phpbb
4141
ref: ${{ '{{' }} env.PHPBB_BRANCH }}
4242
path: phpBB3
4343

4444
- name: Checkout extension
45-
uses: actions/checkout@v3
45+
uses: actions/checkout@v4
4646
with:
4747
path: phpBB3/phpBB/ext/${{ '{{' }} env.EXTNAME }}
4848

@@ -91,7 +91,7 @@ jobs:
9191

9292
# START MySQL and MariaDB Job
9393
mysql-tests:
94-
runs-on: ubuntu-20.04
94+
runs-on: ubuntu-22.04
9595
strategy:
9696
matrix:
9797
include:
@@ -156,14 +156,14 @@ jobs:
156156

157157
steps:
158158
- name: Checkout phpBB
159-
uses: actions/checkout@v3
159+
uses: actions/checkout@v4
160160
with:
161161
repository: phpbb/phpbb
162162
ref: ${{ '{{' }} env.PHPBB_BRANCH }}
163163
path: phpBB3
164164

165165
- name: Checkout extension
166-
uses: actions/checkout@v3
166+
uses: actions/checkout@v4
167167
with:
168168
path: phpBB3/phpBB/ext/${{ '{{' }} env.EXTNAME }}
169169

@@ -209,7 +209,7 @@ jobs:
209209

210210
# START PostgreSQL Job
211211
postgres-tests:
212-
runs-on: ubuntu-20.04
212+
runs-on: ubuntu-22.04
213213
strategy:
214214
matrix:
215215
include:
@@ -270,14 +270,14 @@ jobs:
270270

271271
steps:
272272
- name: Checkout phpBB
273-
uses: actions/checkout@v3
273+
uses: actions/checkout@v4
274274
with:
275275
repository: phpbb/phpbb
276276
ref: ${{ '{{' }} env.PHPBB_BRANCH }}
277277
path: phpBB3
278278

279279
- name: Checkout extension
280-
uses: actions/checkout@v3
280+
uses: actions/checkout@v4
281281
with:
282282
path: phpBB3/phpBB/ext/${{ '{{' }} env.EXTNAME }}
283283

@@ -323,7 +323,7 @@ jobs:
323323

324324
# START Other Tests Job (SQLite 3 and mssql)
325325
other-tests:
326-
runs-on: ubuntu-20.04
326+
runs-on: ubuntu-22.04
327327
strategy:
328328
matrix:
329329
include:
@@ -365,14 +365,14 @@ jobs:
365365

366366
steps:
367367
- name: Checkout phpBB
368-
uses: actions/checkout@v3
368+
uses: actions/checkout@v4
369369
with:
370370
repository: phpbb/phpbb
371371
ref: ${{ '{{' }} env.PHPBB_BRANCH }}
372372
path: phpBB3
373373

374374
- name: Checkout extension
375-
uses: actions/checkout@v3
375+
uses: actions/checkout@v4
376376
with:
377377
path: phpBB3/phpBB/ext/${{ '{{' }} env.EXTNAME }}
378378

0 commit comments

Comments
 (0)