1 files changed, 4 insertions, 12 deletions
diff --git a/phpBB/phpbb/feed/base.php b/phpBB/phpbb/feed/base.php
index de7dd41df4..0e3a80ebb8 100644
--- a/phpBB/phpbb/feed/base.php
+++ b/phpBB/phpbb/feed/base.php
@@ -10,14 +10,6 @@
 namespace phpbb\feed;
 
 /**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
 * Base class with some generic functions and settings.
 *
 * @package phpBB3
@@ -33,7 +25,7 @@ abstract class base
 	/** @var \phpbb\config\config */
 	protected $config;
 
-	/** @var \phpbb\db\driver\driver */
+	/** @var \phpbb\db\driver\driver_interface */
 	protected $db;
 
 	/** @var \phpbb\cache\driver\driver_interface */
@@ -78,7 +70,7 @@ abstract class base
 	*
 	* @param \phpbb\feed\helper $helper Feed helper
 	* @param \phpbb\config\config		$config		Config object
-	* @param \phpbb\db\driver\driver	$db			Database connection
+	* @param \phpbb\db\driver\driver_interface	$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
@@ -86,7 +78,7 @@ abstract class base
 	* @param string				$phpEx		php file extension
 	* @return	null
 	*/
-	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)
+	function __construct(\phpbb\feed\helper $helper, \phpbb\config\config $config, \phpbb\db\driver\driver_interface $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;
@@ -150,7 +142,7 @@ abstract class base
 	*/
 	function get($key)
 	{
-		return (isset($this->keys[$key])) ? $this->keys[$key] : NULL;
+		return (isset($this->keys[$key])) ? $this->keys[$key] : null;
 	}
 
 	function get_readable_forums()