mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-21 14:59:46 +02:00
Code Issues Releases Wiki Activity

[ticket/9737] Fix a few minor things in migrations

Browse Source 
PHPBB3-9737
This commit is contained in:
Nathaniel Guse 2013-01-22 13:19:49 -06:00
parent ccd08e21f6
commit dfabdbca50
2 changed files with 9 additions and 4 deletions
phpBB/includes/db
migration
exception.php
migrator.php

7
phpBB/includes/db/migration/exception.php

@ -22,7 +22,10 @@ if (!defined('IN_PHPBB'))
*/ */
class phpbb_db_migration_exception extends \Exception 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; protected $parameters;
/** /**
@ -42,6 +45,8 @@ class phpbb_db_migration_exception extends \Exception
/** /**
* Output the error as a string * Output the error as a string
*
* @return string
*/ */
public function __toString() public function __toString()
{ {

6
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 * @param string The class name of the migration
* @return bool Whether any update step was successfully run * @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 * 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 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 * @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 * @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]; $type = $step[0];
$parameters = $step[1]; $parameters = $step[1];