Add CI for MW 1.42/43 (#896)

* Add CI for MW 1.42/43 * Update SemanticResultFormats.utils.php * Update ResourcesTest.php * Update JsonTestCaseScriptRunnerTest.php * Update JsonTestCaseScriptRunnerTest.php * Update listwidget-01.json * Update listwidget-01.json * Update carousel-01.json
SemanticMediaWiki · Dec 30, 2024 · 7679b15 · 7679b15
1 parent ff52a47
commit 7679b15
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -40,6 +40,24 @@ jobs:
             database_image: "mariadb:11.2"
             coverage: false
             experimental: false
+          - mediawiki_version: '1.42'
+            smw_version: dev-master
+            pf_version: 5.9
+            sfs_version: dev-master
+            php_version: 8.1
+            database_type: mysql
+            database_image: "mariadb:11.2"
+            coverage: false
+            experimental: false
+          - mediawiki_version: '1.43'
+            smw_version: dev-master
+            pf_version: 5.9
+            sfs_version: dev-master
+            php_version: 8.1
+            database_type: mysql
+            database_image: "mariadb:11.2"
+            coverage: false
+            experimental: false
 
     env:
       MW_VERSION: ${{ matrix.mediawiki_version }}

diff --git a/SemanticResultFormats.utils.php b/SemanticResultFormats.utils.php
@@ -76,12 +76,12 @@ public static function htmlQueryResultLink( $link ) {
 	 * @return string|WrappedString HTML
 	 */
 	public static function makeVariablesScript( $data, $nonce = null ) {
-		$script = ResourceLoader::makeConfigSetScript( $data );
+		$script = MediaWiki\ResourceLoader\ResourceLoader::makeConfigSetScript( $data );
 		if ( $nonce === null ) {
 			$nonce = RequestContext::getMain()->getOutput()->getCSP()->getNonce();
 		}
 
-		return ResourceLoader::makeInlineScript( $script, $nonce );
+		return MediaWiki\ResourceLoader\ResourceLoader::makeInlineScript( $script, $nonce );
 	}
 
 }
diff --git a/tests/phpunit/Integration/JSONScript/TestCases/carousel-01.json b/tests/phpunit/Integration/JSONScript/TestCases/carousel-01.json
@@ -49,6 +49,9 @@
 		{
 			"type": "parser",
 			"about": "#0",
+			"skip-on": {
+				"mediawiki": [ ">1.42.x", "Check assertions for MW higher then 1.42." ]
+			},
 			"subject": "Test/Carousel/T.1",
 			"assert-output": {
 				"to-contain": [
@@ -60,6 +63,9 @@
 		{
 			"type": "parser",
 			"about": "#1",
+			"skip-on": {
+				"mediawiki": [ ">1.42.x", "Check assertions for MW higher then 1.42." ]
+			},
 			"subject": "Test/Carousel/T.2",
 			"assert-output": {
 				"to-contain": [

diff --git a/tests/phpunit/Integration/JSONScript/TestCases/listwidget-01.json b/tests/phpunit/Integration/JSONScript/TestCases/listwidget-01.json
@@ -51,6 +51,9 @@
 		{
 			"type": "parser-html",
 			"about": "#0 Listwidget - alphabet - unordered",
+			"skip-on": {
+				"mediawiki": [ ">1.41.x", "Check assertions for MW higher then 1.41." ]
+			},
 			"subject": "Listwidget - alphabet - unordered",
 			"assert-output": {
 				"to-contain": [
@@ -61,6 +64,9 @@
 		{
 			"type": "parser-html",
 			"about": "#1 Listwidget - menu - listtype unspecified",
+			"skip-on": {
+				"mediawiki": [ ">1.41.x", "Check assertions for MW higher then 1.41." ]
+			},
 			"subject": "Listwidget - menu - listtype unspecified",
 			"assert-output": {
 				"to-contain": [
@@ -71,6 +77,9 @@
 		{
 			"type": "parser-html",
 			"about": "#2 Listwidget - pagination - ordered",
+			"skip-on": {
+				"mediawiki": [ ">1.41.x", "Check assertions for MW higher then 1.41." ]
+			},
 			"subject": "Listwidget - pagination - ordered",
 			"assert-output": {
 				"to-contain": [

diff --git a/tests/phpunit/Integration/ResourcesTest.php b/tests/phpunit/Integration/ResourcesTest.php
@@ -3,8 +3,8 @@
 namespace SRF\Tests\Integration;
 
 use MediaWiki\MediaWikiServices;
-use ResourceLoader;
-use ResourceLoaderContext;
+use MediaWiki\ResourceLoader\Context;
+use MediaWiki\ResourceLoader\ResourceLoader;
 
 /**
  * Tests for resource definitions and files
@@ -36,7 +36,7 @@ private function getSRFResourceModules() {
 	public function moduleDataProvider() {
 		$resourceLoader = MediaWikiServices::getInstance()->getResourceLoader();
 
-		$context = ResourceLoaderContext::newDummyContext();
+		$context = Context::newDummyContext();
 		$modules = $this->getSRFResourceModules();
 
 		return [ [ $modules, $resourceLoader, $context ] ];