Restore Semantic MediaWiki 6 compatibility

Semantic MediaWiki 7 moved several classes into new namespaces (e.g.
SMW\DataItems\DataItem) and the Semantic integration was switched to those,
which do not exist on Semantic MediaWiki 6. Use the pre-7 names instead, which
Semantic MediaWiki 7 keeps as aliases, so the integration runs on both major
versions; the one symbol with no name common to both (the event dispatcher,
namespaced in 7 but the Onoi interface in 6) loses its type hint.

Also test both major versions in CI. The matrix shared one cache across all
Semantic MediaWiki versions (the constraint's "^" dropped out of the cache
key), so those rows silently skipped the Semantic tests; key the cache per
version.

Fixes #908

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

Author: JeroenDeDauw

.github/workflows/ci.yml

@@ -13,23 +13,35 @@ jobs:
 
     strategy:
       matrix:
+        # smwCache keeps the cache key free of the version constraint's special
+        # characters, which would otherwise collide and share one cache.
         include:
           - mw: 'REL1_43'
             php: 8.3
             smw: ''
+            smwCache: 'none'
             experimental: false
           - mw: 'REL1_44'
             php: 8.3
             smw: ''
+            smwCache: 'none'
             experimental: false
           - mw: 'REL1_45'
             php: 8.3
             smw: ''
+            smwCache: 'none'
             experimental: false
           # Exercises the Semantic MediaWiki integration, which self-skips when SMW is absent.
+          # Both supported major versions are tested, as they differ in API (e.g. class namespaces).
+          - mw: 'REL1_43'
+            php: 8.3
+            smw: '^6.0'
+            smwCache: 'smw6'
+            experimental: false
           - mw: 'REL1_43'
             php: 8.3
             smw: '^7.0'
+            smwCache: 'smw7'
             experimental: false
 
     runs-on: ubuntu-latest
@@ -54,7 +66,7 @@ jobs:
             mediawiki
             !mediawiki/extensions/
             !mediawiki/vendor/
-          key: mw_${{ matrix.mw }}-php${{ matrix.php }}-smw${{ matrix.smw }}-v23
+          key: mw_${{ matrix.mw }}-php${{ matrix.php }}-${{ matrix.smwCache }}-v24
 
       - name: Cache Composer cache
         uses: actions/cache@v4

src/GeoJsonPages/Semantic/SemanticGeoJsonStore.php

@@ -6,19 +6,19 @@
 
 use Maps\GeoJsonPages\GeoJsonStore;
 use MediaWiki\Title\Title;
-use SMW\DataItems\Property;
-use SMW\EventDispatcher\EventDispatcher;
+use SMW\DIProperty;
 use SMW\ParserData;
