From b7b9378484cd424f1ce55e8e00dfc49e4d295886 Mon Sep 17 00:00:00 2001
From: Dag <me@dvikan.no>
Date: Wed, 22 Jun 2022 18:28:07 +0200
Subject: [PATCH] refactor: ActionFactory (#2833)

---
 index.php                        |  1 -
 lib/ActionFactory.php            | 63 +++++++++-----------------------
 tests/Actions/ListActionTest.php |  1 -
 3 files changed, 18 insertions(+), 47 deletions(-)

diff --git a/index.php b/index.php
index f0d5bd43..a4e5af89 100644
--- a/index.php
+++ b/index.php
@@ -16,7 +16,6 @@ if (isset($argv)) {
 try {
 
 	$actionFac = new \ActionFactory();
-	$actionFac->setWorkingDir(PATH_LIB_ACTIONS);
 
 	if(array_key_exists('action', $params)) {
 		$action = $actionFac->create($params['action']);
diff --git a/lib/ActionFactory.php b/lib/ActionFactory.php
index 1a0520b5..bd1297b4 100644
--- a/lib/ActionFactory.php
+++ b/lib/ActionFactory.php
@@ -11,53 +11,26 @@
  * @link	https://github.com/rss-bridge/rss-bridge
  */
 
-/**
- * Factory for action objects.
- */
-class ActionFactory extends FactoryAbstract {
-	/**
-	 * {@inheritdoc}
-	 *
-	 * @param string $name {@inheritdoc}
-	 */
-	public function create($name) {
-		$filePath = $this->buildFilePath($name);
+class ActionFactory
+{
+	private $folder;
 
+	public function __construct(string $folder = PATH_LIB_ACTIONS)
+	{
+		$this->folder = $folder;
+	}
+
+	/**
+	 * @param string $name The name of the action e.g. "Display", "List", or "Connectivity"
+	 */
+	public function create(string $name): ActionInterface
+	{
+		$name = ucfirst(strtolower($name)) . 'Action';
+		$filePath = $this->folder . $name . '.php';
 		if(!file_exists($filePath)) {
-			throw new \Exception('Action ' . $name . ' does not exist!');
+			throw new \Exception('Invalid action');
 		}
-
-		$class = $this->buildClassName($name);
-
-		if((new \ReflectionClass($class))->isInstantiable()) {
-			return new $class();
-		}
-
-		return false;
-	}
-
-	/**
-	 * Build class name from action name
-	 *
-	 * The class name consists of the action name with prefix "Action". The first
-	 * character of the class name must be uppercase.
-	 *
-	 * Example: 'display' => 'DisplayAction'
-	 *
-	 * @param string $name The action name.
-	 * @return string The class name.
-	 */
-	protected function buildClassName($name) {
-		return ucfirst(strtolower($name)) . 'Action';
-	}
-
-	/**
-	 * Build file path to the action class.
-	 *
-	 * @param string $name The action name.
-	 * @return string Path to the action class.
-	 */
-	protected function buildFilePath($name) {
-		return $this->getWorkingDir() . $this->buildClassName($name) . '.php';
+		$className = '\\' . $name;
+		return new $className();
 	}
 }
diff --git a/tests/Actions/ListActionTest.php b/tests/Actions/ListActionTest.php
index e5ef9570..bbd6ec78 100644
--- a/tests/Actions/ListActionTest.php
+++ b/tests/Actions/ListActionTest.php
@@ -78,7 +78,6 @@ class ListActionTest extends TestCase {
 
 	private function initAction() {
 		$actionFac = new ActionFactory();
-		$actionFac->setWorkingDir(PATH_LIB_ACTIONS);
 
 		$action = $actionFac->create('list');
 		$action->setUserData(array()); /* no user data required */