diff options
| author | diosmosis <benaka@piwik.pro> | 2015-05-26 22:12:47 +0300 |
|---|---|---|
| committer | diosmosis <benaka@piwik.pro> | 2015-06-02 01:05:27 +0300 |
| commit | 86738409ae2ad93675fbdd6741ca82f4ec6212b6 (patch) | |
| tree | f66f2bfce0fe5fe33d2a4adbb063503328f6af52 /tests/PHPUnit/proxy | |
| parent | 17f61e3137ff7e420d75e283b705121e4731cce7 (diff) | |
Rename Piwik_TestingEnvironment to TestingEnvironment and move the class to Piwik\Tests\Framework namespace. Remove manual require statements.
Diffstat (limited to 'tests/PHPUnit/proxy')
| -rw-r--r-- | tests/PHPUnit/proxy/archive.php | 2 | ||||
| -rw-r--r-- | tests/PHPUnit/proxy/console | 2 | ||||
| -rw-r--r-- | tests/PHPUnit/proxy/includes.php | 2 | ||||
| -rw-r--r-- | tests/PHPUnit/proxy/index.php | 2 | ||||
| -rwxr-xr-x | tests/PHPUnit/proxy/piwik.php | 2 |
5 files changed, 4 insertions, 6 deletions
diff --git a/tests/PHPUnit/proxy/archive.php b/tests/PHPUnit/proxy/archive.php index a4d5f4e476..33c7d715fc 100644 --- a/tests/PHPUnit/proxy/archive.php +++ b/tests/PHPUnit/proxy/archive.php @@ -3,7 +3,7 @@ define('PIWIK_ARCHIVE_NO_TRUNCATE', true); require realpath(dirname(__FILE__)) . "/includes.php"; -Piwik_TestingEnvironment::addHooks(); +\Piwik\Tests\Framework\TestingEnvironment::addHooks(); // include archive.php, and let 'er rip require_once PIWIK_INCLUDE_PATH . "/misc/cron/archive.php"; diff --git a/tests/PHPUnit/proxy/console b/tests/PHPUnit/proxy/console index 1ccef19ecc..a6cd68e1ae 100644 --- a/tests/PHPUnit/proxy/console +++ b/tests/PHPUnit/proxy/console @@ -2,6 +2,6 @@ <?php require realpath(dirname(__FILE__)) . "/includes.php"; -Piwik_TestingEnvironment::addHooks(); +\Piwik\Tests\Framework\TestingEnvironment::addHooks(); require_once PIWIK_INCLUDE_PATH . "/console"; diff --git a/tests/PHPUnit/proxy/includes.php b/tests/PHPUnit/proxy/includes.php index 0d6b3d878c..69af8b7804 100644 --- a/tests/PHPUnit/proxy/includes.php +++ b/tests/PHPUnit/proxy/includes.php @@ -9,6 +9,4 @@ if (!defined('PIWIK_USER_PATH')) { require_once PIWIK_INCLUDE_PATH . '/core/bootstrap.php'; -require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/TestingEnvironment.php'; - Piwik\SettingsServer::setMaxExecutionTime(0); diff --git a/tests/PHPUnit/proxy/index.php b/tests/PHPUnit/proxy/index.php index 213df21cf8..2c1183235d 100644 --- a/tests/PHPUnit/proxy/index.php +++ b/tests/PHPUnit/proxy/index.php @@ -6,6 +6,6 @@ require realpath(dirname(__FILE__)) . "/includes.php"; -Piwik_TestingEnvironment::addHooks(); +\Piwik\Tests\Framework\TestingEnvironment::addHooks(); include PIWIK_INCLUDE_PATH . '/index.php';
\ No newline at end of file diff --git a/tests/PHPUnit/proxy/piwik.php b/tests/PHPUnit/proxy/piwik.php index 078069b30f..37d1ba834d 100755 --- a/tests/PHPUnit/proxy/piwik.php +++ b/tests/PHPUnit/proxy/piwik.php @@ -29,7 +29,7 @@ try { }) ); - Piwik_TestingEnvironment::addHooks($globalObservers); + \Piwik\Tests\Framework\TestingEnvironment::addHooks($globalObservers); GeoIp::$geoIPDatabaseDir = 'tests/lib/geoip-files'; |