Skip to content

Commit b9741b3

Browse files
SkouatSkouat
authored
Merge pull request #2 from phpbb-fr-com/master
Master to Master-intl-fr
2 parents cfda485 + 5b5b804 commit b9741b3

File tree

9 files changed

+200
-130
lines changed

9 files changed

+200
-130
lines changed

‎.github/workflows/tests.yml‎

Lines changed: 54 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ env:
44
EXTNAME: phpbb/teamsecurity # Your extension vendor/package name
55
SNIFF: 1 # Run code sniffer on your code? 1 or 0
66
IMAGE_ICC: 1 # Run icc profile sniffer on your images? 1 or 0
7-
EPV: 1 # Run EPV (Extension Pre Validator) on your code? 1 or 0
7+
EPV: 0 # Run EPV (Extension Pre Validator) on your code? 1 or 0
88
EXECUTABLE_FILES: 1 # Run check for executable files? 1 or 0
9-
PHPBB_BRANCH: 3.3.x # The phpBB branch to run tests on
9+
PHPBB_BRANCH: master # The phpBB branch to run tests on
1010

1111
on:
1212
push:
@@ -21,12 +21,12 @@ on:
2121
jobs:
2222
# START Basic Checks Job (EPV, code sniffer, images check, etc.)
2323
basic-checks:
24-
runs-on: ubuntu-22.04
24+
runs-on: ubuntu-latest
2525
strategy:
2626
matrix:
2727
include:
28-
- php: '7.2'
29-
db: "none"
28+
- db: 'none'
29+
php: '8.1'
3030
NOTESTS: 1
3131

3232
name: PHP ${{ matrix.php }} - ${{ matrix.db }}
@@ -48,7 +48,7 @@ jobs:
4848
uses: shivammathur/setup-php@v2
4949
with:
5050
php-version: ${{ matrix.php }}
51-
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, mysqli, sqlite, pdo_sqlite, intl, gd, exif, iconv, sqlsrv, pdo_sqlsrv, ldap
51+
extensions: dom, curl, libxml, mbstring, zip, pcntl, intl, gd, exif, iconv
5252
coverage: none
5353

5454
- name: Setup environment for phpBB
@@ -89,44 +89,42 @@ jobs:
8989

9090
# START MySQL and MariaDB Job
9191
mysql-tests:
92-
runs-on: ubuntu-22.04
92+
runs-on: ubuntu-latest
9393
strategy:
9494
matrix:
9595
include:
96-
- php: '7.2'
97-
db: "mariadb:10.1"
98-
- php: '7.2'
96+
- php: '8.1'
9997
db: "mariadb:10.2"
100-
- php: '7.2'
98+
- php: '8.1'
10199
db: "mariadb:10.3"
102-
- php: '7.2'
100+
- php: '8.1'
103101
db: "mariadb:10.4"
104-
- php: '7.2'
105-
db: "mariadb:10.5"
106-
- php: '7.2'
107-
db: "mysql:5.6"
102+
- php: '8.1'
103+
db: "mariadb:10.6"
104+
- php: '8.1'
105+
db: "mariadb:10.9"
106+
- php: '8.1'
107+
db: "mariadb:10.10"
108+
- php: '8.1'
109+
db: "mariadb:10.11"
110+
- php: '8.1'
111+
db: "mysql:5.7"
108112
db_alias: "MyISAM Tests"
109113
MYISAM: 1
110-
- php: '7.2'
111-
db: "mysql:5.6"
112-
- php: '7.2'
113-
db: "mysql:5.7"
114-
- php: '7.3'
115-
db: "mysql:5.7"
116-
- php: '7.4'
117-
db: "mysql:5.7"
118-
- php: '7.4'
119-
db: "mysql:8.0"
120-
- php: '8.0'
121-
db: "mysql:5.7"
122114
- php: '8.1'
123-
db: "mysql:5.7"
115+
db: "mysql:8.1"
124116
- php: '8.2'
125-
db: "mysql:5.7"
117+
db: "mysql:8.0"
118+
- php: '8.2'
119+
db: "mariadb:10.2"
126120
- php: '8.3'
127121
db: "mysql:5.7"
122+
- php: '8.3'
123+
db: "mariadb:10.2"
128124
- php: '8.4'
129-
db: "mysql:5.7"
125+
db: "mysql:8.0"
126+
- php: '8.4'
127+
db: "mariadb:10.3"
130128

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

