Fix CI

SemanticCite.php

@@ -2,7 +2,7 @@
 
 use SCI\HookRegistry;
 use SCI\Options;
-use SMW\ApplicationFactory;
+use SMW\Services\ServicesFactory as ApplicationFactory;
 
 /**
  * @see https://github.com/SemanticMediaWiki/SemanticCite/

src/CitationResourceMatchFinder.php

@@ -7,10 +7,12 @@
 use SMW\Query\PrintRequest;
 use SMW\Store;
 use SMW\DIProperty;
-use SMWPropertyValue as PropertyValue;
+use SMW\DataValues\PropertyValue;
 use SMWQuery as Query;
 use SMWDIBlob as DIBlob;
 use SMW\DataValueFactory;
+use SMW\Query\QueryResult;
+use SMWInfolink;
 use SCI\DataValues\ResourceIdentifierFactory;
 
 /**
@@ -60,7 +62,7 @@ public function findCitationResourceLinks( array $subjects, $linkClass = '', $ca
 				null
 			);
 
-			$browselink = \SMWInfolink::newBrowsingLink(
+			$browselink = SMWInfolink::newBrowsingLink(
 				$caption,
 				$dataValue->getWikiValue(),
 				$linkClass
@@ -135,7 +137,7 @@ public function findCitationTextFor( $citationReference ) {
 			$citationReference
 		);
 
-		if ( !$queryResult instanceof \SMWQueryResult ) {
+		if ( !$queryResult instanceof QueryResult ) {
 			return [ $subjects, $text ];
 		}
 

src/CitationTextChangeUpdateJobDispatcher.php

@@ -5,9 +5,9 @@
 use SMW\Store;
 use SMW\DIProperty;
 use SMW\DIWikiPage;
-use SMW\ApplicationFactory;
+use SMW\Services\ServicesFactory as ApplicationFactory;
 use SMW\HashBuilder;
-use SMW\SQLStore\CompositePropertyTableDiffIterator;
+use SMW\SQLStore\ChangeOp\ChangeOp;
 
 /**
  * If a citation text was altered then lookup related references on pages used
@@ -59,11 +59,11 @@ public function setEnabledUpdateJobState( $enabledUpdateJobState ) {
 	 * @since  1.0
 	 *
 	 * @param DIWikiPage $subject
-	 * @param CompositePropertyTableDiffIterator $compositePropertyTableDiffIterator
+	 * @param ChangeOp $changeOp
 	 *
 	 * @return boolean
 	 */
