Add CI for MW 1.42/43 (#137)

paladox · web-flow · commit 215f7aa326e9 · 2024-12-31T23:14:47.000+01:00
* Add CI for MW 1.42/43

* Delete .github/.DS_Store

* Update HookRegistry.php

* Update HookRegistry.php

* Fix
diff --git a/.github/.DS_Store b/.github/.DS_Store
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -45,6 +45,20 @@ jobs:
             database_image: "mariadb:11.2"
             coverage: false
             experimental: false
+          - mediawiki_version: '1.42'
+            smw_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
+            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/src/HookRegistry.php b/src/HookRegistry.php
@@ -8,7 +8,6 @@
 use SMW\DataTypeRegistry;
 use SMW\DIWikiPage;
 use SMWDataItem as DataItem;
-use Hooks;
 
 /**
  * @license GNU GPL v2+
@@ -70,7 +69,7 @@ public function setOption( $key, $value ) {
 	 * @return boolean
 	 */
 	public function isRegistered( $name ) {
-		return Hooks::isRegistered( $name );
+		return \MediaWiki\MediaWikiServices::getInstance()->getHookContainer()->isRegistered( $name );
 	}
 
 	/**
@@ -83,13 +82,7 @@ public function clear() {
 		}
 
 		foreach ( $this->handlers as $name => $callback ) {
-			if (
-				!class_exists( '\MediaWiki\MediaWikiServices' ) ||
-				!method_exists( \MediaWiki\MediaWikiServices::getInstance(), 'getHookContainer' ) ) {
-				\Hooks::clear( $name );
-			} else {
-				\MediaWiki\MediaWikiServices::getInstance()->getHookContainer()->clear( $name );
-			}
+			\MediaWiki\MediaWikiServices::getInstance()->getHookContainer()->clear( $name );
 		}
 	}
 
@@ -114,13 +107,7 @@ public function register() {
 		//}
 
 		foreach ( $this->handlers as $name => $callback ) {
-			if (
-				!class_exists( '\MediaWiki\MediaWikiServices' ) ||
-				!method_exists( \MediaWiki\MediaWikiServices::getInstance(), 'getHookContainer' ) ) {
-				\Hooks::register( $name, $callback );
-			} else {
-				\MediaWiki\MediaWikiServices::getInstance()->getHookContainer()->register( $name, $callback );
-			}
+			\MediaWiki\MediaWikiServices::getInstance()->getHookContainer()->register( $name, $callback );
 		}
 	}
 
diff --git a/tests/phpunit/Integration/FilteredMetadata/SciteTransclusionForCannedResponseParserTest.php b/tests/phpunit/Integration/FilteredMetadata/SciteTransclusionForCannedResponseParserTest.php
@@ -13,7 +13,7 @@
  *
  * @author mwjames
  */
-class SciteTransclusionForCannedResponseParserTest extends \PHPUnit_Framework_TestCase {
+class SciteTransclusionForCannedResponseParserTest extends \PHPUnit\Framework\TestCase {
 
 	/**
 	 * @dataProvider crossrefFileProvider
diff --git a/tests/phpunit/Structure/I18nJsonFileIntegrityTest.php b/tests/phpunit/Structure/I18nJsonFileIntegrityTest.php
@@ -14,7 +14,7 @@
  *
  * @author mwjames
  */
-class I18nJsonFileIntegrityTest extends \PHPUnit_Framework_TestCase {
+class I18nJsonFileIntegrityTest extends \PHPUnit\Framework\TestCase {
 
 	use PHPUnitCompat;
 
diff --git a/tests/phpunit/Unit/Bibtex/BibtexAuthorListParserTest.php b/tests/phpunit/Unit/Bibtex/BibtexAuthorListParserTest.php
@@ -13,7 +13,7 @@
  *
  * @author mwjames
  */
-class BibtexAuthorListParserTest extends \PHPUnit_Framework_TestCase {
+class BibtexAuthorListParserTest extends \PHPUnit\Framework\TestCase {
 
 	public function testCanConstruct() {
 
diff --git a/tests/phpunit/Unit/Bibtex/BibtexParserTest.php b/tests/phpunit/Unit/Bibtex/BibtexParserTest.php
@@ -13,7 +13,7 @@
  *
  * @author mwjames
  */
-class BibtexParserTest extends \PHPUnit_Framework_TestCase {
+class BibtexParserTest extends \PHPUnit\Framework\TestCase {
 
 	public function testCanConstruct() {
 
diff --git a/tests/phpunit/Unit/Bibtex/BibtexProcessorTest.php b/tests/phpunit/Unit/Bibtex/BibtexProcessorTest.php
@@ -13,7 +13,7 @@
  *
  * @author mwjames
  */
-class BibtexProcessorTest extends \PHPUnit_Framework_TestCase {
+class BibtexProcessorTest extends \PHPUnit\Framework\TestCase {
 
 	public function testCanConstruct() {
 
diff --git a/tests/phpunit/Unit/CacheKeyProviderTest.php b/tests/phpunit/Unit/CacheKeyProviderTest.php
@@ -14,7 +14,7 @@
  *
  * @author mwjames
  */
-class CacheKeyProviderTest extends \PHPUnit_Framework_TestCase {
+class CacheKeyProviderTest extends \PHPUnit\Framework\TestCase {
 
 	use PHPUnitCompat;
 
diff --git a/tests/phpunit/Unit/CachedReferenceListOutputRendererTest.php b/tests/phpunit/Unit/CachedReferenceListOutputRendererTest.php
@@ -13,7 +13,7 @@
  *
  * @author mwjames
  */
-class CachedReferenceListOutputRendererTest extends \PHPUnit_Framework_TestCase {
+class CachedReferenceListOutputRendererTest extends \PHPUnit\Framework\TestCase {
 
 	private $referenceListOutputRenderer;
 	private $contextInteractor;
diff --git a/tests/phpunit/Unit/CitationReferencePositionJournalTest.php b/tests/phpunit/Unit/CitationReferencePositionJournalTest.php
@@ -14,7 +14,7 @@
  *
  * @author mwjames
  */
-class CitationReferencePositionJournalTest extends \PHPUnit_Framework_TestCase {
+class CitationReferencePositionJournalTest extends \PHPUnit\Framework\TestCase {
 
 	use PHPUnitCompat;
 
diff --git a/tests/phpunit/Unit/CitationResourceMatchFinderTest.php b/tests/phpunit/Unit/CitationResourceMatchFinderTest.php
@@ -13,7 +13,7 @@
  *
  * @author mwjames
  */
-class CitationResourceMatchFinderTest extends \PHPUnit_Framework_TestCase {
+class CitationResourceMatchFinderTest extends \PHPUnit\Framework\TestCase {
 
 	public function testCanConstruct() {
 
diff --git a/tests/phpunit/Unit/CitationTextChangeUpdateJobDispatcherTest.php b/tests/phpunit/Unit/CitationTextChangeUpdateJobDispatcherTest.php
@@ -14,7 +14,7 @@
  *
  * @author mwjames
  */
-class CitationTextChangeUpdateJobDispatcherTest extends \PHPUnit_Framework_TestCase {
+class CitationTextChangeUpdateJobDispatcherTest extends \PHPUnit\Framework\TestCase {
 
 	private $store;
 	private $referenceBacklinksLookup;
diff --git a/tests/phpunit/Unit/CitationTextTemplateRendererTest.php b/tests/phpunit/Unit/CitationTextTemplateRendererTest.php
@@ -13,7 +13,7 @@
  *
  * @author mwjames
  */
-class CitationTextTemplateRendererTest extends \PHPUnit_Framework_TestCase {
+class CitationTextTemplateRendererTest extends \PHPUnit\Framework\TestCase {
 
 	public function testCanConstruct() {
 
diff --git a/tests/phpunit/Unit/DataValues/CitationReferenceValueTest.php b/tests/phpunit/Unit/DataValues/CitationReferenceValueTest.php
@@ -14,7 +14,7 @@
  *
  * @author mwjames
  */
-class CitationReferenceValueTest extends \PHPUnit_Framework_TestCase {
+class CitationReferenceValueTest extends \PHPUnit\Framework\TestCase {
 
 	private $dataValueServiceFactory;
 
diff --git a/tests/phpunit/Unit/DataValues/ResourceIdentifierFactoryTest.php b/tests/phpunit/Unit/DataValues/ResourceIdentifierFactoryTest.php
@@ -13,7 +13,7 @@
  *
  * @author mwjames
  */
-class ResourceIdentifierFactoryTest extends \PHPUnit_Framework_TestCase {
+class ResourceIdentifierFactoryTest extends \PHPUnit\Framework\TestCase {
 
 	public function testCanConstruct() {
 
diff --git a/tests/phpunit/Unit/DataValues/ResourceIdentifierStringValueParserTest.php b/tests/phpunit/Unit/DataValues/ResourceIdentifierStringValueParserTest.php
@@ -13,7 +13,7 @@
  *
  * @author mwjames
  */
-class ResourceIdentifierStringValueParserTest extends \PHPUnit_Framework_TestCase {
+class ResourceIdentifierStringValueParserTest extends \PHPUnit\Framework\TestCase {
 
 	/**
 	 * @dataProvider typeProvider
diff --git a/tests/phpunit/Unit/DataValues/ResourceIdentifierStringValueTest.php b/tests/phpunit/Unit/DataValues/ResourceIdentifierStringValueTest.php
@@ -13,7 +13,7 @@
  *
  * @author mwjames
  */
-class ResourceIdentifierStringValueTest extends \PHPUnit_Framework_TestCase {
+class ResourceIdentifierStringValueTest extends \PHPUnit\Framework\TestCase {
 
 	/**
 	 * @dataProvider typeProvider
diff --git a/tests/phpunit/Unit/FilteredMetadata/BibliographicFilteredRecordTest.php b/tests/phpunit/Unit/FilteredMetadata/BibliographicFilteredRecordTest.php
@@ -13,7 +13,7 @@
  *
  * @author mwjames
  */
-class BibliographicFilteredRecordTest extends \PHPUnit_Framework_TestCase {
+class BibliographicFilteredRecordTest extends \PHPUnit\Framework\TestCase {
 
 	public function testCanConstruct() {
 
diff --git a/tests/phpunit/Unit/FilteredMetadata/CrossRefResponseParserTest.php b/tests/phpunit/Unit/FilteredMetadata/CrossRefResponseParserTest.php
@@ -13,7 +13,7 @@
  *
  * @author mwjames
  */
-class CrossRefResponseParserTest extends \PHPUnit_Framework_TestCase {
+class CrossRefResponseParserTest extends \PHPUnit\Framework\TestCase {
 
 	public function testCanConstruct() {
 
diff --git a/tests/phpunit/Unit/FilteredMetadata/HttpResponseParserFactoryTest.php b/tests/phpunit/Unit/FilteredMetadata/HttpResponseParserFactoryTest.php
@@ -13,7 +13,7 @@
  *
  * @author mwjames
  */
-class HttpResponseParserFactoryTest extends \PHPUnit_Framework_TestCase {
+class HttpResponseParserFactoryTest extends \PHPUnit\Framework\TestCase {
 
 	public function testCanConstruct() {
 
diff --git a/tests/phpunit/Unit/FilteredMetadata/NcbiPubMedResponseParserTest.php b/tests/phpunit/Unit/FilteredMetadata/NcbiPubMedResponseParserTest.php
@@ -13,7 +13,7 @@
  *
  * @author mwjames
  */
-class NcbiPubMedResponseParserTest extends \PHPUnit_Framework_TestCase {
+class NcbiPubMedResponseParserTest extends \PHPUnit\Framework\TestCase {
 
 	public function testCanConstruct() {
 
diff --git a/tests/phpunit/Unit/FilteredMetadata/OLResponseParserTest.php b/tests/phpunit/Unit/FilteredMetadata/OLResponseParserTest.php
@@ -13,7 +13,7 @@
  *
  * @author mwjames
  */
-class OLResponseParserTest extends \PHPUnit_Framework_TestCase {
+class OLResponseParserTest extends \PHPUnit\Framework\TestCase {
 
 	public function testCanConstruct() {
 
diff --git a/tests/phpunit/Unit/FilteredMetadata/OclcResponseParserTest.php b/tests/phpunit/Unit/FilteredMetadata/OclcResponseParserTest.php
@@ -13,7 +13,7 @@
  *
  * @author mwjames
  */
-class OclcResponseParserTest extends \PHPUnit_Framework_TestCase {
+class OclcResponseParserTest extends \PHPUnit\Framework\TestCase {
 
 	public function testCanConstruct() {
 
diff --git a/tests/phpunit/Unit/FilteredMetadata/ViafResponseParserTest.php b/tests/phpunit/Unit/FilteredMetadata/ViafResponseParserTest.php
@@ -13,7 +13,7 @@
  *
  * @author mwjames
  */
-class ViafResponseParserTest extends \PHPUnit_Framework_TestCase {
+class ViafResponseParserTest extends \PHPUnit\Framework\TestCase {
 
 	public function testCanConstruct() {
 
diff --git a/tests/phpunit/Unit/HookRegistryTest.php b/tests/phpunit/Unit/HookRegistryTest.php
@@ -18,7 +18,7 @@
  *
  * @author mwjames
  */
-class HookRegistryTest extends \PHPUnit_Framework_TestCase {
+class HookRegistryTest extends \PHPUnit\Framework\TestCase {
 
 	use PHPUnitCompat;
 
diff --git a/tests/phpunit/Unit/MediaWikiContextInteractorTest.php b/tests/phpunit/Unit/MediaWikiContextInteractorTest.php
@@ -15,7 +15,7 @@
  * @author mwjames
  * @reviewer thomas-topway-it
  */
-class MediaWikiContextInteractorTest extends \PHPUnit_Framework_TestCase {
+class MediaWikiContextInteractorTest extends \PHPUnit\Framework\TestCase {
 
 	use PHPUnitCompat;
 
diff --git a/tests/phpunit/Unit/MediaWikiNsContentMapperTest.php b/tests/phpunit/Unit/MediaWikiNsContentMapperTest.php
@@ -13,7 +13,7 @@
  *
  * @author mwjames
  */
-class MediaWikiNsContentMapperTest extends \PHPUnit_Framework_TestCase {
+class MediaWikiNsContentMapperTest extends \PHPUnit\Framework\TestCase {
 
 	public function testCanConstruct() {
 
diff --git a/tests/phpunit/Unit/OptionsTest.php b/tests/phpunit/Unit/OptionsTest.php
@@ -13,7 +13,7 @@
  *
  * @author mwjames
  */
-class OptionsTest extends \PHPUnit_Framework_TestCase {
+class OptionsTest extends \PHPUnit\Framework\TestCase {
 
 	public function testCanConstruct() {
 
diff --git a/tests/phpunit/Unit/ParserFunctionFactoryTest.php b/tests/phpunit/Unit/ParserFunctionFactoryTest.php
@@ -16,7 +16,7 @@
  *
  * @author mwjames
  */
-class ParserFunctionFactoryTest extends \PHPUnit_Framework_TestCase {
+class ParserFunctionFactoryTest extends \PHPUnit\Framework\TestCase {
 
 	private $parser;
 
diff --git a/tests/phpunit/Unit/PreTextFormatterTest.php b/tests/phpunit/Unit/PreTextFormatterTest.php
@@ -17,7 +17,7 @@
  *
  * @author mwjames
  */
-class PreTextFormatterTest extends \PHPUnit_Framework_TestCase {
+class PreTextFormatterTest extends \PHPUnit\Framework\TestCase {
 
 	use PHPUnitCompat;
 
diff --git a/tests/phpunit/Unit/PropertyRegistryTest.php b/tests/phpunit/Unit/PropertyRegistryTest.php
@@ -14,7 +14,7 @@
  *
  * @author mwjames
  */
-class PropertyRegistryTest extends \PHPUnit_Framework_TestCase {
+class PropertyRegistryTest extends \PHPUnit\Framework\TestCase {
 
 	public function testCanConstruct() {
 
diff --git a/tests/phpunit/Unit/ReferenceBacklinksLookupTest.php b/tests/phpunit/Unit/ReferenceBacklinksLookupTest.php
@@ -18,7 +18,7 @@
  *
  * @author mwjames
  */
-class ReferenceBacklinksLookupTest extends \PHPUnit_Framework_TestCase {
+class ReferenceBacklinksLookupTest extends \PHPUnit\Framework\TestCase {
 
 	use PHPUnitCompat;
 
diff --git a/tests/phpunit/Unit/ReferenceListFactoryTest.php b/tests/phpunit/Unit/ReferenceListFactoryTest.php
@@ -14,7 +14,7 @@
  *
  * @author mwjames
  */
-class ReferenceListFactoryTest extends \PHPUnit_Framework_TestCase {
+class ReferenceListFactoryTest extends \PHPUnit\Framework\TestCase {
 
 	private $store;
 	private $namespaceExaminer;
diff --git a/tests/phpunit/Unit/ReferenceListOutputRendererTest.php b/tests/phpunit/Unit/ReferenceListOutputRendererTest.php
@@ -15,7 +15,7 @@
  *
  * @author mwjames
  */
-class ReferenceListOutputRendererTest extends \PHPUnit_Framework_TestCase {
+class ReferenceListOutputRendererTest extends \PHPUnit\Framework\TestCase {
 
 	use PHPUnitCompat;
 
diff --git a/tests/phpunit/Unit/ReferenceListParserFunctionTest.php b/tests/phpunit/Unit/ReferenceListParserFunctionTest.php
@@ -15,7 +15,7 @@
  *
  * @author mwjames
  */
-class ReferenceListParserFunctionTest extends \PHPUnit_Framework_TestCase {
+class ReferenceListParserFunctionTest extends \PHPUnit\Framework\TestCase {
 
 	use PHPUnitCompat;
 
diff --git a/tests/phpunit/Unit/SciteParserFunctionTest.php b/tests/phpunit/Unit/SciteParserFunctionTest.php
@@ -15,7 +15,7 @@
  *
  * @author mwjames
  */
-class SciteParserFunctionTest extends \PHPUnit_Framework_TestCase {
+class SciteParserFunctionTest extends \PHPUnit\Framework\TestCase {
 
 	use PHPUnitCompat;
 
diff --git a/tests/phpunit/Unit/Specials/CitableMetadata/HtmlResponseParserRendererTest.php b/tests/phpunit/Unit/Specials/CitableMetadata/HtmlResponseParserRendererTest.php
@@ -13,7 +13,7 @@
  *
  * @author mwjames
  */
-class HtmlResponseParserRendererTest extends \PHPUnit_Framework_TestCase {
+class HtmlResponseParserRendererTest extends \PHPUnit\Framework\TestCase {
 
 	public function testCanConstruct() {
 
diff --git a/tests/phpunit/Unit/Specials/CitableMetadata/PageBuilderTest.php b/tests/phpunit/Unit/Specials/CitableMetadata/PageBuilderTest.php
@@ -13,7 +13,7 @@
  *
  * @author mwjames
  */
-class PageBuilderTest extends \PHPUnit_Framework_TestCase {
+class PageBuilderTest extends \PHPUnit\Framework\TestCase {
 
 	private $htmlFormRenderer;
 	private $hmlColumnListRenderer;
diff --git a/tests/phpunit/Unit/Specials/SpecialFindCitableMetadataTest.php b/tests/phpunit/Unit/Specials/SpecialFindCitableMetadataTest.php

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`*`
`14`	`14`	`* @author mwjames`
`15`	`15`	`*/`
`16`		`-class SciteTransclusionForCannedResponseParserTest extends \PHPUnit_Framework_TestCase {`
	`16`	`+class SciteTransclusionForCannedResponseParserTest extends \PHPUnit\Framework\TestCase {`
`17`	`17`
`18`	`18`	`/**`
`19`	`19`	`* @dataProvider crossrefFileProvider`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`*`
`15`	`15`	`* @author mwjames`
`16`	`16`	`*/`
`17`		`-class I18nJsonFileIntegrityTest extends \PHPUnit_Framework_TestCase {`
	`17`	`+class I18nJsonFileIntegrityTest extends \PHPUnit\Framework\TestCase {`
`18`	`18`
`19`	`19`	`use PHPUnitCompat;`
`20`	`20`