Add CI for MW 1.41 (#136)

* Add CI for MW 1.41 * Update extension.json * Update extension.json * Update composer.json * Update composer.json * Update SemanticCiteJsonTestCaseScriptRunnerTest.php
SemanticMediaWiki · Dec 31, 2024 · bb42818 · bb42818
1 parent 60f6b22
commit bb42818
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 22 deletions.
diff --git a/.github/.DS_Store b/.github/.DS_Store
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -38,6 +38,13 @@ jobs:
             database_image: "mariadb:11.2"
             coverage: true
             experimental: false
+          - mediawiki_version: '1.41'
+            smw_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/composer.json b/composer.json
@@ -27,15 +27,11 @@
 	},
 	"require": {
 		"php": ">=7.4",
-		"composer/installers": "^1.0.12",
-		"mediawiki/semantic-media-wiki": "~4.0|~5.0",
+		"composer/installers": ">=1.0.1",
 		"onoi/cache": "~1.2",
 		"mediawiki/http-request": "~2.0|~1.1",
 		"onoi/remi":"~0.2"
 	},
-	"require-dev": {
-		"mediawiki/semantic-media-wiki": "@dev"
-	},
 	"autoload": {
 		"files" : [
 			"SemanticCite.php"
@@ -45,7 +41,10 @@
 		}
 	},
 	"config": {
-		"process-timeout": 0
+		"process-timeout": 0,
+		"allow-plugins": {
+			"composer/installers": true
+		}
 	},
 	"scripts":{
 		"test-coverage": [

diff --git a/extension.json b/extension.json
@@ -16,11 +16,15 @@
 		}
 	},
 	"AutoloadNamespaces": {
-		"SCI\\": "src"
+		"SCI\\": "src/"
 	},
 	"AutoloadClasses": {
 		"SemanticCite": "SemanticCite.php"
 	},
+	"TestAutoloadNamespaces": {
+		"SCI\\Tests\\": "tests/phpunit/Unit/",
+		"SCI\\Tests\\Integration\\": "tests/phpunit/Integration/"
+	},
 	"MessagesDirs": {
 		"SemanticCite": [
 			"i18n"

diff --git a/tests/phpunit/Integration/JSONScript/SemanticCiteJsonTestCaseScriptRunnerTest.php b/tests/phpunit/Integration/JSONScript/SemanticCiteJsonTestCaseScriptRunnerTest.php
@@ -6,21 +6,22 @@
 use SCI\HookRegistry;
 use SCI\Options;
 use Onoi\Cache\CacheFactory;
-use SMW\Tests\LightweightJsonTestCaseScriptRunner;
-use SMW\Tests\JsonTestCaseFileHandler;
+use SMW\Tests\JSONScriptServicesTestCaseRunner;
+use SMW\Tests\Utils\JSONScript\JsonTestCaseFileHandler;
 use SMW\Tests\Utils\UtilityFactory;
 use SMW\DIWikiPage;
 
 /**
  * @group semantic-cite
  * @group medium
+ * @group Database
  *
  * @license GNU GPL v2+
  * @since 1.0
  *
  * @author mwjames
  */
-class SemanticCiteJsonTestCaseScriptRunnerTest extends LightweightJsonTestCaseScriptRunner {
+class SemanticCiteJsonTestCaseScriptRunnerTest extends JSONScriptServicesTestCaseRunner {
 
 	private $semanticDataValidator;
 	private $stringValidator;

diff --git a/tests/phpunit/Unit/MediaWikiContextInteractorTest.php b/tests/phpunit/Unit/MediaWikiContextInteractorTest.php
@@ -37,19 +37,9 @@ public function testHasAction() {
 			->disableOriginalConstructor()
 			->getMock();
 
-		$webRequest = $this->getMockBuilder( '\WebRequest' )
-			->disableOriginalConstructor()
-			->getMock();
-
-		// replaced $this->once() with $this->any(), is that correct ?
-		$webRequest->expects( $this->any() )
-			->method( 'getVal' )
-			->will( $this->returnValue( 'view' ) );
-
-		// replaced $this->once() with $this->any(), is that correct ?
 		$context->expects( $this->any() )
-			->method( 'getRequest' )
-			->will( $this->returnValue( $webRequest ) );
+			->method( 'getActionName' )
+			->willReturn( 'view');
 
 		$instance = new MediaWikiContextInteractor( $context );