Skip to content

Commit 1fe5bfe

Browse files
iMattProiMattPro
committed
Merge branch 'master' into dev/4.0
Signed-off-by: Matt Friedman <maf675@gmail.com> # Conflicts: # .github/workflows/tests.yml # composer.json # ext.php
2 parents dfc3c69 + 19ce8e1 commit 1fe5bfe

File tree

6 files changed

+34
-17
lines changed

6 files changed

+34
-17
lines changed

‎.github/workflows/tests.yml‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,10 @@ jobs:
125125
db: "mysql:5.7"
126126
- php: '8.3'
127127
db: "mariadb:10.2"
128+
- php: '8.4'
129+
db: "mysql:8.0"
130+
- php: '8.4'
131+
db: "mariadb:10.3"
128132

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

@@ -262,6 +266,8 @@ jobs:
262266
db: "postgres:9.5"
263267
- php: '8.3'
264268
db: "postgres:9.5"
269+
- php: '8.4'
270+
db: "postgres:9.5"
265271

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

@@ -346,7 +352,7 @@ jobs:
346352

347353
# START Other Tests Job (SQLite 3 and mssql)
348354
other-tests:
349-
runs-on: ubuntu-latest
355+
runs-on: ubuntu-20.04 # TODO: Change back to 'ubuntu-22.04' when https://github.com/microsoft/mssql-docker/issues/899 resolved.
350356
strategy:
351357
matrix:
352358
include:
@@ -356,17 +362,17 @@ jobs:
356362
db: "mcr.microsoft.com/mssql/server:2017-latest"
357363
db_alias: 'MSSQL 2017'
358364
- php: '8.1'
359-
db: "mcr.microsoft.com/mssql/server:2019-latest"
365+
db: "mcr.microsoft.com/mssql/server:2019-CU27-ubuntu-20.04"
360366
db_alias: 'MSSQL 2019'
361367
- php: '8.1'
362-
db: "mcr.microsoft.com/mssql/server:2022-latest"
368+
db: "mcr.microsoft.com/mssql/server:2022-CU13-ubuntu-22.04"
363369
db_alias: 'MSSQL 2022'
364370

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

