Remove deprecated method

ProfessionalWiki · Mar 2, 2019 · 386307e · 386307e
1 parent 4c0498d
commit 386307e
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 11 deletions.
diff --git a/src/MappingServices.php b/src/MappingServices.php
@@ -75,13 +75,6 @@ public function getServiceOrDefault( string $name ): MappingService {
 		return $this->nameToServiceMap[$this->defaultService];
 	}
 
-	/**
-	 * @deprecated
-	 */
-	public static function getServiceInstance( string $serviceIdentifier ): MappingService {
-		return MapsFactory::globalInstance()->getMappingServices()->nameToServiceMap[$serviceIdentifier];
-	}
-
 	public function getAllNames(): array {
 		return array_keys( $this->nameToServiceMap );
 	}

diff --git a/src/MediaWiki/ParserHooks/MapsDocFunction.php b/src/MediaWiki/ParserHooks/MapsDocFunction.php
@@ -3,6 +3,7 @@
 namespace Maps\MediaWiki\ParserHooks;
 
 use Maps\MappingServices;
+use Maps\MapsFactory;
 use ParamProcessor\ParamDefinition;
 use ParserHook;
 
@@ -47,7 +48,7 @@ private function getServiceParameters( $service ) {
 					'message' => 'maps-par-zoom',
 				]
 			],
-			MappingServices::getServiceInstance( $service )->getParameterInfo()
+			MapsFactory::globalInstance()->getMappingServices()->getService( $service )->getParameterInfo()
 		);
 	}
 

diff --git a/src/SemanticMaps.php b/src/SemanticMaps.php
@@ -58,8 +58,6 @@ private function registerGoogleMaps() {
 	}
 
 	private function registerLeaflet() {
-
-
 		// TODO: inject
 		$services = MapsFactory::globalInstance()->getMappingServices();
 

diff --git a/tests/System/SemanticMW/MapQueryTest.php b/tests/System/SemanticMW/MapQueryTest.php
@@ -33,7 +33,7 @@ public function setUp() {
 		}
 
 		$this->pageCreator = TestFactory::newInstance()->getPageCreator();
-		$this->contentFetcher = MapsFactory::globalInstance()->getPageContentFetcher();
+		$this->contentFetcher = MapsFactory::newDefault()->getPageContentFetcher();
 	}
 
 	public function testMapQuery() {