Skip to content

Commit 0021db6

Browse files
iMattProiMattPro
committed
Merge branch 'master' into ticket/17541
2 parents 30b69b6 + 243c67a commit 0021db6

50 files changed

Lines changed: 797 additions & 704 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/phpunit-mariadb-github.xml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,18 @@
2323
<group>slow</group>
2424
</exclude>
2525
</groups>
26+
<source restrictDeprecations="true">
27+
<include>
28+
<directory suffix=".php">../phpBB/</directory>
29+
<directory suffix=".php">../tests/</directory>
30+
</include>
31+
<exclude>
32+
<directory suffix=".php">../phpBB/vendor/</directory>
33+
<directory suffix=".php">../phpBB/cache/</directory>
34+
<directory suffix=".php">../phpBB/develop/</directory>
35+
<directory suffix=".php">../phpBB/store/</directory>
36+
</exclude>
37+
</source>
2638
<php>
2739
<server name="PHPBB_TEST_DBMS" value="mysqli"/>
2840
<server name="PHPBB_TEST_DBHOST" value="0.0.0.0"/>

‎.github/phpunit-mssql-github.xml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,18 @@
2323
<group>slow</group>
2424
</exclude>
2525
</groups>
26+
<source restrictDeprecations="true">
27+
<include>
28+
<directory suffix=".php">../phpBB/</directory>
29+
<directory suffix=".php">../tests/</directory>
30+
</include>
31+
<exclude>
32+
<directory suffix=".php">../phpBB/vendor/</directory>
33+
<directory suffix=".php">../phpBB/cache/</directory>
34+
<directory suffix=".php">../phpBB/develop/</directory>
35+
<directory suffix=".php">../phpBB/store/</directory>
36+
</exclude>
37+
</source>
2638
<php>
2739
<server name="PHPBB_TEST_DBMS" value="phpbb\db\driver\mssqlnative"/>
2840
<server name="PHPBB_TEST_DBHOST" value="127.0.0.1"/>

‎.github/phpunit-mysql-github.xml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,18 @@
2323
<group>slow</group>
2424
</exclude>
2525
</groups>
26+
<source restrictDeprecations="true">
27+
<include>
28+
<directory suffix=".php">../phpBB/</directory>
29+
<directory suffix=".php">../tests/</directory>
30+
</include>
31+
<exclude>
32+
<directory suffix=".php">../phpBB/vendor/</directory>
33+
<directory suffix=".php">../phpBB/cache/</directory>
34+
<directory suffix=".php">../phpBB/develop/</directory>
35+
<directory suffix=".php">../phpBB/store/</directory>
36+
</exclude>
37+
</source>
2638
<php>
2739
<server name="PHPBB_TEST_DBMS" value="phpbb\db\driver\mysqli"/>
2840
<server name="PHPBB_TEST_DBHOST" value="0.0.0.0"/>

‎.github/phpunit-postgres-github.xml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,18 @@
2323
<group>slow</group>
2424
</exclude>
2525
</groups>
26+
<source restrictDeprecations="true">
27+
<include>
28+
<directory suffix=".php">../phpBB/</directory>
29+
<directory suffix=".php">../tests/</directory>
30+
</include>
31+
<exclude>
32+
<directory suffix=".php">../phpBB/vendor/</directory>
33+
<directory suffix=".php">../phpBB/cache/</directory>
34+
<directory suffix=".php">../phpBB/develop/</directory>
35+
<directory suffix=".php">../phpBB/store/</directory>
36+
</exclude>
37+
</source>
2638
<php>
2739
<server name="PHPBB_TEST_DBMS" value="phpbb\db\driver\postgres"/>
2840
<server name="PHPBB_TEST_DBHOST" value="localhost"/>

‎.github/phpunit-psql-windows-github.xml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,18 @@
2323
<group>slow</group>
2424
</exclude>
2525
</groups>
26+
<source restrictDeprecations="true">
27+
<include>
28+
<directory suffix=".php">../phpBB/</directory>
29+
<directory suffix=".php">../tests/</directory>
30+
</include>
31+
<exclude>
32+
<directory suffix=".php">../phpBB/vendor/</directory>
33+
<directory suffix=".php">../phpBB/cache/</directory>
34+
<directory suffix=".php">../phpBB/develop/</directory>
35+
<directory suffix=".php">../phpBB/store/</directory>
36+
</exclude>
37+
</source>
2638
<php>
2739
<server name="PHPBB_TEST_DBMS" value="phpbb\db\driver\postgres"/>
2840
<server name="PHPBB_TEST_DBHOST" value="localhost"/>

‎.github/phpunit-sqlite3-github.xml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,18 @@
2323
<group>slow</group>
2424
</exclude>
2525
</groups>
26+
<source restrictDeprecations="true">
27+
<include>
28+
<directory suffix=".php">../phpBB/</directory>
29+
<directory suffix=".php">../tests/</directory>
30+
</include>
31+
<exclude>
32+
<directory suffix=".php">../phpBB/vendor/</directory>
33+
<directory suffix=".php">../phpBB/cache/</directory>
34+
<directory suffix=".php">../phpBB/develop/</directory>
35+
<directory suffix=".php">../phpBB/store/</directory>
36+
</exclude>
37+
</source>
2638
<php>
2739
<server name="PHPBB_TEST_REDIS_HOST" value="0.0.0.0"/>
2840
<server name="PHPBB_TEST_MEMCACHED_HOST" value="localhost"/>

‎.github/workflows/tests.yml‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,10 @@ jobs:
145145
db: "mysql:8.0"
146146
- php: '8.4'
147147
db: "mariadb:10.3"
148+
- php: '8.5'
149+
db: "mysql:8.0"
150+
- php: '8.5'
151+
db: "mariadb:10.3"
148152

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

@@ -286,6 +290,8 @@ jobs:
286290
db: "postgres:9.5"
287291
- php: '8.4'
288292
db: "postgres:9.5"
293+
- php: '8.5'
294+
db: "postgres:9.5"
289295

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

@@ -495,11 +501,11 @@ jobs:
495501
496502
# Test with IIS & PostgreSQL on Windows
497503
windows-tests:
498-
runs-on: windows-latest
504+
runs-on: windows-2025
499505
strategy:
500506
matrix:
501507
type: ['unit', 'functional']
502-
php: ['8.1', '8.2', '8.3']
508+
php: ['8.4']
503509
db: ['postgres']
504510

505511
name: Windows - ${{ matrix.type }} - PHP ${{ matrix.php }} - ${{ matrix.db }}
@@ -516,7 +522,7 @@ jobs:
516522
uses: shivammathur/setup-php@v2
517523
with:
518524
php-version: ${{ matrix.php }}
519-
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, intl, gd, exif, iconv, pgsql, pdo_pgsql, sodium
525+
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, intl, gd, exif, iconv, pgsql, pdo_pgsql, sodium, bz2, fileinfo
520526
ini-values: upload_tmp_dir=${{ runner.temp }}, sys_temp_dir=${{ runner.temp }}
521527
coverage: none
522528

‎composer.phar‎

10 KB
Binary file not shown.

‎phpBB/composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"bantu/ini-get-wrapper": "~1.0",
3535
"carlos-mg89/oauth": "^0.8.15",
3636
"composer/composer": "^2.0",
37-
"composer/installers": "^1.9",
37+
"composer/installers": "^2.3",
3838
"composer/package-versions-deprecated": "^1.11",
3939
"doctrine/dbal": "^3.9",
4040
"google/recaptcha": "~1.1",

0 commit comments

Comments
 (0)