diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index db38639..4c3b017 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -358,7 +358,7 @@ jobs: # START Other Tests Job (SQLite 3 and mssql) other-tests: - runs-on: ubuntu-22.04 + runs-on: ubuntu-20.04 # TODO: Change back to 'ubuntu-22.04' when https://github.com/microsoft/mssql-docker/issues/899 resolved. strategy: matrix: include: @@ -368,14 +368,14 @@ jobs: db: "mcr.microsoft.com/mssql/server:2017-latest" db_alias: 'MSSQL 2017' - php: '7.2' - db: "mcr.microsoft.com/mssql/server:2019-latest" + db: "mcr.microsoft.com/mssql/server:2019-CU27-ubuntu-20.04" db_alias: 'MSSQL 2019' 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' && 'mcr.microsoft.com/mssql/server:2017-latest' || matrix.db }} env: SA_PASSWORD: "Pssw0rd_12" ACCEPT_EULA: "y" @@ -415,7 +415,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' ] then db='mssql' else diff --git a/CHANGELOG.md b/CHANGELOG.md index 226b883..4111e56 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## 1.1.12 - 2024-09-29 + +- Updated GitHub action workflows to address compatibility and bug issues. +- Added PHP 8.4 testing to GitHub action workflows. +- Ensure Skeleton extension can only be installed on compatible versions of phpBB. +- Minor code improvements and clean up. + ## 1.1.11 - 2023-12-29 - Updated GitHub Actions workflow to include "main" as a default repo branch to test. @@ -137,7 +144,7 @@ - Skeleton ACP PHP files have correct visibility declarations for methods and properties now. - Skeleton config service files correctly encapsulate all strings in quotes that begin with @ and % per Symfony specifications. - Skeleton PHP files have all their DocBlocks updated to be consistent with PSR-5 recommendations. -- 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). +- 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). - Internal DocBlocks have been updated. ## 1.0.0 - 2016-08-04 diff --git a/README.md b/README.md index 73dc3a3..5c1796f 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # phpBB Skeleton Extension -[![Build Status](https://github.com/phpbb-extensions/phpbb-ext-skeleton/workflows/Tests/badge.svg)](https://github.com/phpbb-extensions/phpbb-ext-skeleton/actions) +[![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) [![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) 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. diff --git a/composer.json b/composer.json index 04d12c9..767ef70 100644 --- a/composer.json +++ b/composer.json @@ -3,7 +3,7 @@ "type": "phpbb-extension", "description": "The official phpBB skeleton extension generator.", "homepage": "https://www.phpbb.com/customise/db/official_tool/ext_skeleton/", - "version": "1.1.12-dev", + "version": "1.1.12", "license": "GPL-2.0-only", "authors": [ { @@ -23,7 +23,7 @@ "composer/installers": "~1.0" }, "require-dev": { - "phing/phing": "2.4.*" + "phing/phing": "~2.4" }, "extra": { "display-name": "phpBB Skeleton Extension", diff --git a/skeleton/.github/workflows/tests.yml.twig b/skeleton/.github/workflows/tests.yml.twig index ec42c0b..9c39700 100644 --- a/skeleton/.github/workflows/tests.yml.twig +++ b/skeleton/.github/workflows/tests.yml.twig @@ -327,7 +327,7 @@ jobs: # START Other Tests Job (SQLite 3 and mssql) other-tests: - runs-on: ubuntu-22.04 + runs-on: ubuntu-20.04 strategy: matrix: include: @@ -337,14 +337,14 @@ jobs: db: "mcr.microsoft.com/mssql/server:2017-latest" db_alias: 'MSSQL 2017' - php: '7.2' - db: "mcr.microsoft.com/mssql/server:2019-latest" + db: "mcr.microsoft.com/mssql/server:2019-CU27-ubuntu-20.04" db_alias: 'MSSQL 2019' 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' && 'mcr.microsoft.com/mssql/server:2017-latest' || matrix.db }} env: SA_PASSWORD: "Pssw0rd_12" ACCEPT_EULA: "y" @@ -384,7 +384,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' ] then db='mssql' else diff --git a/skeleton/composer.json.twig b/skeleton/composer.json.twig index aecee69..d38326d 100644 --- a/skeleton/composer.json.twig +++ b/skeleton/composer.json.twig @@ -23,7 +23,7 @@ }, {% if COMPONENT.build %} "require-dev": { - "phing/phing": "2.4.*" + "phing/phing": "~2.4" }, {% endif %} "extra": {