Modernise the extension under a MediaWiki 1.43 baseline

.github/workflows/ci.yml

@@ -13,34 +13,26 @@ jobs:
     strategy:
       matrix:
         include:
-          - mw: 'REL1_39'
-            php: 8.0
-            type: coverage
-            experimental: false
-          - mw: 'REL1_39'
-            php: 8.1
-            type: normal
-            experimental: false
-          - mw: 'REL1_40'
-            php: 8.1
-            type: normal
-            experimental: false
-          - mw: 'REL1_41'
+          - mw: 'REL1_43'
             php: 8.1
             type: normal
             experimental: false
-          - mw: 'REL1_42'
+          - mw: 'REL1_44'
             php: 8.2
             type: normal
             experimental: false
-          - mw: 'REL1_43'
+          - mw: 'REL1_45'
             php: 8.3
             type: normal
-            experimental: true
+            experimental: false
           - mw: 'master'
             php: 8.4
             type: normal
             experimental: true
+          - mw: 'master'
+            php: 8.5
+            type: normal
+            experimental: true
 
     runs-on: ubuntu-latest
     continue-on-error: ${{ matrix.experimental }}

.scrutinizer.yml

@@ -14,8 +14,9 @@ tools:
     php_loc: true
     php_analyzer: true
     sensiolabs_security_checker: true
-    external_code_coverage:
-        timeout: '1200' # timeout in seconds
+    # TODO: Scrutinizer Ocular coverage disabled due to https://github.com/scrutinizer-ci/ocular/issues/51
+    # external_code_coverage:
+    #    timeout: '1200' # timeout in seconds
 
 checks:
     php:

README.md

@@ -16,8 +16,8 @@ configuration it can add a new [gallery][Gallery] mode, and replace normal
 [image rendering][Image] with an image modal.
 
 ## Requirements
-* PHP 8.0 or later
-* MediaWiki 1.39 or later
+* PHP 8.1 or later
+* MediaWiki 1.43 or later
 
 ## Documentation
 - [Installation and configuration](docs/installation-configuration.md)

composer.json

