Skip to content

Master to Master-intl-fr #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Skouat merged 21 commits into from
Apr 16, 2025
Merged

Master to Master-intl-fr #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
924c8ea
Update tests
iMattPro Oct 20, 2021
6fc0b4a
Merge branch 'master' into dev/4.0
iMattPro May 11, 2023
fc68fb4
Add support for symfony mailer in phpBB 4.x
marc1706 Apr 2, 2025
27e9415
Soft require phpBB 4.0 dev
marc1706 Apr 2, 2025
3a87126
Update github actions for 4.0
marc1706 Apr 2, 2025
a49dbaa
Merge branch 'dev/4.0' into update-to-4
iMattPro Apr 2, 2025
17d7ccd
Update test environments
iMattPro Apr 2, 2025
dfe61f1
Change min php version and run composer update
marc1706 Apr 2, 2025
5f9f323
Update tests
iMattPro Apr 2, 2025
5ba9190
Start adding email method as mock to listener
marc1706 Apr 2, 2025
1b01855
Pass doctrine_db to tools factory get()
marc1706 Apr 2, 2025
f608cb2
Add missing constructor parameter for db migrator
marc1706 Apr 2, 2025
311be38
Fix extension manager arguments in ext_test
marc1706 Apr 2, 2025
68f5aea
Fix tests
iMattPro Apr 2, 2025
de94714
Merge pull request #64 from iMattPro/update-to-4
iMattPro Apr 3, 2025
f568903
Merge branch 'master' into fix/symfony_mailer
iMattPro Apr 3, 2025
c983f20
Fix ext_test.php
iMattPro Apr 3, 2025
a7ce501
Merge pull request #63 from phpbb-extensions/fix/symfony_mailer
iMattPro Apr 3, 2025
183f2a3
Remove unused code
iMattPro Apr 3, 2025
b617b05
Merge pull request #65 from iMattPro/fixes
iMattPro Apr 3, 2025
5b5b804
Merge branch 'master-intl-fr' into master
Skouat Apr 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
113 changes: 54 additions & 59 deletions .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ env:
EXTNAME: phpbb/teamsecurity # Your extension vendor/package name
SNIFF: 1 # Run code sniffer on your code? 1 or 0
IMAGE_ICC: 1 # Run icc profile sniffer on your images? 1 or 0
EPV: 1 # Run EPV (Extension Pre Validator) on your code? 1 or 0
EPV: 0 # Run EPV (Extension Pre Validator) on your code? 1 or 0
EXECUTABLE_FILES: 1 # Run check for executable files? 1 or 0
PHPBB_BRANCH: 3.3.x # The phpBB branch to run tests on
PHPBB_BRANCH: master # The phpBB branch to run tests on

on:
push:
Expand All @@ -21,12 +21,12 @@ on:
jobs:
# START Basic Checks Job (EPV, code sniffer, images check, etc.)
basic-checks:
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
strategy:
matrix:
include:
- php: '7.2'
db: "none"
- db: 'none'
php: '8.1'
NOTESTS: 1

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

- name: Setup environment for phpBB
Expand Down Expand Up @@ -89,44 +89,42 @@ jobs:

# START MySQL and MariaDB Job
mysql-tests:
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
strategy:
matrix:
include:
- php: '7.2'
db: "mariadb:10.1"
- php: '7.2'
- php: '8.1'
db: "mariadb:10.2"
- php: '7.2'
- php: '8.1'
db: "mariadb:10.3"
- php: '7.2'
- php: '8.1'
db: "mariadb:10.4"
- php: '7.2'
db: "mariadb:10.5"
- php: '7.2'
db: "mysql:5.6"
- php: '8.1'
db: "mariadb:10.6"
- php: '8.1'
db: "mariadb:10.9"
- php: '8.1'
db: "mariadb:10.10"
- php: '8.1'
db: "mariadb:10.11"
- php: '8.1'
db: "mysql:5.7"
db_alias: "MyISAM Tests"
MYISAM: 1
- php: '7.2'
db: "mysql:5.6"
- php: '7.2'
db: "mysql:5.7"
- php: '7.3'
db: "mysql:5.7"
- php: '7.4'
db: "mysql:5.7"
- php: '7.4'
db: "mysql:8.0"
- php: '8.0'
db: "mysql:5.7"
- php: '8.1'
db: "mysql:5.7"
db: "mysql:8.1"
- php: '8.2'
db: "mysql:5.7"
db: "mysql:8.0"
- php: '8.2'
db: "mariadb:10.2"
- php: '8.3'
db: "mysql:5.7"
- php: '8.3'
db: "mariadb:10.2"
- php: '8.4'
db: "mysql:5.7"
db: "mysql:8.0"
- php: '8.4'
db: "mariadb:10.3"

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

