mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-10-12 23:45:10 +00:00
Throw errors instead of abort()
This commit is contained in:
@@ -10,6 +10,7 @@ declare(strict_types = 1);
|
||||
|
||||
namespace FireflyIII\Rules\Actions;
|
||||
|
||||
use FireflyIII\Exceptions\FireflyException;
|
||||
use FireflyIII\Models\RuleAction;
|
||||
use FireflyIII\Models\TransactionJournal;
|
||||
use FireflyIII\Support\Domain;
|
||||
@@ -22,48 +23,56 @@ use FireflyIII\Support\Domain;
|
||||
class ActionFactory
|
||||
{
|
||||
protected static $actionTypes = null;
|
||||
|
||||
/**
|
||||
* Returns the class name to be used for actions with the given name
|
||||
* @param string $actionType
|
||||
* @return ActionInterface
|
||||
*/
|
||||
public static function getActionClass(string $actionType): string {
|
||||
$actionTypes = self::getActionTypes();
|
||||
|
||||
if (!array_key_exists($actionType, $actionTypes)) {
|
||||
abort(500, 'No such action exists ("' . $actionType . '").');
|
||||
}
|
||||
|
||||
$class = $actionTypes[$actionType];
|
||||
if (!class_exists($class)) {
|
||||
abort(500, 'Could not instantiate class for rule action type "' . $actionType . '" (' . $class . ').');
|
||||
}
|
||||
|
||||
return $class;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Returns the action for the given type and journal
|
||||
* @param RuleAction $action
|
||||
*
|
||||
* @param RuleAction $action
|
||||
* @param TransactionJournal $journal
|
||||
*
|
||||
* @return ActionInterface
|
||||
*/
|
||||
public static function getAction(RuleAction $action, TransactionJournal $journal): ActionInterface {
|
||||
public static function getAction(RuleAction $action, TransactionJournal $journal): ActionInterface
|
||||
{
|
||||
$actionType = $action->action_type;
|
||||
$class = self::getActionClass($actionType);
|
||||
|
||||
$class = self::getActionClass($actionType);
|
||||
|
||||
return new $class($action, $journal);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Returns the class name to be used for actions with the given name
|
||||
*
|
||||
* @param string $actionType
|
||||
*
|
||||
* @return ActionInterface|string
|
||||
* @throws FireflyException
|
||||
*/
|
||||
public static function getActionClass(string $actionType): string
|
||||
{
|
||||
$actionTypes = self::getActionTypes();
|
||||
|
||||
if (!array_key_exists($actionType, $actionTypes)) {
|
||||
throw new FireflyException('No such action exists ("' . e($actionType) . '").');
|
||||
}
|
||||
|
||||
$class = $actionTypes[$actionType];
|
||||
if (!class_exists($class)) {
|
||||
throw new FireflyException('Could not instantiate class for rule action type "' . e($actionType) . '" (' . e($class) . ').');
|
||||
}
|
||||
|
||||
return $class;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns a map with actiontypes, mapped to the class representing that type
|
||||
*/
|
||||
protected static function getActionTypes() {
|
||||
if( !self::$actionTypes ) {
|
||||
protected static function getActionTypes()
|
||||
{
|
||||
if (!self::$actionTypes) {
|
||||
self::$actionTypes = Domain::getRuleActions();
|
||||
}
|
||||
|
||||
|
||||
return self::$actionTypes;
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user