diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2011-01-09 23:58:27 +0100 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2011-01-09 23:58:27 +0100 |
| commit | 95c683056b85399200e2caaa9aa65edc6843c16f (patch) | |
| tree | ac11043ba149791a225d587e7a61e34db75a04f6 /phpBB/includes/class_loader.php | |
| parent | 5373f8157d8a2619197702c3a00a6bb432ef3e25 (diff) | |
| parent | 1aef7eb20ee195c7f21d6c5b78653b7c43e669ec (diff) | |
| download | forums-95c683056b85399200e2caaa9aa65edc6843c16f.tar forums-95c683056b85399200e2caaa9aa65edc6843c16f.tar.gz forums-95c683056b85399200e2caaa9aa65edc6843c16f.tar.bz2 forums-95c683056b85399200e2caaa9aa65edc6843c16f.tar.xz forums-95c683056b85399200e2caaa9aa65edc6843c16f.zip | |
Merge branch 'task/acm-refactor' into develop
Conflicts:
tests/bootstrap.php
Diffstat (limited to 'phpBB/includes/class_loader.php')
| -rw-r--r-- | phpBB/includes/class_loader.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/phpBB/includes/class_loader.php b/phpBB/includes/class_loader.php index 5df654799a..a28d745983 100644 --- a/phpBB/includes/class_loader.php +++ b/phpBB/includes/class_loader.php @@ -42,8 +42,9 @@ class phpbb_class_loader * * @param string $phpbb_root_path phpBB's root directory containing includes/ * @param string $php_ext The file extension for PHP files + * @param phpbb_cache_driver_interface $cache An implementation of the phpBB cache interface. */ - public function __construct($phpbb_root_path, $php_ext = '.php', $cache = null) + public function __construct($phpbb_root_path, $php_ext = '.php', phpbb_cache_driver_interface $cache = null) { $this->phpbb_root_path = $phpbb_root_path; $this->php_ext = $php_ext; @@ -56,9 +57,9 @@ class phpbb_class_loader * the class loader will resolve paths by checking for the existance of every * directory in the class name every time. * - * @param acm $cache An implementation of the phpBB cache interface. + * @param phpbb_cache_driver_interface $cache An implementation of the phpBB cache interface. */ - public function set_cache($cache = null) + public function set_cache(phpbb_cache_driver_interface $cache = null) { if ($cache) { |