Merge pull request #502 from JeroenDeDauw/cln

Cleanup

README.md

@@ -66,6 +66,11 @@ The `src/` contains the PHP code and follows PSR-4 autoloading.
 * `src/Presentation` - presentation layer code (all code dealing with HTML etc should be here)
 * `src/SemanticMW` - Semantic MediaWiki hook points, including result printers and value descriptions
 
+JavaScript, CSS and other web resources go into `resources/`.
+
+Tests for PHP go into `tests/` where they are grouped by test type (ie unit, integration). Within those test type
+directories the tests should mirror the directory structure in `src/`.
+
 ### Running the tests
 
 As setup, run `composer install` inside of the Maps root directory.

composer.json

@@ -50,7 +50,6 @@
 		},
 		"classmap": [
 			"MapsRegistration.php",
-			"includes/",
 			"tests/Unit/Elements/",
 			"tests/Integration/parserhooks/ParserHookTest.php"
 		]

extension.json

@@ -27,7 +27,7 @@
 
 	"callback": "MapsRegistration::onRegistration",
 	"ContentHandlers": {
-		"GeoJson": "Maps\\GeoJson\\GeoJsonContentHandler"
+		"GeoJson": "Maps\\MediaWiki\\Content\\GeoJsonContentHandler"
 	},
 	"namespaces": [
 		{

resources/GoogleMaps/GoogleMaps3.php

@@ -0,0 +1,29 @@
+<?php
+
+/**
+ * This group contains all Google Maps v3 related files of the Maps extension.
+ *
+ * @defgroup Maps\MapsGoogleMaps3 Google Maps v3
+ */
+
+/**
+ * This file holds the hook and initialization for the Google Maps v3 service.
+ *
+ * @licence GNU GPL v2+
+ * @author Jeroen De Dauw < [email protected] >
+ */
+
+if ( !defined( 'MEDIAWIKI' ) ) {
+	die( 'Not an entry point.' );
+}
+
+call_user_func(
+	function () {
+		global $wgResourceModules;
+
+		$pathParts = explode( '/', str_replace( DIRECTORY_SEPARATOR, '/', __DIR__ ) );
+		$remoteExtPath = implode( DIRECTORY_SEPARATOR, array_slice( $pathParts, -4 ) );
+
+
+	}
+);

src/Geocoders/CachingGeocoder.php → src/DataAccess/CachingGeocoder.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Maps\Geocoders;
+namespace Maps\DataAccess;
 
 use BagOStuff;
 use DataValues\Geo\Values\LatLongValue;