diff options
| author | Philipp Schüttlöffel <schuettloeffel@zqs.uni-hannover.de> | 2024-09-24 10:53:31 +0200 |
|---|---|---|
| committer | Philipp Schüttlöffel <schuettloeffel@zqs.uni-hannover.de> | 2024-09-24 10:53:31 +0200 |
| commit | 4459dd7917f4d1c34f40bb68f0e991e9c3d53e4c (patch) | |
| tree | 5c07151ae61276d334e88f6309c30d439a85c12e /tests/functional | |
| parent | da0022e5c1abbf9825ae76debaabdff7e8623bb4 (diff) | |
| parent | 97a188592c679890a25c37ab78463add76a52ff7 (diff) | |
Merge branch 'main' into issue-3911issue-3911
Diffstat (limited to 'tests/functional')
| -rw-r--r-- | tests/functional/_bootstrap.php | 25 |
1 files changed, 3 insertions, 22 deletions
diff --git a/tests/functional/_bootstrap.php b/tests/functional/_bootstrap.php index 49f3324..e8a911d 100644 --- a/tests/functional/_bootstrap.php +++ b/tests/functional/_bootstrap.php @@ -18,7 +18,7 @@ $inc_path .= PATH_SEPARATOR . __DIR__ . '/../..'; $inc_path .= PATH_SEPARATOR . __DIR__ . '/../../config'; ini_set('include_path', $inc_path); -require 'lib/classes/StudipAutoloader.php'; +require 'lib/helpers.php'; require 'lib/functions.php'; require_once 'lib/language.inc.php'; require 'lib/visual.inc.php'; @@ -26,24 +26,6 @@ require 'lib/messaging.inc.php'; $STUDIP_BASE_PATH = realpath(dirname(__FILE__) . '/../..'); -StudipAutoloader::register(); -StudipAutoloader::addAutoloadPath($STUDIP_BASE_PATH . '/lib/calendar', 'Studip\\Calendar'); -StudipAutoloader::addAutoloadPath($STUDIP_BASE_PATH . '/lib/classes'); -StudipAutoloader::addAutoloadPath($STUDIP_BASE_PATH . '/lib/classes', 'Studip'); -StudipAutoloader::addAutoloadPath($STUDIP_BASE_PATH . '/lib/exceptions'); -StudipAutoloader::addAutoloadPath($STUDIP_BASE_PATH . '/lib/exceptions/resources'); -StudipAutoloader::addAutoloadPath($STUDIP_BASE_PATH . '/lib/filesystem'); -StudipAutoloader::addAutoloadPath($STUDIP_BASE_PATH . '/lib/migrations'); -StudipAutoloader::addAutoloadPath($STUDIP_BASE_PATH . '/lib/models'); -StudipAutoloader::addAutoloadPath($STUDIP_BASE_PATH . '/lib/models/resources'); -StudipAutoloader::addAutoloadPath($STUDIP_BASE_PATH . '/lib/phplib'); -StudipAutoloader::addAutoloadPath($STUDIP_BASE_PATH . '/lib/raumzeit'); -StudipAutoloader::addAutoloadPath($STUDIP_BASE_PATH . '/lib/resources'); -StudipAutoloader::addAutoloadPath($STUDIP_BASE_PATH . '/lib/plugins/core'); -StudipAutoloader::addAutoloadPath($STUDIP_BASE_PATH . '/lib/modules'); -StudipAutoloader::addAutoloadPath($STUDIP_BASE_PATH . '/lib/plugins/db'); -StudipAutoloader::addAutoloadPath($STUDIP_BASE_PATH . '/lib/plugins/engine'); - // load config-variables $added_configs = []; StudipFileloader::load( @@ -62,8 +44,7 @@ require 'vendor/email_message/email_message.php'; require 'vendor/email_message/debug_message.php'; StudipMail::setDefaultTransporter(new debug_message_class()); -require_once 'vendor/flexi/lib/flexi.php'; -$GLOBALS['template_factory'] = new Flexi_TemplateFactory(dirname(dirname(__DIR__)) . '/templates'); +$GLOBALS['template_factory'] = new Flexi\Factory(dirname(dirname(__DIR__)) . '/templates'); // Disable caching to fallback to memory cache $GLOBALS['CACHING_ENABLE'] = false; @@ -74,7 +55,7 @@ if (!class_exists('StudipTestHelper')) { { static function set_up_tables($tables) { - $cache = StudipCacheFactory::getCache(false); + $cache = \Studip\Cache\Factory::getCache(false); // second step, expire table scheme SimpleORMap::expireTableScheme(); |