diff options
| author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-02-25 13:12:32 -0600 |
|---|---|---|
| committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-02-25 13:12:32 -0600 |
| commit | 7a8ae493009eac3d4f5c97279f0be6e10c588002 (patch) | |
| tree | a252058ef587e62506130ef71644f5af945b8575 /phpBB/install/install_install.php | |
| parent | a665ad5c2e44922fbd9790597913091c68311533 (diff) | |
| download | forums-7a8ae493009eac3d4f5c97279f0be6e10c588002.tar forums-7a8ae493009eac3d4f5c97279f0be6e10c588002.tar.gz forums-7a8ae493009eac3d4f5c97279f0be6e10c588002.tar.bz2 forums-7a8ae493009eac3d4f5c97279f0be6e10c588002.tar.xz forums-7a8ae493009eac3d4f5c97279f0be6e10c588002.zip | |
[feature/migrations] Inject migrator rather than the container.
Some docblocks
PHBB3-9737
Diffstat (limited to 'phpBB/install/install_install.php')
| -rw-r--r-- | phpBB/install/install_install.php | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php index e0eb9e4472..a99de9bec9 100644 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -114,7 +114,7 @@ class install_install extends module $this->add_bots($mode, $sub); $this->email_admin($mode, $sub); $this->disable_avatars_if_unwritable(); - $this->populate_migrations($phpbb_container, $phpbb_root_path); + $this->populate_migrations($phpbb_container->get('migrator'), $phpbb_root_path); // Remove the lock file @unlink($phpbb_root_path . 'cache/install_lock'); @@ -1881,9 +1881,18 @@ class install_install extends module } } - function populate_migrations($container, $phpbb_root_path) + /** + * Populate migrations for the installation + * + * This "installs" all migrations from (root path)/includes/db/migrations/data. + * "installs" means it adds all migrations to the migrations table, but does not + * perform any of the actions in the migrations. + * + * @param phpbb_db_migrator $migrator + * @param string $phpbb_root_path + */ + function populate_migrations($migrator, $phpbb_root_path) { - $migrator = $container->get('migrator'); $migrator->populate_migrations_from_directory($phpbb_root_path . 'includes/db/migration/data/'); } |