Merge "Replace uses of ParserOutput::setPageProperty()"

wikimedia · Sep 6, 2024 · 0e119fe · 0e119fe
2 parents 821c66e + ee10917
commit 0e119fe
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 8 deletions.
diff --git a/client/tests/phpunit/integration/includes/Hooks/SidebarHookHandlerTest.php b/client/tests/phpunit/integration/includes/Hooks/SidebarHookHandlerTest.php
@@ -165,7 +165,7 @@ public function testMoveConnectedItemFeatureFlag_inActive() {
 
 	private function primeParserOutput( ParserOutput $parserOutput, array $pageProps, array $extensionData, array $extensionDataAppend ) {
 		foreach ( $pageProps as $name => $value ) {
-			$parserOutput->setPageProperty( $name, $value );
+			$parserOutput->setUnsortedPageProperty( $name, $value );
 		}
 
 		foreach ( $extensionData as $key => $value ) {

diff --git a/client/tests/phpunit/unit/includes/ClientParserOutputDataUpdaterTest.php b/client/tests/phpunit/unit/includes/ClientParserOutputDataUpdaterTest.php
@@ -388,7 +388,11 @@ public function testUpdateUnconnectedPageProperty(
 		$parserOutput = new ParserOutput();
 		$parserOutputProvider = new ScopedParserOutputProvider( $parserOutput );
 		foreach ( $priorPageProps as $key => $value ) {
-			$parserOutput->setPageProperty( $key, $value );
+			if ( is_numeric( $value ) ) {
+				$parserOutput->setNumericPageProperty( $key, $value );
+			} else {
+				$parserOutput->setUnsortedPageProperty( $key, $value );
+			}
 		}
 
 		$content = $this->createMock( Content::class );

diff --git a/repo/includes/Content/EntityHandler.php b/repo/includes/Content/EntityHandler.php
@@ -911,7 +911,13 @@ private function applyEntityPageProperties( EntityContent $content, ParserOutput
 
 		$properties = $content->getEntityPageProperties();
 		foreach ( $properties as $name => $value ) {
-			$parserOutput->setPageProperty( $name, $value );
+			if ( is_numeric( $value ) ) {
+				$parserOutput->setNumericPageProperty( $name, $value );
+			} elseif ( is_bool( $value ) ) {
+				$parserOutput->setNumericPageProperty( $name, (int)$value );
+			} else {
+				$parserOutput->setUnsortedPageProperty( $name, $value );
+			}
 		}
 	}
 

diff --git a/repo/includes/ParserOutput/PageImagesDataUpdater.php b/repo/includes/ParserOutput/PageImagesDataUpdater.php
@@ -181,7 +181,7 @@ public function updateParserOutput( ParserOutput $parserOutput ) {
 			$parserOutput->unsetPageProperty( $this->pagePropName );
 		} else {
 			$fileName = str_replace( ' ', '_', $this->bestFileName );
-			$parserOutput->setPageProperty( $this->pagePropName, $fileName );
+			$parserOutput->setUnsortedPageProperty( $this->pagePropName, $fileName );
 		}
 	}
 

diff --git a/repo/tests/phpunit/includes/ParserOutput/GlobeCoordinateKartographerDataUpdaterTest.php b/repo/tests/phpunit/includes/ParserOutput/GlobeCoordinateKartographerDataUpdaterTest.php
@@ -113,8 +113,8 @@ private function getKartographerParserOutput() {
 		$parserOutput = new ParserOutput();
 		$parserOutput->addModules( [ 'kartographer-rl-module1', 'javascript-stuffs' ] );
 		$parserOutput->setExtensionData( 'kartographer', [ [ 'whatever' ] ] );
-		$parserOutput->setPageProperty( 'kartographer_links', 34 );
-		$parserOutput->setPageProperty( 'kartographer_frames', 42 );
+		$parserOutput->setNumericPageProperty( 'kartographer_links', 34 );
+		$parserOutput->setNumericPageProperty( 'kartographer_frames', 42 );
 		$parserOutput->setJsConfigVar( 'wgKartographerMapServer', 'https://maps.wikimedia.org' );
 
 		return $parserOutput;

diff --git a/repo/tests/phpunit/includes/ParserOutput/PageImagesDataUpdaterTest.php b/repo/tests/phpunit/includes/ParserOutput/PageImagesDataUpdaterTest.php
@@ -79,11 +79,11 @@ public function testUpdateParserOutput(
 
 		if ( $expected !== null ) {
 			$parserOutput->expects( $this->once() )
-				->method( 'setPageProperty' )
+				->method( 'setUnsortedPageProperty' )
 				->with( 'page_image', $expected );
 		} else {
 			$parserOutput->expects( $this->never() )
-				->method( 'setPageProperty' );
+				->method( 'setUnsortedPageProperty' );
 		}
 
 		$instance = $this->newInstance( $propertyIds );