Merge pull request filbertkm#33 from lucaswerkmeister/autoload

Extension loading improvements

Author: addshore

README.md

@@ -19,7 +19,7 @@ Then go into the WikibaseImport extension directory and run ```composer update``
 Then, to enable the extension, add it in your ```LocalSettings.php``` file:
 
 ```
-require_once "$IP/extensions/WikibaseImport/WikibaseImport.php";
+wfLoadExtension( 'WikibaseImport' );
 ```
 
 The extension requires a new database table to map entity ids from the foreign

WikibaseImport.php

@@ -1,11 +1,15 @@
 <?php
 
 if ( function_exists( 'wfLoadExtension' ) ) {
-	if ( file_exists( __DIR__ . '/vendor/autoload.php' ) ) {
-		require_once __DIR__ . '/vendor/autoload.php';
-	}
-
 	wfLoadExtension( 'WikibaseImport', __DIR__ . '/extension.json' );
+	// Keep i18n globals so mergeMessageFileList.php doesn't break
+	$wgMessagesDirs['WikibaseImport'] = __DIR__ . '/i18n';
+	$wgExtensionMessagesFiles['WikibaseImportAlias'] = __DIR__ . '/WikibaseImport.i18n.alias.php';
+	wfWarn(
+		'Deprecated PHP entry point used for WikibaseImport extension. ' .
+		'Please use wfLoadExtension instead, ' .
+		'see https://www.mediawiki.org/wiki/Extension_registration for more details.'
+	);
 } else {
 	die( 'WikibaseImport requires MediaWiki 1.25+' );
 }

extension.json

@@ -1,4 +1,5 @@
 {
+	"load_composer_autoloader": true,
 	"name": "Wikibase Import",
 	"version": "0.1",
 	"author": [