Simplified tests autoloading by using Composer's "autoload-dev"

composer.json

@@ -30,6 +30,11 @@
             "Archive_": "libs/"
         }
     },
+    "autoload-dev": {
+        "psr-4": {
+            "Piwik\\Tests\\": "tests/PHPUnit/"
+        }
+    },
     "require": {
         "php": ">=5.3.3",
         "twig/twig": "~1.0",

core/Loader.php

@@ -35,13 +35,4 @@ class Loader
 
         return $loader;
     }
-
-    public static function registerTestNamespace()
-    {
-        $prefix = 'Piwik\\Tests\\';
-        $paths  = PIWIK_INCLUDE_PATH . '/tests/PHPUnit';
-
-        $loader = self::getLoader();
-        $loader->addPsr4($prefix, $paths, $prepend = false);
-    }
 }

plugins/CoreConsole/Commands/TestsSetupFixture.php

@@ -231,16 +231,12 @@ class TestsSetupFixture extends ConsoleCommand
 
     private function requireFixtureFiles(InputInterface $input)
     {
-        \Piwik\Loader::registerTestNamespace();
-
         require_once PIWIK_INCLUDE_PATH . '/libs/PiwikTracker/PiwikTracker.php';
         require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/FakeAccess.php';
         require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/TestingEnvironment.php';
         require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/IntegrationTestCase.php';
-        require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/Fixture.php';
 
         $fixturesToLoad = array(
-            '/tests/PHPUnit/Fixtures/*.php',
             '/tests/PHPUnit/UI/Fixtures/*.php',
             '/plugins/*/tests/Fixtures/*.php',
             '/plugins/*/Test/Fixtures/*.php',

tests/PHPUnit/bootstrap.php

@@ -30,15 +30,11 @@ error_reporting(E_ALL | E_NOTICE);
 require_once PIWIK_INCLUDE_PATH . '/core/Loader.php';
 
 \Piwik\Loader::init();
-\Piwik\Loader::registerTestNamespace();
 
 require_once PIWIK_INCLUDE_PATH . '/libs/upgradephp/upgrade.php';
 require_once PIWIK_INCLUDE_PATH . '/core/testMinimumPhpVersion.php';
-require_once PIWIK_INCLUDE_PATH . '/core/FrontController.php';
-require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/Fixture.php';
 require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/DatabaseTestCase.php';
 require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/IntegrationTestCase.php';
-require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/ConsoleCommandTestCase.php';
 require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/BenchmarkTestCase.php';
 require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/FakeAccess.php';
 require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/TestingEnvironment.php';
@@ -49,7 +45,6 @@ if (getenv('PIWIK_USE_XHPROF') == 1) {
 
 // require test fixtures
 $fixturesToLoad = array(
-    '/tests/PHPUnit/Fixtures/*.php',
     '/tests/PHPUnit/UI/Fixtures/*.php',
     '/plugins/*/tests/Fixtures/*.php',
     '/plugins/*/Test/Fixtures/*.php',