Skip to content

Commit dee419a

Browse files
authored
Merge pull request #62 from iMattPro/updates
Maintenance
2 parents 25fa81f + 1f70007 commit dee419a

File tree

2 files changed

+34
-30
lines changed

2 files changed

+34
-30
lines changed

.github/workflows/tests.yml

Lines changed: 33 additions & 29 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,28 +89,26 @@ 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:
96-
- php: '7.1'
96+
- php: '7.2'
9797
db: "mariadb:10.1"
98-
- php: '7.1'
98+
- php: '7.2'
9999
db: "mariadb:10.2"
100-
- php: '7.1'
100+
- php: '7.2'
101101
db: "mariadb:10.3"
102-
- php: '7.1'
102+
- php: '7.2'
103103
db: "mariadb:10.4"
104-
- php: '7.1'
104+
- php: '7.2'
105105
db: "mariadb:10.5"
106-
- php: '7.1'
106+
- php: '7.2'
107107
db: "mysql:5.6"
108108
db_alias: "MyISAM Tests"
109109
MYISAM: 1
110-
- php: '7.1'
110+
- php: '7.2'
111111
db: "mysql:5.6"
112-
- php: '7.1'
113-
db: "mysql:5.7"
114112
- php: '7.2'
115113
db: "mysql:5.7"
116114
- php: '7.3'
@@ -125,6 +123,10 @@ jobs:
125123
db: "mysql:5.7"
126124
- php: '8.2'
127125
db: "mysql:5.7"
126+
- php: '8.3'
127+
db: "mysql:5.7"
128+
- php: '8.4'
129+
db: "mysql:5.7"
128130

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

@@ -154,14 +156,14 @@ jobs:
154156

155157
steps:
156158
- name: Checkout phpBB
157-
uses: actions/checkout@v3
159+
uses: actions/checkout@v4
158160
with:
159161
repository: phpbb/phpbb
160162
ref: ${{ env.PHPBB_BRANCH }}
161163
path: phpBB3
162164

163165
- name: Checkout extension
164-
uses: actions/checkout@v3
166+
uses: actions/checkout@v4
165167
with:
166168
path: phpBB3/phpBB/ext/${{ env.EXTNAME }}
167169

@@ -207,22 +209,20 @@ jobs:
207209

208210
# START PostgreSQL Job
209211
postgres-tests:
210-
runs-on: ubuntu-20.04
212+
runs-on: ubuntu-22.04
211213
strategy:
212214
matrix:
213215
include:
214-
- php: '7.1'
216+
- php: '7.2'
215217
db: "postgres:9.5"
216-
- php: '7.1'
218+
- php: '7.2'
217219
db: "postgres:9.6"
218-
- php: '7.1'
220+
- php: '7.2'
219221
db: "postgres:10"
220-
- php: '7.1'
222+
- php: '7.2'
221223
db: "postgres:11"
222-
- php: '7.1'
224+
- php: '7.2'
223225
db: "postgres:12"
224-
- php: '7.1'
225-
db: "postgres:13"
226226
- php: '7.2'
227227
db: "postgres:13"
228228
- php: '7.3'
@@ -237,6 +237,10 @@ jobs:
237237
db: "postgres:14"
238238
- php: '8.2'
239239
db: "postgres:14"
240+
- php: '8.3'
241+
db: "postgres:14"
242+
- php: '8.4'
243+
db: "postgres:14"
240244

241245
name: PHP ${{ matrix.php }} - ${{ matrix.db }}
242246

@@ -268,14 +272,14 @@ jobs:
268272

269273
steps:
270274
- name: Checkout phpBB
271-
uses: actions/checkout@v3
275+
uses: actions/checkout@v4
272276
with:
273277
repository: phpbb/phpbb
274278
ref: ${{ env.PHPBB_BRANCH }}
275279
path: phpBB3
276280

277281
- name: Checkout extension
278-
uses: actions/checkout@v3
282+
uses: actions/checkout@v4
279283
with:
280284
path: phpBB3/phpBB/ext/${{ env.EXTNAME }}
281285

@@ -321,11 +325,11 @@ jobs:
321325

322326
# START Other Tests Job (SQLite 3 and mssql)
323327
other-tests:
324-
runs-on: ubuntu-20.04
328+
runs-on: ubuntu-22.04
325329
strategy:
326330
matrix:
327331
include:
328-
- php: '7.1'
332+
- php: '7.2'
329333
db: "sqlite3"
330334
- php: '7.2'
331335
db: "mcr.microsoft.com/mssql/server:2017-latest"
@@ -363,14 +367,14 @@ jobs:
363367

364368
steps:
365369
- name: Checkout phpBB
366-
uses: actions/checkout@v3
370+
uses: actions/checkout@v4
367371
with:
368372
repository: phpbb/phpbb
369373
ref: ${{ env.PHPBB_BRANCH }}
370374
path: phpBB3
371375

372376
- name: Checkout extension
373-
uses: actions/checkout@v3
377+
uses: actions/checkout@v4
374378
with:
375379
path: phpBB3/phpBB/ext/${{ env.EXTNAME }}
376380

acp/teamsecurity_module.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public function __construct()
7575
public function main()
7676
{
7777
$this->tpl_name = 'acp_teamsecurity';
78-
$this->page_title = $this->language->lang('ACP_TEAM_SECURITY_SETTINGS');
78+
$this->page_title = 'ACP_TEAM_SECURITY_SETTINGS';
7979

8080
// Only allow founders to view/manage these settings
8181
if ($this->user->data['user_type'] != USER_FOUNDER)

0 commit comments

Comments
 (0)