use hook registration via extension.json, prepared 2.0.0-alpha, now requires SMW 3.1+, MW 1.31+

Author: Alexander Gesinn

Diff for: SemanticDependencyUpdater.hooks.php

@@ -13,18 +13,13 @@
 class Hooks {
 
 	public static function setup() {
-
 		if ( !defined( 'MEDIAWIKI' ) ) {
 			die();
 		}
 
 		if ( !defined( 'SMW_VERSION' ) ) {
 			die( "ERROR: Semantic MediaWiki must be installed for Semantic Dependency Updater to run!" );
 		}
-
-		global $wgHooks;
-		// registered Hook this way to make sure SMW is loaded
-		$wgHooks['SMW::SQLStore::AfterDataUpdateComplete'][] = 'SDU\Hooks::onAfterDataUpdateComplete';
 	}
 
 	public static function onAfterDataUpdateComplete( SMWStore $store, SMWSemanticData $newData,
@@ -44,15 +39,16 @@ public static function onAfterDataUpdateComplete( SMWStore $store, SMWSemanticDa
 		wfDebugLog( 'SemanticDependencyUpdater', "[SDU] --> " . $title );
 
 
-		// FIRST CHECK: Does the page data contain a $wgSUTPropertyName semantic property ?
+		// FIRST CHECK: Does the page data contain a $wgSDUProperty semantic property ?
 		$properties = $newData->getProperties();
-		$diffTable = $compositePropertyTableDiffIterator->getOrderedDiffByTable();
-
 		if ( !isset( $properties[$wgSDUProperty] ) ) {
 			wfDebugLog( 'SemanticDependencyUpdater', "[SDU] <-- No SDU property found" );
 			return true;
 		}
 
+		$diffTable = $compositePropertyTableDiffIterator->getOrderedDiffByTable();
+
+
 		// SECOND CHECK: Have there been actual changes in the data? (Ignore internal SMW data!)
 		// TODO: Introduce an explicit list of Semantic Properties to watch ?
 		unset( $diffTable['smw_fpt_mdat'] ); // Ignore SMW's internal properties "smw_fpt_mdat"
@@ -68,7 +64,7 @@ public static function onAfterDataUpdateComplete( SMWStore $store, SMWSemanticDa
 
 		// THIRD CHECK: Has this page been already traversed more than twice?
 		// This should only be the case when SMW errors occur.
-		// In that case, the diffTable contains everything and SDU can't know if changes happend
+		// In that case, the diffTable contains everything and SDU can't know if changes happened
 		if ( array_key_exists( $id, $wgSDUTraversed ) ) {
 			$wgSDUTraversed[$id] = $wgSDUTraversed[$id] + 1;
 		} else {
@@ -82,6 +78,8 @@ public static function onAfterDataUpdateComplete( SMWStore $store, SMWSemanticDa
 
 		// QUERY AND UPDATE DEPENDENCIES
 
+		// SMW\SemanticData $newData
+		// SMWDataItem[] $dataItem
 		$dataItem = $newData->getPropertyValues( $properties[$wgSDUProperty] );
 
 		if ( $dataItem != null ) {

Diff for: extension.json

@@ -1,6 +1,6 @@
 {
   "name": "SemanticDependencyUpdater",
-  "version": "1.4.1",
+  "version": "2.0.0-alpha",
   "author": [
     "Simon Heimler (gesinn.it GmbH & Co. KG)",
     "Alexander Gesinn (gesinn.it GmbH & Co. KG)",
@@ -12,21 +12,24 @@
   "license-name": "MIT",
   "type": "semantic",
   "requires": {
-    "MediaWiki": ">= 1.25",
+    "MediaWiki": ">= 1.31",
     "extensions": {
-      "SemanticMediaWiki": ">= 2.3.0"
+      "SemanticMediaWiki": ">= 3.1.0"
     }
   },
   "AutoloadClasses": {
     "SDU\\Hooks": "SemanticDependencyUpdater.hooks.php",
     "SDU\\DummyEditJob": "includes/DummyEditJob.php"
   },
+  "Hooks": {
+    "SMW::SQLStore::AfterDataUpdateComplete": [
+      "SDU\\Hooks::onAfterDataUpdateComplete"
+    ]
+  },
   "JobClasses": {
     "SDU\\DummyEditJob": "DummyEditJob"
   },
-  "ExtensionFunctions": [
-    "SDU\\Hooks::setup"
-  ],
+  "callback": "SDU\\Hooks::setup",
   "config": {
     "SDUProperty": "Semantic Dependency",
     "SDUUseJobQueue": false