Improve autoloading code

* Removed custom autoloaders
* Use Composer classmap (psr-0 would require making the dir structure deeper)
* Updated TravisCI config

.travis.yml

@@ -35,6 +35,7 @@ script:
   - if [ "$TESTSUITE" == "MediaWiki" ] ; then phpunit --coverage-clover build/logs/clover.xml ; fi
 
 after_script:
+  - composer require satooshi/php-coveralls dev-master
   - php vendor/bin/coveralls -v
 
 notifications:

WikibaseDatabase.mw.php

@@ -12,6 +12,10 @@
 	die( 'Not an entry point.' );
 }
 
+if ( is_readable( __DIR__ . '/vendor/autoload.php' ) ) {
+	require_once( __DIR__ . '/vendor/autoload.php' );
+}
+
 $GLOBALS['wgExtensionCredits']['wikibase'][] = array(
 	'path' => __DIR__,
 	'name' => 'Wikibase Database',
@@ -26,10 +30,6 @@
 
 $GLOBALS['wgExtensionMessagesFiles']['WikibaseDatabase'] = __DIR__ . '/WikibaseDatabase.i18n.php';
 
-if ( defined( 'MW_PHPUNIT_TEST' ) ) {
-	require_once __DIR__ . '/tests/testLoader.php';
-}
-
 /**
  * Hook to add PHPUnit test cases.
  * @see https://www.mediawiki.org/wiki/Manual:Hooks/UnitTestsList

WikibaseDatabase.php

@@ -3,54 +3,18 @@
 /**
  * Entry point of the Wikibase Database component.
  *
+ * @codeCoverageIgnore
+ *
  * @licence GNU GPL v2+
  * @author Jeroen De Dauw < jeroendedauw@gmail.com >
  */
 
-if ( defined( 'WIKIBASE_DATABASE_VERSION' ) ) {
-	// Do not initialize more then once.
-	return;
-}
-
-define( 'WIKIBASE_DATABASE_VERSION', '0.1' );
-
-spl_autoload_register( function ( $className ) {
-	$className = ltrim( $className, '\\' );
-	$fileName = '';
-	$namespace = '';
-
-	if ( $lastNsPos = strripos( $className, '\\') ) {
-		$namespace = substr( $className, 0, $lastNsPos );
-		$className = substr( $className, $lastNsPos + 1 );
-		$fileName  = str_replace( '\\', '/', $namespace ) . '/';
-	}
-
-	$fileName .= str_replace( '_', '/', $className ) . '.php';
-
-	$namespaceSegments = explode( '\\', $namespace );
-
-	$inQueryEngineNamespace = count( $namespaceSegments ) > 1
-		&& $namespaceSegments[0] === 'Wikibase'
-		&& $namespaceSegments[1] === 'Database';
+if ( !defined( 'WIKIBASE_DATABASE_VERSION' ) ) {
+	define( 'WIKIBASE_DATABASE_VERSION', '0.2 alpha' );
 
-	if ( $inQueryEngineNamespace ) {
-		$inTestNamespace = count( $namespaceSegments ) > 2 && $namespaceSegments[2] === 'Tests';
-
-		if ( !$inTestNamespace ) {
-			$pathParts = explode( '/', $fileName );
-			array_shift( $pathParts );
-			array_shift( $pathParts );
-			$fileName = implode( '/', $pathParts );
-
-			require_once __DIR__ . '/src/' . $fileName;
-		}
+	if ( defined( 'MEDIAWIKI' ) ) {
+		call_user_func( function() {
+			require_once __DIR__ . '/WikibaseDatabase.mw.php';
+		} );
 	}
-} );
-
-// @codeCoverageIgnoreStart
-if ( defined( 'MEDIAWIKI' ) ) {
-	call_user_func( function() {
-		require_once __DIR__ . '/WikibaseDatabase.mw.php';
-	} );
 }
-// @codeCoverageIgnoreEnd

composer.json

@@ -28,10 +28,10 @@
 	"require": {
 		"php": ">=5.3.2"
 	},
-	"require-dev": {
-		"satooshi/php-coveralls": "dev-master"
-	},
 	"autoload": {
+		"classmap": [
+			"src"
+		],
 		"files" : [
 			"WikibaseDatabase.php"
 		]

tests/bootstrap.php

@@ -9,10 +9,12 @@
  * @author Jeroen De Dauw < jeroendedauw@gmail.com >
  */
 
+if ( !is_readable( __DIR__ . '/../vendor/autoload.php' ) ) {
+	die( 'You need to install this package with Composer before you can run the tests' );
+}
+
 if ( !in_array( '--testsuite=WikibaseDatabaseStandalone', $GLOBALS['argv'] ) ) {
 	require_once( __DIR__ . '/evilMediaWikiBootstrap.php' );
 }
 
-require_once( __DIR__ . '/../WikibaseDatabase.php' );
-
-require_once( __DIR__ . '/testLoader.php' );
+require_once( __DIR__ . '/../vendor/autoload.php' );