PSR corrections and other fixes

Author: iMattPro

.editorconfig

@@ -13,5 +13,4 @@ trim_trailing_whitespace = true
 trim_trailing_whitespace = false
 
 [*.yml]
-indent_size = 4
 indent_style = space

acp/ideas_module.php

@@ -16,10 +16,11 @@ class ideas_module
 	public $u_action;
 
 	/**
-	* Main ACP module
-	*
-	* @access public
-	*/
+	 * Main ACP module
+	 *
+	 * @access public
+	 * @throws \Exception
+	 */
 	public function main()
 	{
 		global $phpbb_container;

controller/idea_controller.php

@@ -42,7 +42,7 @@ public function idea($idea_id)
 		$mode = $this->request->variable('mode', '');
 		if (!empty($mode) && $this->request->is_ajax())
 		{
-			$result = call_user_func(array($this, $mode));
+			$result = $this->$mode();
 
 			return new \Symfony\Component\HttpFoundation\JsonResponse($result);
 		}

event/listener.php

@@ -78,7 +78,7 @@ public function __construct(auth $auth, config $config, helper $helper, ideas $i
 	/**
 	 * @inheritDoc
 	 */
-	static public function getSubscribedEvents()
+	public static function getSubscribedEvents()
 	{
 		return array(
 			'core.viewforum_get_topic_data'				=> 'ideas_forum_redirect',
@@ -334,9 +334,9 @@ public function viewonline_ideas($event)
 	public function edit_idea_title($event)
 	{
 		if ($event['mode'] !== 'edit' ||
+			$event['post_data']['topic_first_post_id'] != $event['post_id'] ||
 			!$event['update_subject'] ||
-			!$this->is_ideas_forum($event['forum_id']) ||
-			$event['post_data']['topic_first_post_id'] != $event['post_id'])
+			!$this->is_ideas_forum($event['forum_id']))
 		{
 			return;
 		}

factory/ideas.php

@@ -421,7 +421,7 @@ public function set_title($idea_id, $title)
 	 * @param int   $user_id The ID of the user voting.
 	 * @param int   $value   Up (1) or down (0)?
 	 *
-	 * @return array Array of information.
+	 * @return array|string Array of information or string on error.
 	 */
 	public function vote(&$idea, $user_id, $value)
 	{

tests/factory/linkhelper_test.php

@@ -12,7 +12,7 @@
 
 class linkhelper_test extends \phpbb_database_test_case
 {
-	static protected function setup_extensions()
+	protected static function setup_extensions()
 	{
 		return array('phpbb/ideas');
 	}

tests/functional/ideas_functional_base.php

@@ -20,7 +20,7 @@ class ideas_functional_base extends \phpbb_functional_test_case
 	*
 	* @return array vendor/name of extension(s) to test
 	*/
-	static protected function setup_extensions()
+	protected static function setup_extensions()
 	{
 		return array('phpbb/ideas');
 	}

tests/functional/ideas_test.php

@@ -135,7 +135,7 @@ public function create_idea($title, $message)
 
 		// Get the new idea's ID and add it to the data array
 		$url = $crawler->selectLink($this->lang('REMOVE_VOTE'))->link()->getUri();
-		preg_match('#\/idea\/(\d+)\?#', $url, $matches);
+		preg_match('#/idea/(\d+)\?#', $url, $matches);
 		$data['idea_id'] = $matches ? $matches[1] : null;
 
 		return $data;

tests/ideas/get_ideas_test.php

@@ -32,7 +32,7 @@ class get_ideas_test extends ideas_base
 	public function test_get_ideas($test_data, $expected)
 	{
 		// Initialize get_ideas argument values
-		$number = $sort = $sort_direction = $status = $where = $start = null;
+		$number = $sort = $sort_direction = $status = $start = null;
 
 		// Update the default values array with test values
 		foreach ($test_data as $key => $var)

tests/ideas/ideas_base.php

@@ -12,7 +12,7 @@
 
 class ideas_base extends \phpbb_database_test_case
 {
-	static protected function setup_extensions()
+	protected static function setup_extensions()
 	{
 		return array('phpbb/ideas');
 	}