Merge pull request #62 from alex-mashin/CALLABLE

This change addresses the feature request #61.
SemanticMediaWiki · Sep 18, 2020 · 858ed9b · 858ed9b
2 parents 2e6d8d0 + 9917cd9
commit 858ed9b
Show file tree

Hide file tree

Showing 4 changed files with 62 additions and 18 deletions.
diff --git a/src/HookRegistry.php b/src/HookRegistry.php
@@ -94,7 +94,8 @@ private function addCallbackHandlers( $store, $options ) {
 			);
 
 			$propertyValuesContentAggregator = new PropertyValuesContentAggregator(
-				$lazySemanticDataLookup
+				$lazySemanticDataLookup,
+				$outputPage
 			);
 
 			$propertyValuesContentAggregator->useFallbackChainForMultipleProperties(

diff --git a/src/MetaTagsProcessor.php b/src/MetaTagsProcessor.php
@@ -90,6 +90,8 @@ private function addMetaTagsForAggregatedProperties( $tag, $properties ) {
 
 		if ( is_string( $properties ) ) {
 			$properties = explode( ',', $properties );
+		} elseif ( is_callable( $properties ) ) {
+			$properties = [ $properties ];
 		}
 
 		$content = $this->propertyValuesContentAggregator->doAggregateFor(

diff --git a/src/PropertyValuesContentAggregator.php b/src/PropertyValuesContentAggregator.php
@@ -20,6 +20,11 @@ class PropertyValuesContentAggregator {
 	 */
 	private $lazySemanticDataLookup;
 
+	/**
+	 * @var \OutputPage $mOutputPage
+	 */
+	private $mOutputPage;
+
 	/**
 	 * Whether multiple properties should be used through a fallback chain where
 	 * the first available property with content will determine the end of the
@@ -33,9 +38,11 @@ class PropertyValuesContentAggregator {
 	 * @since 1.0
 	 *
 	 * @param LazySemanticDataLookup $lazySemanticDataLookup
+	 * @param OutputPage $outputPage
 	 */
-	public function __construct( LazySemanticDataLookup $lazySemanticDataLookup ) {
+	public function __construct( LazySemanticDataLookup $lazySemanticDataLookup, \OutputPage $outputPage ) {
 		$this->lazySemanticDataLookup = $lazySemanticDataLookup;
+		$this->mOutputPage = $outputPage;
 	}
 
 	/**
@@ -66,27 +73,41 @@ public function doAggregateFor( array $propertyNames ) {
 				break;
 			}
 
-			$this->fetchContentForProperty( trim( $property ), $values );
+			if ( is_string( $property ) ) {
+				$property = trim( $property );
+			}
+			$this->fetchContentForProperty( $property, $values );
 		}
 
 		return implode( ',', $values );
 	}
 
-	private function fetchContentForProperty( $property, &$values ) {
+	private function fetchContentForProperty( $property, array &$values ) {
 
-		$property = DIProperty::newFromUserLabel( $property );
-		$semanticData = $this->lazySemanticDataLookup->getSemanticData();
-
-		$this->iterateToCollectPropertyValues(
-			$semanticData->getPropertyValues( $property ),
-			$values
-		);
+		if ( is_callable( $property ) ) {
+			// This is actually a callback function.
+			$result = $property( $this->mOutputPage );
+			if ( $result ) {
+				foreach ( (array)$result as $value ) {
+					$values[$value] = (string)$value;
+				}
+			}
+		} else {
+			// This is a real property.
+			$property = DIProperty::newFromUserLabel( $property );
+			$semanticData = $this->lazySemanticDataLookup->getSemanticData();
 
-		foreach ( $semanticData->getSubSemanticData() as $subSemanticData ) {
 			$this->iterateToCollectPropertyValues(
-				$subSemanticData->getPropertyValues( $property ),
+				$semanticData->getPropertyValues( $property ),
 				$values
 			);
+
+			foreach ( $semanticData->getSubSemanticData() as $subSemanticData ) {
+				$this->iterateToCollectPropertyValues(
+					$subSemanticData->getPropertyValues( $property ),
+					$values
+				);
+			}
 		}
 	}
 

diff --git a/tests/phpunit/Unit/PropertyValuesContentAggregatorTest.php b/tests/phpunit/Unit/PropertyValuesContentAggregatorTest.php
@@ -25,9 +25,13 @@ public function testCanConstruct() {
 			->disableOriginalConstructor()
 			->getMock();
 
+		$outputPage = $this->getMockBuilder( 'OutputPage' )
+			->disableOriginalConstructor()
+			->getMock();
+
 		$this->assertInstanceOf(
 			'\SMT\PropertyValuesContentAggregator',
-			new PropertyValuesContentAggregator( $lazySemanticDataLookup )
+			new PropertyValuesContentAggregator( $lazySemanticDataLookup, $outputPage )
 		);
 	}
 
@@ -56,7 +60,11 @@ public function testFindContentForProperty() {
 			->method( 'getSemanticData' )
 			->will( $this->returnValue( $semanticData ) );
 
-		$instance = new PropertyValuesContentAggregator( $lazySemanticDataLookup );
+		$outputPage = $this->getMockBuilder( 'OutputPage' )
+			->disableOriginalConstructor()
+			->getMock();
+
+		$instance = new PropertyValuesContentAggregator( $lazySemanticDataLookup, $outputPage );
 
 		$this->assertSame(
 			'Foo',
@@ -93,7 +101,11 @@ public function testAggregatePropertyValueContentWithSameHash() {
 			->method( 'getSemanticData' )
 			->will( $this->returnValue( $semanticData ) );
 
-		$instance = new PropertyValuesContentAggregator( $lazySemanticDataLookup );
+		$outputPage = $this->getMockBuilder( 'OutputPage' )
+			->disableOriginalConstructor()
+			->getMock();
+
+		$instance = new PropertyValuesContentAggregator( $lazySemanticDataLookup, $outputPage );
 
 		$this->assertSame(
 			'http://username@example.org/foo,Foo',
@@ -134,7 +146,11 @@ public function testFindContentForSubobjectProperty() {
 			->method( 'getSemanticData' )
 			->will( $this->returnValue( $semanticData ) );
 
-		$instance = new PropertyValuesContentAggregator( $lazySemanticDataLookup );
+		$outputPage = $this->getMockBuilder( 'OutputPage' )
+			->disableOriginalConstructor()
+			->getMock();
+
+		$instance = new PropertyValuesContentAggregator( $lazySemanticDataLookup, $outputPage );
 
 		$this->assertSame(
 			'Foo-with-html-"<>"-escaping-to-happen-somewhere-else',
@@ -230,7 +246,11 @@ private function doAssertContentForMultipleProperties( $fallbackChainUsageState,
 			->method( 'getSemanticData' )
 			->will( $this->returnValue( $semanticData ) );
 
-		$instance = new PropertyValuesContentAggregator( $lazySemanticDataLookup );
+		$outputPage = $this->getMockBuilder( 'OutputPage' )
+			->disableOriginalConstructor()
+			->getMock();
+
+		$instance = new PropertyValuesContentAggregator( $lazySemanticDataLookup, $outputPage );
 		$instance->useFallbackChainForMultipleProperties( $fallbackChainUsageState );
 
 		$this->assertSame(