diff options
| author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-01-22 13:19:49 -0600 |
|---|---|---|
| committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-01-22 13:19:49 -0600 |
| commit | dfabdbca508a3fbd60c8df57ea756a974f4f135b (patch) | |
| tree | 42ceeb58c65e56bfd7784ca3709ee25d67b9c2b4 /phpBB/includes/db | |
| parent | ccd08e21f6ae97ff0ff628ff29935a70bdd7a58d (diff) | |
| download | forums-dfabdbca508a3fbd60c8df57ea756a974f4f135b.tar forums-dfabdbca508a3fbd60c8df57ea756a974f4f135b.tar.gz forums-dfabdbca508a3fbd60c8df57ea756a974f4f135b.tar.bz2 forums-dfabdbca508a3fbd60c8df57ea756a974f4f135b.tar.xz forums-dfabdbca508a3fbd60c8df57ea756a974f4f135b.zip | |
[ticket/9737] Fix a few minor things in migrations
PHPBB3-9737
Diffstat (limited to 'phpBB/includes/db')
| -rw-r--r-- | phpBB/includes/db/migration/exception.php | 7 | ||||
| -rw-r--r-- | phpBB/includes/db/migrator.php | 6 |
2 files changed, 9 insertions, 4 deletions
diff --git a/phpBB/includes/db/migration/exception.php b/phpBB/includes/db/migration/exception.php index bd46a4e064..ffdcd97780 100644 --- a/phpBB/includes/db/migration/exception.php +++ b/phpBB/includes/db/migration/exception.php @@ -22,7 +22,10 @@ if (!defined('IN_PHPBB')) */ class phpbb_db_migration_exception extends \Exception { - /** @var array Extra parameters sent to exception to aid in debugging */ + /** + * Extra parameters sent to exception to aid in debugging + * @var array + */ protected $parameters; /** @@ -42,6 +45,8 @@ class phpbb_db_migration_exception extends \Exception /** * Output the error as a string + * + * @return string */ public function __toString() { diff --git a/phpBB/includes/db/migrator.php b/phpBB/includes/db/migrator.php index d95283ae01..4456600b0a 100644 --- a/phpBB/includes/db/migrator.php +++ b/phpBB/includes/db/migrator.php @@ -394,7 +394,7 @@ class phpbb_db_migrator } /** - * Attempts to apply a step of the given migration or one of its dependencies + * Attempts to revert a step of the given migration or one of its dependencies * * @param string The class name of the migration * @return bool Whether any update step was successfully run @@ -559,12 +559,12 @@ class phpbb_db_migrator /** * Get a callable statement from a data step * - * @param mixed $step Data step from migration + * @param array $step Data step from migration * @param mixed $last_result Result to pass to the callable (only for 'custom' method) * @param bool $reverse False to install, True to attempt uninstallation by reversing the call * @return array Array with parameters for call_user_func_array(), 0 is the callable, 1 is parameters */ - protected function get_callable_from_step($step, $last_result = false, $reverse = false) + protected function get_callable_from_step(array $step, $last_result = false, $reverse = false) { $type = $step[0]; $parameters = $step[1]; |