Filter invalid KML file names

Author: JeroenDeDauw

RELEASE-NOTES.md

@@ -3,6 +3,12 @@ different releases and which versions of PHP and MediaWiki they support, see the
 [platform compatibility tables](INSTALL.md#platform-compatibility-and-release-status).
 
 
+## Maps 7.12.2
+
+Released on December 9th, 2019.
+
+* Invalid KML file names are no longer passed to Google Maps
+
 ## Maps 7.12.1
 
 Released on December 9th, 2019.

extension.json

@@ -1,6 +1,6 @@
 {
 	"name": "Maps",
-	"version": "7.12.1",
+	"version": "7.12.2",
 
 	"author": [
 		"[https://www.entropywins.wtf/mediawiki Jeroen De Dauw]",

src/GoogleMapsService.php

@@ -214,11 +214,18 @@ public function getParameterInfo(): array {
 			'message' => 'maps-par-kml',
 			'islist' => true,
 			'post-format' => function( array $kmlFileNames ) {
-				return array_map(
-					function( string $fileName ) {
-						return wfExpandUrl( MapsFunctions::getFileUrl( $fileName ) );
-					},
-					$kmlFileNames
+				return array_values(
+					array_filter(
+						array_map(
+							function( string $fileName ) {
+								return wfExpandUrl( MapsFunctions::getFileUrl( $fileName ) );
+							},
+							$kmlFileNames
+						),
+						function( string $fileName ) {
+							return $fileName !== '';
+						}
+					)
 				);
 			}
 		];

tests/Integration/Parser/DisplayMapTest.php

@@ -245,4 +245,13 @@ public function testGeoJsonSourceForPage() {
 		);
 	}
 
+	public function testGoogleMapsKmlFiltersInvalidFileNames() {
+		$this->assertContains(
+			'"kml":["ValidFile.kml"],',
+			$this->parse(
+				"{{#display_map:service=google|kml=, ,ValidFile.kml ,}}"
+			)
+		);
+	}
+
 }