Load composer autoloader from extension.json

lucaswerkmeister · lucaswerkmeister · commit 06c1faab1e1c · 2018-05-16T16:49:13.000+02:00
This ensures that loading the extension via wfLoadExtension( 'WikibaseImport' ); instead of the PHP entry point also works. Fixes filbertkm#32.
diff --git a/WikibaseImport.php b/WikibaseImport.php
@@ -1,10 +1,6 @@
 <?php
 
 if ( function_exists( 'wfLoadExtension' ) ) {
-	if ( file_exists( __DIR__ . '/vendor/autoload.php' ) ) {
-		require_once __DIR__ . '/vendor/autoload.php';
-	}
-
 	wfLoadExtension( 'WikibaseImport', __DIR__ . '/extension.json' );
 } else {
 	die( 'WikibaseImport requires MediaWiki 1.25+' );
diff --git a/extension.json b/extension.json
@@ -1,4 +1,5 @@
 {
+	"load_composer_autoloader": true,
 	"name": "Wikibase Import",
 	"version": "0.1",
 	"author": [

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`{`
	`2`	`+ "load_composer_autoloader": true,`
`2`	`3`	`"name": "Wikibase Import",`
`3`	`4`	`"version": "0.1",`
`4`	`5`	`"author": [`