Merge "build: Updating composer dependencies"

composer.json

@@ -3,8 +3,8 @@
 		"jakub-onderka/php-parallel-lint": "1.0.0",
 		"mediawiki/mediawiki-codesniffer": "29.0.0",
 		"jakub-onderka/php-console-highlighter": "0.4.0",
-		"mediawiki/minus-x": "0.3.2",
+		"mediawiki/minus-x": "1.0.0",
-		"mediawiki/mediawiki-phan-config": "0.9.0"
+		"mediawiki/mediawiki-phan-config": "0.9.1"
 	},
 	"scripts": {
 		"fix": [

includes/TimelessTemplate.php

@@ -187,6 +187,7 @@ class TimelessTemplate extends BaseTemplate {
 	 * @param array $setOptions miscellaneous overrides, see below
 	 *
 	 * @return string html
+	 * @suppress PhanTypeMismatchArgumentNullable
 	 */
 	protected function getPortlet( $name, $content, $msg = null, $setOptions = [] ) {
 		// random stuff to override with any provided options
@@ -357,6 +358,7 @@ class TimelessTemplate extends BaseTemplate {
 			$wordmarkImage = $this->getLogoImage( $config->get( 'TimelessWordmark' ), true );
 
 			$titleClass = '';
+			$siteTitle = '';
 			if ( !$wordmarkImage ) {
 				if ( $language->hasVariants() ) {
 					$siteTitle = $language->convert( $this->getMsg( 'timeless-sitetitle' )->escaped() );
@@ -833,13 +835,13 @@ class TimelessTemplate extends BaseTemplate {
 	 */
 	protected function getCategories() {
 		$skin = $this->getSkin();
+		$catHeader = 'categories';
 		$catList = '';
 		$html = '';
 
 		$allCats = $skin->getOutput()->getCategoryLinks();
 		if ( !empty( $allCats ) ) {
 			if ( !empty( $allCats['normal'] ) ) {
-				$catHeader = 'categories';
 				$catList .= $this->getCatList(
 					$allCats['normal'],
 					'normal-catlinks',