Merge branch 'master' into dependabot/composer/phpstan/phpstan-tw-1.10.15or-tw-2.0.0

Author: malberts

.github/workflows/ci.yml

@@ -15,20 +15,20 @@ jobs:
     strategy:
       matrix:
         include:
-          - mw: 'REL1_39'
-            php: 8.0
-            experimental: false
-          - mw: 'REL1_40'
-            php: 8.1
-            experimental: false
-          - mw: 'REL1_41'
+          - mw: 'REL1_43'
             php: 8.1
             experimental: false
-          - mw: 'REL1_42'
+          - mw: 'REL1_44'
             php: 8.2
+            experimental: false
+          - mw: 'REL1_45'
+            php: 8.3
+            experimental: false
+          - mw: 'master'
+            php: 8.4
             experimental: true
           - mw: 'master'
-            php: 8.3
+            php: 8.5
             experimental: true
 
     runs-on: ubuntu-latest
@@ -86,8 +86,8 @@ jobs:
     strategy:
       matrix:
         include:
-          - mw: 'REL1_39'
-            php: '8.0'
+          - mw: 'REL1_43'
+            php: '8.1'
 
     runs-on: ubuntu-latest
 
@@ -112,8 +112,8 @@ jobs:
     strategy:
       matrix:
         include:
-          - mw: 'REL1_39'
-            php: '8.0'
+          - mw: 'REL1_43'
+            php: '8.1'
 
     runs-on: ubuntu-latest
 
@@ -173,8 +173,8 @@ jobs:
     strategy:
       matrix:
         include:
-          - mw: 'REL1_39'
-            php: '8.0'
+          - mw: 'REL1_43'
+            php: '8.1'
 
     runs-on: ubuntu-latest
 

README.md

@@ -1,15 +1,15 @@
 # MediaWiki SCSS library
 
 [![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/ProfessionalWiki/SCSS/ci.yml?branch=master)](https://github.com/ProfessionalWiki/SCSS/actions?query=workflow%3ACI)
-[![Latest Stable Version](https://poser.pugx.org/mediawiki/scss/version.png)](https://packagist.org/packages/mediawiki/scss)
+[![Latest Stable Version](https://poser.pugx.org/mediawiki/scss/v/stable)](https://packagist.org/packages/mediawiki/scss)
 [![License](https://poser.pugx.org/mediawiki/scss/license)](https://packagist.org/packages/mediawiki/scss)
 
 The MediaWiki SCSS library provides a ResourceLoader module capable of compiling [SCSS].
 
 ## Requirements
 
-- [PHP] 8.0 or later
-- [MediaWiki] 1.39 or later
+- [PHP] 8.1 or later
+- [MediaWiki] 1.43 or later
 - [Composer]
 
 ## Use
@@ -123,6 +123,15 @@ version 3][license] (or any later version).
 
 ## Release notes
 
+### Version 5.0.0
+
+Released on 2025-12-20
+
+* Raised minimum MediaWiki version from 1.39 to 1.43
+* Raised minimum PHP version from 8.0 to 8.1
+* Raised minimum `scssphp` version from 1.12.1 to 1.13.0
+* Fixed MediaWiki 1.43 deprecations
+
 ### Version 4.0.0
 
 Released on 2024-04-25

composer.json

@@ -36,14 +36,14 @@
 		"rss": "https://github.com/ProfessionalWiki/SCSS/releases.atom"
 	},
 	"require": {
-		"php": ">=8.0",
-		"scssphp/scssphp": "^1.12.1"
+		"php": ">=8.1",
+		"scssphp/scssphp": "^1.13.0"
 	},
 	"require-dev": {
 		"phpunit/phpunit": "^9.6.8",
 		"vimeo/psalm": "^5.12.0",
-		"phpstan/phpstan": "^1.10.15 || ^2.0.0",
-		"mediawiki/mediawiki-codesniffer": "^44.0.0 || ^45.0.0",
+		"phpstan/phpstan": "^2.0.0",
+		"mediawiki/mediawiki-codesniffer": "^46.0.0",
 		"slevomat/coding-standard": "^v8.11.1"
 	},
 	"autoload": {
@@ -54,7 +54,7 @@
 	},
 	"extra": {
 		"branch-alias": {
-			"dev-master": "4.x-dev"
+			"dev-master": "5.x-dev"
 		}
 	},
 	"config": {

src/ResourceLoaderSCSSModule.php

@@ -25,14 +25,15 @@
 
 namespace SCSS;
 
-use BagOStuff;
 use CSSJanus;
 use Exception;
+use MediaWiki\MediaWikiServices;
 use MediaWiki\ResourceLoader\Context;
 use MediaWiki\ResourceLoader\FileModule;
 use MediaWiki\ResourceLoader\FilePath;
-use ObjectCache;
+use ObjectCacheFactory;
 use ScssPhp\ScssPhp\Compiler;
+use Wikimedia\ObjectCache\BagOStuff;
 
 /**
  * ResourceLoader module based on local JavaScript/SCSS files.
@@ -138,12 +139,16 @@ protected function retrieveStylesFromCache( Context $context ): void {
 
 	protected function getCache(): BagOStuff {
 		if ( $this->cache === null ) {
-			$this->cache = ObjectCache::getInstance( $this->getCacheType() );
+			$this->cache = $this->getObjectCacheFactory()->getInstance( $this->getCacheType() );
 		}
 
 		return $this->cache;
 	}
 
+	private function getObjectCacheFactory(): ObjectCacheFactory {
+		return MediaWikiServices::getInstance()->getObjectCacheFactory();
+	}
+
 	private function getCacheType(): int {
 		return array_key_exists( 'egScssCacheType', $GLOBALS ) ? (int)$GLOBALS[ 'egScssCacheType' ] : -1;
 	}
@@ -168,7 +173,7 @@ protected function getCacheKey( Context $context ): string {
 			// have to hash the module config, else it may become too long
 			$configHash = md5( $styles . $vars );
 
-			$this->cacheKey = \ObjectCache::getLocalClusterInstance()->makeKey(
+			$this->cacheKey = $this->getObjectCacheFactory()->getLocalClusterInstance()->makeKey(
 				'ext',
 				'scss',
 				$configHash,

tests/phpunit/ResourceLoaderSCSSModuleTest.php

@@ -25,10 +25,10 @@
 
 namespace SCSS\Tests;
 
-use HashBagOStuff;
 use MediaWiki\ResourceLoader\Context;
 use PHPUnit\Framework\TestCase;
 use SCSS\ResourceLoaderSCSSModule;
+use Wikimedia\ObjectCache\HashBagOStuff;
 
 /**
  * @covers \SCSS\ResourceLoaderSCSSModule