-use SMW\DataItems\Container;
+use SMWDIContainer;
 
 class SemanticGeoJsonStore implements GeoJsonStore {
 
 	private ParserData $parserData;
 	private Title $subjectPage;
-	private EventDispatcher $smwEventDispatcher;
+	/** @var \SMW\EventDispatcher\EventDispatcher|\Onoi\EventDispatcher\EventDispatcher Namespaced in SMW 7, the Onoi interface in SMW 6. */
+	private $smwEventDispatcher;
 	private SubObjectBuilder $subObjectBuilder;
 
-	public function __construct( ParserData $parserData, Title $subjectPage, EventDispatcher $smwEventDispatcher, SubObjectBuilder $subObjectBuilder ) {
+	public function __construct( ParserData $parserData, Title $subjectPage, $smwEventDispatcher, SubObjectBuilder $subObjectBuilder ) {
 		$this->parserData = $parserData;
 		$this->subjectPage = $subjectPage;
 		$this->smwEventDispatcher = $smwEventDispatcher;
@@ -28,8 +28,8 @@ public function __construct( ParserData $parserData, Title $subjectPage, EventDi
 	public function storeGeoJson( string $geoJson ) {
 		foreach ( $this->subObjectBuilder->getSubObjectsFromGeoJson( $geoJson ) as $subObject ) {
 			$this->parserData->getSemanticData()->addPropertyObjectValue(
-				new Property( Property::TYPE_SUBOBJECT ),
-				new Container( $subObject->toContainerSemanticData( $this->subjectPage->getTitleValue() ) )
+				new DIProperty( DIProperty::TYPE_SUBOBJECT ),
+				new SMWDIContainer( $subObject->toContainerSemanticData( $this->subjectPage->getTitleValue() ) )
 			);
 		}
 

src/GeoJsonPages/Semantic/SubObject.php

@@ -5,25 +5,24 @@
 namespace Maps\GeoJsonPages\Semantic;
 
 use SMW\DataModel\ContainerSemanticData;
-use SMW\DataItems\Property;
-use SMW\DataItems\WikiPage;
+use SMW\DIProperty;
+use SMW\DIWikiPage;
 use TitleValue;
-use SMW\DataItems\DataItem;
 
 class SubObject {
 
 	private string $name;
 
 	/**
-	 * @var array<string, array<int, DataItem>>
+	 * @var array<string, array<int, \SMWDataItem>>
 	 */
 	private array $values = [];
 
 	public function __construct( string $name ) {
 		$this->name = $name;
 	}
 
-	public function addPropertyValuePair( string $propertyName, DataItem $dataItem ) {
+	public function addPropertyValuePair( string $propertyName, \SMWDataItem $dataItem ) {
 		$this->values[$propertyName][] = $dataItem;
 	}
 
@@ -33,7 +32,7 @@ public function toContainerSemanticData( TitleValue $subjectPage ): ContainerSem
 		foreach ( $this->values as $propertyName => $dataItems ) {
 			foreach ( $dataItems as $dataItem ) {
 				$container->addPropertyObjectValue(
-					new Property( $propertyName ),
+					new DIProperty( $propertyName ),
 					$dataItem
 				);
 			}
@@ -44,7 +43,7 @@ public function toContainerSemanticData( TitleValue $subjectPage ): ContainerSem
 
 	private function newContainerSemanticData( TitleValue $subjectPage ): ContainerSemanticData {
 		return new ContainerSemanticData(
-			new WikiPage(
+			new DIWikiPage(
 				$subjectPage->getDBkey(),
 				$subjectPage->getNamespace(),
 				$subjectPage->getInterwiki(),

src/GeoJsonPages/Semantic/SubObjectBuilder.php

@@ -8,8 +8,6 @@
 use GeoJson\Feature\FeatureCollection;
 use GeoJson\GeoJson;
 use GeoJson\Geometry\Point;
-use SMW\DataItems\GeoCoord;
-use SMW\DataItems\Blob;
 
 class SubObjectBuilder {
 
@@ -47,20 +45,20 @@ private function pointToSubobject( Point $point, array $properties ): SubObject
 
 		$subObject->addPropertyValuePair(
 			'HasCoordinates',
-			new GeoCoord( $point->getCoordinates()[1], $point->getCoordinates()[0] )
+			new \SMWDIGeoCoord( $point->getCoordinates()[1], $point->getCoordinates()[0] )
 		);
 
 		if ( array_key_exists( 'description', $properties ) && is_string( $properties['description'] ) ) {
 			$subObject->addPropertyValuePair(
 				'HasDescription',
-				new Blob( $properties['description'] )
+				new \SMWDIBlob( $properties['description'] )
 			);
 		}
 
 		if ( array_key_exists( 'title', $properties ) && is_string( $properties['title'] ) ) {
 			$subObject->addPropertyValuePair(
 				'HasTitle',
-				new Blob( $properties['title'] )
+				new \SMWDIBlob( $properties['title'] )
 			);
 		}
 

src/Map/SemanticFormat/MapPrinter.php

@@ -20,7 +20,7 @@
 use MediaWiki\Parser\Parser;
 use SMW\Query\QueryResult;
 use SMW\Query\ResultPrinters\ResultPrinter;
-use SMW\MediaWiki\Outputs;
+use SMWOutputs;
 
 /**
  * @licence GNU GPL v2+
@@ -140,13 +140,13 @@ final public function getResultText( QueryResult $res, $outputMode ): string {
 	}
 
 	private function outputResources( MapOutput $mapOutput ) {
-		Outputs::requireHeadItem(
+		SMWOutputs::requireHeadItem(
 			$this->randomString(),
 			$mapOutput->getHeadItems()
 		);
 
 		foreach ( $mapOutput->getResourceModules() as $resourceModule ) {
-			Outputs::requireResource( $resourceModule );
+			SMWOutputs::requireResource( $resourceModule );
 		}
 	}
 

src/SemanticMW/AreaDescription.php

@@ -9,13 +9,13 @@
 use Maps\GeoFunctions;
 use Maps\Presentation\MapsDistanceParser;
 use SMW\DataValueFactory;
-use SMW\DataItems\Property;
+use SMW\DIProperty;
 use SMW\Query\Language\Description;
 use SMW\Query\Language\ThingDescription;
 use SMW\Query\Language\ValueDescription;
+use SMWDataItem;
+use SMWDIGeoCoord;
 use Wikimedia\Rdbms\IDatabase;
-use SMW\DataItems\GeoCoord;
-use SMW\DataItems\DataItem;
 
 /**
  * Description of a geographical area defined by a coordinates set and a distance to the bounds.
@@ -27,12 +27,12 @@
  */
 class AreaDescription extends ValueDescription {
 
-	private GeoCoord $center;
+	private SMWDIGeoCoord $center;
 	private string $radius;
 
-	public function __construct( DataItem $areaCenter, int $comparator, string $radius, ?Property $property = null ) {
-		if ( !( $areaCenter instanceof GeoCoord ) ) {
-			throw new InvalidArgumentException( '$areaCenter needs to be a GeoCoord' );
+	public function __construct( SMWDataItem $areaCenter, int $comparator, string $radius, ?DIProperty $property = null ) {
+		if ( !( $areaCenter instanceof SMWDIGeoCoord ) ) {
+			throw new InvalidArgumentException( '$areaCenter needs to be a SMWDIGeoCoord' );
 		}
 
 		parent::__construct( $areaCenter, $property, $comparator );
@@ -83,7 +83,7 @@ public function getQueryString( $asValue = false ): string {
 	 * @return string|false
 	 */
 	public function getSQLCondition( $tableName, array $fieldNames, IDatabase $db ) {
-		if ( $this->center->getDIType() != DataItem::TYPE_GEO ) {
+		if ( $this->center->getDIType() != SMWDataItem::TYPE_GEO ) {
 			throw new \LogicException( 'Constructor should have prevented this' );
 		}
 

src/SemanticMW/CoordinateDescription.php

@@ -6,8 +6,8 @@
 
 use SMW\DataValueFactory;
 use SMW\Query\Language\ValueDescription;
+use SMWDIGeoCoord;
 use Wikimedia\Rdbms\IDatabase;
-use SMW\DataItems\GeoCoord;
 
 /**
  * Description of one data value of type Geographical Coordinates.
@@ -41,7 +41,7 @@ public function getSQLCondition( $tableName, array $fieldNames, IDatabase $db )
 
 		// Only execute the query when the description's type is geographical coordinates,
 		// the description is valid, and the near comparator is used.
-		if ( $dataItem instanceof GeoCoord ) {
+		if ( $dataItem instanceof SMWDIGeoCoord ) {
 			switch ( $this->getComparator() ) {
 				case SMW_CMP_EQ:
 					$comparator = '=';

src/SemanticMW/CoordinateValue.php

@@ -13,24 +13,24 @@
 use SMW\Query\Language\ThingDescription;
 use SMW\Query\QueryComparator;
 use ValueParsers\ParseException;
-use SMW\DataValues\DataValue;
-use SMW\DataItems\GeoCoord;
-use SMW\DataItems\DataItem;
-use SMW\Formatters\Highlighter;
+use SMWDataValue;
+use SMWDIGeoCoord;
+use SMWDataItem;
+use SMW\Highlighter;
 
 /**
- * @property GeoCoord m_dataitem
+ * @property SMWDIGeoCoord m_dataitem
  *
  * @licence GNU GPL v2+
  * @author Jeroen De Dauw < jeroendedauw@gmail.com >
  * @author Markus Krötzsch
  */
-class CoordinateValue extends DataValue {
+class CoordinateValue extends SMWDataValue {
 
 	private $wikiValue;
 
 	/**
-	 * Overwrite DataValue::getQueryDescription() to be able to process
+	 * Overwrite SMWDataValue::getQueryDescription() to be able to process
 	 * comparators between all values.
 	 *
 	 * @param string $value
@@ -67,7 +67,7 @@ public function getQueryDescription( $value ) {
 	}
 
 	/**
-	 * @see DataValue::parseUserValue
+	 * @see SMWDataValue::parseUserValue
 	 */
 	protected function parseUserValue( $value ): void {
 		$this->parseAndReturnUserValue( $value );
@@ -110,14 +110,14 @@ private function tryParseAndSetDataItem( string $coordinates ) {
 
 		try {
 			$value = $parser->parse( $coordinates );
-			$this->m_dataitem = new GeoCoord( $value->getLatitude(), $value->getLongitude() );
+			$this->m_dataitem = new SMWDIGeoCoord( $value->getLatitude(), $value->getLongitude() );
 		}
 		catch ( ParseException $parseException ) {
 			$this->addError( wfMessage( 'maps_unrecognized_coords', $coordinates, 1 )->text() );
 
 			// Make sure this is always set
 			// TODO: Why is this needed?!
-			$this->m_dataitem = new GeoCoord( [ 'lat' => 0, 'lon' => 0 ] );
+			$this->m_dataitem = new SMWDIGeoCoord( [ 'lat' => 0, 'lon' => 0 ] );
 		}
 	}
 
@@ -135,7 +135,7 @@ private function parserDistance( $distance ) {
 	}
 
 	/**
-	 * @see DataValue::getShortHTMLText
+	 * @see SMWDataValue::getShortHTMLText
 	 *
 	 * @since 0.6
 	 */
@@ -144,7 +144,7 @@ public function getShortHTMLText( $linker = null ) {
 	}
 
 	/**
-	 * @see DataValue::getShortWikiText
+	 * @see SMWDataValue::getShortWikiText
 	 */
 	public function getShortWikiText( $linker = null ) {
 		if ( $this->isValid() ) {
@@ -159,12 +159,12 @@ public function getShortWikiText( $linker = null ) {
 	}
 
 	/**
-	 * @param GeoCoord $dataItem
+	 * @param SMWDIGeoCoord $dataItem
 	 * @param string|null $format
 	 *
 	 * @return string|null
 	 */
-	private function getFormattedCoord( GeoCoord $dataItem, ?string $format = null ) {
+	private function getFormattedCoord( SMWDIGeoCoord $dataItem, ?string $format = null ) {
 		return MapsFactory::globalInstance()->getCoordinateFormatter()->format(
 			new LatLongValue(
 				$dataItem->getLatitude(),
@@ -176,14 +176,14 @@ private function getFormattedCoord( GeoCoord $dataItem, ?string $format = null )
 	}
 
 	/**
-	 * @see DataValue::getLongHTMLText
+	 * @see SMWDataValue::getLongHTMLText
 	 */
 	public function getLongHTMLText( $linker = null ) {
 		return $this->getLongWikiText( $linker );
 	}
 
 	/**
-	 * @see DataValue::getLongWikiText
+	 * @see SMWDataValue::getLongWikiText
 	 *
 	 * @since 0.6
 	 */
@@ -215,21 +215,21 @@ public function getLongWikiText( $linked = null ) {
 	}
 
 	/**
-	 * @see DataValue::getWikiValue
+	 * @see SMWDataValue::getWikiValue
 	 */
 	public function getWikiValue() {
 		return $this->wikiValue;
 	}
 
 	/**
-	 * @see DataValue::setDataItem
+	 * @see SMWDataValue::setDataItem
 	 *
-	 * @param DataItem $dataItem
+	 * @param SMWDataItem $dataItem
 	 *
 	 * @return boolean
 	 */
-	protected function loadDataItem( DataItem $dataItem ) {
-		if ( $dataItem instanceof GeoCoord ) {
+	protected function loadDataItem( SMWDataItem $dataItem ) {
+		if ( $dataItem instanceof SMWDIGeoCoord ) {
 			$formattedValue = $this->getFormattedCoord( $dataItem );
 
 			if ( $formattedValue !== null ) {
@@ -262,7 +262,7 @@ protected function getServiceLinkParams(): array {
 	}
 
 	/**
-	 * @return GeoCoord|\SMW\DataItems\Error
+	 * @return SMWDIGeoCoord|\SMWDIError
 	 */
 	public function getDataItem() {
 		return parent::getDataItem();