ErnadoO / ext-phpbb-directory

migrations/v20x/add_cat_route_field.php

Spacing +5 added lines, -5 removed lines

@@ -28,7 +28,7 @@ 
 	{
 		return array(
 			'add_columns'	=> array(
-				$this->table_prefix . 'directory_cats' => array(
+				$this->table_prefix.'directory_cats' => array(
 					'cat_route'	=> array('VCHAR', '', 'after' => 'cat_name'),
 				)
 			),
@@ -52,7 +52,7 @@ 
 	{
 		return array(
 			'drop_columns'	=> array(
-				$this->table_prefix . 'directory_cats' => array(
+				$this->table_prefix.'directory_cats' => array(
 					'cat_route',
 				),
 			),
@@ -63,13 +63,13 @@ 
 	{
 		$slug = new \E1379\SpeakingUrl\SpeakingUrl();
 
-		$sql = 'SELECT cat_id, cat_name FROM ' . $this->table_prefix . 'directory_cats';
+		$sql = 'SELECT cat_id, cat_name FROM '.$this->table_prefix.'directory_cats';
 		$result = $this->db->sql_query($sql);
 
 		while ($row = $this->db->sql_fetchrow($result))
 		{
-			$sql = 'UPDATE ' . $this->table_prefix . 'directory_cats' . '
-				SET cat_route = "' . (string) $slug->getSlug($row['cat_name'], array('lang' => $this->config['default_lang'], 'symbols' => true)). '"
+			$sql = 'UPDATE '.$this->table_prefix.'directory_cats'.'
+				SET cat_route = "' . (string) $slug->getSlug($row['cat_name'], array('lang' => $this->config['default_lang'], 'symbols' => true)).'"
 				WHERE cat_id = ' . (int) $row['cat_id'];
 			$this->db->sql_query($sql);
 		}

Indentation +6 added lines, -6 removed lines

@@ -20,8 +20,8 @@ 
 	}
 
 	/**
-	* @inheritDoc
-	*/
+	 * @inheritDoc
+	 */
 	public function update_schema()
 	{
 		return array(
@@ -34,8 +34,8 @@ 
 	}
 
 	/**
-	* @inheritDoc
-	*/
+	 * @inheritDoc
+	 */
 	public function update_data()
 	{
 		return array(
@@ -44,8 +44,8 @@ 
 	}
 
 	/**
-	* @inheritDoc
-	*/
+	 * @inheritDoc
+	 */
 	public function revert_schema()
 	{
 		return array(

migrations/v20x/remove_pagerank_conf.php

Spacing +2 added lines, -2 removed lines

@@ -37,7 +37,7 @@ 
 	{
 		return array(
 			'drop_columns' => array(
-				$this->table_prefix . 'directory_links'	=> array(
+				$this->table_prefix.'directory_links'	=> array(
 					'link_pagerank',
 				),
 			),
@@ -48,7 +48,7 @@ 
 	{
 		return array(
 			'add_columns' => array(
-				$this->table_prefix . 'directory_links'	=> array(
+				$this->table_prefix.'directory_links'	=> array(
 					'link_pagerank' => array('CHAR:2', ''),
 				),
 			),

core/link.php

Indentation +144 added lines, -144 removed lines

@@ -57,23 +57,23 @@ 
 	protected $php_ext;
 
 	/**
-	* Constructor
-	*
-	* @param \phpbb\db\driver\driver_interface 					$db					Database object
-	* @param \phpbb\config\config 								$config				Config object
-	* @param \phpbb\language\language							$language			Language object
-	* @param \phpbb\template\template 							$template			Template object
-	* @param \phpbb\user 										$user				User object
-	* @param \phpbb\controller\helper 							$helper				Controller helper object
-	* @param \phpbb\request\request 							$request			Request object
-	* @param \phpbb\auth\auth 									$auth				Auth object
-	* @param \phpbb\notification\manager						$notification		Notification object
-	* @param \phpbb\filesystem\filesystem_interface				$filesystem			phpBB filesystem helper
-	* @param \FastImageSize\FastImageSize						$imagesize 			FastImageSize class
-	* @param \phpbb\files\factory								$files_factory		File classes factory
-	* @param string         									$root_path			phpBB root path
-	* @param string         									$php_ext			phpEx
-	*/
+	 * Constructor
+	 *
+	 * @param \phpbb\db\driver\driver_interface 					$db					Database object
+	 * @param \phpbb\config\config 								$config				Config object
+	 * @param \phpbb\language\language							$language			Language object
+	 * @param \phpbb\template\template 							$template			Template object
+	 * @param \phpbb\user 										$user				User object
+	 * @param \phpbb\controller\helper 							$helper				Controller helper object
+	 * @param \phpbb\request\request 							$request			Request object
+	 * @param \phpbb\auth\auth 									$auth				Auth object
+	 * @param \phpbb\notification\manager						$notification		Notification object
+	 * @param \phpbb\filesystem\filesystem_interface				$filesystem			phpBB filesystem helper
+	 * @param \FastImageSize\FastImageSize						$imagesize 			FastImageSize class
+	 * @param \phpbb\files\factory								$files_factory		File classes factory
+	 * @param string         									$root_path			phpBB root path
+	 * @param string         									$php_ext			phpEx
+	 */
 	public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\config\config $config, \phpbb\language\language $language, \phpbb\template\template $template, \phpbb\user $user, \phpbb\controller\helper $helper, \phpbb\request\request $request, \phpbb\auth\auth $auth, \phpbb\notification\manager $notification, \phpbb\filesystem\filesystem_interface $filesystem, \FastImageSize\FastImageSize $imagesize, \phpbb\files\factory $files_factory, $root_path, $php_ext)
 	{
 		$this->db				= $db;
@@ -93,12 +93,12 @@ 
 	}
 
 	/**
-	* Add a link into db
-	*
-	* @param	array	$data			Contains all data to insert in db
-	* @param	bool	$need_approval	Links needs to be approved?
-	* @return	null
-	*/
+	 * Add a link into db
+	 *
+	 * @param	array	$data			Contains all data to insert in db
+	 * @param	bool	$need_approval	Links needs to be approved?
+	 * @return	null
+	 */
 	public function add($data, $need_approval)
 	{
 		$notification_data = array();
@@ -143,13 +143,13 @@ 
 	}
 
 	/**
-	* Edit a link of the db
-	*
-	* @param	array	$data			Contains all data to edit in db
-	* @param	int		$link_id		is link's id, for WHERE clause
-	* @param	bool	$need_approval	Links needs to be approved?
-	* @return	null
-	*/
+	 * Edit a link of the db
+	 *
+	 * @param	array	$data			Contains all data to edit in db
+	 * @param	int		$link_id		is link's id, for WHERE clause
+	 * @param	bool	$need_approval	Links needs to be approved?
+	 * @return	null
+	 */
 	public function edit($data, $link_id, $need_approval)
 	{
 		$notification_data = array(
@@ -201,12 +201,12 @@ 
 	}
 
 	/**
-	* Delete a link of the db
-	*
-	* @param	int 	$cat_id		The category ID
-	* @param	mixed 	$link_id	Link's id, for WHERE clause
-	* @return	null
-	*/
+	 * Delete a link of the db
+	 *
+	 * @param	int 	$cat_id		The category ID
+	 * @param	mixed 	$link_id	Link's id, for WHERE clause
+	 * @return	null
+	 */
 	public function del($cat_id, $link_id)
 	{
 		$this->db->sql_transaction('begin');
@@ -279,12 +279,12 @@ 
 	}
 
 	/**
-	* Increments link view counter
-	*
-	* @param	int		$link_id	Link's id, for WHERE clause
-	* @return	null
-	* @throws	\phpbb\exception\http_exception
-	*/
+	 * Increments link view counter
+	 *
+	 * @param	int		$link_id	Link's id, for WHERE clause
+	 * @return	null
+	 * @throws	\phpbb\exception\http_exception
+	 */
 	public function view($link_id)
 	{
 		$sql = 'SELECT link_id, link_url
@@ -308,11 +308,11 @@ 
 	}
 
 	/**
-	* Verify that an URL exist before add into db
-	*
-	* @param	string	$url	The URL to check
-	* @return	bool			True if url is reachable, else false.
-	*/
+	 * Verify that an URL exist before add into db
+	 *
+	 * @param	string	$url	The URL to check
+	 * @return	bool			True if url is reachable, else false.
+	 */
 	public function checkurl($url)
 	{
 		$details = parse_url($url);
@@ -351,11 +351,11 @@ 
 	}
 
 	/**
-	* Delete the final '/', if no path
-	*
-	* @param	string	$url	URL to clean
-	* @return	string	$url	The correct string.
-	*/
+	 * Delete the final '/', if no path
+	 *
+	 * @param	string	$url	URL to clean
+	 * @return	string	$url	The correct string.
+	 */
 	public function clean_url($url)
 	{
 		$details = parse_url($url);
@@ -368,11 +368,11 @@ 
 	}
 
 	/**
-	* Display a flag
-	*
-	* @param	array	$data	Link's data from db
-	* @return	string			Flag path.
-	*/
+	 * Display a flag
+	 *
+	 * @param	array	$data	Link's data from db
+	 * @return	string			Flag path.
+	 */
 	public function display_flag($data)
 	{
 		global $phpbb_extension_manager;
@@ -390,13 +390,13 @@ 
 	}
 
 	/**
-	* Calculate the link's note
-	*
-	* @param	int		$total_note		Sum of all link's notes
-	* @param	int		$nb_vote		Number of votes
-	* @param	bool	$votes_status	Votes are enable in this category?
-	* @return	string	$note			The calculated note.
-	*/
+	 * Calculate the link's note
+	 *
+	 * @param	int		$total_note		Sum of all link's notes
+	 * @param	int		$nb_vote		Number of votes
+	 * @param	bool	$votes_status	Votes are enable in this category?
+	 * @return	string	$note			The calculated note.
+	 */
 	public function display_note($total_note, $nb_vote, $votes_status)
 	{
 		if (!$votes_status)
@@ -411,11 +411,11 @@ 
 	}
 
 	/**
-	* Display the vote form for auth users
-	*
-	* @param	array	$data	Link's data from db
-	* @return	null|string		Html combo list or nothing if votes are not available.
-	*/
+	 * Display the vote form for auth users
+	 *
+	 * @param	array	$data	Link's data from db
+	 * @return	null|string		Html combo list or nothing if votes are not available.
+	 */
 	public function display_vote($data)
 	{
 		if ($this->user->data['is_registered'] && $this->auth->acl_get('u_vote_dir') && empty($data['vote_user_id']))
@@ -432,11 +432,11 @@ 
 	}
 
 	/**
-	* Display the RSS icon
-	*
-	* @param	array	$data	Link's data from db
-	* @return	null|string		RSS feed URL or nothing.
-	*/
+	 * Display the RSS icon
+	 *
+	 * @param	array	$data	Link's data from db
+	 * @return	null|string		RSS feed URL or nothing.
+	 */
 	public function display_rss($data)
 	{
 		if ($this->config['dir_activ_rss'] && !empty($data['link_rss']))
@@ -446,13 +446,13 @@ 
 	}
 
 	/**
-	* Display link's thumb if thumb service enabled.
-	* if thumb don't exists in db or if a new service was choosen in acp
-	* thumb is research
-	*
-	* @param	array		$data	Link's data from db
-	* @return	string|null			Thumb or null.
-	*/
+	 * Display link's thumb if thumb service enabled.
+	 * if thumb don't exists in db or if a new service was choosen in acp
+	 * thumb is research
+	 *
+	 * @param	array		$data	Link's data from db
+	 * @return	string|null			Thumb or null.
+	 */
 	public function display_thumb($data)
 	{
 		if ($this->config['dir_activ_thumb'])
@@ -473,11 +473,11 @@ 
 	}
 
 	/**
-	* Display and resize a banner
-	*
-	* @param	array	$data		link's data from db
-	* @return	string	$s_banner	html code.
-	*/
+	 * Display and resize a banner
+	 *
+	 * @param	array	$data		link's data from db
+	 * @return	string	$s_banner	html code.
+	 */
 	public function display_bann($data)
 	{
 		if (!empty($data['link_banner']))
@@ -515,11 +515,11 @@ 
 	}
 
 	/**
-	* Add a vote in db, for a specifi link
-	*
-	* @param	int		$link_id	Link_id from db
-	* @return	null
-	*/
+	 * Add a vote in db, for a specifi link
+	 *
+	 * @param	int		$link_id	Link_id from db
+	 * @return	null
+	 */
 	public function add_vote($link_id)
 	{
 		$data = array(
@@ -563,11 +563,11 @@ 
 	}
 
 	/**
-	* Search an appropriate thumb for url
-	*
-	* @param	string	$url	Link's url
-	* @return	string			The thumb url
-	*/
+	 * Search an appropriate thumb for url
+	 *
+	 * @param	string	$url	Link's url
+	 * @return	string			The thumb url
+	 */
 	public function thumb_process($url)
 	{
 		if (!$this->config['dir_activ_thumb'])
@@ -588,12 +588,12 @@ 
 	}
 
 	/**
-	* Check if ascreen thumb exists
-	*
-	* @param	string	$protocol	The protocol
-	* @param	string	$host		The hostname
-	* @return	bool				True if ascreen file exixts, else false
-	*/
+	 * Check if ascreen thumb exists
+	 *
+	 * @param	string	$protocol	The protocol
+	 * @param	string	$host		The hostname
+	 * @return	bool				True if ascreen file exixts, else false
+	 */
 	private function _ascreen_exist($protocol, $host)
 	{
 		if (($thumb_info = $this->imagesize->getImageSize($protocol.'://'.$host.'/ascreen.jpg')) !== false)
@@ -608,12 +608,12 @@ 
 	}
 
 	/**
-	* Primary work on banner, can edit, copy or check a banner
-	*
-	* @param	string	$banner	The banner's remote url
-	* @param	array	$error	The array error, passed by reference
-	* @return	null
-	*/
+	 * Primary work on banner, can edit, copy or check a banner
+	 *
+	 * @param	string	$banner	The banner's remote url
+	 * @param	array	$error	The array error, passed by reference
+	 * @return	null
+	 */
 	public function banner_process(&$banner, &$error)
 	{
 		$old_banner = $this->request->variable('old_banner', '');
@@ -649,13 +649,13 @@ 
 	}
 
 	/**
-	* Copy a remonte banner to server.
-	* called by banner_process()
-	*
-	* @param	string	$banner The banner's remote url
-	* @param	array	$error	The array error, passed by reference
-	* @return	false|string	String if no errors, else false
-	*/
+	 * Copy a remonte banner to server.
+	 * called by banner_process()
+	 *
+	 * @param	string	$banner The banner's remote url
+	 * @param	array	$error	The array error, passed by reference
+	 * @return	false|string	String if no errors, else false
+	 */
 	private function _banner_upload($banner, &$error)
 	{
 		/** @var \phpbb\files\upload $upload */
@@ -687,13 +687,13 @@ 
 	}
 
 	/**
-	* Check than remote banner exists
-	* called by banner_process()
-	*
-	* @param	string	$banner	The banner's remote url
-	* @param	array	$error	The array error, passed by reference
-	* @return	false|string	String if no errors, else false
-	*/
+	 * Check than remote banner exists
+	 * called by banner_process()
+	 *
+	 * @param	string	$banner	The banner's remote url
+	 * @param	array	$error	The array error, passed by reference
+	 * @return	false|string	String if no errors, else false
+	 */
 	private function _banner_remote($banner, &$error)
 	{
 		if (!preg_match('#^(http|https|ftp)://#i', $banner))
@@ -801,11 +801,11 @@ 
 	}
 
 	/**
-	* Delete a banner from server
-	*
-	* @param	string	$file	The file's name
-	* @return	bool			True if delete success, else false
-	*/
+	 * Delete a banner from server
+	 *
+	 * @param	string	$file	The file's name
+	 * @return	bool			True if delete success, else false
+	 */
 	private function _banner_delete($file)
 	{
 		if (file_exists($this->get_banner_path($file)))
@@ -818,12 +818,12 @@ 
 	}
 
 	/**
-	* List flags
-	*
-	* @param	string	$flag_path	The flag directory path
-	* @param	string	$value		Selected flag
-	* @return	string	$list		Html code
-	*/
+	 * List flags
+	 *
+	 * @param	string	$flag_path	The flag directory path
+	 * @param	string	$value		Selected flag
+	 * @return	string	$list		Html code
+	 */
 	public function get_dir_flag_list($flag_path, $value)
 	{
 		$list = '';
@@ -858,10 +858,10 @@ 
 	}
 
 	/**
-	* Display recents links added
-	*
-	* @return	null
-	*/
+	 * Display recents links added
+	 *
+	 * @return	null
+	 */
 	public function recents()
 	{
 		if ($this->config['dir_recent_block'])
@@ -938,13 +938,13 @@ 
 	}
 
 	/**
-	* Validate back link
-	*
-	* @param	string		$remote_url	Page URL contains the backlink
-	* @param	bool		$optional	Link back is optional in this category?
-	* @param	bool		$cron		This methos is called by con process?
-	* @return	false|string			Either false if validation succeeded or a string which will be used as the error message (with the variable name appended)
-	*/
+	 * Validate back link
+	 *
+	 * @param	string		$remote_url	Page URL contains the backlink
+	 * @param	bool		$optional	Link back is optional in this category?
+	 * @param	bool		$cron		This methos is called by con process?
+	 * @return	false|string			Either false if validation succeeded or a string which will be used as the error message (with the variable name appended)
+	 */
 	public function validate_link_back($remote_url, $optional, $cron = false)
 	{
 		if (!$cron)

Spacing +41 added lines, -41 removed lines

@@ -76,20 +76,20 @@ 
 	*/
 	public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\config\config $config, \phpbb\language\language $language, \phpbb\template\template $template, \phpbb\user $user, \phpbb\controller\helper $helper, \phpbb\request\request $request, \phpbb\auth\auth $auth, \phpbb\notification\manager $notification, \phpbb\filesystem\filesystem_interface $filesystem, \FastImageSize\FastImageSize $imagesize, \phpbb\files\factory $files_factory, $root_path, $php_ext)
 	{
-		$this->db				= $db;
-		$this->config			= $config;
+		$this->db = $db;
+		$this->config = $config;
 		$this->language			= $language;
 		$this->template			= $template;
 		$this->user				= $user;
-		$this->helper			= $helper;
-		$this->request			= $request;
+		$this->helper = $helper;
+		$this->request = $request;
 		$this->auth				= $auth;
-		$this->notification		= $notification;
-		$this->filesystem		= $filesystem;
+		$this->notification = $notification;
+		$this->filesystem = $filesystem;
 		$this->imagesize		= $imagesize;
-		$this->files_factory 	= $files_factory;
+		$this->files_factory = $files_factory;
 		$this->root_path		= $root_path;
-		$this->php_ext			= $php_ext;
+		$this->php_ext = $php_ext;
 	}
 
 	/**
@@ -105,13 +105,13 @@ 
 
 		$this->db->sql_transaction('begin');
 
-		$sql = 'INSERT INTO ' . $this->links_table . ' ' . $this->db->sql_build_array('INSERT', $data);
+		$sql = 'INSERT INTO '.$this->links_table.' '.$this->db->sql_build_array('INSERT', $data);
 		$this->db->sql_query($sql);
 		$notification_data['link_id'] = $this->db->sql_nextid();
 
 		if (!$need_approval || $this->auth->acl_get('a_') || $this->auth->acl_get('m_'))
 		{
-			$sql = 'UPDATE ' . $this->categories_table . '
+			$sql = 'UPDATE '.$this->categories_table.'
 				SET cat_links = cat_links + 1
 				WHERE cat_id = ' . (int) $data['link_cat'];
 			$this->db->sql_query($sql);
@@ -169,14 +169,14 @@ 
 
 			$this->db->sql_transaction('begin');
 
-			$sql = 'UPDATE ' . $this->categories_table . '
+			$sql = 'UPDATE '.$this->categories_table.'
 				SET cat_links = cat_links - 1
 				WHERE cat_id = ' . (int) $old_cat;
 			$this->db->sql_query($sql);
 
 			if (!$need_approval)
 			{
-				$sql = 'UPDATE ' . $this->categories_table . '
+				$sql = 'UPDATE '.$this->categories_table.'
 					SET cat_links = cat_links + 1
 					WHERE cat_id = ' . (int) $data['link_cat'];
 				$this->db->sql_query($sql);
@@ -194,8 +194,8 @@ 
 			$this->notification->add_notifications($notification_type, $notification_data);
 		}
 
-		$sql = 'UPDATE ' . $this->links_table . '
-			SET ' . $this->db->sql_build_array('UPDATE', $data) . '
+		$sql = 'UPDATE '.$this->links_table.'
+			SET ' . $this->db->sql_build_array('UPDATE', $data).'
 			WHERE link_id = ' . (int) $link_id;
 		$this->db->sql_query($sql);
 	}
@@ -221,7 +221,7 @@ 
 		);
 
 		$sql = 'SELECT link_banner
-			FROM ' . $this->links_table . '
+			FROM ' . $this->links_table.'
 			WHERE '. $this->db->sql_in_set('link_id', $url_array);
 		$result = $this->db->sql_query($sql);
 
@@ -243,7 +243,7 @@ 
 			$this->db->sql_query("DELETE FROM $table WHERE ".$this->db->sql_in_set($field, $url_array));
 		}
 
-		$sql = 'UPDATE ' . $this->categories_table . '
+		$sql = 'UPDATE '.$this->categories_table.'
 			SET cat_links = cat_links - '.sizeof($url_array).'
 			WHERE cat_id = ' . (int) $cat_id;
 		$this->db->sql_query($sql);
@@ -261,7 +261,7 @@ 
 		if ($this->request->is_ajax())
 		{
 			$sql = 'SELECT cat_links
-				FROM ' . $this->categories_table . '
+				FROM ' . $this->categories_table.'
 				WHERE cat_id = ' . (int) $cat_id;
 			$result = $this->db->sql_query($sql);
 			$data = $this->db->sql_fetchrow($result);
@@ -288,7 +288,7 @@ 
 	public function view($link_id)
 	{
 		$sql = 'SELECT link_id, link_url
-			FROM ' . $this->links_table . '
+			FROM ' . $this->links_table.'
 			WHERE link_id = ' . (int) $link_id;
 		$result = $this->db->sql_query($sql);
 		$data = $this->db->sql_fetchrow($result);
@@ -298,7 +298,7 @@ 
 			throw new \phpbb\exception\http_exception(404, 'DIR_ERROR_NO_LINKS');
 		}
 
-		$sql = 'UPDATE ' . $this->links_table . '
+		$sql = 'UPDATE '.$this->links_table.'
 			SET link_view = link_view + 1
 			WHERE link_id = ' . (int) $link_id;
 		$this->db->sql_query($sql);
@@ -323,7 +323,7 @@ 
 		if ($details['scheme'] == 'https')
 		{
 			$default_port = 443;
-			$hostname = 'tls://' . $details['host'];
+			$hostname = 'tls://'.$details['host'];
 		}
 
 		if (!isset($details['path']))
@@ -381,7 +381,7 @@ 
 		$flag_path = $ext_path.'images/flags/';
 		$img_flag = 'no_flag.png';
 
-		if ($this->config['dir_activ_flag'] && !empty($data['link_flag']) && file_exists($flag_path . $data['link_flag']))
+		if ($this->config['dir_activ_flag'] && !empty($data['link_flag']) && file_exists($flag_path.$data['link_flag']))
 		{
 			$img_flag = $data['link_flag'];
 		}
@@ -423,7 +423,7 @@ 
 			$list = '<select name="vote">';
 			for ($i = 0; $i <= 10; $i++)
 			{
-				$list .= '<option value="' . $i . '"' . (($i == 5) ? ' selected="selected"' : '') . '>' . $i . '</option>';
+				$list .= '<option value="'.$i.'"'.(($i == 5) ? ' selected="selected"' : '').'>'.$i.'</option>';
 			}
 			$list .= '</select>';
 
@@ -461,8 +461,8 @@ 
 			{
 				$thumb = $this->thumb_process($data['link_url']);
 
-				$sql = 'UPDATE ' . $this->links_table . '
-					SET link_thumb = "' . $this->db->sql_escape($thumb) . '"
+				$sql = 'UPDATE '.$this->links_table.'
+					SET link_thumb = "' . $this->db->sql_escape($thumb).'"
 					WHERE link_id = ' . (int) $data['link_id'];
 				$this->db->sql_query($sql);
 
@@ -509,7 +509,7 @@ 
 				$height /= $coef_max;
 			}
 
-			return '<img src="' . $img_src . '" width="' . $width . '" height="' . $height . '" alt="'.$data['link_name'].'" title="'.$data['link_name'].'" />';
+			return '<img src="'.$img_src.'" width="'.$width.'" height="'.$height.'" alt="'.$data['link_name'].'" title="'.$data['link_name'].'" />';
 		}
 		return '';
 	}
@@ -530,12 +530,12 @@ 
 
 		$this->db->sql_transaction('begin');
 
-		$sql = 'INSERT INTO ' . $this->votes_table . ' ' . $this->db->sql_build_array('INSERT', $data);
+		$sql = 'INSERT INTO '.$this->votes_table.' '.$this->db->sql_build_array('INSERT', $data);
 		$this->db->sql_query($sql);
 
-		$sql = 'UPDATE ' . $this->links_table . '
+		$sql = 'UPDATE '.$this->links_table.'
 			SET link_vote = link_vote + 1,
-			link_note = link_note + ' . (int) $data['vote_note'] . '
+			link_note = link_note + ' . (int) $data['vote_note'].'
 		WHERE link_id = ' . (int) $link_id;
 		$this->db->sql_query($sql);
 
@@ -543,7 +543,7 @@ 
 
 		if ($this->request->is_ajax())
 		{
-			$sql= 'SELECT link_vote, link_note FROM ' . $this->links_table . ' WHERE link_id = ' . (int) $link_id;
+			$sql = 'SELECT link_vote, link_note FROM '.$this->links_table.' WHERE link_id = '.(int) $link_id;
 			$result = $this->db->sql_query($sql);
 			$data = $this->db->sql_fetchrow($result);
 
@@ -577,8 +577,8 @@ 
 
 		$details = parse_url($url);
 
-		$root_url		= $details['scheme'].'://'.$details['host'];
-		$absolute_url	= isset($details['path']) ? $root_url.$details['path'] : $root_url;
+		$root_url = $details['scheme'].'://'.$details['host'];
+		$absolute_url = isset($details['path']) ? $root_url.$details['path'] : $root_url;
 
 		if ($this->config['dir_activ_thumb_remote'] && $this->_ascreen_exist($details['scheme'], $details['host']))
 		{
@@ -621,7 +621,7 @@ 
 		$destination = $this->get_banner_path();
 
 		// Can we upload?
-		$can_upload = ($this->config['dir_storage_banner'] && $this->filesystem->exists($this->root_path . $destination) && $this->filesystem->is_writable($this->root_path . $destination) && (@ini_get('file_uploads') || strtolower(@ini_get('file_uploads')) == 'on')) ? true : false;
+		$can_upload = ($this->config['dir_storage_banner'] && $this->filesystem->exists($this->root_path.$destination) && $this->filesystem->is_writable($this->root_path.$destination) && (@ini_get('file_uploads') || strtolower(@ini_get('file_uploads')) == 'on')) ? true : false;
 
 		if ($banner && $can_upload)
 		{
@@ -667,7 +667,7 @@ 
 
 		$file = $upload->handle_upload('files.types.remote', $banner);
 
-		$prefix = unique_id() . '_';
+		$prefix = unique_id().'_';
 		$file->clean_filename('real', $prefix);
 
 		if (sizeof($file->error))
@@ -698,7 +698,7 @@ 
 	{
 		if (!preg_match('#^(http|https|ftp)://#i', $banner))
 		{
-			$banner = 'http://' . $banner;
+			$banner = 'http://'.$banner;
 		}
 		if (!preg_match('#^(http|https|ftp)://(?:(.*?\.)*?[a-z0-9\-]+?\.[a-z]{2,4}|(?:\d{1,3}\.){3,5}\d{1,3}):?([0-9]*?).*?\.(gif|jpg|jpeg|png)$#i', $banner))
 		{
@@ -729,8 +729,8 @@ 
 		}
 
 		// Check image type
-		$types		= \phpbb\files\upload::image_types();
-		$extension	= strtolower(\phpbb\files\filespec::get_extension($banner));
+		$types = \phpbb\files\upload::image_types();
+		$extension = strtolower(\phpbb\files\filespec::get_extension($banner));
 
 		// Check if this is actually an image
 		if ($file_stream = @fopen($banner, 'r'))
@@ -850,7 +850,7 @@ 
 
 			if (file_exists($flag_path.$img_file))
 			{
-				$list .= '<option value="' . $img_file . '" ' . (($img_file == $value) ? 'selected="selected"' : '') . '>' . $name . '</option>';
+				$list .= '<option value="'.$img_file.'" '.(($img_file == $value) ? 'selected="selected"' : '').'>'.$name.'</option>';
 			}
 		}
 
@@ -866,8 +866,8 @@ 
 	{
 		if ($this->config['dir_recent_block'])
 		{
-			$limit_sql		= $this->config['dir_recent_rows'] * $this->config['dir_recent_columns'];
-			$exclude_array	= explode(',', str_replace(' ', '', $this->config['dir_recent_exclude']));
+			$limit_sql = $this->config['dir_recent_rows'] * $this->config['dir_recent_columns'];
+			$exclude_array = explode(',', str_replace(' ', '', $this->config['dir_recent_exclude']));
 
 			$sql_array = array(
 				'SELECT'	=> 'l.link_id, l.link_cat, l.link_url, l.link_user_id, l.link_comment, l. link_description, l.link_vote, l.link_note, l.link_view, l.link_time, l.link_name, l.link_thumb, u.user_id, u.username, u.user_colour, c.cat_name',
@@ -900,7 +900,7 @@ 
 			if (sizeof($rowset))
 			{
 				$this->template->assign_block_vars('block', array(
-					'S_COL_WIDTH'			=> (100 / $this->config['dir_recent_columns']) . '%',
+					'S_COL_WIDTH'			=> (100 / $this->config['dir_recent_columns']).'%',
 				));
 
 				foreach ($rowset as $row)
@@ -919,7 +919,7 @@ 
 						'COUNT'					  => $row['link_view'],
 						'COMMENT'                 => $row['link_comment'],
 
-						'U_CAT'                   => $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_' . $row['link_cat']),
+						'U_CAT'                   => $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_'.$row['link_cat']),
 						'U_COMMENT'               => $this->helper->route('ernadoo_phpbbdirectory_comment_view_controller', array('link_id' => (int) $row['link_id'])),
 
 						'L_DIR_SEARCH_NB_CLICKS'	=> $this->language->lang('DIR_SEARCH_NB_CLICKS', (int) $row['link_view']),

routing/categories_loader.php

Indentation +14 added lines, -14 removed lines

@@ -26,12 +26,12 @@ 
 	protected $categories_table;
 
 	/**
-	* Constructor
-	*
-	* @param \phpbb\db\driver\driver_interface    $db          		Database connection
-	* @param string                               $categories_table Table name
-	* @access public
-	*/
+	 * Constructor
+	 *
+	 * @param \phpbb\db\driver\driver_interface    $db          		Database connection
+	 * @param string                               $categories_table Table name
+	 * @access public
+	 */
 	public function __construct(\phpbb\db\driver\driver_interface $db, $categories_table)
 	{
 		$this->db          		= $db;
@@ -39,10 +39,10 @@ 
 	}
 
 	/**
-	* {@inheritdoc}
-	*
-	* @api
-	*/
+	 * {@inheritdoc}
+	 *
+	 * @api
+	 */
 	public function load($resource, $type = null)
 	{
 		$routes = new RouteCollection();
@@ -78,10 +78,10 @@ 
 	}
 
 	/**
-	* {@inheritdoc}
-	*
-	* @api
-	*/
+	 * {@inheritdoc}
+	 *
+	 * @api
+	 */
 	public function supports($resource, $type = null)
 	{
 		return $type === 'ernadoo_phpbbdirectory_route';

Spacing +3 added lines, -3 removed lines

@@ -34,7 +34,7 @@ 
 	*/
 	public function __construct(\phpbb\db\driver\driver_interface $db, $categories_table)
 	{
-		$this->db          		= $db;
+		$this->db = $db;
 		$this->categories_table = $categories_table;
 	}
 
@@ -67,10 +67,10 @@ 
 		while ($row = $this->db->sql_fetchrow($result))
 		{
 			$defaults['cat_id'] = $row['cat_id'];
-			$path = 'directory/' . $row['cat_route'] . '/{page}/{sort_days}/{sort_key}/{sort_dir}';
+			$path = 'directory/'.$row['cat_route'].'/{page}/{sort_days}/{sort_key}/{sort_dir}';
 
 			$route = new Route($path, $defaults, $requirements);
-			$routes->add('ernadoo_phpbbdirectory_dynamic_route_' . $row['cat_id'], $route);
+			$routes->add('ernadoo_phpbbdirectory_dynamic_route_'.$row['cat_id'], $route);
 		}
 		$this->db->sql_freeresult();
 

controller/categories.php

Indentation +52 added lines, -52 removed lines

@@ -50,20 +50,20 @@ 
 	protected $link;
 
 	/**
-	* Constructor
-	*
-	* @param \phpbb\db\driver\driver_interface					$db			Database object
-	* @param \phpbb\config\config								$config		Config object
-	* @param \phpbb\language\language							$language	Language object
-	* @param \phpbb\template\template							$template	Template object
-	* @param \phpbb\user										$user		User object
-	* @param \phpbb\controller\helper							$helper		Controller helper object
-	* @param \phpbb\request\request								$request	Request object
-	* @param \phpbb\auth\auth									$auth		Auth object
-	* @param \phpbb\pagination									$pagination	Pagination object
-	* @param \ernadoo\phpbbdirectory\core\categorie				$categorie	PhpBB Directory extension categorie object
-	* @param \ernadoo\phpbbdirectory\core\link					$link		PhpBB Directory extension link object
-	*/
+	 * Constructor
+	 *
+	 * @param \phpbb\db\driver\driver_interface					$db			Database object
+	 * @param \phpbb\config\config								$config		Config object
+	 * @param \phpbb\language\language							$language	Language object
+	 * @param \phpbb\template\template							$template	Template object
+	 * @param \phpbb\user										$user		User object
+	 * @param \phpbb\controller\helper							$helper		Controller helper object
+	 * @param \phpbb\request\request								$request	Request object
+	 * @param \phpbb\auth\auth									$auth		Auth object
+	 * @param \phpbb\pagination									$pagination	Pagination object
+	 * @param \ernadoo\phpbbdirectory\core\categorie				$categorie	PhpBB Directory extension categorie object
+	 * @param \ernadoo\phpbbdirectory\core\link					$link		PhpBB Directory extension link object
+	 */
 	public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\config\config $config, \phpbb\language\language $language, \phpbb\template\template $template, \phpbb\user $user, \phpbb\controller\helper $helper, \phpbb\request\request $request, \phpbb\auth\auth $auth, \phpbb\pagination $pagination, \ernadoo\phpbbdirectory\core\categorie $categorie, \ernadoo\phpbbdirectory\core\link $link)
 	{
 		$this->db			= $db;
@@ -86,10 +86,10 @@ 
 	}
 
 	/**
-	* Base controller to be accessed with the URL /directory
-	*
-	* @return	\Symfony\Component\HttpFoundation\Response	A Symfony Response object
-	*/
+	 * Base controller to be accessed with the URL /directory
+	 *
+	 * @return	\Symfony\Component\HttpFoundation\Response	A Symfony Response object
+	 */
 	public function base()
 	{
 		$this->categorie->display();
@@ -99,19 +99,19 @@ 
 	}
 
 	/**
-	* Legacy view controller for display a category
-	* Used with /directory/categorie/{cat_id}
-	* @deprecated 2.0.0 No longer used since dynamic routing.
-	*
-	* @param	int		$cat_id		The category ID
-	* @param	int		$page		Page number taken from the URL
-	* @param	int		$sort_days	Specifies the maximum amount of days a link may be old
-	* @param	string	$sort_key	is the key of $sort_by_sql for the selected sorting: a|t|r|s|v
-	* @param	string	$sort_dir	is either a or d representing ASC and DESC (ascending|descending)
-	* @param	string	$mode		watch|unwatch
-	* @return	\Symfony\Component\HttpFoundation\Response	A Symfony Response object
-	* @throws	\phpbb\exception\http_exception
-	*/
+	 * Legacy view controller for display a category
+	 * Used with /directory/categorie/{cat_id}
+	 * @deprecated 2.0.0 No longer used since dynamic routing.
+	 *
+	 * @param	int		$cat_id		The category ID
+	 * @param	int		$page		Page number taken from the URL
+	 * @param	int		$sort_days	Specifies the maximum amount of days a link may be old
+	 * @param	string	$sort_key	is the key of $sort_by_sql for the selected sorting: a|t|r|s|v
+	 * @param	string	$sort_dir	is either a or d representing ASC and DESC (ascending|descending)
+	 * @param	string	$mode		watch|unwatch
+	 * @return	\Symfony\Component\HttpFoundation\Response	A Symfony Response object
+	 * @throws	\phpbb\exception\http_exception
+	 */
 	public function view($cat_id, $page, $sort_days, $sort_key, $sort_dir, $mode = '')
 	{
 		$url = $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_' . $cat_id, array('page' => $page, 'sort_days' => $sort_days, 'sort_key' => $sort_key, 'sort_dir' => $sort_dir));
@@ -120,17 +120,17 @@ 
 	}
 
 	/**
-	* View controller for display a category
-	*
-	* @param	int		$cat_id		The category ID
-	* @param	int		$page		Page number taken from the URL
-	* @param	int		$sort_days	Specifies the maximum amount of days a link may be old
-	* @param	string	$sort_key	is the key of $sort_by_sql for the selected sorting: a|t|r|s|v|p
-	* @param	string	$sort_dir	is either a or d representing ASC and DESC (ascending|descending)
-	* @param	string	$mode		watch|unwatch
-	* @return	\Symfony\Component\HttpFoundation\Response	A Symfony Response object
-	* @throws	\phpbb\exception\http_exception
-	*/
+	 * View controller for display a category
+	 *
+	 * @param	int		$cat_id		The category ID
+	 * @param	int		$page		Page number taken from the URL
+	 * @param	int		$sort_days	Specifies the maximum amount of days a link may be old
+	 * @param	string	$sort_key	is the key of $sort_by_sql for the selected sorting: a|t|r|s|v|p
+	 * @param	string	$sort_dir	is either a or d representing ASC and DESC (ascending|descending)
+	 * @param	string	$mode		watch|unwatch
+	 * @return	\Symfony\Component\HttpFoundation\Response	A Symfony Response object
+	 * @throws	\phpbb\exception\http_exception
+	 */
 	public function view_route($cat_id, $page = 1, $sort_days = 0, $sort_key = '', $sort_dir = '', $mode = '')
 	{
 		if (false === $this->categorie->get($cat_id))
@@ -385,11 +385,11 @@ 
 	}
 
 	/**
-	* date controller for return a date
-	*
-	* @return	\phpbb\json_response	A Json Response
-	* @throws	\phpbb\exception\http_exception
-	*/
+	 * date controller for return a date
+	 *
+	 * @return	\phpbb\json_response	A Json Response
+	 * @throws	\phpbb\exception\http_exception
+	 */
 	public function return_date()
 	{
 		if (!$this->request->is_ajax())
@@ -406,11 +406,11 @@ 
 	}
 
 	/**
-	* slug controller for return a slugify category name
-	*
-	* @return	\phpbb\json_response	A Json Response
-	* @throws	\phpbb\exception\http_exception
-	*/
+	 * slug controller for return a slugify category name
+	 *
+	 * @return	\phpbb\json_response	A Json Response
+	 * @throws	\phpbb\exception\http_exception
+	 */
 	public function return_slug()
 	{
 		if (!$this->request->is_ajax())

Spacing +24 added lines, -24 removed lines

@@ -66,16 +66,16 @@ 
 	*/
 	public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\config\config $config, \phpbb\language\language $language, \phpbb\template\template $template, \phpbb\user $user, \phpbb\controller\helper $helper, \phpbb\request\request $request, \phpbb\auth\auth $auth, \phpbb\pagination $pagination, \ernadoo\phpbbdirectory\core\categorie $categorie, \ernadoo\phpbbdirectory\core\link $link)
 	{
-		$this->db			= $db;
-		$this->config		= $config;
+		$this->db = $db;
+		$this->config = $config;
 		$this->language		= $language;
 		$this->template		= $template;
 		$this->user			= $user;
-		$this->helper		= $helper;
-		$this->request		= $request;
+		$this->helper = $helper;
+		$this->request = $request;
 		$this->auth			= $auth;
-		$this->pagination	= $pagination;
-		$this->categorie	= $categorie;
+		$this->pagination = $pagination;
+		$this->categorie = $categorie;
 		$this->link			= $link;
 
 		$language->add_lang('directory', 'ernadoo/phpbbdirectory');
@@ -114,7 +114,7 @@ 
 	*/
 	public function view($cat_id, $page, $sort_days, $sort_key, $sort_dir, $mode = '')
 	{
-		$url = $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_' . $cat_id, array('page' => $page, 'sort_days' => $sort_days, 'sort_key' => $sort_key, 'sort_dir' => $sort_dir));
+		$url = $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_'.$cat_id, array('page' => $page, 'sort_days' => $sort_days, 'sort_key' => $sort_key, 'sort_dir' => $sort_dir));
 
 		return new RedirectResponse($url, 301);
 	}
@@ -140,13 +140,13 @@ 
 
 		$start = ($page - 1) * $this->config['dir_show'];
 
-		$default_sort_days	= 0;
+		$default_sort_days = 0;
 		$default_sort_key	= (string) substr($this->config['dir_default_order'], 0, 1);
 		$default_sort_dir	= (string) substr($this->config['dir_default_order'], 2);
 
 		$sort_days	= (!$sort_days) ? $this->request->variable('st', $default_sort_days) : $sort_days;
 		$sort_key 	= (!$sort_key) ? $this->request->variable('sk', $default_sort_key) : $sort_key;
-		$sort_dir	= (!$sort_dir) ? $this->request->variable('sd', $default_sort_dir) : $sort_dir;
+		$sort_dir = (!$sort_dir) ? $this->request->variable('sd', $default_sort_dir) : $sort_dir;
 		$link_list = $rowset = array();
 
 		// Categorie ordering options
@@ -184,8 +184,8 @@ 
 			$min_post_time = time() - ($sort_days * 86400);
 
 			$sql = 'SELECT COUNT(link_id) AS nb_links
-				FROM ' . $this->links_table . '
-				WHERE link_cat = ' . (int) $cat_id . '
+				FROM ' . $this->links_table.'
+				WHERE link_cat = ' . (int) $cat_id.'
 					AND link_time >= ' . $min_post_time;
 			$result = $this->db->sql_query($sql);
 			$nb_links = (int) $this->db->sql_fetchfield('nb_links');
@@ -200,7 +200,7 @@ 
 		else
 		{
 			$sql_limit_time = '';
-			$nb_links		= (int) $this->categorie->data['cat_links'];
+			$nb_links = (int) $this->categorie->data['cat_links'];
 		}
 
 		// Make sure $start is set to the last page if it exceeds the amount
@@ -213,7 +213,7 @@ 
 		$this->categorie->make_cat_jumpbox();
 
 		$base_url = array(
-			'routes'	=> 'ernadoo_phpbbdirectory_dynamic_route_' . $cat_id,
+			'routes'	=> 'ernadoo_phpbbdirectory_dynamic_route_'.$cat_id,
 			'params'	=> array_merge(array('cat_id' => $cat_id), $u_sort_param),
 		);
 
@@ -226,14 +226,14 @@ 
 			'S_SELECT_SORT_KEY'		=> $s_sort_key,
 			'S_SELECT_SORT_DAYS'	=> $s_limit_days,
 			'S_CATLIST'				=> $this->categorie->make_cat_select($cat_id),
-			'S_PAGE_ACTION'			=> $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_' . $cat_id, array('page' => $page)),
+			'S_PAGE_ACTION'			=> $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_'.$cat_id, array('page' => $page)),
 			'S_CAT_ID'				=> $cat_id,
 
 			'TOTAL_LINKS'			=> $this->language->lang('DIR_NB_LINKS', (int) $nb_links),
 
 			'U_NEW_SITE' 			=> $this->helper->route('ernadoo_phpbbdirectory_new_controller', array('cat_id' => $cat_id)),
 
-			'U_VIEW_CAT'			=> $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_' . $cat_id),
+			'U_VIEW_CAT'			=> $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_'.$cat_id),
 			'U_WATCH_CAT'			=> $s_watching_categorie['link'],
 			'U_WATCH_CAT_TOGGLE'	=> $s_watching_categorie['link_toggle'],
 			'S_WATCH_CAT_TITLE'		=> $s_watching_categorie['title'],
@@ -263,11 +263,11 @@ 
 
 		if (is_array($sort_by_sql[$sort_key]))
 		{
-			$sql_sort_order = implode(' ' . $direction . ', ', $sort_by_sql[$sort_key]) . ' ' . $direction;
+			$sql_sort_order = implode(' '.$direction.', ', $sort_by_sql[$sort_key]).' '.$direction;
 		}
 		else
 		{
-			$sql_sort_order = $sort_by_sql[$sort_key] . ' ' . $direction;
+			$sql_sort_order = $sort_by_sql[$sort_key].' '.$direction;
 		}
 
 		// Grab just the sorted link ids
@@ -310,7 +310,7 @@ 
 						),
 						array(
 							'FROM'	=> array($this->votes_table => 'v'),
-							'ON'	=> 'l.link_id = v.vote_link_id AND v.vote_user_id = ' . $this->user->data['user_id']
+							'ON'	=> 'l.link_id = v.vote_link_id AND v.vote_user_id = '.$this->user->data['user_id']
 						)
 				),
 				'WHERE'		=> $this->db->sql_in_set('l.link_id', $link_list)
@@ -327,8 +327,8 @@ 
 
 			$link_list = ($store_reverse) ? array_reverse($link_list) : $link_list;
 
-			$votes_status 		= ($this->categorie->data['cat_allow_votes']) ? true : false;
-			$comments_status 	= ($this->categorie->data['cat_allow_comments']) ? true : false;
+			$votes_status = ($this->categorie->data['cat_allow_votes']) ? true : false;
+			$comments_status = ($this->categorie->data['cat_allow_comments']) ? true : false;
 
 			foreach ($link_list as $link_id)
 			{
@@ -338,10 +338,10 @@ 
 				$s_note		= $this->link->display_note($site['link_note'], $site['link_vote'], $votes_status);
 				$s_thumb	= $this->link->display_thumb($site);
 				$s_vote		= $this->link->display_vote($site);
-				$s_banner	= $this->link->display_bann($site);
-				$s_rss		= $this->link->display_rss($site);
+				$s_banner = $this->link->display_bann($site);
+				$s_rss = $this->link->display_rss($site);
 
-				$edit_allowed 	= ($this->user->data['is_registered'] && ($this->auth->acl_get('m_edit_dir') || ($this->user->data['user_id'] == $site['link_user_id'] && $this->auth->acl_get('u_edit_dir'))));
+				$edit_allowed = ($this->user->data['is_registered'] && ($this->auth->acl_get('m_edit_dir') || ($this->user->data['user_id'] == $site['link_user_id'] && $this->auth->acl_get('u_edit_dir'))));
 				$delete_allowed = ($this->user->data['is_registered'] && ($this->auth->acl_get('m_delete_dir') || ($this->user->data['user_id'] == $site['link_user_id'] && $this->auth->acl_get('u_delete_dir'))));
 
 				$this->template->assign_block_vars('site', array(
@@ -377,7 +377,7 @@ 
 			$this->template->assign_block_vars('no_draw_link', array());
 		}
 
-		$page_title = $this->language->lang('DIRECTORY') . ' - ' . $this->categorie->data['cat_name'];
+		$page_title = $this->language->lang('DIRECTORY').' - '.$this->categorie->data['cat_name'];
 
 		$this->categorie->display();
 

tests/controller/controller_base.php

Doc Comments +4 added lines, -1 removed lines

@@ -36,7 +36,7 @@ 
 	/**
 	* Define the extensions to be tested
 	*
-	* @return array vendor/name of extension(s) to test
+	* @return string[] vendor/name of extension(s) to test
 	*/
 	static protected function setup_extensions()
 	{
@@ -221,6 +221,9 @@ 
 		$this->core_categorie->set_extension_manager($phpbb_extension_manager);
 	}
 
+	/**
+	 * @param \ernadoo\phpbbdirectory\cron\task\core\prune_categorie[] $tasks
+	 */
 	private function create_cron_manager($tasks)
 	{
 		global $phpbb_root_path, $phpEx;

Indentation +4 added lines, -4 removed lines

@@ -34,10 +34,10 @@
 	protected $user;
 
 	/**
-	* Define the extensions to be tested
-	*
-	* @return array vendor/name of extension(s) to test
-	*/
+	 * Define the extensions to be tested
+	 *
+	 * @return array vendor/name of extension(s) to test
+	 */
 	static protected function setup_extensions()
 	{
 		return array('ernadoo/phpbbdirectory');

Spacing +4 added lines, -4 removed lines

@@ -51,8 +51,8 @@ 
 
 		parent::setUp();
 
-		$table_categories	= 'phpbb_directory_cats';
-		$tables_comments	= 'phpbb_directory_comments';
+		$table_categories = 'phpbb_directory_cats';
+		$tables_comments = 'phpbb_directory_comments';
 		$tables_links		= 'phpbb_directory_links';
 		$tables_votes		= 'phpbb_directory_votes';
 		$tables_watch		= 'phpbb_directory_watch';
@@ -100,7 +100,7 @@ 
 
 		$this->helper->expects($this->any())
 			->method('render')
-			->willReturnCallback(function ($template_file, $page_title = '', $status_code = 200, $display_online_list = false) {
+			->willReturnCallback(function($template_file, $page_title = '', $status_code = 200, $display_online_list = false) {
 				return new \Symfony\Component\HttpFoundation\Response($template_file, $status_code);
 		});
 		$this->helper
@@ -131,7 +131,7 @@ 
 		$phpbb_container->set('path_helper', $phpbb_path_helper);
 		$phpbb_container->set('ext.manager', $phpbb_extension_manager);
 		$phpbb_container->set('user', $this->user);
-		$phpbb_container->setParameter('core.cache_dir', $phpbb_root_path . 'cache/' . PHPBB_ENVIRONMENT . '/');
+		$phpbb_container->setParameter('core.cache_dir', $phpbb_root_path.'cache/'.PHPBB_ENVIRONMENT.'/');
 
 		$context = new \phpbb\template\context();
 		$twig_extension = new \phpbb\template\twig\extension($context, $this->lang);

Braces +2 added lines, -1 removed lines

@@ -100,7 +100,8 @@
 
 		$this->helper->expects($this->any())
 			->method('render')
-			->willReturnCallback(function ($template_file, $page_title = '', $status_code = 200, $display_online_list = false) {
+			->willReturnCallback(function ($template_file, $page_title = '', $status_code = 200, $display_online_list = false)
+			{
 				return new \Symfony\Component\HttpFoundation\Response($template_file, $status_code);
 		});
 		$this->helper

tests/controller/phpbbdirectory_base_test.php

Indentation +13 added lines, -13 removed lines

@@ -22,8 +22,8 @@ 
 	}
 
 	/**
-	* Setup test environment
-	*/
+	 * Setup test environment
+	 */
 	public function setUp()
 	{
 		parent::setUp();
@@ -61,10 +61,10 @@ 
 	}
 
 	/**
-	* Test data for the test_display_base() function
-	*
-	* @return array Array of test data
-	*/
+	 * Test data for the test_display_base() function
+	 *
+	 * @return array Array of test data
+	 */
 	public function display_base_data()
 	{
 		return array(
@@ -73,10 +73,10 @@ 
 	}
 
 	/**
-	* Test controller display
-	*
-	* @dataProvider display_base_data
-	*/
+	 * Test controller display
+	 *
+	 * @dataProvider display_base_data
+	 */
 	public function test_display_base($status_code, $page_content)
 	{
 		$controller = $this->get_controller();
@@ -87,9 +87,9 @@ 
 	}
 
 	/**
-	* Test base case scenario
-	*
-	*/
+	 * Test base case scenario
+	 *
+	 */
 	public function test_for_root_categories()
 	{
 		$this->template->expects($this->exactly(2))

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
 {
 	public function getDataSet()
 	{
-		return $this->createMySQLXMLDataSet(__DIR__ . '/fixtures/fixture_base.xml');
+		return $this->createMySQLXMLDataSet(__DIR__.'/fixtures/fixture_base.xml');
 	}
 
 	/**

tests/controller/phpbbdirectory_cats_test.php

Indentation +42 added lines, -42 removed lines

@@ -22,8 +22,8 @@ 
 	}
 
 	/**
-	* Setup test environment
-	*/
+	 * Setup test environment
+	 */
 	public function setUp()
 	{
 		parent::setUp();
@@ -65,10 +65,10 @@ 
 	}
 
 	/**
-	* Test data for the test_display_cat_by_id() function
-	*
-	* @return array Array of test data
-	*/
+	 * Test data for the test_display_cat_by_id() function
+	 *
+	 * @return array Array of test data
+	 */
 	public function display_cat_by_id_data()
 	{
 		return array(
@@ -77,10 +77,10 @@ 
 	}
 
 	/**
-	* Test controller display
-	*
-	* @dataProvider display_cat_by_id_data
-	*/
+	 * Test controller display
+	 *
+	 * @dataProvider display_cat_by_id_data
+	 */
 	public function test_display_cat_by_id($cat_id, $page, $status_code)
 	{
 		$controller = $this->get_controller();
@@ -121,10 +121,10 @@ 
 	}
 
 	/**
-	* Test data for the test_display_cat_fails() function
-	*
-	* @return array Array of test data
-	*/
+	 * Test data for the test_display_cat_fails() function
+	 *
+	 * @return array Array of test data
+	 */
 	public function display_cat_fails_data()
 	{
 		return array(
@@ -133,10 +133,10 @@ 
 	}
 
 	/**
-	* Test controller display throws 404 exceptions
-	*
-	* @dataProvider display_cat_fails_data
-	*/
+	 * Test controller display throws 404 exceptions
+	 *
+	 * @dataProvider display_cat_fails_data
+	 */
 	public function test_display_cat_fails($cat_id, $page, $status_code, $page_content)
 	{
 		$controller = $this->get_controller();
@@ -153,10 +153,10 @@ 
 	}
 
 	/**
-	* Test data for the test_category_one_page() function
-	*
-	* @return array Array of test data
-	*/
+	 * Test data for the test_category_one_page() function
+	 *
+	 * @return array Array of test data
+	 */
 	public function category_one_page_data()
 	{
 		return array(
@@ -165,10 +165,10 @@ 
 	}
 
 	/**
-	* Test base case scenario
-	*
-	* @dataProvider category_one_page_data
-	*/
+	 * Test base case scenario
+	 *
+	 * @dataProvider category_one_page_data
+	 */
 	function test_category_one_page($cat_id, $cat_name, $parent_cat_id, $nb_links)
 	{
 		$controller = $this->get_controller();
@@ -178,10 +178,10 @@ 
 	}
 
 	/**
-	* Test data for the test_category_no_links() function
-	*
-	* @return array Array of test data
-	*/
+	 * Test data for the test_category_no_links() function
+	 *
+	 * @return array Array of test data
+	 */
 	public function category_no_links_data()
 	{
 		return array(
@@ -190,10 +190,10 @@ 
 	}
 
 	/**
-	* Test base case scenario
-	*
-	* @dataProvider category_no_links_data
-	*/
+	 * Test base case scenario
+	 *
+	 * @dataProvider category_no_links_data
+	 */
 	function test_category_no_links($cat_id, $cat_name, $nb_links)
 	{
 		$this->template->expects($this->at(3))
@@ -209,10 +209,10 @@ 
 	}
 
 	/**
-	* Test data for the test_category_with_pages() function
-	*
-	* @return array Array of test data
-	*/
+	 * Test data for the test_category_with_pages() function
+	 *
+	 * @return array Array of test data
+	 */
 	public function category_with_pages_data()
 	{
 		return array(
@@ -222,10 +222,10 @@ 
 	}
 
 	/**
-	* Test base case scenario
-	*
-	* @dataProvider category_with_pages_data
-	*/
+	 * Test base case scenario
+	 *
+	 * @dataProvider category_with_pages_data
+	 */
 	public function test_category_with_pages($cat_id, $cat_name, $parent_cat_id, $parent_cat_name, $nb_links, $page = 1, $sort_days = 0)
 	{
 		$controller = $this->get_controller();

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
 {
 	public function getDataSet()
 	{
-		return $this->createMySQLXMLDataSet(__DIR__ . '/fixtures/fixture_categories.xml');
+		return $this->createMySQLXMLDataSet(__DIR__.'/fixtures/fixture_categories.xml');
 	}
 
 	/**

tests/routing/categories_routing_loader_test.php

Indentation +17 added lines, -17 removed lines

@@ -13,10 +13,10 @@ 
 class categories_routing_loader_test extends \phpbb_database_test_case
 {
 	/**
-	* Define the extensions to be tested
-	*
-	* @return array vendor/name of extension(s) to test
-	*/
+	 * Define the extensions to be tested
+	 *
+	 * @return array vendor/name of extension(s) to test
+	 */
 	static protected function setup_extensions()
 	{
 		return array('ernadoo/phpbbdirectory');
@@ -50,10 +50,10 @@ 
 	}
 
 	/**
-	* Get the route collection from the categories_loader
-	*
-	* @return \Symfony\Component\Routing\RouteCollection
-	*/
+	 * Get the route collection from the categories_loader
+	 *
+	 * @return \Symfony\Component\Routing\RouteCollection
+	 */
 	public function get_categories_route_collection()
 	{
 		$collection = $this->loader->load('ernadoo_phpbbdirectory_route_controller', 'pages_extension');
@@ -65,10 +65,10 @@ 
 	}
 
 	/**
-	* Data set for test_page_loader
-	*
-	* @return array
-	*/
+	 * Data set for test_page_loader
+	 *
+	 * @return array
+	 */
 	public function page_loader_data()
 	{
 		return array(
@@ -79,11 +79,11 @@ 
 	}
 
 	/**
-	* @dataProvider page_loader_data
-	*
-	* @param int    $id       Id of a categorie
-	* @param string $expected Expected route of a categorie
-	*/
+	 * @dataProvider page_loader_data
+	 *
+	 * @param int    $id       Id of a categorie
+	 * @param string $expected Expected route of a categorie
+	 */
 	public function test_page_loader($id, $expected)
 	{
 		// Get a route instance

Spacing +2 added lines, -2 removed lines

@@ -33,7 +33,7 @@ 
 
 	public function getDataSet()
 	{
-		return $this->createMySQLXMLDataSet(__DIR__ . '/fixtures/categories.xml');
+		return $this->createMySQLXMLDataSet(__DIR__.'/fixtures/categories.xml');
 	}
 
 	public function setUp()
@@ -87,7 +87,7 @@ 
 	public function test_page_loader($id, $expected)
 	{
 		// Get a route instance
-		$route = $this->collection->get('ernadoo_phpbbdirectory_dynamic_route_' . $id);
+		$route = $this->collection->get('ernadoo_phpbbdirectory_dynamic_route_'.$id);
 
 		// Assert the roue is an instance of Route
 		$this->assertInstanceOf('Symfony\Component\Routing\Route', $route, 'A route instance could not be made.');