From b81613e5e57fd208e832637b6886abf9ec806c4b Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Sun, 14 Jul 2013 12:25:28 -0400
Subject: [ticket/11700] With namespaces interface will no longer be a valid
 classname

PHPBB3-11700
---
 phpBB/phpbb/log/interface.php     | 106 --------------------------------------
 phpBB/phpbb/log/log_interface.php | 106 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 106 insertions(+), 106 deletions(-)
 delete mode 100644 phpBB/phpbb/log/interface.php
 create mode 100644 phpBB/phpbb/log/log_interface.php

(limited to 'phpBB/phpbb/log')

diff --git a/phpBB/phpbb/log/interface.php b/phpBB/phpbb/log/interface.php
deleted file mode 100644
index 3b459c9bdf..0000000000
--- a/phpBB/phpbb/log/interface.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-/**
-*
-* @package phpbb_log
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* The interface for the log-system.
-*
-* @package phpbb_log
-*/
-interface phpbb_log_interface
-{
-	/**
-	* This function returns the state of the log system.
-	*
-	* @param	string	$type	The log type we want to check. Empty to get
-	*							global log status.
-	*
-	* @return	bool	True if log for the type is enabled
-	*/
-	public function is_enabled($type = '');
-
-	/**
-	* Disable log
-	*
-	* This function allows disabling the log system or parts of it, for this
-	* page call. When add_log is called and the type is disabled,
-	* the log will not be added to the database.
-	*
-	* @param	mixed	$type	The log type we want to disable. Empty to
-	*						disable all logs. Can also be an array of types.
-	*
-	* @return	null
-	*/
-	public function disable($type = '');
-
-	/**
-	* Enable log
-	*
-	* This function allows re-enabling the log system.
-	*
-	* @param	mixed	$type	The log type we want to enable. Empty to
-	*						enable all logs. Can also be an array of types.
-	*
-	* @return	null
-	*/
-	public function enable($type = '');
-
-	/**
-	* Adds a log entry to the database
-	*
-	* @param	string	$mode				The mode defines which log_type is used and from which log the entry is retrieved
-	* @param	int		$user_id			User ID of the user
-	* @param	string	$log_ip				IP address of the user
-	* @param	string	$log_operation		Name of the operation
-	* @param	int		$log_time			Timestamp when the log entry was added, if empty time() will be used
-	* @param	array	$additional_data	More arguments can be added, depending on the log_type
-	*
-	* @return	int|bool		Returns the log_id, if the entry was added to the database, false otherwise.
-	*/
-	public function add($mode, $user_id, $log_ip, $log_operation, $log_time = false, $additional_data = array());
-
-	/**
-	* Grab the logs from the database
-	*
-	* @param	string	$mode			The mode defines which log_type is used and ifrom which log the entry is retrieved
-	* @param	bool	$count_logs		Shall we count all matching log entries?
-	* @param	int		$limit			Limit the number of entries that are returned
-	* @param	int		$offset			Offset when fetching the log entries, f.e. when paginating
-	* @param	mixed	$forum_id		Restrict the log entries to the given forum_id (can also be an array of forum_ids)
-	* @param	int		$topic_id		Restrict the log entries to the given topic_id
-	* @param	int		$user_id		Restrict the log entries to the given user_id
-	* @param	int		$log_time		Only get log entries newer than the given timestamp
-	* @param	string	$sort_by		SQL order option, e.g. 'l.log_time DESC'
-	* @param	string	$keywords		Will only return log entries that have the keywords in log_operation or log_data
-	*
-	* @return	array			The result array with the logs
-	*/
-	public function get_logs($mode, $count_logs = true, $limit = 0, $offset = 0, $forum_id = 0, $topic_id = 0, $user_id = 0, $log_time = 0, $sort_by = 'l.log_time DESC', $keywords = '');
-
-	/**
-	* Get total log count
-	*
-	* @return	int			Returns the number of matching logs from the last call to get_logs()
-	*/
-	public function get_log_count();
-
-	/**
-	* Get offset of the last valid page
-	*
-	* @return	int			Returns the offset of the last valid page from the last call to get_logs()
-	*/
-	public function get_valid_offset();
-}
diff --git a/phpBB/phpbb/log/log_interface.php b/phpBB/phpbb/log/log_interface.php
new file mode 100644
index 0000000000..2d41c9994f
--- /dev/null
+++ b/phpBB/phpbb/log/log_interface.php
@@ -0,0 +1,106 @@
+<?php
+/**
+*
+* @package phpbb_log
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* The interface for the log-system.
+*
+* @package phpbb_log
+*/
+interface phpbb_log_log_interface
+{
+	/**
+	* This function returns the state of the log system.
+	*
+	* @param	string	$type	The log type we want to check. Empty to get
+	*							global log status.
+	*
+	* @return	bool	True if log for the type is enabled
+	*/
+	public function is_enabled($type = '');
+
+	/**
+	* Disable log
+	*
+	* This function allows disabling the log system or parts of it, for this
+	* page call. When add_log is called and the type is disabled,
+	* the log will not be added to the database.
+	*
+	* @param	mixed	$type	The log type we want to disable. Empty to
+	*						disable all logs. Can also be an array of types.
+	*
+	* @return	null
+	*/
+	public function disable($type = '');
+
+	/**
+	* Enable log
+	*
+	* This function allows re-enabling the log system.
+	*
+	* @param	mixed	$type	The log type we want to enable. Empty to
+	*						enable all logs. Can also be an array of types.
+	*
+	* @return	null
+	*/
+	public function enable($type = '');
+
+	/**
+	* Adds a log entry to the database
+	*
+	* @param	string	$mode				The mode defines which log_type is used and from which log the entry is retrieved
+	* @param	int		$user_id			User ID of the user
+	* @param	string	$log_ip				IP address of the user
+	* @param	string	$log_operation		Name of the operation
+	* @param	int		$log_time			Timestamp when the log entry was added, if empty time() will be used
+	* @param	array	$additional_data	More arguments can be added, depending on the log_type
+	*
+	* @return	int|bool		Returns the log_id, if the entry was added to the database, false otherwise.
+	*/
+	public function add($mode, $user_id, $log_ip, $log_operation, $log_time = false, $additional_data = array());
+
+	/**
+	* Grab the logs from the database
+	*
+	* @param	string	$mode			The mode defines which log_type is used and ifrom which log the entry is retrieved
+	* @param	bool	$count_logs		Shall we count all matching log entries?
+	* @param	int		$limit			Limit the number of entries that are returned
+	* @param	int		$offset			Offset when fetching the log entries, f.e. when paginating
+	* @param	mixed	$forum_id		Restrict the log entries to the given forum_id (can also be an array of forum_ids)
+	* @param	int		$topic_id		Restrict the log entries to the given topic_id
+	* @param	int		$user_id		Restrict the log entries to the given user_id
+	* @param	int		$log_time		Only get log entries newer than the given timestamp
+	* @param	string	$sort_by		SQL order option, e.g. 'l.log_time DESC'
+	* @param	string	$keywords		Will only return log entries that have the keywords in log_operation or log_data
+	*
+	* @return	array			The result array with the logs
+	*/
+	public function get_logs($mode, $count_logs = true, $limit = 0, $offset = 0, $forum_id = 0, $topic_id = 0, $user_id = 0, $log_time = 0, $sort_by = 'l.log_time DESC', $keywords = '');
+
+	/**
+	* Get total log count
+	*
+	* @return	int			Returns the number of matching logs from the last call to get_logs()
+	*/
+	public function get_log_count();
+
+	/**
+	* Get offset of the last valid page
+	*
+	* @return	int			Returns the offset of the last valid page from the last call to get_logs()
+	*/
+	public function get_valid_offset();
+}
-- 
cgit v1.2.1


