Support DIUri

SemanticMediaWiki · Feb 18, 2015 · c94ee19 · c94ee19
1 parent 919683e
commit c94ee19
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/src/PropertyValueContentFinder.php b/src/PropertyValueContentFinder.php
@@ -6,6 +6,7 @@
 use SMW\DIProperty;
 use SMW\DIWikiPage;
 use SMWDIBlob as DIBlob;
+use SMWDIUri as DIUri;
 
 /**
  * @license GNU GPL v2+
@@ -70,7 +71,7 @@ private function iterateOverPropertyValues( array $propertyValues, &$values ) {
 
 			if ( $value instanceOf DIBlob ) {
 				$values[] = htmlspecialchars( $value->getString() );
-			} elseif( $value instanceOf DIWikiPage ) {
+			} elseif( $value instanceOf DIWikiPage || $value instanceOf DIUri ) {
 				$values[] = htmlspecialchars( $value->getSortKey() );
 			}
 		}

diff --git a/tests/phpunit/Integration/MetaTagsContentGenerationIntegrationTest.php b/tests/phpunit/Integration/MetaTagsContentGenerationIntegrationTest.php
@@ -69,14 +69,14 @@ public function testAddStandardMetaTag() {
 
 		$this->pageCreator
 			->createPage( $subject->getTitle() )
-			->doEdit( '[[SMT keywords::KeywordMetaTags]]' );
+			->doEdit( '[[SMT keywords::KeywordMetaTag]] [[SMT keywords::AnotherKeywordMetaTag]]' );
 
 		$parserOutput = $this->pageCreator->getEditInfo()->output;
 
 		$outputPage->addParserOutputMetadata( $parserOutput );
 
 		$this->assertEquals(
-			array( array( 'keywords', 'KeywordMetaTags' ) ),
+			array( array( 'keywords', 'KeywordMetaTag,AnotherKeywordMetaTag' ) ),
 			$outputPage->getMetaTags()
 		);
 

diff --git a/tests/phpunit/Unit/PropertyValueContentFinderTest.php b/tests/phpunit/Unit/PropertyValueContentFinderTest.php
@@ -6,6 +6,7 @@
 use SMW\DIProperty;
 use SMW\DIWikiPage;
 use SMWDIBlob as DIBlob;
+use SMWDIUri as DIUri;
 
 /**
  * @covers \SMT\PropertyValueContentFinder
@@ -100,12 +101,16 @@ public function testFindContentForMultipleProperties() {
 		$semanticData->expects( $this->at( 0 ) )
 			->method( 'getPropertyValues' )
 			->with( $this->equalTo( DIProperty::newFromUserLabel( 'foo' ) ) )
-			->will( $this->returnValue( array( new DIWikiPage( '"Foo"', NS_MAIN ) ) ) );
+			->will( $this->returnValue( array(
+				new DIUri( 'http', 'username@example.org/foo', '', '' ),
+				new DIWikiPage( '"Foo"', NS_MAIN ) ) ) );
 
 		$semanticData->expects( $this->at( 2 ) )
 			->method( 'getPropertyValues' )
 			->with( $this->equalTo( DIProperty::newFromUserLabel( 'bar' ) ) )
-			->will( $this->returnValue( array( new DIBlob( 'Mo' ), new DIBlob( 'fo' ) ) ) );
+			->will( $this->returnValue( array(
+				new DIBlob( 'Mo' ),
+				new DIBlob( 'fo' ) ) ) );
 
 		$semanticData->expects( $this->any() )
 			->method( 'getSubSemanticData' )
@@ -114,7 +119,7 @@ public function testFindContentForMultipleProperties() {
 		$instance = new PropertyValueContentFinder( $semanticData );
 
 		$this->assertSame(
-			'&quot;Foo&quot;,Mo,fo',
+			'http://username@example.org/foo,&quot;Foo&quot;,Mo,fo',
 			$instance->findContentForProperties( $properties )
 		);
 	}