diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2013-07-23 11:13:25 -0500 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2013-07-23 11:13:25 -0500 |
| commit | 485c6ab3553f518b157610ee1144bbcbef63f797 (patch) | |
| tree | 0c50392c4716511e118eeabd3f48cceb3ac7e906 /phpBB/includes/db/migration/exception.php | |
| parent | 41d8bfa974900c9befbde06cc08060eb8a552ec8 (diff) | |
| parent | be59885d5fd4b44f1c43994dec928eda816f9ab8 (diff) | |
| download | forums-485c6ab3553f518b157610ee1144bbcbef63f797.tar forums-485c6ab3553f518b157610ee1144bbcbef63f797.tar.gz forums-485c6ab3553f518b157610ee1144bbcbef63f797.tar.bz2 forums-485c6ab3553f518b157610ee1144bbcbef63f797.tar.xz forums-485c6ab3553f518b157610ee1144bbcbef63f797.zip | |
Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11667
# By Joas Schilling (224) and others
# Via Andreas Fischer (23) and others
* 'develop' of github.com:phpbb/phpbb3: (385 commits)
[ticket/11734] Readd accidently removed language strings of forum permissions
[ticket/11620] Whitespace and combine function into test_case
[ticket/11620] Move check_ban_test functions to setUp/tearDown for clarity
[ticket/11620] Changed incorrect global variable
[ticket/11620] Minor indentation changes and comment clarity
[ticket/11733] Fix "Illegal offset type" Warning caused by overall feed
[ticket/11733] Add browse test for feed.php
[ticket/11731] Remove static calls to captcha garbage collector
[ticket/11728] Replace topic_approved with topic_visibility
[ticket/11620] Expected and actual test conditions wrongly swapped
[ticket/11620] Space between . in directory import concatenation
[ticket/11620] Changes to match merge
[ticket/11620] Changes for code guidelines consistency
[ticket/11620] Fix a static calls to non-static for session captcha
[ticket/11620] Cleanup creation_test that was renamed on a cherry-pick
[ticket/11620] Update auth_provider for new interface
[ticket/11620] Added garbage_collection_test
[ticket/11620] Fixed check_ban_test errors with cache and ban warning message
[ticket/11620] Fixed a typo on check_ban_test
[ticket/11620] Refactored check_isvalid_test to use session_test_case
...
Diffstat (limited to 'phpBB/includes/db/migration/exception.php')
| -rw-r--r-- | phpBB/includes/db/migration/exception.php | 79 |
1 files changed, 0 insertions, 79 deletions
diff --git a/phpBB/includes/db/migration/exception.php b/phpBB/includes/db/migration/exception.php deleted file mode 100644 index e84330dd71..0000000000 --- a/phpBB/includes/db/migration/exception.php +++ /dev/null @@ -1,79 +0,0 @@ -<?php -/** -* -* @package db -* @copyright (c) 2012 phpBB Group -* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2 -* -*/ - -/** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ - exit; -} - -/** -* The migrator is responsible for applying new migrations in the correct order. -* -* @package db -*/ -class phpbb_db_migration_exception extends \Exception -{ - /** - * Extra parameters sent to exception to aid in debugging - * @var array - */ - protected $parameters; - - /** - * Throw an exception. - * - * First argument is the error message. - * Additional arguments will be output with the error message. - */ - public function __construct() - { - $parameters = func_get_args(); - $message = array_shift($parameters); - parent::__construct($message); - - $this->parameters = $parameters; - } - - /** - * Output the error as a string - * - * @return string - */ - public function __toString() - { - return $this->message . ': ' . var_export($this->parameters, true); - } - - /** - * Get the parameters - * - * @return array - */ - public function getParameters() - { - return $this->parameters; - } - - /** - * Get localised message (with $user->lang()) - * - * @param phpbb_user $user - * @return string - */ - public function getLocalisedMessage(phpbb_user $user) - { - $parameters = $this->getParameters(); - array_unshift($parameters, $this->getMessage()); - - return call_user_func_array(array($user, 'lang'), $parameters); - } -} |