aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/extension/manager.php
diff options
context:
space:
mode:
authorNathaniel Guse <nathaniel.guse@gmail.com>2013-03-02 11:02:53 -0600
committerNathaniel Guse <nathaniel.guse@gmail.com>2013-03-02 11:12:12 -0600
commit39ca212e17e80d14dbbd20cf5542ab37f27bd217 (patch)
tree15df3b2c6677d483ed38a8c0e7cb1cf75353982f /phpBB/includes/extension/manager.php
parent8200509c7940166d560c309c35b2ade2e4952f75 (diff)
downloadforums-39ca212e17e80d14dbbd20cf5542ab37f27bd217.tar
forums-39ca212e17e80d14dbbd20cf5542ab37f27bd217.tar.gz
forums-39ca212e17e80d14dbbd20cf5542ab37f27bd217.tar.bz2
forums-39ca212e17e80d14dbbd20cf5542ab37f27bd217.tar.xz
forums-39ca212e17e80d14dbbd20cf5542ab37f27bd217.zip
[ticket/11386] Use finder to find migration files
PHPBB3-11386
Diffstat (limited to 'phpBB/includes/extension/manager.php')
-rw-r--r--phpBB/includes/extension/manager.php11
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