diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8fe1ea1..db5e9fe 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,34 +13,27 @@ 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 + # TODO: Scrutinzer Ocular overage disabled due to https://github.com/scrutinizer-ci/ocular/issues/51 type: normal - experimental: false - - mw: 'REL1_42' + experimental: true + - 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 }} diff --git a/.scrutinizer.yml b/.scrutinizer.yml index 871b49f..0a9a12a 100644 --- a/.scrutinizer.yml +++ b/.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: Scrutinzer Ocular overage disabled due to https://github.com/scrutinizer-ci/ocular/issues/51 + # external_code_coverage: + # timeout: '1200' # timeout in seconds checks: php: diff --git a/README.md b/README.md index b4683f7..1c259d6 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ Bootstrap Components is a [MediaWiki] extension that aims to provide editors with easy access to certain components introduced by -[Twitter Bootstrap 4][Bootstrap]. +[Twitter Bootstrap 5][Bootstrap]. Depending on your configuration, editors can utilize several _tag extensions_ and _parser functions_ inside wiki code to place certain @@ -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) @@ -31,8 +31,9 @@ configuration it can add a new [gallery][Gallery] mode, and replace normal Please also see the [known issues][known-issues] section. -There is also a [migration guide](docs/migration-guide.md) for users switching -from bootstrap3 (BootstrapComponents ~1.2) to bootstrap4 (BootstrapComponents ~4.0). +There is also a [migration guide](docs/migration-guide.md) for users switching between versions: +- Bootstrap 3 → Bootstrap 4: BootstrapComponents ~1.2 → ~4.0 +- Bootstrap 4 → Bootstrap 5: BootstrapComponents ~5.x → ~6.0 ## Contact For bug reports and feature requests, please see if it is already reported on diff --git a/composer.json b/composer.json index 3691d76..9b5b049 100644 --- a/composer.json +++ b/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" + "mediawiki/bootstrap": "^6.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" @@ -58,5 +58,10 @@ "composer phpunit", "composer cs" ] + }, + "extra": { + "branch-alias": { + "dev-master": "6.x-dev" + } } } diff --git a/docs/components.md b/docs/components.md index d02f2b0..1917ade 100644 --- a/docs/components.md +++ b/docs/components.md @@ -22,6 +22,9 @@ the following components are available to be used inside the wiki text: want to hide and show large amount of content. * **[Jumbotron](components/jumbotron.md)**: A jumbotron indicates a big box for calling extra attention to some special content or information. + _Bootstrap 5 removed `.jumbotron`; the parser function is retained + (now emitting BS5 utility classes) but is deprecated and may be removed + in a future release._ * **[Modal](components/modal.md)**: The Modal component is a dialog box/popup window that is displayed on top of the current page. * **[Popover](components/popover.md)**: The Popover component produces a diff --git a/docs/components/accordion.md b/docs/components/accordion.md index ca1ffdd..36bdcd5 100644 --- a/docs/components/accordion.md +++ b/docs/components/accordion.md @@ -40,6 +40,6 @@ add multiple css styles, separate them by a semicolon. ### Links -* https://getbootstrap.com/docs/4.1/components/collapse/#accordion-example +* https://getbootstrap.com/docs/5.3/components/collapse/#accordion-example * https://www.w3schools.com/bootstrap4/bootstrap_collapse.asp diff --git a/docs/components/alert.md b/docs/components/alert.md index 0a0907a..f8a4027 100644 --- a/docs/components/alert.md +++ b/docs/components/alert.md @@ -54,6 +54,6 @@ add multiple css styles, separate them by a semicolon. ### Links -* https://getbootstrap.com/docs/4.1/components/alerts/ +* https://getbootstrap.com/docs/5.3/components/alerts/ * https://www.w3schools.com/bootstrap4/bootstrap_alerts.asp -* https://getbootstrap.com/docs/4.1/utilities/colors/ +* https://getbootstrap.com/docs/5.3/utilities/colors/ diff --git a/docs/components/badge.md b/docs/components/badge.md index 31eb228..880adb0 100644 --- a/docs/components/badge.md +++ b/docs/components/badge.md @@ -24,7 +24,7 @@ add multiple classes, separate them by a space. Allowed Values are