Revert manager just use multiple classes

Author: iMattPro

config/services.yml

@@ -8,7 +8,7 @@ services:
             - '@auth'
             - '@config'
             - '@controller.helper'
-            - '@phpbb.ideas.manager'
+            - '@phpbb.ideas.idea'
             - '@language'
             - '@phpbb.ideas.linkhelper'
             - '@template'
@@ -37,7 +37,6 @@ services:
             - '@auth'
             - '@config'
             - '@controller.helper'
-            - '@phpbb.ideas.manager'
             - '@language'
             - '@phpbb.ideas.linkhelper'
             - '@pagination'
@@ -50,10 +49,14 @@ services:
     phpbb.ideas.index_controller:
         class: phpbb\ideas\controller\index_controller
         parent: phpbb.ideas.controller.base
+        calls:
+            - [get_entity, ['@phpbb.ideas.ideas']]
 
     phpbb.ideas.list_controller:
         class: phpbb\ideas\controller\list_controller
         parent: phpbb.ideas.controller.base
+        calls:
+            - [get_entity, ['@phpbb.ideas.ideas']]
 
     phpbb.ideas.post_controller:
         class: phpbb\ideas\controller\post_controller
@@ -62,19 +65,16 @@ services:
     phpbb.ideas.idea_controller:
         class: phpbb\ideas\controller\idea_controller
         parent: phpbb.ideas.controller.base
+        calls:
+            - [get_entity, ['@phpbb.ideas.idea']]
 
     phpbb.ideas.livesearch_controller:
         class: phpbb\ideas\controller\livesearch_controller
         parent: phpbb.ideas.controller.base
+        calls:
+            - [get_entity, ['@phpbb.ideas.ideas']]
 
 # ----- Idea Factory Classes -----
-    phpbb.ideas.manager:
-        class: phpbb\ideas\factory\manager
-        arguments:
-            - '@phpbb.ideas.idea'
-            - '@phpbb.ideas.ideas'
-            - '@phpbb.ideas.vote'
-
     phpbb.ideas.base:
         class: phpbb\ideas\factory\ideas
         arguments:
@@ -95,12 +95,6 @@ services:
     phpbb.ideas.idea:
         class: phpbb\ideas\factory\idea
         parent: phpbb.ideas.base
-        arguments:
-            - '@phpbb.ideas.vote'
-
-    phpbb.ideas.vote:
-        class: phpbb\ideas\factory\vote
-        parent: phpbb.ideas.base
 
     phpbb.ideas.linkhelper:
         class: phpbb\ideas\factory\linkhelper
@@ -119,7 +113,7 @@ services:
         class: phpbb\ideas\cron\prune_orphaned_ideas
         arguments:
             - '@config'
-            - '@phpbb.ideas.manager'
+            - '@phpbb.ideas.ideas'
         calls:
             - [set_name, [cron.task.prune_orphaned_ideas]]
         tags:

controller/base.php

@@ -14,7 +14,6 @@
 use phpbb\config\config;
 use phpbb\controller\helper;
 use phpbb\ideas\ext;
-use phpbb\ideas\factory\manager as ideas;
 use phpbb\ideas\factory\linkhelper;
 use phpbb\language\language;
 use phpbb\pagination;
@@ -33,7 +32,7 @@ abstract class base
 	/* @var helper */
 	protected $helper;
 
-	/* @var ideas */
+	/* @var \phpbb\ideas\factory\ideas|\phpbb\ideas\factory\idea */
 	protected $ideas;
 
 	/** @var language  */
@@ -64,7 +63,6 @@ abstract class base
 	 * @param auth       $auth
 	 * @param config     $config
 	 * @param helper     $helper
-	 * @param ideas      $ideas
 	 * @param language   $language
 	 * @param linkhelper $link_helper
 	 * @param pagination $pagination
@@ -74,12 +72,11 @@ abstract class base
 	 * @param string     $root_path
 	 * @param string     $php_ext
 	 */
