diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2013-01-10 19:32:39 -0600 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2013-02-06 11:31:49 -0600 |
| commit | 8d3a82a4fa8ced50fbc1d1019ef439d1d5c81e71 (patch) | |
| tree | 482e300d80d3c702422a9a82bdb99b0e7bcf14ec /phpBB/includes/extension/manager.php | |
| parent | effaef6bddf49b9016d66bd64706392fcdb452b3 (diff) | |
| download | forums-8d3a82a4fa8ced50fbc1d1019ef439d1d5c81e71.tar forums-8d3a82a4fa8ced50fbc1d1019ef439d1d5c81e71.tar.gz forums-8d3a82a4fa8ced50fbc1d1019ef439d1d5c81e71.tar.bz2 forums-8d3a82a4fa8ced50fbc1d1019ef439d1d5c81e71.tar.xz forums-8d3a82a4fa8ced50fbc1d1019ef439d1d5c81e71.zip | |
[feature/migrations] Make the container available to extension installers
This allows extensions to load and install migrations easily as per their
needs.
PHPBB3-11318
Diffstat (limited to 'phpBB/includes/extension/manager.php')
| -rw-r--r-- | phpBB/includes/extension/manager.php | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/phpBB/includes/extension/manager.php b/phpBB/includes/extension/manager.php index de6f364320..8136dfa90b 100644 --- a/phpBB/includes/extension/manager.php +++ b/phpBB/includes/extension/manager.php @@ -15,6 +15,8 @@ if (!defined('IN_PHPBB')) exit; } +use Symfony\Component\DependencyInjection\ContainerInterface; + /** * The extension manager provides means to activate/deactivate extensions. * @@ -22,6 +24,9 @@ if (!defined('IN_PHPBB')) */ class phpbb_extension_manager { + /** @var ContainerInterface */ + protected $container; + protected $db; protected $config; protected $cache; @@ -34,6 +39,7 @@ class phpbb_extension_manager /** * Creates a manager and loads information from database * + * @param ContainerInterface $container A container * @param phpbb_db_driver $db A database connection * @param phpbb_config $config phpbb_config * @param string $extension_table The name of the table holding extensions @@ -42,8 +48,9 @@ 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(phpbb_db_driver $db, phpbb_config $config, $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; @@ -126,11 +133,11 @@ class phpbb_extension_manager if (class_exists($extension_class_name)) { - return new $extension_class_name; + return new $extension_class_name($this->container); } else { - return new phpbb_extension_base; + return new phpbb_extension_base($this->container); } } |