Split out livesearch into its own child class

Author: iMattPro

config/services.yml

@@ -72,7 +72,7 @@ services:
         class: phpbb\ideas\controller\livesearch_controller
         parent: phpbb.ideas.controller.base
         calls:
-            - [get_entity, ['@phpbb.ideas.ideas']]
+            - [get_entity, ['@phpbb.ideas.livesearch']]
 
 # ----- Idea Factory Classes -----
     phpbb.ideas.base:
@@ -96,6 +96,10 @@ services:
         class: phpbb\ideas\factory\idea
         parent: phpbb.ideas.base
 
+    phpbb.ideas.livesearch:
+        class: phpbb\ideas\factory\livesearch
+        parent: phpbb.ideas.base
+
     phpbb.ideas.linkhelper:
         class: phpbb\ideas\factory\linkhelper
         arguments:

controller/livesearch_controller.php

@@ -15,7 +15,7 @@
  */
 class livesearch_controller extends base
 {
-	/* @var \phpbb\ideas\factory\ideas */
+	/* @var \phpbb\ideas\factory\livesearch */
 	protected $entity;
 
 	/**
@@ -27,7 +27,7 @@ public function title_search()
 	{
 		$title_chars = $this->request->variable('duplicateeditinput', '', true);
 
-		$matches = $this->ideas->livesearch($title_chars, 10);
+		$matches = $this->entity->title_search($title_chars, 10);
 
 		return new \Symfony\Component\HttpFoundation\JsonResponse([
 			'keyword' => $title_chars,

factory/ideas.php

@@ -219,35 +219,6 @@ protected function query_count()
 		return $count;
 	}
 
-	/**
-	 * Do a live search on idea titles. Return any matches based on a given search query.
-	 *
-	 * @param string $search The string of characters to search using LIKE
-	 * @param int    $limit  The number of results to return
-	 *
-	 * @return array An array of matching idea id/key and title/values
-	 */
-	public function livesearch($search, $limit = 10)
-	{
-		$results = [];
-		$sql = 'SELECT idea_title, idea_id
-			FROM ' . $this->table_ideas . '
-			WHERE idea_title ' . $this->db->sql_like_expression($this->db->get_any_char() . $search . $this->db->get_any_char());
-		$result = $this->db->sql_query_limit($sql, $limit);
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$results[] = [
-				'idea_id'     => $row['idea_id'],
-				'result'      => $row['idea_id'],
-				'clean_title' => $row['idea_title'],
-				'display'     => "<span>{$row['idea_title']}</span>", // spans are expected in phpBB's live search JS
-			];
-		}
-		$this->db->sql_freeresult($result);
-
-		return $results;
-	}
-
 	/**
 	 * Get a user's votes from a group of ideas
 	 *

factory/livesearch.php

@@ -0,0 +1,49 @@
+<?php
+/**
+ *
+ * Ideas extension for the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ */
+
+namespace phpbb\ideas\factory;
+
+/**
+ * Class for handling multiple ideas
+ */
+class livesearch extends base
+{
+	/** @var array */
+	protected $sql;
+
+	/**
+	 * Do a live search on idea titles. Return any matches based on a given search query.
+	 *
+	 * @param string $search The string of characters to search using LIKE
+	 * @param int    $limit  The number of results to return
+	 *
+	 * @return array An array of matching idea id/key and title/values
+	 */
+	public function title_search($search, $limit = 10)
+	{
+		$results = [];
+		$sql = 'SELECT idea_title, idea_id
+			FROM ' . $this->table_ideas . '
+			WHERE idea_title ' . $this->db->sql_like_expression($this->db->get_any_char() . $search . $this->db->get_any_char());
+		$result = $this->db->sql_query_limit($sql, $limit);
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$results[] = [
+				'idea_id'     => $row['idea_id'],
+				'result'      => $row['idea_id'],
+				'clean_title' => $row['idea_title'],
+				'display'     => "<span>{$row['idea_title']}</span>", // spans are expected in phpBB's live search JS
+			];
+		}
+		$this->db->sql_freeresult($result);
+
+		return $results;
+	}
+}