Merge pull request #406 from Wikia/simplify-mapping-service

Change signature of MapsMappingService::addDependencies
ProfessionalWiki · Jan 22, 2018 · 4c1d0a8 · 4c1d0a8
2 parents 2763cf1 + 6453e06
commit 4c1d0a8
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 17 deletions.
diff --git a/includes/Maps_DisplayMapRenderer.php b/includes/Maps_DisplayMapRenderer.php
@@ -48,8 +48,10 @@ public final function renderMap( array $params, Parser $parser ) {
 			self::getLayerDependencies( $params['mappingservice'], $params )
 		);
 
-		$this->service->addDependencies( $parser );
-		$parser->getOutput()->addHeadItem( $configVars );
+		$parserOutput = $parser->getOutput();
+
+		$this->service->addDependencies( $parserOutput );
+		$parserOutput->addHeadItem( $configVars );
 
 		return $output;
 	}

diff --git a/includes/Maps_MappingService.php b/includes/Maps_MappingService.php
@@ -78,25 +78,18 @@ public function addFeature( $featureName, $handlingClass ) {
 	}
 
 	/**
-	 * @since 0.6.3
+	 * @since 5.2.0
+	 * @param ParserOutput $parserOutput
 	 */
-	public final function addDependencies( &$parserOrOut ) {
+	public final function addDependencies( ParserOutput $parserOutput ) {
 		$dependencies = $this->getDependencyHtml();
 
 		// Only add a head item when there are dependencies.
-		if ( $parserOrOut instanceof Parser ) {
-			if ( $dependencies ) {
-				$parserOrOut->getOutput()->addHeadItem( $dependencies );
-			}
-
-			$parserOrOut->getOutput()->addModules( $this->getResourceModules() );
-		} elseif ( $parserOrOut instanceof OutputPage ) {
-			if ( $dependencies !== false ) {
-				$parserOrOut->addHeadItem( md5( $dependencies ), $dependencies );
-			}
-
-			$parserOrOut->addModules( $this->getResourceModules() );
+		if ( $dependencies ) {
+			$parserOutput->addHeadItem( $dependencies );
 		}
+
+		$parserOutput->addModules( $this->getResourceModules() );
 	}
 
 	/**
@@ -106,7 +99,7 @@ public final function getDependencyHtml() {
 		$allDependencies = array_merge( $this->getDependencies(), $this->dependencies );
 		$dependencies = [];
 
-		// Only add dependnecies that have not yet been added.
+		// Only add dependencies that have not yet been added.
 		foreach ( $allDependencies as $dependency ) {
 			if ( !in_array( $dependency, $this->addedDependencies ) ) {
 				$dependencies[] = $dependency;