From 878c021cb71fa2bd10475ba2cb2c3d9017a1688c Mon Sep 17 00:00:00 2001 From: jdlrobson Date: Fri, 26 Mar 2021 15:08:11 -0700 Subject: [PATCH 1/2] Fixes composer issue Your requirements could not be resolved to an installable set of packages. Problem 1 - composer/semver 1.4.2 requires php ^5.3.2 || ^7.0 -> your PHP version (8.0.3) does not satisfy that requirement. - mediawiki/mediawiki-codesniffer v24.0.0 requires composer/semver 1.4.2 -> satisfiable by composer/semver[1.4.2]. - Installation request for mediawiki/mediawiki-codesniffer 24.0.0 -> satisfiable by mediawiki/mediawiki-codesniffer[v24.0.0]. --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index f6d208c..918b83c 100644 --- a/composer.json +++ b/composer.json @@ -4,7 +4,7 @@ "jakub-onderka/php-console-highlighter": "0.3.2", "mediawiki/minus-x": "0.3.1", "mediawiki/mediawiki-phan-config": "0.6.1", - "mediawiki/mediawiki-codesniffer": "24.0.0" + "mediawiki/mediawiki-codesniffer": "35.0.0" }, "scripts": { "fix": [ From 6ad164c2298920b24d3a9a457e54405d11bbfe7f Mon Sep 17 00:00:00 2001 From: jdlrobson Date: Fri, 26 Mar 2021 15:08:43 -0700 Subject: [PATCH 2/2] The Sanitizer::escapeId method no longer exists Fixes: #95 --- includes/BootstrapMediaWikiTemplate.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/BootstrapMediaWikiTemplate.php b/includes/BootstrapMediaWikiTemplate.php index 90bfc87..c79f46e 100644 --- a/includes/BootstrapMediaWikiTemplate.php +++ b/includes/BootstrapMediaWikiTemplate.php @@ -872,7 +872,7 @@ private function getArrayLinks( $array, $title, $which ) { $nav[] = [ 'title' => $title ]; foreach ( $array as $key => $item ) { $link = [ - 'id' => Sanitizer::escapeId( $key ), + 'id' => Sanitizer::escapeIdForAttribute( $key ), 'attributes' => $item['attributes'] ?? null, 'link' => $item['href'] ?? null, 'key' => $item['key'] ?? null,