Merge pull request #6891 from piwik/bootstrap

Simplified bootstrap files

2 files changed, 6 insertions, 18 deletions

diff --git a/misc/cron/archive.php b/misc/cron/archive.php
index 41dfb06d7e..69c5d1d118 100644
--- a/misc/cron/archive.php
+++ b/misc/cron/archive.php
@@ -22,12 +22,10 @@ if (!defined('PIWIK_USER_PATH')) {
     define('PIWIK_USER_PATH', PIWIK_INCLUDE_PATH);
 }
 
-if (!class_exists('Piwik\Console', false)) {
-    define('PIWIK_ENABLE_DISPATCH', false);
-    define('PIWIK_ENABLE_ERROR_HANDLER', false);
-    define('PIWIK_ENABLE_SESSION_START', false);
-    require_once PIWIK_INCLUDE_PATH . "/index.php";
-}
+define('PIWIK_ENABLE_DISPATCH', false);
+define('PIWIK_ENABLE_ERROR_HANDLER', false);
+define('PIWIK_ENABLE_SESSION_START', false);
+require_once PIWIK_INCLUDE_PATH . "/index.php";
 
 if (!empty($_SERVER['argv'][0])) {
     $callee = $_SERVER['argv'][0];
diff --git a/misc/others/cli-script-bootstrap.php b/misc/others/cli-script-bootstrap.php
index e2374bbe10..ac60ae30af 100644
--- a/misc/others/cli-script-bootstrap.php
+++ b/misc/others/cli-script-bootstrap.php
@@ -10,29 +10,19 @@ use Piwik\Container\StaticContainer;
 use Piwik\FrontController;
 use Symfony\Bridge\Monolog\Handler\ConsoleHandler;
 use Symfony\Component\Console\Output\ConsoleOutput;
-use Symfony\Component\Console\Output\OutputInterface;
-
-error_reporting(E_ALL | E_NOTICE);
 
 define('PIWIK_DOCUMENT_ROOT', dirname(__FILE__) == '/' ? '' : dirname(__FILE__) . '/../..');
 if (file_exists(PIWIK_DOCUMENT_ROOT . '/bootstrap.php')) {
     require_once PIWIK_DOCUMENT_ROOT . '/bootstrap.php';
 }
-if (!defined('PIWIK_USER_PATH')) {
-    define('PIWIK_USER_PATH', PIWIK_DOCUMENT_ROOT);
-}
 if (!defined('PIWIK_INCLUDE_PATH')) {
     define('PIWIK_INCLUDE_PATH', PIWIK_DOCUMENT_ROOT);
 }
 
+require_once PIWIK_INCLUDE_PATH . '/core/bootstrap.php';
+
 ignore_user_abort(true);
 set_time_limit(0);
-@date_default_timezone_set('UTC');
-
-require_once PIWIK_INCLUDE_PATH . '/libs/upgradephp/upgrade.php';
-require_once PIWIK_INCLUDE_PATH . '/core/testMinimumPhpVersion.php';
-require_once PIWIK_INCLUDE_PATH . '/core/Loader.php';
-\Piwik\Loader::init();
 
 $GLOBALS['PIWIK_TRACKER_DEBUG'] = false;
 define('PIWIK_ENABLE_DISPATCH', false);