-	public function __construct(auth $auth, config $config, helper $helper, ideas $ideas, language $language, linkhelper $link_helper, pagination $pagination, request $request, template $template, user $user, $root_path, $php_ext)
+	public function __construct(auth $auth, config $config, helper $helper, language $language, linkhelper $link_helper, pagination $pagination, request $request, template $template, user $user, $root_path, $php_ext)
 	{
 		$this->auth = $auth;
 		$this->config = $config;
 		$this->helper = $helper;
-		$this->ideas = $ideas;
 		$this->language = $language;
 		$this->link_helper = $link_helper;
 		$this->pagination = $pagination;
@@ -92,6 +89,16 @@ public function __construct(auth $auth, config $config, helper $helper, ideas $i
 		$this->language->add_lang('common', 'phpbb/ideas');
 	}
 
+	/**
+	 * Set the Ideas entity
+	 *
+	 * @param string $entity
+	 */
+	public function get_entity($entity)
+	{
+		$this->ideas = $entity;
+	}
+
 	/**
 	 * Check if Ideas is properly configured after installation
 	 * Ideas is available only after forum settings have been set in ACP

controller/livesearch_controller.php

@@ -24,7 +24,7 @@ public function title_search()
 	{
 		$title_chars = $this->request->variable('duplicateeditinput', '', true);
 
-		$matches = $this->ideas->ideas_title_livesearch($title_chars, 10);
+		$matches = $this->ideas->livesearch($title_chars, 10);
 
 		return new \Symfony\Component\HttpFoundation\JsonResponse([
 			'keyword' => $title_chars,

cron/prune_orphaned_ideas.php

@@ -18,17 +18,17 @@ class prune_orphaned_ideas extends \phpbb\cron\task\base
 	/** @var \phpbb\config\config */
 	protected $config;
 
-	/** @var \phpbb\ideas\factory\manager */
+	/** @var \phpbb\ideas\factory\ideas */
 	protected $ideas;
 
 	/**
 	 * Constructor
 	 *
-	 * @param \phpbb\config\config         $config Config object
-	 * @param \phpbb\ideas\factory\manager $ideas  Ideas factory object
+	 * @param \phpbb\config\config       $config Config object
+	 * @param \phpbb\ideas\factory\ideas $ideas  Ideas factory object
 	 * @access public
 	 */
-	public function __construct(\phpbb\config\config $config, \phpbb\ideas\factory\manager $ideas)
+	public function __construct(\phpbb\config\config $config, \phpbb\ideas\factory\ideas $ideas)
 	{
 		$this->config = $config;
 		$this->ideas = $ideas;

event/listener.php

@@ -14,7 +14,7 @@
 use phpbb\config\config;
 use phpbb\controller\helper;
 use phpbb\ideas\ext;
-use phpbb\ideas\factory\manager as ideas;
+use phpbb\ideas\factory\idea;
 use phpbb\ideas\factory\linkhelper;
 use phpbb\language\language;
 use phpbb\template\template;
@@ -32,8 +32,8 @@ class listener implements EventSubscriberInterface
 	/* @var helper */
 	protected $helper;
 
-	/* @var ideas */
-	protected $ideas;
+	/* @var idea */
+	protected $idea;
 
 	/** @var language */
 	protected $language;
@@ -54,19 +54,19 @@ class listener implements EventSubscriberInterface
 	 * @param \phpbb\auth\auth                $auth
 	 * @param \phpbb\config\config            $config
 	 * @param \phpbb\controller\helper        $helper
-	 * @param \phpbb\ideas\factory\manager    $ideas
+	 * @param \phpbb\ideas\factory\idea       $idea
 	 * @param \phpbb\language\language        $language
 	 * @param \phpbb\ideas\factory\linkhelper $link_helper
 	 * @param \phpbb\template\template        $template
 	 * @param \phpbb\user                     $user
 	 * @param string                          $php_ext
 	 */
-	public function __construct(auth $auth, config $config, helper $helper, ideas $ideas, language $language, linkhelper $link_helper, template $template, user $user, $php_ext)
+	public function __construct(auth $auth, config $config, helper $helper, idea $idea, language $language, linkhelper $link_helper, template $template, user $user, $php_ext)
 	{
 		$this->auth = $auth;
 		$this->config = $config;
 		$this->helper = $helper;
-		$this->ideas = $ideas;
+		$this->idea = $idea;
 		$this->language = $language;
 		$this->link_helper = $link_helper;
 		$this->template = $template;
@@ -143,7 +143,7 @@ public function show_idea($event)
 			return;
 		}
 
-		$idea = $this->ideas->get_idea_by_topic_id($event['topic_data']['topic_id']);
+		$idea = $this->idea->get_idea_by_topic_id($event['topic_data']['topic_id']);
 
 		if (!$idea)
 		{
@@ -174,7 +174,7 @@ public function show_idea($event)
 		$s_voted_up = $s_voted_down = false;
 		if ($idea['idea_votes_up'] || $idea['idea_votes_down'])
 		{
-			$votes = $this->ideas->get_voters($idea['idea_id']);
+			$votes = $this->idea->get_voters($idea['idea_id']);
 
 			foreach ($votes as $vote)
 			{
@@ -198,9 +198,9 @@ public function show_idea($event)
 			'IDEA_VOTES_DOWN'	=> $idea['idea_votes_down'],
 			'IDEA_POINTS'		=> $points,
 			'IDEA_STATUS_ID'	=> $idea['idea_status'],
-			'IDEA_STATUS_NAME'	=> $this->ideas->get_status_from_id($idea['idea_status']),
+			'IDEA_STATUS_NAME'	=> $this->idea->get_status_from_id($idea['idea_status']),
 
-			'IDEA_DUPLICATE'	=> $idea['duplicate_id'] ? $this->ideas->get_title($idea['duplicate_id']) : '',
+			'IDEA_DUPLICATE'	=> $idea['duplicate_id'] ? $this->idea->get_title($idea['duplicate_id']) : '',
 			'IDEA_RFC'			=> $idea['rfc_link'],
 			'IDEA_TICKET'		=> $idea['ticket_id'],
 			'IDEA_IMPLEMENTED'	=> $idea['implemented_version'],
@@ -341,7 +341,7 @@ public function submit_idea_after($event)
 			return;
 		}
 
-		$this->ideas->submit($event['data']);
+		$this->idea->submit($event['data']);
 
 		// Show users who's posts need approval a special message
 		if (!$this->auth->acl_get('f_noapprove', $event['data']['forum_id']))
@@ -370,8 +370,8 @@ public function edit_idea_title($event)
 			return;
 		}
 
-		$idea = $this->ideas->get_idea_by_topic_id($event['topic_id']);
-		$this->ideas->set_title($idea['idea_id'], $event['post_data']['post_subject']);
+		$idea = $this->idea->get_idea_by_topic_id($event['topic_id']);
+		$this->idea->set_title($idea['idea_id'], $event['post_data']['post_subject']);
 	}
 
 	/**