diff options
| author | Nils Adermann <naderman@naderman.de> | 2013-09-25 07:50:22 -0700 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2013-09-25 07:50:22 -0700 |
| commit | 8da31332381b572f8d03c63d4c32a4f32ed8775f (patch) | |
| tree | 1ef729ea3700bae463cd57b672e8de12311fe00d /phpBB/phpbb/log | |
| parent | 717e2337b9276d9f9680110dff552ea536d0723c (diff) | |
| parent | 645bd127dd53300b7877b779226ac53a4891620c (diff) | |
| download | forums-8da31332381b572f8d03c63d4c32a4f32ed8775f.tar forums-8da31332381b572f8d03c63d4c32a4f32ed8775f.tar.gz forums-8da31332381b572f8d03c63d4c32a4f32ed8775f.tar.bz2 forums-8da31332381b572f8d03c63d4c32a4f32ed8775f.tar.xz forums-8da31332381b572f8d03c63d4c32a4f32ed8775f.zip | |
Merge pull request #1565 from naderman/ticket/11700
[WIP][ticket/11700] Namespaces
Diffstat (limited to 'phpBB/phpbb/log')
| -rw-r--r-- | phpBB/phpbb/log/log.php | 22 | ||||
| -rw-r--r-- | phpBB/phpbb/log/log_interface.php (renamed from phpBB/phpbb/log/interface.php) | 8 | ||||
| -rw-r--r-- | phpBB/phpbb/log/null.php | 4 |
3 files changed, 20 insertions, 14 deletions
diff --git a/phpBB/phpbb/log/log.php b/phpBB/phpbb/log/log.php index 7a26858348..7f4e52ed39 100644 --- a/phpBB/phpbb/log/log.php +++ b/phpBB/phpbb/log/log.php @@ -1,12 +1,14 @@ <?php /** * -* @package phpbb_log +* @package \phpbb\log\log * @copyright (c) 2012 phpBB Group * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 * */ +namespace phpbb\log; + /** * @ignore */ @@ -18,9 +20,9 @@ if (!defined('IN_PHPBB')) /** * This class is used to add entries into the log table. * -* @package phpbb_log +* @package \phpbb\log\log */ -class phpbb_log implements phpbb_log_interface +class log implements \phpbb\log\log_interface { /** * If set, administrative user profile links will be returned and messages @@ -56,19 +58,19 @@ class phpbb_log implements phpbb_log_interface /** * Database object - * @var phpbb_db_driver + * @var \phpbb\db\driver\driver */ protected $db; /** * User object - * @var phpbb_user + * @var \phpbb\user */ protected $user; /** * Auth object - * @var phpbb_auth + * @var \phpbb\auth\auth */ protected $auth; @@ -99,9 +101,9 @@ class phpbb_log implements phpbb_log_interface /** * Constructor * - * @param phpbb_db_driver $db Database object - * @param phpbb_user $user User object - * @param phpbb_auth $auth Auth object + * @param \phpbb\db\driver\driver $db Database object + * @param \phpbb\user $user User object + * @param \phpbb\auth\auth $auth Auth object * @param phpbb_dispatcher $phpbb_dispatcher Event dispatcher * @param string $phpbb_root_path Root path * @param string $relative_admin_path Relative admin root path @@ -123,7 +125,7 @@ class phpbb_log implements phpbb_log_interface /* * IN_ADMIN is set after the session is created, * so we need to take ADMIN_START into account as well, otherwise - * it will not work for the phpbb_log object we create in common.php + * it will not work for the \phpbb\log\log object we create in common.php */ $this->set_is_admin((defined('ADMIN_START') && ADMIN_START) || (defined('IN_ADMIN') && IN_ADMIN)); $this->enable(); diff --git a/phpBB/phpbb/log/interface.php b/phpBB/phpbb/log/log_interface.php index 3b459c9bdf..427d30015d 100644 --- a/phpBB/phpbb/log/interface.php +++ b/phpBB/phpbb/log/log_interface.php @@ -1,12 +1,14 @@ <?php /** * -* @package phpbb_log +* @package \phpbb\log\log * @copyright (c) 2012 phpBB Group * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 * */ +namespace phpbb\log; + /** * @ignore */ @@ -18,9 +20,9 @@ if (!defined('IN_PHPBB')) /** * The interface for the log-system. * -* @package phpbb_log +* @package \phpbb\log\log */ -interface phpbb_log_interface +interface log_interface { /** * This function returns the state of the log system. diff --git a/phpBB/phpbb/log/null.php b/phpBB/phpbb/log/null.php index 14b5f65eec..2ef69926ee 100644 --- a/phpBB/phpbb/log/null.php +++ b/phpBB/phpbb/log/null.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\log; + /** * @ignore */ @@ -20,7 +22,7 @@ if (!defined('IN_PHPBB')) * * @package phpbb_log */ -class phpbb_log_null implements phpbb_log_interface +class null implements log_interface { /** * {@inheritdoc} |