-	public function dispatchUpdateJobFor( DIWikiPage $subject, CompositePropertyTableDiffIterator $compositePropertyTableDiffIterator ) {
+	public function dispatchUpdateJobFor( DIWikiPage $subject, ChangeOp $changeOp ) {
 
 		if ( !$this->enabledUpdateJobState ) {
 			return false;
@@ -74,7 +74,7 @@ public function dispatchUpdateJobFor( DIWikiPage $subject, CompositePropertyTabl
 		);
 
 		$subjectIdList = $this->getSubjectListFrom(
-			$compositePropertyTableDiffIterator->getOrderedDiffByTable( $tableName )
+			$changeOp->getOrderedDiffByTable( $tableName )
 		);
 
 		if ( ( $jobList = $this->getDispatchableTargetList( $subjectIdList ) ) === [] ) {

src/DataValues/CitationReferenceValue.php

@@ -3,7 +3,7 @@
 namespace SCI\DataValues;
 
 use SCI\CitationReferencePositionJournal;
-use SMWStringValue as StringValue;
+use SMW\DataValues\StringValue;
 use SMWDIBlob as DIBlob;
 use Html;
 

src/DataValues/ResourceIdentifierStringValue.php

@@ -2,7 +2,7 @@
 
 namespace SCI\DataValues;
 
-use SMWStringValue as StringValue;
+use SMW\DataValues\StringValue;
 use SMWDIBlob as DIBlob;
 use Html;
 

src/HookRegistry.php

@@ -4,7 +4,7 @@
 
 use SMW\Store;
 use Onoi\Cache\Cache;
-use SMW\ApplicationFactory;
+use SMW\Services\ServicesFactory as ApplicationFactory;
 use SMW\DataTypeRegistry;
 use SMW\DIWikiPage;
 use SMWDataItem as DataItem;

src/ParserFunctionFactory.php

@@ -2,7 +2,7 @@
 
 namespace SCI;
 
-use SMW\ApplicationFactory;
+use SMW\Services\ServicesFactory as ApplicationFactory;
 use SMW\NamespaceExaminer;
 use SMW\ParameterProcessorFactory;
 use SCI\Bibtex\BibtexProcessor;

src/ReferenceListFactory.php

@@ -4,7 +4,7 @@
 
 use SMW\Store;
 use SMW\NamespaceExaminer;
-use SMW\ApplicationFactory;
+use SMW\Services\ServicesFactory as ApplicationFactory;
 use Onoi\Cache\Cache;
 use Parser;
 

src/Specials/CitableMetadata/PageBuilder.php

@@ -2,7 +2,7 @@
 
 namespace SCI\Specials\CitableMetadata;
 
-use SMW\ApplicationFactory;
+use SMW\Services\ServicesFactory as ApplicationFactory;
 use SCI\CitationResourceMatchFinder;
 use SMW\MediaWiki\Renderer\HtmlFormRenderer;
 use SMW\MediaWiki\Renderer\HtmlColumnListRenderer;

src/Specials/SpecialFindCitableMetadata.php

@@ -4,7 +4,7 @@
 
 use MediaWiki\MediaWikiServices;
 use SpecialPage;
-use SMW\ApplicationFactory;
+use SMW\Services\ServicesFactory as ApplicationFactory;
 use Onoi\HttpRequest\HttpRequestFactory;
 use SCI\FilteredMetadata\HttpResponseParserFactory;
 use SCI\CitationResourceMatchFinder;

tests/phpunit/Unit/CitationResourceMatchFinderTest.php

@@ -32,7 +32,7 @@ public function testCanConstruct() {
 	 */
 	public function testFindMatchForUidTypeOf( $key, $id ) {
 
-		$queryResult = $this->getMockBuilder( '\SMWQueryResult' )
+		$queryResult = $this->getMockBuilder( '\SMW\Query\QueryResult' )
 			->disableOriginalConstructor()
 			->getMock();
 

tests/phpunit/Unit/CitationTextChangeUpdateJobDispatcherTest.php

@@ -50,16 +50,16 @@ public function testDisabledDispatchJob() {
 
 		$instance->setEnabledUpdateJobState( false );
 
-		$compositePropertyTableDiffIterator = $this->getMockBuilder( '\SMW\SQLStore\CompositePropertyTableDiffIterator' )
+		$changeOp = $this->getMockBuilder( '\SMW\SQLStore\ChangeOp\ChangeOp' )
 			->disableOriginalConstructor()
 			->getMock();
 
-		$compositePropertyTableDiffIterator->expects( $this->never() )
+		$changeOp->expects( $this->never() )
 			->method( 'getOrderedDiffByTable' );
 
 		$subject = DIWikiPage::newFromText( __METHOD__ );
 
-		$instance->dispatchUpdateJobFor( $subject, $compositePropertyTableDiffIterator );
+		$instance->dispatchUpdateJobFor( $subject, $changeOp );
 	}
 
 	/**
@@ -97,18 +97,18 @@ public function testDispatchJobForDiffableChange( $diff ) {
 			$this->referenceBacklinksLookup
 		);
 
-		$compositePropertyTableDiffIterator = $this->getMockBuilder( '\SMW\SQLStore\CompositePropertyTableDiffIterator' )
+		$changeOp = $this->getMockBuilder( '\SMW\SQLStore\ChangeOp\ChangeOp' )
 			->disableOriginalConstructor()
 			->getMock();
 
-		$compositePropertyTableDiffIterator->expects( $this->once() )
+		$changeOp->expects( $this->once() )
 			->method( 'getOrderedDiffByTable' )
 			->will( $this->returnValue( $diff ) );
 
 		$subject = DIWikiPage::newFromText( __METHOD__ );
 
 		$this->assertTrue(
-			$instance->dispatchUpdateJobFor( $subject, $compositePropertyTableDiffIterator )
+			$instance->dispatchUpdateJobFor( $subject, $changeOp )
 		);
 	}
 
@@ -129,18 +129,18 @@ public function testDispatchJobForNoValidDiff() {
 			$this->referenceBacklinksLookup
 		);
 
-		$compositePropertyTableDiffIterator = $this->getMockBuilder( '\SMW\SQLStore\CompositePropertyTableDiffIterator' )
+		$changeOp = $this->getMockBuilder( '\SMW\SQLStore\ChangeOp\ChangeOp' )
 			->disableOriginalConstructor()
 			->getMock();
 
-		$compositePropertyTableDiffIterator->expects( $this->once() )
+		$changeOp->expects( $this->once() )
 			->method( 'getOrderedDiffByTable' )
 			->will( $this->returnValue( $diff ) );
 
 		$subject = DIWikiPage::newFromText( __METHOD__ );
 
 		$this->assertFalse(
-			$instance->dispatchUpdateJobFor( $subject, $compositePropertyTableDiffIterator )
+			$instance->dispatchUpdateJobFor( $subject, $changeOp )
 		);
 	}
 

tests/phpunit/Unit/HookRegistryTest.php

@@ -447,13 +447,13 @@ public function doTestRegisteredAfterDataUpdateComplete( $instance ) {
 			->disableOriginalConstructor()
 			->getMock();
 
-		$compositePropertyTableDiffIterator = $this->getMockBuilder( '\SMW\SQLStore\CompositePropertyTableDiffIterator' )
+		$changeOp = $this->getMockBuilder( '\SMW\SQLStore\ChangeOp\ChangeOp' )
 			->disableOriginalConstructor()
 			->getMock();
 
 		$this->assertThatHookIsExcutable(
 			$instance->getHandlerFor( $hook ),
-			[ $store, $semanticData, $compositePropertyTableDiffIterator ]
+			[ $store, $semanticData, $changeOp ]
 		);
 	}
 

tests/phpunit/Unit/ReferenceBacklinksLookupTest.php

@@ -120,7 +120,7 @@ public function testAddReferenceBacklinks() {
 					$this->equalTo( new DIProperty( PropertyRegistry::SCI_CITE_REFERENCE ) ),
 					$this->anything() );
 
-		$queryResult = $this->getMockBuilder( '\SMWQueryResult' )
+		$queryResult = $this->getMockBuilder( '\SMW\Query\QueryResult' )
 			->disableOriginalConstructor()
 			->getMock();