367373
services:
368374
mssql:
369-
image: ${{ matrix.db != 'mcr.microsoft.com/mssql/server:2017-latest' && matrix.db != 'mcr.microsoft.com/mssql/server:2019-latest' && matrix.db != 'mcr.microsoft.com/mssql/server:2022-latest' && 'mcr.microsoft.com/mssql/server:2017-latest' || matrix.db }}
375+
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 }}
370376
env:
371377
SA_PASSWORD: "Pssw0rd_12"
372378
ACCEPT_EULA: "y"
@@ -406,7 +412,7 @@ jobs:
406412
env:
407413
MATRIX_DB: ${{ matrix.db }}
408414
run: |
409-
if [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2017-latest' ] || [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2019-latest' ] || [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2022-latest' ]
415+
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' ]
410416
then
411417
db='mssql'
412418
else

‎CHANGELOG.md‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# Changelog
22

3+
## 1.1.12 - 2024-09-29
4+
5+
- Updated GitHub action workflows to address compatibility and bug issues.
6+
- Added PHP 8.4 testing to GitHub action workflows.
7+
- Ensure Skeleton extension can only be installed on compatible versions of phpBB.
8+
- Minor code improvements and clean up.
9+
310
## 1.1.11 - 2023-12-29
411

512
- Updated GitHub Actions workflow to include "main" as a default repo branch to test.
@@ -137,7 +144,7 @@
137144
- Skeleton ACP PHP files have correct visibility declarations for methods and properties now.
138145
- Skeleton config service files correctly encapsulate all strings in quotes that begin with @ and % per Symfony specifications.
139146
- Skeleton PHP files have all their DocBlocks updated to be consistent with PSR-5 recommendations.
140-
- Skeleton event class methods that do not use the $event variable do not have them defined as an argument (this is done to demonstrate that the $event argument is only needed if actually used in an event listener method).
147+
- Skeleton event class methods that do not use the `$event` variable do not have them defined as an argument (this is done to demonstrate that the `$event` argument is only needed if actually used in an event listener method).
141148
- Internal DocBlocks have been updated.
142149

143150
## 1.0.0 - 2016-08-04

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# phpBB Skeleton Extension
22

3-
[![Build Status](https://github.com/phpbb-extensions/phpbb-ext-skeleton/workflows/Tests/badge.svg)](https://github.com/phpbb-extensions/phpbb-ext-skeleton/actions)
3+
[![Build Status](https://github.com/phpbb-extensions/phpbb-ext-skeleton/actions/workflows/tests.yml/badge.svg)](https://github.com/phpbb-extensions/phpbb-ext-skeleton/actions)
44
[![codecov](https://codecov.io/gh/phpbb-extensions/phpbb-ext-skeleton/branch/master/graph/badge.svg?token=lIiplpo6OQ)](https://codecov.io/gh/phpbb-extensions/phpbb-ext-skeleton)
55

66
phpBB's Skeleton Extension is a tool for extension authors to help speed up and simplify the task of starting a new extension project. It generates sample starter files and directories in a skeleton package that you can use to begin building your extension.

‎composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"composer/installers": "~1.0"
2424
},
2525
"require-dev": {
26-
"phing/phing": "2.4.*"
26+
"phing/phing": "~2.4"
2727
},
2828
"extra": {
2929
"display-name": "phpBB Skeleton Extension",

‎skeleton/.github/workflows/tests.yml.twig‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,10 @@ jobs:
125125
db: "mysql:5.7"
126126
- php: '8.2'
127127
db: "mysql:5.7"
128-
- php: '8.3'
129-
db: "mysql:5.7"
128+
- php: '8.3'
129+
db: "mysql:5.7"
130+
- php: '8.4'
131+
db: "mysql:5.7"
130132

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

@@ -237,8 +239,10 @@ jobs:
237239
db: "postgres:14"
238240
- php: '8.2'
239241
db: "postgres:14"
240-
- php: '8.3'
241-
db: "postgres:14"
242+
- php: '8.3'
243+
db: "postgres:14"
244+
- php: '8.4'
245+
db: "postgres:14"
242246

243247
name: PHP ${{ '{{' }} matrix.php }} - ${{ '{{' }} matrix.db }}
244248

@@ -323,7 +327,7 @@ jobs:
323327

324328
# START Other Tests Job (SQLite 3 and mssql)
325329
other-tests:
326-
runs-on: ubuntu-22.04
330+
runs-on: ubuntu-20.04
327331
strategy:
328332
matrix:
329333
include:
@@ -333,14 +337,14 @@ jobs:
333337
db: "mcr.microsoft.com/mssql/server:2017-latest"
334338
db_alias: 'MSSQL 2017'
335339
- php: '7.2'
336-
db: "mcr.microsoft.com/mssql/server:2019-latest"
340+
db: "mcr.microsoft.com/mssql/server:2019-CU27-ubuntu-20.04"
337341
db_alias: 'MSSQL 2019'
338342

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

341345
services:
342346
mssql:
343-
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 }}
347+
image: ${{ '{{' }} matrix.db != 'mcr.microsoft.com/mssql/server:2017-latest' && matrix.db != 'mcr.microsoft.com/mssql/server:2019-CU27-ubuntu-20.04' && 'mcr.microsoft.com/mssql/server:2017-latest' || matrix.db }}
344348
env:
345349
SA_PASSWORD: "Pssw0rd_12"
346350
ACCEPT_EULA: "y"
@@ -380,7 +384,7 @@ jobs:
380384
env:
381385
MATRIX_DB: ${{ '{{' }} matrix.db }}
382386
run: |
383-
if [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2017-latest' ] || [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2019-latest' ]
387+
if [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2017-latest' ] || [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2019-CU27-ubuntu-20.04' ]
384388
then
385389
db='mssql'
386390
else

‎skeleton/composer.json.twig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
},
2424
{% if COMPONENT.build %}
2525
"require-dev": {
26-
"phing/phing": "2.4.*"
26+
"phing/phing": "~2.4"
2727
},
2828
{% endif %}
2929
"extra": {

0 commit comments

Comments
 (0)