@@ -209,44 +207,38 @@ jobs:
209207

210208
# START PostgreSQL Job
211209
postgres-tests:
212-
runs-on: ubuntu-22.04
210+
runs-on: ubuntu-latest
213211
strategy:
214212
matrix:
215213
include:
216-
- php: '7.2'
214+
- php: '8.1'
217215
db: "postgres:9.5"
218-
- php: '7.2'
216+
- php: '8.1'
219217
db: "postgres:9.6"
220-
- php: '7.2'
218+
- php: '8.1'
221219
db: "postgres:10"
222-
- php: '7.2'
220+
- php: '8.1'
223221
db: "postgres:11"
224-
- php: '7.2'
225-
db: "postgres:12"
226-
- php: '7.2'
227-
db: "postgres:13"
228-
- php: '7.3'
229-
db: "postgres:13"
230-
- php: '7.4'
231-
db: "postgres:13"
232-
- php: '8.0'
222+
- php: '8.1'
233223
db: "postgres:12"
234-
- php: '8.0'
224+
- php: '8.1'
235225
db: "postgres:13"
236226
- php: '8.1'
237227
db: "postgres:14"
228+
- php: '8.1'
229+
db: "postgres:15"
238230
- php: '8.2'
239-
db: "postgres:14"
231+
db: "postgres:9.5"
240232
- php: '8.3'
241-
db: "postgres:14"
233+
db: "postgres:9.5"
242234
- php: '8.4'
243-
db: "postgres:14"
235+
db: "postgres:9.5"
244236

245237
name: PHP ${{ matrix.php }} - ${{ matrix.db }}
246238

247239
services:
248240
postgres:
249-
image: ${{ matrix.db != 'postgres:9.5' && matrix.db != 'postgres:9.6' && matrix.db != 'postgres:10' && matrix.db != 'postgres:11' && matrix.db != 'postgres:12' && matrix.db != 'postgres:13' && 'postgres:10' || matrix.db }}
241+
image: ${{ matrix.db != 'postgres:9.5' && matrix.db != 'postgres:9.6' && matrix.db != 'postgres:10' && matrix.db != 'postgres:11' && matrix.db != 'postgres:12' && matrix.db != 'postgres:13' && matrix.db != 'postgres:14' && matrix.db != 'postgres:15' && 'postgres:10' || matrix.db }}
250242
env:
251243
POSTGRES_HOST: localhost
252244
POSTGRES_USER: postgres
@@ -294,7 +286,7 @@ jobs:
294286
uses: shivammathur/setup-php@v2
295287
with:
296288
php-version: ${{ matrix.php }}
297-
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, mysqli, sqlite, pdo_sqlite, intl, gd, exif, iconv, sqlsrv, pdo_sqlsrv, ldap
289+
extensions: dom, curl, libxml, mbstring, zip, pcntl, intl, gd, exif, iconv, pgsql, pdo, pdo_pgsql
298290
coverage: none
299291

300292
- name: Setup environment for phpBB
@@ -325,24 +317,27 @@ jobs:
325317

