diff options
| author | diosmosis <benakamoorthi@fastmail.fm> | 2014-08-20 09:06:20 +0400 |
|---|---|---|
| committer | diosmosis <benakamoorthi@fastmail.fm> | 2014-08-20 09:06:20 +0400 |
| commit | 75b284c8f6fdbe7f69782c693a8849892e434da3 (patch) | |
| tree | ea41f9c6fa181ba1cf0f6cd6ee03d0400155d3be /tests | |
| parent | 6de375ec21d236dce4f7a3caebb2ac605e17f9ea (diff) | |
Remove Piwik autoloader and replace composer autoloader.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/PHPUnit/bootstrap.php | 1 | ||||
| -rw-r--r-- | tests/PHPUnit/proxy/includes.php | 1 | ||||
| -rw-r--r-- | tests/resources/staticFileServer.php | 2 |
3 files changed, 1 insertions, 3 deletions
diff --git a/tests/PHPUnit/bootstrap.php b/tests/PHPUnit/bootstrap.php index d32c604026..6a80c72755 100644 --- a/tests/PHPUnit/bootstrap.php +++ b/tests/PHPUnit/bootstrap.php @@ -33,7 +33,6 @@ require_once file_exists(PIWIK_INCLUDE_PATH . '/vendor/autoload.php') 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'; require_once PIWIK_INCLUDE_PATH . '/core/FrontController.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 6e3acc8af5..858ae485d2 100644 --- a/tests/PHPUnit/proxy/includes.php +++ b/tests/PHPUnit/proxy/includes.php @@ -13,7 +13,6 @@ 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'; require_once PIWIK_INCLUDE_PATH . '/libs/upgradephp/upgrade.php'; diff --git a/tests/resources/staticFileServer.php b/tests/resources/staticFileServer.php index 237cf0af59..5907c169e3 100644 --- a/tests/resources/staticFileServer.php +++ b/tests/resources/staticFileServer.php @@ -39,7 +39,7 @@ require_once PIWIK_INCLUDE_PATH . '/core/testMinimumPhpVersion.php'; session_cache_limiter('nocache'); @date_default_timezone_set('UTC'); -require_once PIWIK_INCLUDE_PATH .'/core/Loader.php'; +require_once PIWIK_INCLUDE_PATH .'/vendor/autoload.php'; // This is Piwik logo, the static file used in this test suit define("TEST_FILE_LOCATION", dirname(__FILE__) . "/lipsum.txt"); |