Merge commit 'f6d65'

# Conflicts:
#	skins/ArchLinux/ArchLinux.php

1 files changed, 18 insertions, 0 deletions

diff --git a/extensions/LocalisationUpdate/LocalisationUpdate.class.php b/extensions/LocalisationUpdate/LocalisationUpdate.class.php
index 349c35f0..d4413ed7 100644
--- a/extensions/LocalisationUpdate/LocalisationUpdate.class.php
+++ b/extensions/LocalisationUpdate/LocalisationUpdate.class.php
@@ -78,4 +78,22 @@ class LocalisationUpdate {
 	public static function getFilename( $language ) {
 		return "l10nupdate-$language.json";
 	}
+
+	/**
+	 * Hook: UnitTestsList
+	 */
+	public static function setupUnitTests( array &$files ) {
+		$dir = __DIR__ . '/tests/phpunit';
+		$directoryIterator = new RecursiveDirectoryIterator( $dir );
+		$fileIterator = new RecursiveIteratorIterator( $directoryIterator );
+
+		/// @var SplFileInfo $fileInfo
+		foreach ( $fileIterator as $fileInfo ) {
+			if ( substr( $fileInfo->getFilename(), -8 ) === 'Test.php' ) {
+				$files[] = $fileInfo->getPathname();
+			}
+		}
+
+		return true;
+	}
 }