Skip to content

Commit 860b8c6

Browse files
marc1706marc1706
committed
Merge remote-tracking branch 'upstream/master'
2 parents 6ad72f6 + b8e66f4 commit 860b8c6

319 files changed

Lines changed: 9945 additions & 15857 deletions

File tree

Some content is hidden

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

‎.github/check-js.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,5 @@ sudo npm install -g > /dev/null
1515
npm ci > /dev/null
1616
set -x
1717
node_modules/eslint/bin/eslint.js "phpBB/**/*.js"
18+
node_modules/eslint/bin/eslint.js "phpBB/**/*.js.twig"
1819
node_modules/eslint/bin/eslint.js "gulpfile.js"

‎.github/workflows/tests.yml‎

Lines changed: 39 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929

3030
steps:
3131
- name: Checkout repository
32-
uses: actions/checkout@v3
32+
uses: actions/checkout@v4
3333
with:
3434
fetch-depth: 100
3535

@@ -48,7 +48,7 @@ jobs:
4848
cd ..
4949
5050
- name: Cache Composer dependencies
51-
uses: actions/cache@v3
51+
uses: actions/cache@v4
5252
with:
5353
path: ${{ steps.composer-cache.outputs.dir }}
5454
key: composer-${{ matrix.php }}-${{ hashFiles('phpBB/composer.lock') }}
@@ -166,7 +166,7 @@ jobs:
166166

167167
steps:
168168
- name: Checkout repository
169-
uses: actions/checkout@v3
169+
uses: actions/checkout@v4
170170

171171
- id: database-type
172172
env:
@@ -192,7 +192,7 @@ jobs:
192192
cd ..
193193
194194
- name: Cache Composer dependencies
195-
uses: actions/cache@v3
195+
uses: actions/cache@v4
196196
with:
197197
path: ${{ steps.composer-cache.outputs.dir }}
198198
key: composer-${{ matrix.php }}-${{ hashFiles('phpBB/composer.lock') }}
@@ -217,6 +217,13 @@ jobs:
217217
run: |
218218
.github/setup-ldap.sh
219219
220+
- name: Setup node
221+
uses: actions/setup-node@v4
222+
with:
223+
node-version: 20
224+
- name: Setup node dependencies
225+
run: npm ci
226+
220227
- name: Setup SPHINX
221228
run: |
222229
.github/setup-sphinx.sh
@@ -296,7 +303,7 @@ jobs:
296303

297304
steps:
298305
- name: Checkout repository
299-
uses: actions/checkout@v3
306+
uses: actions/checkout@v4
300307

301308
- id: database-type
302309
env:
@@ -322,7 +329,7 @@ jobs:
322329
cd ..
323330
324331
- name: Cache Composer dependencies
325-
uses: actions/cache@v3
332+
uses: actions/cache@v4
326333
with:
327334
path: ${{ steps.composer-cache.outputs.dir }}
328335
key: composer-${{ matrix.php }}-${{ hashFiles('phpBB/composer.lock') }}
@@ -342,6 +349,13 @@ jobs:
342349
run: |
343350
.github/setup-database.sh $DB $MYISAM
344351
352+
- name: Setup node
353+
uses: actions/setup-node@v4
354+
with:
355+
node-version: 20
356+
- name: Setup node dependencies
357+
run: npm ci
358+
345359
- name: Run unit tests
346360
env:
347361
DB: ${{steps.database-type.outputs.db}}
@@ -396,7 +410,7 @@ jobs:
396410

397411
steps:
398412
- name: Checkout repository
399-
uses: actions/checkout@v3
413+
uses: actions/checkout@v4
400414

401415
- id: database-type
402416
env:
@@ -427,7 +441,7 @@ jobs:
427441
cd ..
428442
429443
- name: Cache Composer dependencies
430-
uses: actions/cache@v3
444+
uses: actions/cache@v4
431445
with:
432446
path: ${{ steps.composer-cache.outputs.dir }}
433447
key: composer-${{ matrix.php }}-${{ hashFiles('phpBB/composer.lock') }}
@@ -447,6 +461,13 @@ jobs:
447461
run: |
448462
.github/setup-database.sh $DB $MYISAM
449463
464+
- name: Setup node
465+
uses: actions/setup-node@v4
466+
with:
467+
node-version: 20
468+
- name: Setup node dependencies
469+
run: npm ci
470+
450471
- name: Run unit tests
451472
env:
452473
DB: ${{steps.database-type.outputs.db}}
@@ -470,7 +491,7 @@ jobs:
470491
git config --system core.autocrlf false
471492
git config --system core.eol lf
472493
- name: Checkout repository
473-
uses: actions/checkout@v3
494+
uses: actions/checkout@v4
474495