Expand Down Expand Up @@ -209,44 +207,38 @@ jobs:

# START PostgreSQL Job
postgres-tests:
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
strategy:
matrix:
include:
- php: '7.2'
- php: '8.1'
db: "postgres:9.5"
- php: '7.2'
- php: '8.1'
db: "postgres:9.6"
- php: '7.2'
- php: '8.1'
db: "postgres:10"
- php: '7.2'
- php: '8.1'
db: "postgres:11"
- php: '7.2'
db: "postgres:12"
- php: '7.2'
db: "postgres:13"
- php: '7.3'
db: "postgres:13"
- php: '7.4'
db: "postgres:13"
- php: '8.0'
- php: '8.1'
db: "postgres:12"
- php: '8.0'
- php: '8.1'
db: "postgres:13"
- php: '8.1'
db: "postgres:14"
- php: '8.1'
db: "postgres:15"
- php: '8.2'
db: "postgres:14"
db: "postgres:9.5"
- php: '8.3'
db: "postgres:14"
db: "postgres:9.5"
- php: '8.4'
db: "postgres:14"
db: "postgres:9.5"

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

services:
postgres:
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 }}
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 }}
env:
POSTGRES_HOST: localhost
POSTGRES_USER: postgres
Expand Down Expand Up @@ -294,7 +286,7 @@ jobs:
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php }}
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, mysqli, sqlite, pdo_sqlite, intl, gd, exif, iconv, sqlsrv, pdo_sqlsrv, ldap
extensions: dom, curl, libxml, mbstring, zip, pcntl, intl, gd, exif, iconv, pgsql, pdo, pdo_pgsql
coverage: none

- name: Setup environment for phpBB
Expand Down Expand Up @@ -325,24 +317,27 @@ jobs:

# START Other Tests Job (SQLite 3 and mssql)
other-tests:
runs-on: ubuntu-22.04
runs-on: ubuntu-20.04
strategy:
matrix:
include:
- php: '7.2'
- php: '8.1'
db: "sqlite3"
- php: '7.2'
- php: '8.1'
db: "mcr.microsoft.com/mssql/server:2017-latest"
db_alias: 'MSSQL 2017'
- php: '7.2'
db: "mcr.microsoft.com/mssql/server:2019-latest"
- php: '8.1'
db: "mcr.microsoft.com/mssql/server:2019-CU27-ubuntu-20.04"
db_alias: 'MSSQL 2019'
- php: '8.1'
db: "mcr.microsoft.com/mssql/server:2022-CU13-ubuntu-22.04"
db_alias: 'MSSQL 2022'

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

services:
mssql:
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 }}
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 }}
env:
SA_PASSWORD: "Pssw0rd_12"
ACCEPT_EULA: "y"
Expand Down Expand Up @@ -382,7 +377,7 @@ jobs:
env:
MATRIX_DB: ${{ matrix.db }}
run: |
if [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2017-latest' ] || [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2019-latest' ]
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' ]
then
db='mssql'
else
Expand All @@ -394,7 +389,7 @@ jobs:
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php }}
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, mysqli, sqlite, pdo_sqlite, intl, gd, exif, iconv, sqlsrv, pdo_sqlsrv, ldap
extensions: dom, curl, libxml, mbstring, zip, pcntl, intl, gd, exif, iconv, sqlsrv, pdo, pdo_sqlsrv
coverage: none

- name: Setup environment for phpBB
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

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

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

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.

Expand Down
11 changes: 8 additions & 3 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"type": "phpbb-extension",
"description": "Security measures to help watch over team member accounts.",
"homepage": "https://www.phpbb.com",
"version": "1.0.1",
"version": "1.1.0-dev",
"license": "GPL-2.0-only",
"authors": [
{
Expand All @@ -19,13 +19,18 @@
}
],
"require": {
"php": ">=5.4",
"php": ">=8.1",
"composer/installers": "~1.0"
},
"extra": {
"display-name": "Team Security Measures",
"soft-require": {
"phpbb/phpbb": ">=3.2.0"
"phpbb/phpbb": ">=4.0.0@dev,<4.1.0@dev"
}
},
"config": {
"allow-plugins": {
"composer/installers": true
}
}
}
Loading
Loading