From da2752e4004b296ae5acdd08b7c0a758d8f61e9d Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Sun, 14 Jul 2013 13:30:52 -0400
Subject: [ticket/11700] Modify all code to use the new interface names

PHPBB3-11700
---
 phpBB/phpbb/log/log.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/phpbb/log')

diff --git a/phpBB/phpbb/log/log.php b/phpBB/phpbb/log/log.php
index 7a26858348..0a755b5c78 100644
--- a/phpBB/phpbb/log/log.php
+++ b/phpBB/phpbb/log/log.php
@@ -20,7 +20,7 @@ if (!defined('IN_PHPBB'))
 *
 * @package phpbb_log
 */
-class phpbb_log implements phpbb_log_interface
+class phpbb_log implements phpbb_log_log_interface
 {
 	/**
 	* If set, administrative user profile links will be returned and messages
-- 
cgit v1.2.1


From b95fdacdd378877d277e261465da73deb06e50da Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Tue, 10 Sep 2013 14:01:09 +0200
Subject: [ticket/11700] Move all recent code to namespaces

PHPBB3-11700
---
 phpBB/phpbb/log/log.php           | 22 ++++++++++++----------
 phpBB/phpbb/log/log_interface.php |  8 +++++---
 2 files changed, 17 insertions(+), 13 deletions(-)

(limited to 'phpBB/phpbb/log')

diff --git a/phpBB/phpbb/log/log.php b/phpBB/phpbb/log/log.php
index 0a755b5c78..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_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_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_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_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/log_interface.php b/phpBB/phpbb/log/log_interface.php
index 2d41c9994f..427d30015d 100644
--- a/phpBB/phpbb/log/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_log_interface
+interface log_interface
 {
 	/**
 	* This function returns the state of the log system.
-- 
cgit v1.2.1


From 2472271bc0cd7c15c77783c86ccaac643ab1756a Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Mon, 16 Sep 2013 02:41:03 +0200
Subject: [ticket/11700] Fix tests after merging new develop code

PHPBB3-11700
---
 phpBB/phpbb/log/null.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'phpBB/phpbb/log')

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}
-- 
cgit v1.2.1