From 1bee93c02df3fb6d459d919660993c32b9911087 Mon Sep 17 00:00:00 2001 From: SomeRandomDeveloper Date: Tue, 22 Jul 2025 02:25:33 +0200 Subject: [PATCH 1/3] Use namespaced imports for Html class Fixes compatibility with MW 1.44. Raise MW requirement to 1.43 accordingly. Run CI on 1.44. Bump version to 4.0.0. --- .github/workflows/ci.yml | 15 +++------------ README.md | 10 ++++++++-- extension.json | 4 ++-- src/IconRenderers/JavascriptRenderer.php | 2 +- src/IconRenderers/WebfontRenderer.php | 2 +- .../IconRenderers/JavascriptRendererTest.php | 2 +- .../phpunit/IconRenderers/WebfontRendererTest.php | 2 +- 7 files changed, 17 insertions(+), 20 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f061c7b..36df330 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,21 +14,12 @@ jobs: strategy: matrix: include: - - mw: 'REL1_39' - php: 7.4 - experimental: false - - mw: 'REL1_40' - php: 8.0 - experimental: false - - mw: 'REL1_41' - php: 8.1 - experimental: false - - mw: 'REL1_42' - php: 8.2 - experimental: false - mw: 'REL1_43' php: 8.3 experimental: false + - mw: 'REL1_44' + php: 8.3 + experimental: false runs-on: ubuntu-latest diff --git a/README.md b/README.md index 1a681c3..b03bcd6 100644 --- a/README.md +++ b/README.md @@ -11,8 +11,8 @@ Currently Font Awesome Free version 6.7.2 is included. ## Requirements -- PHP 7.4.3 or later -- MediaWiki 1.39 or later +- PHP 8.1.0 or later +- MediaWiki 1.43 or later ## Installation @@ -101,6 +101,12 @@ The Font Awesome Free package is included in the extension. See its ## Release notes +### Version 4.0.0 + +Released on July 22, 2025. + +* Raised the minimum MediaWiki version from 1.39 to 1.43 + ### Version 3.0.0 Released on March 15, 2025. diff --git a/extension.json b/extension.json index 399aa76..5f99fc0 100644 --- a/extension.json +++ b/extension.json @@ -1,6 +1,6 @@ { "name": "FontAwesome", - "version": "3.0.0", + "version": "4.0.0", "type": "other", "author": [ "[https://www.mediawiki.org/wiki/User:F.trott Stephan Gambke]", @@ -10,7 +10,7 @@ "descriptionmsg": "fontawesome-desc", "license-name": "GPL-3.0-or-later", "requires": { - "MediaWiki": ">=1.39" + "MediaWiki": ">=1.43" }, "MessagesDirs": { "FontAwesome": "i18n" diff --git a/src/IconRenderers/JavascriptRenderer.php b/src/IconRenderers/JavascriptRenderer.php index 50bf493..ed3618f 100644 --- a/src/IconRenderers/JavascriptRenderer.php +++ b/src/IconRenderers/JavascriptRenderer.php @@ -26,7 +26,7 @@ namespace FontAwesome\IconRenderers; -use Html; +use MediaWiki\Html\Html; use Parser; use PPFrame; diff --git a/src/IconRenderers/WebfontRenderer.php b/src/IconRenderers/WebfontRenderer.php index 237962b..a2cb4e3 100644 --- a/src/IconRenderers/WebfontRenderer.php +++ b/src/IconRenderers/WebfontRenderer.php @@ -26,7 +26,7 @@ namespace FontAwesome\IconRenderers; -use Html; +use MediaWiki\Html\Html; use Parser; use PPFrame; diff --git a/tests/phpunit/IconRenderers/JavascriptRendererTest.php b/tests/phpunit/IconRenderers/JavascriptRendererTest.php index 6c3e4ce..0c5a9e7 100644 --- a/tests/phpunit/IconRenderers/JavascriptRendererTest.php +++ b/tests/phpunit/IconRenderers/JavascriptRendererTest.php @@ -28,7 +28,7 @@ use FontAwesome\IconRenderers\IconRenderer; use FontAwesome\IconRenderers\JavascriptRenderer; -use Html; +use MediaWiki\Html\Html; use Parser; use ParserOutput; use PHPUnit\Framework\TestCase; diff --git a/tests/phpunit/IconRenderers/WebfontRendererTest.php b/tests/phpunit/IconRenderers/WebfontRendererTest.php index b8dedf0..62e371c 100644 --- a/tests/phpunit/IconRenderers/WebfontRendererTest.php +++ b/tests/phpunit/IconRenderers/WebfontRendererTest.php @@ -28,7 +28,7 @@ use FontAwesome\IconRenderers\IconRenderer; use FontAwesome\IconRenderers\WebfontRenderer; -use Html; +use MediaWiki\Html\Html; use Parser; use ParserOutput; use PHPUnit\Framework\TestCase; From 08b37a1bad506c88d92e24ef3d83b1c0f3ee9bf4 Mon Sep 17 00:00:00 2001 From: SomeRandomDeveloper Date: Tue, 22 Jul 2025 15:45:36 +0200 Subject: [PATCH 2/3] Bump PHP requirement to 8.1.0 MediaWiki 1.43 requires PHP 8.1.0. --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 6150733..ffbefde 100644 --- a/composer.json +++ b/composer.json @@ -32,7 +32,7 @@ "issues": "https://github.com/ProfessionalWiki/FontAwesome/issues" }, "require": { - "php": ">=7.4.3", + "php": ">=8.1", "composer/installers": "^2|^1.0.1" }, "require-dev": { From bdc6774a71e12755a4d737b1d435a6159fc541f6 Mon Sep 17 00:00:00 2001 From: SomeRandomDeveloper Date: Tue, 22 Jul 2025 19:53:01 +0200 Subject: [PATCH 3/3] Mention PHP version requirement change in changelog --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index b03bcd6..26a1d96 100644 --- a/README.md +++ b/README.md @@ -105,6 +105,7 @@ The Font Awesome Free package is included in the extension. See its Released on July 22, 2025. +* Raised the minimum PHP version from 7.4.3 to 8.1.0 * Raised the minimum MediaWiki version from 1.39 to 1.43 ### Version 3.0.0