475496
- name: Setup PHP
476497
uses: shivammathur/setup-php@v2
@@ -488,7 +509,7 @@ jobs:
488509
cd ..
489510
490511
- name: Cache Composer dependencies
491-
uses: actions/cache@v3
512+
uses: actions/cache@v4
492513
with:
493514
path: ${{ steps.composer-cache.outputs.dir }}
494515
key: composer-${{ matrix.php }}-${{ hashFiles('phpBB/composer.lock') }}
@@ -555,6 +576,14 @@ jobs:
555576
psql -c 'create database phpbb_tests;' -U postgres
556577
Set-MpPreference -ExclusionPath "${env:PGDATA}" # Exclude PGDATA directory from Windows Defender
557578
Set-MpPreference -DisableRealtimeMonitoring $true
579+
580+
- name: Setup node
581+
uses: actions/setup-node@v4
582+
with:
583+
node-version: 20
584+
- name: Setup node dependencies
585+
run: npm ci
586+
558587
- name: Run unit tests
559588
if: ${{ matrix.type == 'unit' }}
560589
run: |

‎build/build.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<project name="phpBB" description="The phpBB forum software" default="all" basedir="../">
44
<!-- a few settings for the build -->
55
<property name="newversion" value="4.0.0-a1-dev" />
6-
<property name="prevversion" value="3.3.11" />
7-
<property name="olderversions" value="3.1.0, 3.1.1, 3.1.2, 3.1.3, 3.1.4, 3.1.5, 3.1.6, 3.1.7, 3.1.7-pl1, 3.1.8, 3.1.9, 3.1.10, 3.1.11, 3.1.12, 3.2.0, 3.2.1, 3.2.2, 3.2.3, 3.2.4, 3.2.5, 3.2.6, 3.2.7, 3.2.8, 3.2.9, 3.2.10, 3.2.11, 3.3.0, 3.3.1, 3.3.2, 3.3.3, 3.3.4, 3.3.5, 3.3.6, 3.3.7, 3.3.8, 3.3.9, 3.3.10" />
6+
<property name="prevversion" value="3.3.12-RC1" />
7+
<property name="olderversions" value="3.1.0, 3.1.1, 3.1.2, 3.1.3, 3.1.4, 3.1.5, 3.1.6, 3.1.7, 3.1.7-pl1, 3.1.8, 3.1.9, 3.1.10, 3.1.11, 3.1.12, 3.2.0, 3.2.1, 3.2.2, 3.2.3, 3.2.4, 3.2.5, 3.2.6, 3.2.7, 3.2.8, 3.2.9, 3.2.10, 3.2.11, 3.3.0, 3.3.1, 3.3.2, 3.3.3, 3.3.4, 3.3.5, 3.3.6, 3.3.7, 3.3.8, 3.3.9, 3.3.10, 3.3.11" />
88
<!-- no configuration should be needed beyond this point -->
99

1010
<property name="oldversions" value="${olderversions}, ${prevversion}" />

‎composer.phar‎

111 KB
Binary file not shown.

‎git-tools/hooks/prepare-commit-msg‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,12 @@ then
3434
ticket_id=$(sed -E 's/(ticket\/)(security\/)?([0-9]+)(.+$)?/\3/gm;t;d' <<< "$branch");
3535
branch_title=$(sed -E 's/(ticket\/)(security\/)?([0-9]+)(.+$)?/\1\2\3/gm;t;d' <<< "$branch");
3636

37+
# Fall back to branch name if no ticket ID
38+
if [ -z "$branch_title" ];
39+
then
40+
branch_title="$branch";
41+
fi
42+
3743
if [ "security/" = "$(sed -E 's/(ticket\/)(security\/)?([0-9]+)(.+$)?/\2/gm;t;d' <<< "$branch")" ];
3844
then
3945
tail="$(printf '\n\nSECURITY-%s' "$ticket_id")";

‎gulpfile.js‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22

33
const gulp = require('gulp');
44
const rename = require('gulp-rename');
5-
const sourcemaps = require('gulp-sourcemaps');
6-
const concat = require('gulp-concat-css');
5+
const concat = require('gulp-concat');
76
const postcss = require('gulp-postcss');
87
const autoprefixer = require('autoprefixer');
98
const cssnano = require('cssnano');
@@ -19,16 +18,14 @@ const paths = {
1918
};
2019

2120
function styles() {
22-
return gulp.src(paths.styles.src)
23-
.pipe(sourcemaps.init())
21+
return gulp.src(paths.styles.src, { sourcemaps: true })
2422
.pipe(
2523
postcss([
2624
autoprefixer(),
2725
sorting(sortOrder),
2826
]),
2927
)
30-
.pipe(sourcemaps.write('./'))
31-
.pipe(gulp.dest(paths.styles.css));
28+
.pipe(gulp.dest(paths.styles.css, { sourcemaps: './' }));
3229
}
3330

3431
function minify() {
@@ -47,8 +44,7 @@ function minify() {
4744
paths.styles.css + 'colours.css',
4845
paths.styles.css + 'responsive.css',
4946
paths.styles.css + 'bidi.css',
50-
])
51-
.pipe(sourcemaps.init())
47+
], { sourcemaps: true })
5248
.pipe(concat('stylesheet.css'))
5349
.pipe(
5450
postcss([
@@ -59,8 +55,7 @@ function minify() {
5955
suffix: '.min',
6056
extname: '.css',
6157
}))
62-
.pipe(sourcemaps.write('./'))
63-
.pipe(gulp.dest(paths.styles.css));
58+
.pipe(gulp.dest(paths.styles.css, { sourcemaps: './' }));
6459
}
6560

6661
function watch() {

0 commit comments

Comments
 (0)