Skip to content

Commit 19ce8e1

Browse files
authored
Merge pull request #146 from iMattPro/updates
Updates
2 parents 5343eb5 + cf48922 commit 19ce8e1

File tree

6 files changed

+20
-13
lines changed

6 files changed

+20
-13
lines changed

.github/workflows/tests.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ jobs:
358358

359359
# START Other Tests Job (SQLite 3 and mssql)
360360
other-tests:
361-
runs-on: ubuntu-22.04
361+
runs-on: ubuntu-20.04 # TODO: Change back to 'ubuntu-22.04' when https://github.com/microsoft/mssql-docker/issues/899 resolved.
362362
strategy:
363363
matrix:
364364
include:
@@ -368,14 +368,14 @@ jobs:
368368
db: "mcr.microsoft.com/mssql/server:2017-latest"
369369
db_alias: 'MSSQL 2017'
370370
- php: '7.2'
371-
db: "mcr.microsoft.com/mssql/server:2019-latest"
371+
db: "mcr.microsoft.com/mssql/server:2019-CU27-ubuntu-20.04"
372372
db_alias: 'MSSQL 2019'
373373

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

376376
services:
377377
mssql:
378-
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 }}
378+
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 }}
379379
env:
380380
SA_PASSWORD: "Pssw0rd_12"
381381
ACCEPT_EULA: "y"
@@ -415,7 +415,7 @@ jobs:
415415
env:
416416
MATRIX_DB: ${{ matrix.db }}
417417
run: |
418-
if [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2017-latest' ] || [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2019-latest' ]
418+
if [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2017-latest' ] || [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2019-CU27-ubuntu-20.04' ]
419419
then
420420
db='mssql'
421421
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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"type": "phpbb-extension",
44
"description": "The official phpBB skeleton extension generator.",
55
"homepage": "https://www.phpbb.com/customise/db/official_tool/ext_skeleton/",
6-
"version": "1.1.12-dev",
6+
"version": "1.1.12",
77
"license": "GPL-2.0-only",
88
"authors": [
99
{
@@ -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: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ jobs:
327327

328328
# START Other Tests Job (SQLite 3 and mssql)
329329
other-tests:
330-
runs-on: ubuntu-22.04
330+
runs-on: ubuntu-20.04
331331
strategy:
332332
matrix:
333333
include:
@@ -337,14 +337,14 @@ jobs:
337337
db: "mcr.microsoft.com/mssql/server:2017-latest"
338338
db_alias: 'MSSQL 2017'
339339
- php: '7.2'
340-
db: "mcr.microsoft.com/mssql/server:2019-latest"
340+
db: "mcr.microsoft.com/mssql/server:2019-CU27-ubuntu-20.04"
341341
db_alias: 'MSSQL 2019'
342342

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

345345
services:
346346
mssql:
347-
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 }}
348348
env:
349349
SA_PASSWORD: "Pssw0rd_12"
350350
ACCEPT_EULA: "y"
@@ -384,7 +384,7 @@ jobs:
384384
env:
385385
MATRIX_DB: ${{ '{{' }} matrix.db }}
386386
run: |
387-
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' ]
388388
then
389389
db='mssql'
390390
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)