diff options
| author | Thomas Steur <thomas.steur@googlemail.com> | 2014-10-13 06:21:24 +0400 |
|---|---|---|
| committer | Thomas Steur <thomas.steur@googlemail.com> | 2014-10-13 06:21:24 +0400 |
| commit | 9f4ba4eea6c85a92b87fbad6f0556ee5d8551762 (patch) | |
| tree | 0225fe694c5d6b15ca9ba9d528e16f03ce4249bd /tests/PHPUnit/proxy | |
| parent | c87dc623acf264d7559991cfc66cefa85bba4f1f (diff) | |
refs #5940 moved files into a subfolder framework, added autoloader to remove duplicated code to load autoload.php and to be able to register more autoloaders (eg for test files) on demand. This I got read of many includes that had to be updated all the time and that had to be updated all the time when moving iles
Diffstat (limited to 'tests/PHPUnit/proxy')
| -rw-r--r-- | tests/PHPUnit/proxy/includes.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/PHPUnit/proxy/includes.php b/tests/PHPUnit/proxy/includes.php index b813fd21ad..01a28db163 100644 --- a/tests/PHPUnit/proxy/includes.php +++ b/tests/PHPUnit/proxy/includes.php @@ -9,9 +9,8 @@ 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'; +\Piwik\Loader::init(); require_once PIWIK_INCLUDE_PATH . '/core/EventDispatcher.php'; require_once PIWIK_INCLUDE_PATH . '/core/Piwik.php'; |