1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 05:50:42 +02:00

[ticket/11700] Move all recent code to namespaces

PHPBB3-11700
This commit is contained in:
Nils Adermann
2013-09-10 14:01:09 +02:00
parent 196e1813cd
commit b95fdacdd3
420 changed files with 2316 additions and 1840 deletions

View File

@@ -7,6 +7,8 @@
*
*/
namespace phpbb\feed;
/**
* @ignore
*/
@@ -20,27 +22,27 @@ if (!defined('IN_PHPBB'))
*
* @package phpBB3
*/
abstract class phpbb_feed_base
abstract class base
{
/**
* Feed helper object
* @var phpbb_feed_helper
* @var \phpbb\feed\helper
*/
protected $helper;
/** @var phpbb_config */
/** @var \phpbb\config\config */
protected $config;
/** @var phpbb_db_driver */
/** @var \phpbb\db\driver\driver */
protected $db;
/** @var phpbb_cache_driver_driver_interface */
/** @var \phpbb\cache\driver\driver_interface */
protected $cache;
/** @var phpbb_user */
/** @var \phpbb\user */
protected $user;
/** @var phpbb_auth */
/** @var \phpbb\auth\auth */
protected $auth;
/** @var string */
@@ -74,17 +76,17 @@ abstract class phpbb_feed_base
/**
* Constructor
*
* @param phpbb_feed_helper $helper Feed helper
* @param phpbb_config $config Config object
* @param phpbb_db_driver $db Database connection
* @param phpbb_cache_driver_driver_interface $cache Cache object
* @param phpbb_user $user User object
* @param phpbb_auth $auth Auth object
* @param phpbb_content_visibility $content_visibility Auth object
* @param \phpbb\feed\helper $helper Feed helper
* @param \phpbb\config\config $config Config object
* @param \phpbb\db\driver\driver $db Database connection
* @param \phpbb\cache\driver\driver_interface $cache Cache object
* @param \phpbb\user $user User object
* @param \phpbb\auth\auth $auth Auth object
* @param \phpbb\content_visibility $content_visibility Auth object
* @param string $phpEx php file extension
* @return null
*/
function __construct(phpbb_feed_helper $helper, phpbb_config $config, phpbb_db_driver $db, phpbb_cache_driver_driver_interface $cache, phpbb_user $user, phpbb_auth $auth, phpbb_content_visibility $content_visibility, $phpEx)
function __construct(\phpbb\feed\helper $helper, \phpbb\config\config $config, \phpbb\db\driver\driver $db, \phpbb\cache\driver\driver_interface $cache, \phpbb\user $user, \phpbb\auth\auth $auth, \phpbb\content_visibility $content_visibility, $phpEx)
{
$this->config = $config;
$this->helper = $helper;

View File

@@ -7,6 +7,8 @@
*
*/
namespace phpbb\feed;
/**
* @ignore
*/
@@ -19,7 +21,7 @@ if (!defined('IN_PHPBB'))
* Factory class to return correct object
* @package phpBB3
*/
class phpbb_feed_factory
class factory
{
/**
* Service container object
@@ -27,21 +29,21 @@ class phpbb_feed_factory
*/
protected $container;
/** @var phpbb_config */
/** @var \phpbb\config\config */
protected $config;
/** @var phpbb_db_driver */
/** @var \phpbb\db\driver\driver */
protected $db;
/**
* Constructor
*
* @param objec $container Container object
* @param phpbb_config $config Config object
* @param phpbb_db_driver $db Database connection
* @param \phpbb\config\config $config Config object
* @param \phpbb\db\driver\driver $db Database connection
* @return null
*/
public function __construct($container, phpbb_config $config, phpbb_db_driver $db)
public function __construct($container, \phpbb\config\config $config, \phpbb\db\driver\driver $db)
{
$this->container = $container;
$this->config = $config;

View File

@@ -7,6 +7,8 @@
*
*/
namespace phpbb\feed;
/**
* @ignore
*/
@@ -23,7 +25,7 @@ if (!defined('IN_PHPBB'))
*
* @package phpBB3
*/
class phpbb_feed_forum extends phpbb_feed_post_base
class forum extends \phpbb\feed\post_base
{
var $forum_id = 0;
var $forum_data = array();
@@ -32,7 +34,7 @@ class phpbb_feed_forum extends phpbb_feed_post_base
* Set the Forum ID
*
* @param int $forum_id Forum ID
* @return phpbb_feed_forum
* @return \phpbb\feed\forum
*/
public function set_forum_id($topic_id)
{

View File

@@ -7,6 +7,8 @@
*
*/
namespace phpbb\feed;
/**
* @ignore
*/
@@ -23,7 +25,7 @@ if (!defined('IN_PHPBB'))
*
* @package phpBB3
*/
class phpbb_feed_forums extends phpbb_feed_base
class forums extends \phpbb\feed\base
{
var $num_items = 0;

View File

@@ -7,6 +7,8 @@
*
*/
namespace phpbb\feed;
/**
* @ignore
*/
@@ -19,12 +21,12 @@ if (!defined('IN_PHPBB'))
* Class with some helpful functions used in feeds
* @package phpBB3
*/
class phpbb_feed_helper
class helper
{
/** @var phpbb_config */
/** @var \phpbb\config\config */
protected $config;
/** @var phpbb_user */
/** @var \phpbb\user */
protected $user;
/** @var string */
@@ -33,12 +35,12 @@ class phpbb_feed_helper
/**
* Constructor
*
* @param phpbb_config $config Config object
* @param phpbb_user $user User object
* @param \phpbb\config\config $config Config object
* @param \phpbb\user $user User object
* @param string $phpbb_root_path Root path
* @return null
*/
public function __construct(phpbb_config $config, phpbb_user $user, $phpbb_root_path)
public function __construct(\phpbb\config\config $config, \phpbb\user $user, $phpbb_root_path)
{
$this->config = $config;
$this->user = $user;

View File

@@ -7,6 +7,8 @@
*
*/
namespace phpbb\feed;
/**
* @ignore
*/
@@ -23,7 +25,7 @@ if (!defined('IN_PHPBB'))
*
* @package phpBB3
*/
class phpbb_feed_news extends phpbb_feed_topic_base
class news extends \phpbb\feed\topic_base
{
function get_news_forums()
{

View File

@@ -7,6 +7,8 @@
*
*/
namespace phpbb\feed;
/**
* @ignore
*/
@@ -23,7 +25,7 @@ if (!defined('IN_PHPBB'))
*
* @package phpBB3
*/
class phpbb_feed_overall extends phpbb_feed_post_base
class overall extends \phpbb\feed\post_base
{
function get_sql()
{

View File

@@ -7,6 +7,8 @@
*
*/
namespace phpbb\feed;
/**
* @ignore
*/
@@ -20,7 +22,7 @@ if (!defined('IN_PHPBB'))
*
* @package phpBB3
*/
abstract class phpbb_feed_post_base extends phpbb_feed_base
abstract class post_base extends \phpbb\feed\base
{
var $num_items = 'feed_limit_post';

View File

@@ -7,6 +7,8 @@
*
*/
namespace phpbb\feed;
/**
* @ignore
*/
@@ -22,7 +24,7 @@ if (!defined('IN_PHPBB'))
*
* @package phpBB3
*/
class phpbb_feed_topic extends phpbb_feed_post_base
class topic extends \phpbb\feed\post_base
{
var $topic_id = 0;
var $forum_id = 0;
@@ -32,7 +34,7 @@ class phpbb_feed_topic extends phpbb_feed_post_base
* Set the Topic ID
*
* @param int $topic_id Topic ID
* @return phpbb_feed_topic
* @return \phpbb\feed\topic
*/
public function set_topic_id($topic_id)
{

View File

@@ -7,6 +7,8 @@
*
*/
namespace phpbb\feed;
/**
* @ignore
*/
@@ -20,7 +22,7 @@ if (!defined('IN_PHPBB'))
*
* @package phpBB3
*/
abstract class phpbb_feed_topic_base extends phpbb_feed_base
abstract class topic_base extends \phpbb\feed\base
{
var $num_items = 'feed_limit_topic';

View File

@@ -7,6 +7,8 @@
*
*/
namespace phpbb\feed;
/**
* @ignore
*/
@@ -23,7 +25,7 @@ if (!defined('IN_PHPBB'))
*
* @package phpBB3
*/
class phpbb_feed_topics extends phpbb_feed_topic_base
class topics extends \phpbb\feed\topic_base
{
function get_sql()
{

View File

@@ -7,6 +7,8 @@
*
*/
namespace phpbb\feed;
/**
* @ignore
*/
@@ -24,7 +26,7 @@ if (!defined('IN_PHPBB'))
*
* @package phpBB3
*/
class phpbb_feed_topics_active extends phpbb_feed_topic_base
class topics_active extends \phpbb\feed\topic_base
{
var $sort_days = 7;