Removed Piwik\Loader: Composer's autoloader is now included in core/bootstrap.php

10 files changed, 26 insertions, 105 deletions

diff --git a/console b/console
index 9bc11d38ec..ae091c5750 100755
--- a/console
+++ b/console
@@ -14,9 +14,6 @@ if (!defined('PIWIK_INCLUDE_PATH')) {
 
 require_once PIWIK_INCLUDE_PATH . '/core/bootstrap.php';
 
-require_once PIWIK_INCLUDE_PATH . '/core/Loader.php';
-Piwik\Loader::init();
-
 Piwik\Translate::loadEnglishTranslation();
 
 if (!Piwik\Common::isPhpCliMode()) {
diff --git a/core/Loader.php b/core/Loader.php
deleted file mode 100644
index b89e7743f9..0000000000
--- a/core/Loader.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-
-namespace Piwik;
-
-/**
- * Initializes the Composer Autoloader
- * @package Piwik
- */
-class Loader
-{
-    public static function init()
-    {
-        return self::getLoader();
-    }
-
-    /**
-     * @return \Composer\Autoload\ClassLoader
-     */
-    private static function getLoader()
-    {
-        if (file_exists(PIWIK_INCLUDE_PATH . '/vendor/autoload.php')) {
-            $path = PIWIK_INCLUDE_PATH . '/vendor/autoload.php'; // Piwik is the main project
-        } else {
-            $path = PIWIK_INCLUDE_PATH . '/../../autoload.php'; // Piwik is installed as a dependency
-        }
-
-        $loader = require $path;
-
-        return $loader;
-    }
-}
diff --git a/core/bootstrap.php b/core/bootstrap.php
index 546625b8c6..d6e809df20 100644
--- a/core/bootstrap.php
+++ b/core/bootstrap.php
@@ -22,12 +22,21 @@ disableEaccelerator();
 
 require_once PIWIK_INCLUDE_PATH . '/libs/upgradephp/upgrade.php';
 
+// Composer autoloader
+if (file_exists(PIWIK_INCLUDE_PATH . '/vendor/autoload.php')) {
+    $path = PIWIK_INCLUDE_PATH . '/vendor/autoload.php'; // Piwik is the main project
+} else {
+    $path = PIWIK_INCLUDE_PATH . '/../../autoload.php'; // Piwik is installed as a dependency
+}
+require_once $path;
+
 /**
- * See https://github.com/piwik/piwik/issues/4439#comment:8 and https://github.com/eaccelerator/eaccelerator/issues/12
- *
  * Eaccelerator does not support closures and is known to be not comptabile with Piwik. Therefore we are disabling
  * it automatically. At this point it looks like Eaccelerator is no longer under development and the bug has not
  * been fixed within a year.
+ *
+ * @link https://github.com/piwik/piwik/issues/4439#comment:8
+ * @link https://github.com/eaccelerator/eaccelerator/issues/12
  */
 function disableEaccelerator()
 {
diff --git a/index.php b/index.php
index 4b92d7fe2b..ebef3bda37 100644
--- a/index.php
+++ b/index.php
@@ -8,7 +8,7 @@
  * @package Piwik
  */
 
-if(!defined('PIWIK_DOCUMENT_ROOT')) {
+if (!defined('PIWIK_DOCUMENT_ROOT')) {
     define('PIWIK_DOCUMENT_ROOT', dirname(__FILE__) == '/' ? '' : dirname(__FILE__));
 }
 if (file_exists(PIWIK_DOCUMENT_ROOT . '/bootstrap.php')) {
@@ -20,9 +20,6 @@ if (!defined('PIWIK_INCLUDE_PATH')) {
 
 require_once PIWIK_INCLUDE_PATH . '/core/bootstrap.php';
 
-require_once PIWIK_INCLUDE_PATH . '/core/Loader.php';
-\Piwik\Loader::init();
-
 if (!defined('PIWIK_PRINT_ERROR_BACKTRACE')) {
     define('PIWIK_PRINT_ERROR_BACKTRACE', false);
 }
diff --git a/js/tracker.php b/js/tracker.php
index ac85498cb9..b3191f9c49 100644
--- a/js/tracker.php
+++ b/js/tracker.php
@@ -27,8 +27,14 @@ define('PIWIK_DOCUMENT_ROOT', '..');
 define('PIWIK_USER_PATH', '..');
 
 require_once PIWIK_INCLUDE_PATH . '/libs/upgradephp/upgrade.php';
-require_once PIWIK_INCLUDE_PATH . '/core/Loader.php';
-\Piwik\Loader::init();
+
+// Composer autoloader
+if (file_exists(PIWIK_INCLUDE_PATH . '/vendor/autoload.php')) {
+    $path = PIWIK_INCLUDE_PATH . '/vendor/autoload.php'; // Piwik is the main project
+} else {
+    $path = PIWIK_INCLUDE_PATH . '/../../autoload.php'; // Piwik is installed as a dependency
+}
+require $path;
 
 $file = '../piwik.js';
 
diff --git a/misc/others/cli-script-bootstrap.php b/misc/others/cli-script-bootstrap.php
index 7e7e091448..ac60ae30af 100644
--- a/misc/others/cli-script-bootstrap.php
+++ b/misc/others/cli-script-bootstrap.php
@@ -24,9 +24,6 @@ require_once PIWIK_INCLUDE_PATH . '/core/bootstrap.php';
 ignore_user_abort(true);
 set_time_limit(0);
 
-require_once PIWIK_INCLUDE_PATH . '/core/Loader.php';
-\Piwik\Loader::init();
-
 $GLOBALS['PIWIK_TRACKER_DEBUG'] = false;
 define('PIWIK_ENABLE_DISPATCH', false);
 
diff --git a/piwik.php b/piwik.php
index 5cc1040f0e..95cc6271f1 100644
--- a/piwik.php
+++ b/piwik.php
@@ -29,13 +29,6 @@ require_once PIWIK_INCLUDE_PATH . '/core/bootstrap.php';
 
 @ignore_user_abort(true);
 
-if (file_exists(PIWIK_INCLUDE_PATH . '/vendor/autoload.php')) {
-    $vendorDirectory = PIWIK_INCLUDE_PATH . '/vendor';
-} else {
-    $vendorDirectory = PIWIK_INCLUDE_PATH . '/../..';
-}
-require_once $vendorDirectory . '/autoload.php';
-
 require_once PIWIK_INCLUDE_PATH . '/core/Plugin/Controller.php';
 require_once PIWIK_INCLUDE_PATH . '/core/Plugin/ControllerAdmin.php';
 require_once PIWIK_INCLUDE_PATH . '/core/Singleton.php';
diff --git a/tests/PHPUnit/bootstrap.php b/tests/PHPUnit/bootstrap.php
index f77d2b6708..05753119ef 100644
--- a/tests/PHPUnit/bootstrap.php
+++ b/tests/PHPUnit/bootstrap.php
@@ -18,8 +18,6 @@ if (!defined('PIWIK_INCLUDE_PATH')) {
     define('PIWIK_INCLUDE_PATH', PIWIK_PATH_TEST_TO_ROOT);
 }
 
-require_once PIWIK_INCLUDE_PATH . '/core/bootstrap.php';
-
 if (!defined('PIWIK_INCLUDE_SEARCH_PATH')) {
     define('PIWIK_INCLUDE_SEARCH_PATH', get_include_path()
         . PATH_SEPARATOR . PIWIK_INCLUDE_PATH . '/vendor/bin'
@@ -31,9 +29,7 @@ if (!defined('PIWIK_INCLUDE_SEARCH_PATH')) {
 @set_include_path(PIWIK_INCLUDE_SEARCH_PATH);
 @ini_set('memory_limit', -1);
 
-require_once PIWIK_INCLUDE_PATH . '/core/Loader.php';
-
-\Piwik\Loader::init();
+require_once PIWIK_INCLUDE_PATH . '/core/bootstrap.php';
 
 require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/DatabaseTestCase.php';
 require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/IntegrationTestCase.php';
diff --git a/tests/PHPUnit/proxy/includes.php b/tests/PHPUnit/proxy/includes.php
index 01a28db163..0d6b3d878c 100644
--- a/tests/PHPUnit/proxy/includes.php
+++ b/tests/PHPUnit/proxy/includes.php
@@ -1,7 +1,5 @@
 <?php
 
-// Good old test proxy endpoints have some commons
-
 if (!defined('PIWIK_INCLUDE_PATH')) {
     define('PIWIK_INCLUDE_PATH', realpath(dirname(__FILE__)) . '/../../../');
 }
@@ -9,21 +7,8 @@ if (!defined('PIWIK_USER_PATH')) {
     define('PIWIK_USER_PATH', PIWIK_INCLUDE_PATH);
 }
 
-require_once PIWIK_INCLUDE_PATH . '/core/Loader.php';
-\Piwik\Loader::init();
+require_once PIWIK_INCLUDE_PATH . '/core/bootstrap.php';
 
-require_once PIWIK_INCLUDE_PATH . '/core/EventDispatcher.php';
-require_once PIWIK_INCLUDE_PATH . '/core/Piwik.php';
-require_once PIWIK_INCLUDE_PATH . '/libs/upgradephp/upgrade.php';
 require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/TestingEnvironment.php';
-if (file_exists(PIWIK_INCLUDE_PATH . '/vendor/autoload.php')) {
-    $vendorDirectory = PIWIK_INCLUDE_PATH . '/vendor';
-} else {
-    $vendorDirectory = PIWIK_INCLUDE_PATH . '/../..';
-}
-require_once $vendorDirectory . '/autoload.php';
-require_once $vendorDirectory . '/mustangostang/spyc/Spyc.php';
-require_once $vendorDirectory . '/piwik/device-detector/DeviceDetector.php';
-
-\Piwik\SettingsServer::setMaxExecutionTime(0);
 
+Piwik\SettingsServer::setMaxExecutionTime(0);
diff --git a/tests/resources/staticFileServer.php b/tests/resources/staticFileServer.php
index 7975b79348..bf26da55f4 100644
--- a/tests/resources/staticFileServer.php
+++ b/tests/resources/staticFileServer.php
@@ -13,35 +13,14 @@ use Piwik\Common;
 use Piwik\ProxyHttp;
 
 define('PIWIK_DOCUMENT_ROOT', dirname(__FILE__).'/../../');
-if(file_exists(PIWIK_DOCUMENT_ROOT . '/bootstrap.php'))
-{
+if(file_exists(PIWIK_DOCUMENT_ROOT . '/bootstrap.php')) {
     require_once PIWIK_DOCUMENT_ROOT . '/bootstrap.php';
 }
-
-error_reporting(E_ALL|E_NOTICE);
-@ini_set('display_errors', defined('PIWIK_DISPLAY_ERRORS') ? PIWIK_DISPLAY_ERRORS : @ini_get('display_errors'));
-@ini_set('xdebug.show_exception_trace', 0);
-@ini_set('magic_quotes_runtime', 0);
-
-if(!defined('PIWIK_USER_PATH'))
-{
-    define('PIWIK_USER_PATH', PIWIK_DOCUMENT_ROOT);
-}
-if(!defined('PIWIK_INCLUDE_PATH'))
-{
+if (!defined('PIWIK_INCLUDE_PATH')) {
     define('PIWIK_INCLUDE_PATH', PIWIK_DOCUMENT_ROOT);
 }
 
-require_once PIWIK_INCLUDE_PATH . '/libs/upgradephp/upgrade.php';
-require_once PIWIK_INCLUDE_PATH . '/core/testMinimumPhpVersion.php';
-
-// NOTE: the code above this comment must be PHP4 compatible
-
-session_cache_limiter('nocache');
-@date_default_timezone_set('UTC');
-
-require_once PIWIK_INCLUDE_PATH . '/core/Loader.php';
-\Piwik\Loader::init();
+require_once PIWIK_INCLUDE_PATH . '/core/bootstrap.php';
 
 // This is Piwik logo, the static file used in this test suit
 define("TEST_FILE_LOCATION", dirname(__FILE__) . "/lipsum.txt");