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

[ticket/11415] Make migrator/ext.manager dependencies of the base ext class

Browse source 
PHPBB3-11415
This commit is contained in:
Nathaniel Guse 2013-05-01 15:18:53 -05:00
parent 60e3272839
commit 87b01fc854
2 changed files with 23 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
phpBB/includes/extension/base.php
View file

@ -27,6 +27,12 @@ class phpbb_extension_base implements phpbb_extension_interface
/** @var ContainerInterface */ /** @var ContainerInterface */
protected $container; protected $container;
/** @var phpbb_extension_manager */
protected $extension_manager;
/** @var phpbb_db_migrator */
protected $migrator;
/** @var string */ /** @var string */
protected $extension_name; protected $extension_name;
@ -37,12 +43,15 @@ class phpbb_extension_base implements phpbb_extension_interface
* Constructor * Constructor
* *
* @param ContainerInterface $container Container object * @param ContainerInterface $container Container object
* @param phpbb_extension_manager $extension_manager
* @param string $extension_name Name of this extension (from ext.manager) * @param string $extension_name Name of this extension (from ext.manager)
* @param string $extension_path Relative path to this extension * @param string $extension_path Relative path to this extension
*/ */
public function __construct(ContainerInterface $container, $extension_name, $extension_path) public function __construct(ContainerInterface $container, phpbb_extension_manager $extension_manager, phpbb_db_migrator $migrator, $extension_name, $extension_path)
{ {
$this->container = $container; $this->container = $container;
$this->extension_manager = $extension_manager;
$this->migrator = $migrator;
$this->extension_name = $extension_name; $this->extension_name = $extension_name;
$this->extension_path = $extension_path; $this->extension_path = $extension_path;
@ -57,12 +66,12 @@ class phpbb_extension_base implements phpbb_extension_interface
public function enable_step($old_state) public function enable_step($old_state)
{ {
$migrations = $this->get_migration_file_list(); $migrations = $this->get_migration_file_list();
$migrator = $this->container->get('migrator');
$migrator->set_migrations($migrations);
$migrator->update(); $this->migrator->set_migrations($migrations);
return !$migrator->finished(); $this->migrator->update();
return !$this->migrator->finished();
} }
/** /**
@ -85,14 +94,14 @@ class phpbb_extension_base implements phpbb_extension_interface
public function purge_step($old_state) public function purge_step($old_state)
{ {
$migrations = $this->get_migration_file_list(); $migrations = $this->get_migration_file_list();
$migrator = $this->container->get('migrator');
$migrator->set_migrations($migrations); $this->migrator->set_migrations($migrations);
foreach ($migrations as $migration) foreach ($migrations as $migration)
{ {
while ($migrator->migration_state($migration) !== false) while ($this->migrator->migration_state($migration) !== false)
{ {
$migrator->revert($migration); $this->migrator->revert($migration);
return true; return true;
} }
@ -120,8 +129,7 @@ class phpbb_extension_base implements phpbb_extension_interface
$this->extension_name => $this->extension_path, $this->extension_name => $this->extension_path,
); );
$extension_manager = $this->container->get('ext.manager'); $finder = $this->extension_manager->get_finder();
$finder = $extension_manager->get_finder();
$migrations = array(); $migrations = array();
$file_list = $finder $file_list = $finder
->extension_directory('/migrations') ->extension_directory('/migrations')

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

@ -133,13 +133,15 @@ class phpbb_extension_manager
{ {
$extension_class_name = 'phpbb_ext_' . str_replace('/', '_', $name) . '_ext'; $extension_class_name = 'phpbb_ext_' . str_replace('/', '_', $name) . '_ext';
$migrator = $this->container->get('migrator');
if (class_exists($extension_class_name)) if (class_exists($extension_class_name))
{ {
return new $extension_class_name($this->container, $name, $this->get_extension_path($name, true)); return new $extension_class_name($this->container, $this, $migrator, $name, $this->get_extension_path($name, true));
} }
else else
{ {
return new phpbb_extension_base($this->container, $name, $this->get_extension_path($name, true)); return new phpbb_extension_base($this->container, $this, $migrator, $name, $this->get_extension_path($name, true));
} }
} }