@@ -25,15 +25,15 @@
 		"source": "https://github.com/oetterer/BootstrapComponents"
 	},
 	"require": {
-		"php": ">=8.0",
+		"php": ">=8.1",
 		"composer/installers": "^2|^1.0.1",
 		"mediawiki/bootstrap": "^5.0"
 	},
 	"require-dev": {
 		"mediawiki/mediawiki-codesniffer": "46.0.0",
-    "mediawiki/mediawiki-phan-config": "0.15.1",
+		"mediawiki/mediawiki-phan-config": "0.15.1",
 		"phpmd/phpmd": "~2.1",
-		"php": ">=8.0"
+		"php": ">=8.1"
 	},
 	"suggest": {
 		"mediawiki/scribunto": "Framework for embedding scripting languages into MediaWiki pages"

docs/release-notes.md

@@ -1,5 +1,13 @@
 ## Release Notes
 
+### BootstrapComponents 6.0.0
+
+Released on TBD
+
+Breaking changes:
+* requires MediaWiki 1.43 or later
+* requires PHP 8.1 or later
+
 ### BootstrapComponents 5.2.3
 
 Released on 21-May-2026

extension.json

@@ -7,7 +7,7 @@
 	"license-name": "GPL-3.0-or-later",
 	"type": "parserhook",
 	"requires": {
-		"MediaWiki": ">= 1.39.0"
+		"MediaWiki": ">= 1.43.0"
 	},
 	"ConfigRegistry": {
 		"BootstrapComponents": "GlobalVarConfig::newInstance"

src/AbstractComponent.php

@@ -27,7 +27,7 @@
 namespace MediaWiki\Extension\BootstrapComponents;
 
 use MediaWiki\MediaWikiServices;
-use \MWException;
+use RuntimeException;
 
 /**
  * Class AbstractComponent
@@ -107,7 +107,7 @@ abstract protected function placeMe( $input );
 	 * @param ParserOutputHelper $parserOutputHelper
 	 * @param NestingController  $nestingController
 	 *
-	 * @throws MWException cascading {@see ComponentLibrary::getNameFor} or {@see Component::extractAttribute}
+	 * @throws RuntimeException cascading {@see ComponentLibrary::getNameFor} or {@see Component::extractAttribute}
 	 */
 	public function __construct( $componentLibrary, $parserOutputHelper, $nestingController ) {
 		$this->componentLibrary = $componentLibrary;
@@ -144,14 +144,14 @@ public function getId() {
 	/**
 	 * @param ParserRequest $parserRequest ;
 	 *
-	 * @throws MWException self or cascading from {@see Component::processArguments}
+	 * @throws RuntimeException self or cascading from {@see Component::processArguments}
 	 *                      or {@see NestingController::close}
 	 *
 	 * @return string|array
 	 */
 	public function parseComponent( $parserRequest ) {
 		if ( !is_a( $parserRequest, ParserRequest::class ) ) {
-			throw new MWException( 'Invalid ParserRequest supplied to component ' . $this->getComponentName() . '!' );
+			throw new RuntimeException( 'Invalid ParserRequest supplied to component ' . $this->getComponentName() . '!' );
 		}
 		$this->getNestingController()->open( $this );
 		MediaWikiServices::getInstance()

src/ApplicationFactory.php

@@ -28,7 +28,7 @@
 
 use MediaWiki\Logger\LoggerFactory;
 use MediaWiki\MediaWikiServices;
-use MWException;
+use RuntimeException;
 use ReflectionClass;
 
 /**
@@ -104,19 +104,16 @@ public function getNewAttributeManager( array $validAttributes, array $aliases )
 	}
 
 	/**
-	 * @param string             $id
-	 * @param string             $trigger must be safe raw html (best run through {@see Parser::recursiveTagParse})
-	 * @param string             $content must be safe raw html (best run through {@see Parser::recursiveTagParse})
-	 * @param ParserOutputHelper $parserOutputHelper @deprecated unused since the inline-emission modal fix; will be removed in the next major release.
+	 * @param string $id
+	 * @param string $trigger must be safe raw html (best run through {@see Parser::recursiveTagParse})
+	 * @param string $content must be safe raw html (best run through {@see Parser::recursiveTagParse})
 	 *
 	 * @see ModalBuilder::__construct
 	 *
 	 * @return ModalBuilder
 	 */
-	public function getNewModalBuilder(
-		string $id, string $trigger, string $content, ParserOutputHelper $parserOutputHelper
-	): ModalBuilder {
-		return new ModalBuilder( $id, $trigger, $content, $parserOutputHelper );
+	public function getNewModalBuilder( string $id, string $trigger, string $content ): ModalBuilder {
+		return new ModalBuilder( $id, $trigger, $content );
 	}
 
 	/**
@@ -126,7 +123,7 @@ public function getNewModalBuilder(
 	 *
 	 * @see ParserRequest::__construct
 	 *
-	 * @throws \MWException cascading {@see ParserRequest::__construct}
+	 * @throws RuntimeException cascading {@see ParserRequest::__construct}
 	 *
 	 * @return ParserRequest
 	 */
@@ -141,7 +138,7 @@ public function getNewParserRequest(
 	 *
 	 * @see ParserOutputHelper
 	 *
-	 * @throws MWException  cascading {@see ApplicationFactory::getApplication}
+	 * @throws RuntimeException  cascading {@see ApplicationFactory::getApplication}
 	 *
 	 * @return ParserOutputHelper
 	 */
@@ -158,7 +155,7 @@ public function getParserOutputHelper( $parser = null ) {
 	 * @param string $name
 	 * @param string $class
 	 *
-	 * @throws MWException when class to register does not exist
+	 * @throws RuntimeException when class to register does not exist
 	 *
 	 * @return bool
 	 */
@@ -169,7 +166,7 @@ public function registerApplication( string $name, string $class ): bool {
 			$this->applicationClassRegister[$application] = $applicationClass;
 			return true;
 		} elseif ( $application != '' ) {
-			throw new MWException( 'ApplicationFactory was requested to register non existing class "' . $applicationClass . '"!' );
+			throw new RuntimeException( 'ApplicationFactory was requested to register non existing class "' . $applicationClass . '"!' );
 		}
 		$this->getLogger()->error( 'ApplicationFactory was requested to register invalid application for class ' . $applicationClass . '!' );
 		return false;
@@ -200,7 +197,7 @@ public function resetLookup( ?string $application = null ): bool {
 	 *
 	 * @param string $name
 	 *
-	 * @throws MWException  when no class is registered for the requested application or the creation of the object fails.
+	 * @throws RuntimeException  when no class is registered for the requested application or the creation of the object fails.
 	 *
 	 * @return object
 	 */
@@ -209,15 +206,15 @@ protected function getApplication( $name ): object {
 			return $this->applicationStore[$name];
 		}
 		if ( !isset( $this->applicationClassRegister[$name] ) ) {
-			throw new MWException( 'ApplicationFactory was requested to return application "' . $name . '". No appropriate class registered!' );
+			throw new RuntimeException( 'ApplicationFactory was requested to return application "' . $name . '". No appropriate class registered!' );
 		}
 		$args = func_get_args();
 		array_shift( $args ); # because, we already used the first argument $name
 
 		try {
 			$objectReflection = new ReflectionClass( $this->applicationClassRegister[$name] );
 		} catch ( \ReflectionException $e ) {
-			throw new MWException(
+			throw new RuntimeException(
 				'Error while trying to build application "' . $name . '" with class ' . $this->applicationClassRegister[$name]
 			);
 		}

src/BootstrapComponents.php

@@ -43,9 +43,8 @@
 
 namespace MediaWiki\Extension\BootstrapComponents;
 
-use ConfigException;
 use Exception;
-use MWException;
+use RuntimeException;
 
 /**
  * Provides methods to register, when installed by composer
@@ -56,9 +55,6 @@
  */
 class BootstrapComponents {
 
-	const EXTENSION_DATA_NO_IMAGE_MODAL = 'bsc_no_image_modal';
-
-
 	/**
 	 * @var string $version
 	 */
@@ -84,13 +80,7 @@ public static function init( array $info ) {
 
 		if ( !defined( 'MEDIAWIKI' ) ) {
 			echo 'This file is part of the Mediawiki extension BootstrapComponents, it is not a valid entry point.' . PHP_EOL;
-			throw new MWException( 'This file is part of a Mediawiki Extension, it is not a valid entry point.' );
-		}
-
-		if ( version_compare( $GLOBALS[ 'wgVersion' ], '1.39', 'lt' ) ) {
-			echo '<b>Error:</b> <a href="https://github.com/oetterer/BootstrapComponents/">Bootstrap Components</a> '
-				. 'is only compatible with MediaWiki 1.39 or above. You need to upgrade MediaWiki first.' . PHP_EOL;
-			throw new MWException( 'BootstrapComponents detected an incompatible MediaWiki version. Exiting.' );
+			throw new RuntimeException( 'This file is part of a Mediawiki Extension, it is not a valid entry point.' );
 		}
 
 		// Using the constant as indicator to avoid class_exists

src/BootstrapComponentsService.php

@@ -2,8 +2,8 @@
 
 namespace MediaWiki\Extension\BootstrapComponents;
 
-use Config;
-use RequestContext;
+use MediaWiki\Config\Config;
+use MediaWiki\Context\RequestContext;
 
 class BootstrapComponentsService
 {

src/CarouselGallery.php

@@ -26,10 +26,10 @@
 
 namespace MediaWiki\Extension\BootstrapComponents;
 
-use MediaWiki\Extension\BootstrapComponents\Components\Carousel;
 use ImageGalleryBase;
+use MediaWiki\Extension\BootstrapComponents\Components\Carousel;
 use MediaWiki\MediaWikiServices;
-use Title;
+use MediaWiki\Title\Title;
 
 /**
  * Class CarouselGallery
@@ -43,7 +43,7 @@ class CarouselGallery extends ImageGalleryBase {
 	 *
 	 * @param ParserOutputHelper $parserOutputHelper used for unit tests
 	 *
-	 * @throws \MWException cascading {@see CarouselGallery::constructCarouselParserRequest} and  {@see AbstractComponent::parseComponent}
+	 * @throws RuntimeException cascading {@see CarouselGallery::constructCarouselParserRequest} and  {@see AbstractComponent::parseComponent}
 	 * @return string
 	 */
 	public function toHTML( $parserOutputHelper = null ) {
@@ -160,7 +160,7 @@ private function convertImages( $imageList, $parser = null, $hideBadImages = tru
 	 * From array of supplies images and some other object properties, this constructs a parser request object,
 	 * to be used in the carousel component.
 	 *
-	 * @throws \MWException cascading {@see ApplicationFactory::getNewParserRequest}
+	 * @throws RuntimeException cascading {@see ApplicationFactory::getNewParserRequest}
 	 *
 	 * @return false|ParserRequest  returns false, if no valid images were detected
 	 */