diff options
| author | David King <imkingdavid@gmail.com> | 2013-03-02 17:12:43 -0500 |
|---|---|---|
| committer | David King <imkingdavid@gmail.com> | 2013-03-02 17:12:43 -0500 |
| commit | e08edd36b9f18b9206ea327bcfb45e4331630d1b (patch) | |
| tree | 4f3b5d9aca26191bb65695f1b800cf21be51075f /phpBB/includes/extension/manager.php | |
| parent | 9fca8f88fa533c9f8cae80ec5d92f2961006e982 (diff) | |
| parent | 91be99822312d9a83ae4f6849eef864dfd47e4a1 (diff) | |
| download | forums-e08edd36b9f18b9206ea327bcfb45e4331630d1b.tar forums-e08edd36b9f18b9206ea327bcfb45e4331630d1b.tar.gz forums-e08edd36b9f18b9206ea327bcfb45e4331630d1b.tar.bz2 forums-e08edd36b9f18b9206ea327bcfb45e4331630d1b.tar.xz forums-e08edd36b9f18b9206ea327bcfb45e4331630d1b.zip | |
Merge remote-tracking branch 'EXreaction/ticket/11386' into develop
# By Nathaniel Guse
# Via Nathaniel Guse
* EXreaction/ticket/11386:
[ticket/11386] Fix failing tests from constructor changes
[ticket/11386] Fix circular reference error & serialize error
[ticket/11386] Remove tests that check if finder cache is working
[ticket/11386] Forgot to get the migration classes
[ticket/11386] Update tests with new constructors for ext.manager/migrator
[ticket/11386] Use finder to find migration files
Diffstat (limited to 'phpBB/includes/extension/manager.php')
| -rw-r--r-- | phpBB/includes/extension/manager.php | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/phpBB/includes/extension/manager.php b/phpBB/includes/extension/manager.php index 21a9ec1370..0d760681b9 100644 --- a/phpBB/includes/extension/manager.php +++ b/phpBB/includes/extension/manager.php @@ -49,13 +49,12 @@ class phpbb_extension_manager * @param phpbb_cache_driver_interface $cache A cache instance or null * @param string $cache_name The name of the cache variable, defaults to _ext */ - public function __construct(ContainerInterface $container, phpbb_db_driver $db, phpbb_config $config, phpbb_db_migrator $migrator, $extension_table, $phpbb_root_path, $php_ext = '.php', phpbb_cache_driver_interface $cache = null, $cache_name = '_ext') + public function __construct(ContainerInterface $container, phpbb_db_driver $db, phpbb_config $config, $extension_table, $phpbb_root_path, $php_ext = '.php', phpbb_cache_driver_interface $cache = null, $cache_name = '_ext') { $this->container = $container; $this->phpbb_root_path = $phpbb_root_path; $this->db = $db; $this->config = $config; - $this->migrator = $migrator; $this->cache = $cache; $this->php_ext = $php_ext; $this->extension_table = $extension_table; @@ -70,6 +69,14 @@ class phpbb_extension_manager } /** + * Set migrator (get around circular reference) + */ + public function set_migrator(phpbb_db_migrator $migrator) + { + $this->migrator = $migrator; + } + + /** * Loads all extension information from the database * * @return null |