5 files changed, 24 insertions, 18 deletions
diff --git a/phpBB/phpbb/feed/base.php b/phpBB/phpbb/feed/base.php
index 36ecbbcc2e..e31854160a 100644
--- a/phpBB/phpbb/feed/base.php
+++ b/phpBB/phpbb/feed/base.php
@@ -70,15 +70,14 @@ abstract class base
 	/**
 	* Constructor
 	*
-	* @param \phpbb\feed\helper $helper Feed helper
-	* @param \phpbb\config\config		$config		Config object
+	* @param \phpbb\feed\helper					$helper		Feed helper
+	* @param \phpbb\config\config				$config		Config object
 	* @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
-	* @param \phpbb\content_visibility	$content_visibility		Auth object
-	* @param string				$phpEx		php file extension
-	* @return	null
+	* @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
 	*/
 	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)
 	{
@@ -133,6 +132,9 @@ abstract class base
 
 	/**
 	* Set key
+	*
+	* @param string $key Key
+	* @param mixed $value Value
 	*/
 	function set($key, $value)
 	{
@@ -141,6 +143,9 @@ abstract class base
 
 	/**
 	* Get key
+	*
+	* @param string $key Key
+	* @return mixed
 	*/
 	function get($key)
 	{
diff --git a/phpBB/phpbb/feed/factory.php b/phpBB/phpbb/feed/factory.php
index 84b4d5d560..f364f06d03 100644
--- a/phpBB/phpbb/feed/factory.php
+++ b/phpBB/phpbb/feed/factory.php
@@ -13,6 +13,8 @@
 
 namespace phpbb\feed;
 
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
 /**
 * Factory class to return correct object
 */
@@ -20,7 +22,7 @@ class factory
 {
 	/**
 	* Service container object
-	* @var object
+	* @var ContainerInterface
 	*/
 	protected $container;
 
@@ -33,12 +35,11 @@ class factory
 	/**
 	* Constructor
 	*
-	* @param objec				$container	Container object
-	* @param \phpbb\config\config		$config		Config object
+	* @param ContainerInterface					$container	Container object
+	* @param \phpbb\config\config				$config		Config object
 	* @param \phpbb\db\driver\driver_interface	$db			Database connection
-	* @return	null
 	*/
-	public function __construct($container, \phpbb\config\config $config, \phpbb\db\driver\driver_interface $db)
+	public function __construct(ContainerInterface $container, \phpbb\config\config $config, \phpbb\db\driver\driver_interface $db)
 	{
 		$this->container = $container;
 		$this->config = $config;
diff --git a/phpBB/phpbb/feed/helper.php b/phpBB/phpbb/feed/helper.php
index ed78f4893e..9741b752af 100644
--- a/phpBB/phpbb/feed/helper.php
+++ b/phpBB/phpbb/feed/helper.php
@@ -36,7 +36,7 @@ class helper
 	* @param	\phpbb\config\config	$config		Config object
 	* @param	\phpbb\user		$user		User object
 	* @param	string	$phpbb_root_path	Root path
-	* @return	null
+	* @param	string	$phpEx				PHP extension
 	*/
 	public function __construct(\phpbb\config\config $config, \phpbb\user $user, $phpbb_root_path, $phpEx)
 	{
diff --git a/phpBB/phpbb/feed/post_base.php b/phpBB/phpbb/feed/post_base.php
index fe11fd2a79..011775b6af 100644
--- a/phpBB/phpbb/feed/post_base.php
+++ b/phpBB/phpbb/feed/post_base.php
@@ -48,8 +48,8 @@ abstract class post_base extends \phpbb\feed\attachments_base
 		{
 			$item_row['statistics'] = $this->user->lang['POSTED'] . ' ' . $this->user->lang['POST_BY_AUTHOR'] . ' ' . $this->user_viewprofile($row)
 				. ' ' . $this->separator_stats . ' ' . $this->user->format_date($row[$this->get('published')])
-				. (($this->is_moderator_approve_forum($row['forum_id']) && (int)$row['post_visibility'] === ITEM_UNAPPROVED) ? ' ' . $this->separator_stats . ' ' . $this->user->lang['POST_UNAPPROVED'] : '')
-				. (($this->is_moderator_approve_forum($row['forum_id']) && (int)$row['post_visibility'] === ITEM_DELETED) ? ' ' . $this->separator_stats . ' ' . $this->user->lang['POST_DELETED'] : '');
+				. (($this->is_moderator_approve_forum($row['forum_id']) && (int) $row['post_visibility'] === ITEM_UNAPPROVED) ? ' ' . $this->separator_stats . ' ' . $this->user->lang['POST_UNAPPROVED'] : '')
+				. (($this->is_moderator_approve_forum($row['forum_id']) && (int) $row['post_visibility'] === ITEM_DELETED) ? ' ' . $this->separator_stats . ' ' . $this->user->lang['POST_DELETED'] : '');
 		}
 	}
 }
diff --git a/phpBB/phpbb/feed/topic_base.php b/phpBB/phpbb/feed/topic_base.php
index 4fbb498272..f9ff368cba 100644
--- a/phpBB/phpbb/feed/topic_base.php
+++ b/phpBB/phpbb/feed/topic_base.php
@@ -52,11 +52,11 @@ abstract class topic_base extends \phpbb\feed\attachments_base
 
 			if ($this->is_moderator_approve_forum($row['forum_id']))
 			{
-				if ( (int)$row['topic_visibility'] === ITEM_DELETED)
+				if ((int) $row['topic_visibility'] === ITEM_DELETED)
 				{
 					$item_row['statistics'] .= ' ' . $this->separator_stats . ' ' . $this->user->lang['TOPIC_DELETED'];
 				}
-				else if ((int)$row['topic_visibility'] === ITEM_UNAPPROVED)
+				else if ((int) $row['topic_visibility'] === ITEM_UNAPPROVED)
 				{
 					$item_row['statistics'] .= ' ' . $this->separator_stats . ' ' . $this->user->lang['TOPIC_UNAPPROVED'];
 				}