Merge branch 'master' into danwe_custom-maps

Conflicts:
	Maps.classes.php
	Maps.i18n.php
	Maps.php
	includes/Maps_LayerPage.php
	includes/Maps_Layers.php

.gitignore

@@ -1,13 +1,11 @@
-.*
 *~
 *.kate-swp
 
-!.gitignore
-!.gitreview
+!.*
+.idea/
 
-!.travis.yml
-!.travis.sh
-!.coveralls.yml
+vendor/
+extensions/
 
 composer.phar
 composer.lock

.scrutinizer.yml

@@ -0,0 +1,12 @@
+inherit: true
+
+tools:
+    php_code_coverage: false
+    php_code_sniffer: true
+    php_cpd: true
+    php_cs_fixer: true
+    php_loc: true
+    php_mess_detector: true
+    php_pdepend: true
+    php_analyzer: true
+    sensiolabs_security_checker: true

.travis.yml

@@ -1,23 +1,32 @@
 language: php
 
-php:
-  - 5.3
-  - 5.4
-  - 5.5
+env:
+  - THENEEDFORTHIS=FAIL
 
-before_script:
-  - bash .travis.sh
+matrix:
+  include:
+    - env: DBTYPE=mysql; MW=master
+      php: 5.3
+    - env: DBTYPE=mysql; MW=1.19.0
+      php: 5.4
+    - env: DBTYPE=mysql; MW=1.21.0
+      php: 5.5
+    - env: DBTYPE=sqlite; MW=master
+      php: 5.4
+    - env: DBTYPE=sqlite; MW=1.19.0
+      php: 5.5
+  exclude:
+    - env: THENEEDFORTHIS=FAIL
 
-script:
-  - cd ../phase3/extensions/Maps
-  - phpunit --coverage-clover ../../extensions/Maps/build/logs/clover.xml
+before_script: bash ./build/travis/before_script.sh
 
-after_script:
-  - php vendor/bin/coveralls -v
+script: bash ./build/travis/script.sh
+
+after_success: bash ./build/travis/after_success.sh
 
 notifications:
-  email:
-    recipients:
-      - [email protected]
-    on_success: change
-    on_failure: always
+  irc:
+    channels:
+      - "chat.freenode.net#semantic-mediawiki"
+    on_success: never
+    on_failure: always

Maps.hooks.php

@@ -5,9 +5,6 @@
  *
  * @since 0.7
  *
- * @file Maps.hooks.php
- * @ingroup Maps
- *
  * @licence GNU GPL v2+
  * @author Jeroen De Dauw < [email protected] >
  * @author Daniel Werner
@@ -47,51 +44,6 @@ public static function addToAdminLinks( ALTree &$admin_links_tree ) {
 		return true;
 	}
 
-	/**
-	 * Hook to add PHPUnit test cases.
-	 * @see https://www.mediawiki.org/wiki/Manual:Hooks/UnitTestsList
-	 *
-	 * @since 0.7
-	 *
-	 * @param array &$files
-	 *
-	 * @return boolean
-	 */
-	public static function registerUnitTests( array &$files ) {
-		// @codeCoverageIgnoreStart
-		$testFiles = array(
-			'elements/Circle',
-			'elements/ImageOverlay',
-			'elements/Line',
-			'elements/Location',
-			'elements/Polygon',
-			'elements/Rectangle',
-
-			'parserhooks/Coordinates',
-			'parserhooks/DisplayMap',
-			'parserhooks/Distance',
-			'parserhooks/Finddestination',
-			'parserhooks/Geocode',
-			'parserhooks/Geodistance',
-			'parserhooks/MapsDoc',
-
-			'parsers/DistanceParser',
-			'parsers/LineParser',
-			'parsers/LocationParser',
-			'parsers/WmsOverlayParser',
-
-			'Element',
-			'MapsDistanceParser',
-		);
-
-		foreach ( $testFiles as $file ) {
-			$files[] = __DIR__ . '/tests/phpunit/' . $file . 'Test.php';
-		}
-
-		return true;
-		// @codeCoverageIgnoreEnd
-	}
-
 	/**
 	 * Intercept pages in the Layer namespace to handle them correctly.
 	 *

Maps.i18n.alias.php

@@ -4,6 +4,7 @@
 /** English
  * @author netbrain
  */
+// @codingStandardsIgnoreFile
 
 $specialPageAliases = array();
 

Maps.i18n.magic.php

@@ -1,9 +1,7 @@
 <?php
+
 /**
  * Internationalisation file for Maps extension.
- *
- * @file
- * @ingroup Extensions
  */
 
 $magicWords = array();
@@ -44,11 +42,11 @@
 
 /** Egyptian Spoken Arabic (مصرى) */
 $magicWords['arz'] = array(
-	'display_map' => array( 0, 'عرض_الخريطه', 'عرض_الخريطة', 'display_map' ),
-	'geocode' => array( 0, 'كود_جغرافي', 'geocode' ),
-	'geodistance' => array( 0, 'مسافه_جغرافيه', 'مسافة_جغرافية', 'geodistance' ),
-	'finddestination' => array( 0, 'إيجاد_الوجهه', 'إيجاد_الوجهة', 'finddestination' ),
-	'coordinates' => array( 0, 'إحداثيات', 'coordinates' ),
+	'display_map' => array( 0, 'عرض_الخريطه', 'عرض_الخريطة' ),
+	'geocode' => array( 0, 'كود_جغرافي' ),
+	'geodistance' => array( 0, 'مسافه_جغرافيه', 'مسافة_جغرافية' ),
+	'finddestination' => array( 0, 'إيجاد_الوجهه', 'إيجاد_الوجهة' ),
+	'coordinates' => array( 0, 'إحداثيات' ),
 );
 
 /** Assamese (অসমীয়া) */
@@ -83,16 +81,16 @@
 
 /** Zazaki (Zazaki) */
 $magicWords['diq'] = array(
-	'display_map' => array( 0, 'aseniya_xerita' ),
+	'display_map' => array( 0, 'aseniya_ğerita' ),
 	'display_point' => array( 0, 'aseniya_dewti' ),
 	'display_points' => array( 0, 'aseniya_dawıtan' ),
-	'display_line' => array( 0, 'aseniya_xeter' ),
+	'display_line' => array( 0, 'aseniya_ğeter' ),
 	'geocode' => array( 0, 'herunkodi' ),
 	'geodistance' => array( 0, 'heruna_mesafi' ),
 	'finddestination' => array( 0, 'menzilvinayış' ),
 	'coordinates' => array( 0, 'koordinati' ),
 	'distance' => array( 0, 'mesafe' ),
-	'mapsdoc' => array( 0, 'dokumanêxerita' ),
+	'mapsdoc' => array( 0, 'dokumanéğerita' ),
 );
 
 /** Esperanto (Esperanto) */
@@ -348,6 +346,6 @@
 
 /** Vietnamese (Tiếng Việt) */
 $magicWords['vi'] = array(
-	'geocode' => array( 0, 'mãhóađịalý', 'mãhoáđịalý', 'mãhóađịalí', 'mãhoáđịalí' ),
-	'coordinates' => array( 0, 'tọađộ' ),
+	'geocode' => array( 0, 'mã_hóa_địa_lý', 'mãhóađịalý', 'mã_hoá_địa_lý', 'mãhoáđịalý', 'mã_hóa_địa_lí', 'mãhóađịalí', 'mã_hoá_địa_lí', 'mãhoáđịalí' ),
+	'coordinates' => array( 0, 'tọa_độ', 'tọađộ' ),
 );