makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[feature/migrations] Inject Migrator instead of using the container to fetch

Browse source 
PHPBB3-11318
This commit is contained in:
Nathaniel Guse 2013-02-09 20:01:40 -06:00
parent ec9328e943
commit a8da6b89e9
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
phpBB/config/services.yml
View file

@ -115,6 +115,7 @@ services:
- @service_container - @service_container
- @dbal.conn - @dbal.conn
- @config - @config
- @migrator
- %tables.ext% - %tables.ext%
- %core.root_path% - %core.root_path%
- .%core.php_ext% - .%core.php_ext%

15
phpBB/includes/extension/manager.php
View file

@ -29,6 +29,7 @@ class phpbb_extension_manager
protected $db; protected $db;
protected $config; protected $config;
protected $migrator;
protected $cache; protected $cache;
protected $php_ext; protected $php_ext;
protected $extensions; protected $extensions;
@ -48,12 +49,13 @@ class phpbb_extension_manager
* @param phpbb_cache_driver_interface $cache A cache instance or null * @param phpbb_cache_driver_interface $cache A cache instance or null
* @param string $cache_name The name of the cache variable, defaults to _ext * @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, $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, phpbb_db_migrator $migrator, $extension_table, $phpbb_root_path, $php_ext = '.php', phpbb_cache_driver_interface $cache = null, $cache_name = '_ext')
{ {
$this->container = $container; $this->container = $container;
$this->phpbb_root_path = $phpbb_root_path; $this->phpbb_root_path = $phpbb_root_path;
$this->db = $db; $this->db = $db;
$this->config = $config; $this->config = $config;
$this->migrator = $migrator;
$this->cache = $cache; $this->cache = $cache;
$this->php_ext = $php_ext; $this->php_ext = $php_ext;
$this->extension_table = $extension_table; $this->extension_table = $extension_table;
@ -519,11 +521,10 @@ class phpbb_extension_manager
*/ */
protected function handle_migrations($extension_name, $mode) protected function handle_migrations($extension_name, $mode)
{ {
$migrator = $this->container->get('migrator');
$migrations_path = $this->phpbb_root_path . $this->get_extension_path($extension_name) . 'migrations/'; $migrations_path = $this->phpbb_root_path . $this->get_extension_path($extension_name) . 'migrations/';
if (file_exists($migrations_path) && is_dir($migrations_path)) if (file_exists($migrations_path) && is_dir($migrations_path))
{ {
$migrator->load_migrations($migrations_path); $this->migrator->load_migrations($migrations_path);
} }
// What is a safe limit of execution time? Half the max execution time should be safe. // What is a safe limit of execution time? Half the max execution time should be safe.
@ -532,9 +533,9 @@ class phpbb_extension_manager
if ($mode == 'enable') if ($mode == 'enable')
{ {
while (!$migrator->finished()) while (!$this->migrator->finished())
{ {
$migrator->update(); $this->migrator->update();
// Are we approaching the time limit? If so we want to pause the update and continue after refreshing // Are we approaching the time limit? If so we want to pause the update and continue after refreshing
if ((time() - $start_time) >= $safe_time_limit) if ((time() - $start_time) >= $safe_time_limit)
@ -545,9 +546,9 @@ class phpbb_extension_manager
} }
else if ($mode == 'purge') else if ($mode == 'purge')
{ {
while ($migrator->migration_state() !== false) while ($this->migrator->migration_state() !== false)
{ {
$migrator->revert(); $this->migrator->revert();
// Are we approaching the time limit? If so we want to pause the update and continue after refreshing // Are we approaching the time limit? If so we want to pause the update and continue after refreshing
if ((time() - $start_time) >= $safe_time_limit) if ((time() - $start_time) >= $safe_time_limit)