diff options
| author | Nils Adermann <naderman@naderman.de> | 2011-08-15 21:38:47 -0400 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2011-09-29 15:42:46 +0200 |
| commit | 96209e022477d97b581b79cabace4caddd19501b (patch) | |
| tree | 660134bf3d3bc3a3ab50a222e789aafea5379b4a /tests/bootstrap.php | |
| parent | 989bd9cde7314024999f5b92fc2ff4572b9ac937 (diff) | |
| download | forums-96209e022477d97b581b79cabace4caddd19501b.tar forums-96209e022477d97b581b79cabace4caddd19501b.tar.gz forums-96209e022477d97b581b79cabace4caddd19501b.tar.bz2 forums-96209e022477d97b581b79cabace4caddd19501b.tar.xz forums-96209e022477d97b581b79cabace4caddd19501b.zip | |
[feature/extension-manager] The class loader no longer knows about extensions
Instead the class loader is instantiated twice. Once with the phpbb_ prefix
and once with the phpbb_ext_ prefix.
PHPBB3-10323
Diffstat (limited to 'tests/bootstrap.php')
| -rw-r--r-- | tests/bootstrap.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/bootstrap.php b/tests/bootstrap.php index fbe23c1835..a85091ce23 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -32,8 +32,10 @@ else require_once $phpbb_root_path . 'includes/constants.php'; require_once $phpbb_root_path . 'includes/class_loader.' . $phpEx; -$class_loader = new phpbb_class_loader($phpbb_root_path . 'includes/', $phpbb_root_path . 'ext/', '.php'); -$class_loader->register(); +$phpbb_class_loader_ext = new phpbb_class_loader('phpbb_ext_', $phpbb_root_path . 'ext/', ".php"); +$phpbb_class_loader_ext->register(); +$phpbb_class_loader = new phpbb_class_loader('phpbb_', $phpbb_root_path . 'includes/', ".php"); +$phpbb_class_loader->register(); require_once 'test_framework/phpbb_test_case_helpers.php'; require_once 'test_framework/phpbb_test_case.php'; |