326318
# START Other Tests Job (SQLite 3 and mssql)
327319
other-tests:
328-
runs-on: ubuntu-22.04
320+
runs-on: ubuntu-20.04
329321
strategy:
330322
matrix:
331323
include:
332-
- php: '7.2'
324+
- php: '8.1'
333325
db: "sqlite3"
334-
- php: '7.2'
326+
- php: '8.1'
335327
db: "mcr.microsoft.com/mssql/server:2017-latest"
336328
db_alias: 'MSSQL 2017'
337-
- php: '7.2'
338-
db: "mcr.microsoft.com/mssql/server:2019-latest"
329+
- php: '8.1'
330+
db: "mcr.microsoft.com/mssql/server:2019-CU27-ubuntu-20.04"
339331
db_alias: 'MSSQL 2019'
332+
- php: '8.1'
333+
db: "mcr.microsoft.com/mssql/server:2022-CU13-ubuntu-22.04"
334+
db_alias: 'MSSQL 2022'
340335

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

343338
services:
344339
mssql:
345-
image: ${{ matrix.db != 'mcr.microsoft.com/mssql/server:2017-latest' && matrix.db != 'mcr.microsoft.com/mssql/server:2019-latest' && 'mcr.microsoft.com/mssql/server:2017-latest' || matrix.db }}
340+
image: ${{ matrix.db != 'mcr.microsoft.com/mssql/server:2017-latest' && matrix.db != 'mcr.microsoft.com/mssql/server:2019-CU27-ubuntu-20.04' && matrix.db != 'mcr.microsoft.com/mssql/server:2022-CU13-ubuntu-22.04' && 'mcr.microsoft.com/mssql/server:2017-latest' || matrix.db }}
346341
env:
347342
SA_PASSWORD: "Pssw0rd_12"
348343
ACCEPT_EULA: "y"
@@ -382,7 +377,7 @@ jobs:
382377
env:
383378
MATRIX_DB: ${{ matrix.db }}
384379
run: |
385-
if [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2017-latest' ] || [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2019-latest' ]
380+
if [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2017-latest' ] || [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2019-CU27-ubuntu-20.04' ] || [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2022-CU13-ubuntu-22.04' ]
386381
then
387382
db='mssql'
388383
else
@@ -394,7 +389,7 @@ jobs:
394389
uses: shivammathur/setup-php@v2
395390
with:
396391
php-version: ${{ matrix.php }}
397-
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, mysqli, sqlite, pdo_sqlite, intl, gd, exif, iconv, sqlsrv, pdo_sqlsrv, ldap
392+
extensions: dom, curl, libxml, mbstring, zip, pcntl, intl, gd, exif, iconv, sqlsrv, pdo, pdo_sqlsrv
398393
coverage: none
399394

400395
- name: Setup environment for phpBB

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
This is the repository for the development of the Team Security extension for phpBB.
44

5-
[![Build Status](https://github.com/phpbb-extensions/teamsecurity/workflows/Tests/badge.svg)](https://github.com/phpbb-extensions/teamsecurity/actions)
5+
[![Build Status](https://github.com/phpbb-extensions/teamsecurity/actions/workflows/tests.yml/badge.svg)](https://github.com/phpbb-extensions/teamsecurity/actions)
66

77
This extension adds passive security features to phpBB that allow the board's founder to watch for potential attacks against members of privileged groups, such as Administrators and Moderators.
88

‎composer.json‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"type": "phpbb-extension",
44
"description": "Security measures to help watch over team member accounts.",
55
"homepage": "https://www.phpbb.com",
6-
"version": "1.0.1",
6+
"version": "1.1.0-dev",
77
"license": "GPL-2.0-only",
88
"authors": [
99
{
@@ -19,13 +19,18 @@
1919
}
2020
],
2121
"require": {
22-
"php": ">=5.4",
22+
"php": ">=8.1",
2323
"composer/installers": "~1.0"
2424
},
2525
"extra": {
2626
"display-name": "Team Security Measures",
2727
"soft-require": {
28-
"phpbb/phpbb": ">=3.2.0"
28+
"phpbb/phpbb": ">=4.0.0@dev,<4.1.0@dev"
29+
}
30+
},
31+
"config": {
32+
"allow-plugins": {
33+
"composer/installers": true
2934
}
3035
}
3136
}

0 commit comments

Comments
 (0)