Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Steur <thomas.steur@gmail.com>2014-06-18 04:04:56 +0400
committerThomas Steur <thomas.steur@gmail.com>2014-06-18 04:04:56 +0400
commit69b4a70048ea681bc62bca79abe7c763f2233a60 (patch)
tree070b876a73f9402664f624e73de74ed4165518f5 /tests/PHPUnit/proxy
parent031a2de96a2a3ec3f5f395977ee6c0c822b119b3 (diff)
parent02ffeeb228f88d6053edf777d094b34c47b086b4 (diff)
Merge remote-tracking branch 'origin/master' into report_and_dimension_refactoring
Conflicts: core/Tracker/Settings.php core/Tracker/Visit.php plugins/Actions/Widgets.php plugins/CustomVariables/Widgets.php plugins/DevicesDetection/DevicesDetection.php plugins/DevicesDetection/Widgets.php plugins/Events/Widgets.php plugins/Provider/Widgets.php plugins/UserCountry/Widgets.php plugins/UserSettings/Widgets.php plugins/VisitTime/Widgets.php plugins/VisitorInterest/Widgets.php
Diffstat (limited to 'tests/PHPUnit/proxy')
-rw-r--r--tests/PHPUnit/proxy/includes.php4
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/PHPUnit/proxy/includes.php b/tests/PHPUnit/proxy/includes.php
index 905fbd0d13..3530b26934 100644
--- a/tests/PHPUnit/proxy/includes.php
+++ b/tests/PHPUnit/proxy/includes.php
@@ -9,6 +9,10 @@ if (!defined('PIWIK_USER_PATH')) {
define('PIWIK_USER_PATH', PIWIK_INCLUDE_PATH);
}
+require_once file_exists(PIWIK_INCLUDE_PATH . '/vendor/autoload.php')
+ ? PIWIK_INCLUDE_PATH . '/vendor/autoload.php' // Piwik is the main project
+ : PIWIK_INCLUDE_PATH . '/../../autoload.php'; // Piwik is installed as a dependency
+
require_once PIWIK_INCLUDE_PATH . '/core/Loader.php';
require_once PIWIK_INCLUDE_PATH . '/core/EventDispatcher.php';
require_once PIWIK_INCLUDE_PATH . '/core/Piwik.php';