Merge branch 'master' into patch-1

.github/workflows/ci.yml

@@ -17,27 +17,34 @@ jobs:
     strategy:
       matrix:
         include:
-          - mediawiki_version: '1.35'
-            smw_version: '4.1.2'
-            php_version: 7.4
+          - mediawiki_version: '1.39'
+            smw_version: dev-master
+            php_version: 8.1
             database_type: mysql
-            database_image: "mysql:5.7"
-            coverage: true
+            database_image: "mariadb:11.2"
+            coverage: false
             experimental: false
-          - mediawiki_version: '1.35'
+          - mediawiki_version: '1.39'
             smw_version: dev-master
-            php_version: 7.4
+            php_version: 8.1
             database_type: mysql
-            database_image: "mysql:5.7"
+            database_image: "mariadb:11.2"
             coverage: false
             experimental: false
-          - mediawiki_version: '1.39'
+          - mediawiki_version: '1.40'
             smw_version: dev-master
             php_version: 8.1
             database_type: mysql
-            database_image: "mariadb:latest"
+            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: true
+            experimental: false
 
     env:
       MW_VERSION: ${{ matrix.mediawiki_version }}
@@ -65,7 +72,8 @@ jobs:
         if: matrix.coverage == true
 
       - name: Upload code coverage
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v4
         with:
+          token: ${{ secrets.CODECOV_TOKEN }}
           files: coverage/php/coverage.xml
         if: matrix.coverage == true

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "build"]
+	path = build
+	url = https://github.com/gesinn-it-pub/docker-compose-ci.git

Makefile

@@ -0,0 +1,32 @@
+-include .env
+export
+
+# setup for docker-compose-ci build directory
+# delete "build" directory to update docker-compose-ci
+
+ifeq (,$(wildcard ./build/))
+    $(shell git submodule update --init --remote)
+endif
+
+EXTENSION=SemanticCite
+
+# docker images
+MW_VERSION?=1.39
+PHP_VERSION?=8.1
+DB_TYPE?=mysql
+DB_IMAGE?="mariadb:11.2"
+
+# extensions
+SMW_VERSION?=dev-master
+
+# composer
+# Enables "composer update" inside of extension
+COMPOSER_EXT?=true
+
+# nodejs
+# Enables node.js related tests and "npm install"
+# NODE_JS?=true
+
+# check for build dir and git submodule init if it does not exist
+include build/Makefile
+

README.md

@@ -24,8 +24,8 @@ Several short [videos](https://www.youtube.com/playlist?list=PLIJ9eX-UsA5eI_YFdn
 ## Requirements
 
 - PHP 7.4 or later
-- MediaWiki 1.35 or later
-- [Semantic MediaWiki][smw] 3.0 or later
+- MediaWiki 1.39 or later
+- [Semantic MediaWiki][smw] 4.0 or later
 
 Semantic Cite **does not require** nor uses any part of extension [Cite][mw-cite] (or `<ref>` tags) as a means to declare
 a citation resource.

codecov.yml

@@ -0,0 +1,2 @@
+fixes:
+  - "/var/www/html/extensions/SemanticCite/::"

composer.json

@@ -27,14 +27,11 @@
 	},
 	"require": {
 		"php": ">=7.4",
-		"composer/installers": "^1.0.12",
+		"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"
@@ -44,10 +41,21 @@
 		}
 	},
 	"config": {
-		"process-timeout": 0
+		"process-timeout": 0,
+		"allow-plugins": {
+			"composer/installers": true
+		}
 	},
 	"scripts":{
+		"test-coverage": [
+			"@phpunit-coverage"
+		],
 		"phpunit": "php ../../tests/phpunit/phpunit.php -c phpunit.xml.dist",
+		"phpunit-coverage": "php ${MW_INSTALL_PATH:-../..}/tests/phpunit/phpunit.php -c phpunit.xml.dist --testdox --coverage-text --coverage-html coverage/php --coverage-clover coverage/php/coverage.xml",
+		"post-test-coverage": [
+			"sed -i 's|/var/www/html/extensions/SemanticCite/||g' coverage/php/coverage.xml",
+			"find coverage/php -type f -name '*.html' -exec sed -i 's|/var/www/html/extensions/||g' {} +"
+		],
 		"test": "php ../../tests/phpunit/phpunit.php -c phpunit.xml.dist"
 	}
 }

extension.json

@@ -10,17 +10,21 @@
 	"license-name": "GPL-2.0-or-later",
 	"type": "semantic",
 	"requires": {
-		"MediaWiki": ">= 1.35",
+		"MediaWiki": ">= 1.39",
 		"extensions": {
-			"SemanticMediaWiki": ">= 3.0"
+			"SemanticMediaWiki": ">= 4.0"
 		}
 	},
 	"AutoloadNamespaces": {
-		"SCI\\": "src"
+		"SCI\\": "src/"
 	},
 	"AutoloadClasses": {
 		"SemanticCite": "SemanticCite.php"
 	},
+	"TestAutoloadNamespaces": {
+		"SCI\\Tests\\": "tests/phpunit/Unit/",
+		"SCI\\Tests\\Integration\\": "tests/phpunit/Integration/"
+	},
 	"MessagesDirs": {
 		"SemanticCite": [
 			"i18n"

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;
@@ -141,6 +142,10 @@ protected function runTestCaseFile( JsonTestCaseFileHandler $jsonTestCaseFileHan
 
 		foreach ( $jsonTestCaseFileHandler->findTestCasesFor( 'parser-testcases' ) as $case ) {
 
+			if ( $jsonTestCaseFileHandler->requiredToSkipFor( $case, $this->connectorId ) ) {
+				continue;
+			}
+
 			if ( !isset( $case['subject'] ) ) {
 				break;
 			}

tests/phpunit/Integration/JSONScript/TestCases/scite-14-fixed-property-query.json

@@ -19,6 +19,9 @@
 		{
 			"about": "#0 non display formatted query output",
 			"subject": "Example/Query/1",
+			"skip-on": {
+				"mediawiki": [ ">1.38.x", "Failing with 'is an invalid value for the DOI type' on MW 1.39 and above. Needs to be checked and fixed." ]
+			},
 			"expected-output": {
 				"to-contain": [
 					"<td class=\"DOI smwtype_sci_doi\"><span class=\"plainlinks\"><a rel=\"nofollow\" class=\"external text\" href=\"https://doi.org/10.1074%2Fjbc.m114.559054\">10.1074/jbc.m114.559054</a></span></td>"
@@ -28,6 +31,9 @@
 		{
 			"about": "#1 display formatted query output",
 			"subject": "Example/Query/2",
+			"skip-on": {
+				"mediawiki": [ ">1.38.x", "Failing with 'is an invalid value for the DOI type' on MW 1.39 and above. Needs to be checked and fixed." ]
+			},
 			"expected-output": {
 				"to-contain": [
 					"<td class=\"DOI smwtype_sci_doi\">10.1074/jbc.m114.559054</td>"
@@ -46,4 +52,4 @@
 		"is-incomplete": false,
 		"debug": false
 	}
-}
+}

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 );