Add CI for MW 1.41 (#894)

SemanticMediaWiki · Dec 29, 2024 · ace37f7 · ace37f7
1 parent 503e3f4
commit ace37f7
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 18 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -31,10 +31,21 @@ jobs:
             database_image: "mariadb:11.2"
             coverage: true
             experimental: false
+          - mediawiki_version: '1.41'
+            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 }}
       SMW_VERSION: ${{ matrix.smw_version }}
+      PF_VERSION: ${{ matrix.pf_version }}
+      SFS_VERSION: ${{ matrix.sfs_version }}
       PHP_VERSION: ${{ matrix.php_version }}
       DB_TYPE: ${{ matrix.database_type }}
       DB_IMAGE: ${{ matrix.database_image }}

diff --git a/extension.json b/extension.json
@@ -34,6 +34,9 @@
 	"AutoloadNamespaces": {
 		"SRF\\DataTables\\": "formats/datatables"
 	},
+	"TestAutoloadNamespaces": {
+		"SRF\\Tests\\": "tests/phpunit/"
+	},
 	"QUnitTestModule": {
 		"localBasePath": "",
 		"remoteExtPath": "SemanticResultFormats",

diff --git a/formats/filtered/src/View/CalendarView.php b/formats/filtered/src/View/CalendarView.php
@@ -10,6 +10,7 @@
  * @ingroup SemanticResultFormats
  */
 
+use MediaWiki\MediaWikiServices;
 use Message;
 use SRF\Filtered\ResultItem;
 
@@ -218,7 +219,7 @@ public function getJsConfig() {
 				'firstDay' => ( $wgAmericanDates ? '0' : Message::newFromKey(
 					'srf-filtered-firstdayofweek'
 				)->inContentLanguage()->text() ),
-				'isRTL' => wfGetLangObj( true )->isRTL(),
+				'isRTL' => MediaWikiServices::getInstance()->getContentLanguage()->isRTL(),
 			];
 	}
 

diff --git a/src/iCalendar/iCalendarFileExportPrinter.php b/src/iCalendar/iCalendarFileExportPrinter.php
@@ -2,13 +2,13 @@
 
 namespace SRF\iCalendar;
 
+use MediaWiki\MediaWikiServices;
 use SMW\Query\Result\ResultArray;
 use SMWDataValueFactory as DataValueFactory;
 use SMWExportPrinter as FileExportPrinter;
 use SMWQuery as Query;
 use SMWQueryProcessor as QueryProcessor;
 use SMWQueryResult as QueryResult;
-use WikiPage;
 
 /**
  * Printer class for iCalendar exports
@@ -247,7 +247,8 @@ private function getEventParams( array $row ) {
 		$title = $subject->getTitle();
 
 		$params['url'] = $title->getFullURL();
-		$params['timestamp'] = WikiPage::factory( $title )->getTimestamp();
+		$params['timestamp'] = MediaWikiServices::getInstance()->getWikiPageFactory()
+			->newFromTitle( $title )->getTimestamp();
 		$params['sequence'] = $title->getLatestRevID();
 
 		return $params;

diff --git a/src/vCard/vCardFileExportPrinter.php b/src/vCard/vCardFileExportPrinter.php
@@ -2,12 +2,12 @@
 
 namespace SRF\vCard;
 
+use MediaWiki\MediaWikiServices;
 use SMWExportPrinter as FileExportPrinter;
 use SMWQuery as Query;
 use SMWQueryProcessor as QueryProcessor;
 use SMWQueryResult as QueryResult;
 use SMWTimeValue as TimeValue;
-use WikiPage;
 
 /**
  * Printer class for creating vCard exports
@@ -163,7 +163,8 @@ private function getVCardContent( $res ) {
 			$uri = $title->getFullURL();
 
 			// A timestamp for the last time the vCard was updated
-			$timestamp = WikiPage::factory( $title )->getTimestamp();
+			$timestamp = MediaWikiServices::getInstance()->getWikiPageFactory()
+				->newFromTitle( $title )->getTimestamp();
 			$text = $title->getText();
 
 			$vCards[] = $this->newVCard( $row, $uri, $text, $timestamp, $isPublic );

diff --git a/tests/phpunit/Integration/JSONScript/JsonTestCaseScriptRunnerTest.php b/tests/phpunit/Integration/JSONScript/JsonTestCaseScriptRunnerTest.php
@@ -13,6 +13,7 @@
  *
  * @group SRF
  * @group SMWExtension
+ * @group Database
  *
  * @license GPL-2.0-or-later
  * @since 2.5

diff --git a/tests/phpunit/Integration/ResourcesTest.php b/tests/phpunit/Integration/ResourcesTest.php
@@ -2,6 +2,7 @@
 
 namespace SRF\Tests\Integration;
 
+use MediaWiki\MediaWikiServices;
 use ResourceLoader;
 use ResourceLoaderContext;
 
@@ -33,13 +34,7 @@ private function getSRFResourceModules() {
 	}
 
 	public function moduleDataProvider() {
-		// #501
-		// MW 1.33+
-		if ( class_exists( '\MediaWiki\MediaWikiServices' ) && method_exists( '\MediaWiki\MediaWikiServices', 'getResourceLoader' ) ) {
-			$resourceLoader = \MediaWiki\MediaWikiServices::getInstance()->getResourceLoader();
-		} else {
-			$resourceLoader = new ResourceLoader();
-		}
+		$resourceLoader = MediaWikiServices::getInstance()->getResourceLoader();
 
 		$context = ResourceLoaderContext::newDummyContext();
 		$modules = $this->getSRFResourceModules();
@@ -48,19 +43,29 @@ public function moduleDataProvider() {
 	}
 
 	/**
-	 * @covers Recources
+	 * @covers Resources
 	 * @dataProvider moduleDataProvider
 	 */
 	public function testModulesScriptsFilesAreAccessible( $modules, ResourceLoader $resourceLoader, $context ) {
-		foreach ( $modules as $name => $values ) {
-			$module = $resourceLoader->getModule( $name );
-			$scripts = $module->getScript( $context );
-			$this->assertIsString( $scripts );
+		if ( version_compare( MW_VERSION, '1.41.0', '>=' ) ) {
+			foreach ( $modules as $name => $values ) {
+				$module = $resourceLoader->getModule( $name );
+				$scripts = $module->getScript( $context );
+				foreach ( $scripts['plainScripts'] as $key => $value ) {
+					$this->assertIsString( $value['content'] );
+				}
+			}
+		} else {
+			foreach ( $modules as $name => $values ) {
+				$module = $resourceLoader->getModule( $name );
+				$scripts = $module->getScript( $context );
+				$this->assertIsString( $scripts );
+			}
 		}
 	}
 
 	/**
-	 * @covers Recources
+	 * @covers Resources
 	 * Test styles accessibility
 	 *
 	 * @dataProvider moduleDataProvider