kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 23:45:10 +00:00
Code Issues Projects Releases Wiki Activity

Code cleanup courtesy of Scrutiniser CI.

Browse Source
This commit is contained in:
James Cole
2016-02-17 21:55:00 +01:00
parent ff342f6789
commit a178fed0c6
24 changed files with 53 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Controllers/Auth/AuthController.php
View File

@@ -155,9 +155,6 @@ class AuthController extends Controller
return redirect($this->redirectPath());
}
throw new FireflyException('The authenticated user object is invalid.');
return redirect($this->redirectPath());
}
/**

61
app/Http/Controllers/RuleController.php
View File

@@ -272,20 +272,8 @@ class RuleController extends Controller
*/
public function testTriggers(TestRuleFormRequest $request)
{
// build trigger array from response TODO move to function:
$triggers = [];
$data = [
'rule-triggers' => $request->get('rule-trigger'),
'rule-trigger-values' => $request->get('rule-trigger-value'),
'rule-trigger-stop' => $request->get('rule-trigger-stop'),
];
foreach ($data['rule-triggers'] as $index => $triggerType) {
$triggers[] = [
'type' => $triggerType,
'value' => $data['rule-trigger-values'][$index],
'stopProcessing' => intval($data['rule-trigger-stop'][$index]) === 1 ? true : false,
];
}
// build trigger array from response
$triggers = $this->getValidTriggerList($request);
if (count($triggers) == 0) {
@@ -300,20 +288,14 @@ class RuleController extends Controller
$matcher->setRange($range);
$matcher->setTriggers($triggers);
$matchingTransactions = $matcher->findMatchingTransactions();
// Dispatch the actual work to a matched object
// $matchingTransactions
// = (new TransactionMatcher($triggers))
// ->setTransactionLimit($range)
// ->findMatchingTransactions($limit);
// Warn the user if only a subset of transactions is returned
$warning = '';
if (count($matchingTransactions) == $limit) {
$warning = trans('firefly.warning_transaction_subset', ['max_num_transactions' => $limit]);
} else {
if (count($matchingTransactions) == 0) {
$warning = trans('firefly.warning_no_matching_transactions', ['num_transactions' => $range]);
} else {
$warning = "";
}
}
@@ -378,38 +360,25 @@ class RuleController extends Controller
}
/**
* Returns a list of triggers as provided in the URL.
* Only returns triggers that will not match any transaction
* @param TestRuleFormRequest $request
*
* @return array
*/
protected function getValidTriggerList()
protected function getValidTriggerList(TestRuleFormRequest $request): array
{
$triggers = [];
$order = 1;
$data = [
'rule-triggers' => Input::get('rule-trigger'),
'rule-trigger-values' => Input::get('rule-trigger-value'),
'rule-trigger-stop' => Input::get('rule-trigger-stop'),
'rule-triggers' => $request->get('rule-trigger'),
'rule-trigger-values' => $request->get('rule-trigger-value'),
'rule-trigger-stop' => $request->get('rule-trigger-stop'),
];
foreach ($data['rule-triggers'] as $index => $trigger) {
$value = $data['rule-trigger-values'][$index];
$stopProcessing = isset($data['rule-trigger-stop'][$index]) ? true : false;
// Create a new trigger object
$ruleTrigger = new RuleTrigger;
$ruleTrigger->order = $order;
$ruleTrigger->active = 1;
$ruleTrigger->stop_processing = $stopProcessing;
$ruleTrigger->trigger_type = $trigger;
$ruleTrigger->trigger_value = $value;
// Store in list
if (!$ruleTrigger->matchesAnything()) {
$triggers[] = $ruleTrigger;
$order++;
}
foreach ($data['rule-triggers'] as $index => $triggerType) {
$triggers[] = [
'type' => $triggerType,
'value' => $data['rule-trigger-values'][$index],
'stopProcessing' => intval($data['rule-trigger-stop'][$index]) === 1 ? true : false,
];
}
return $triggers;

1
app/Http/Requests/JournalFormRequest.php
View File

@@ -89,7 +89,6 @@ class JournalFormRequest extends Request
break;
default:
throw new FireflyException('Cannot handle transaction type of type ' . e($what) . '.');
break;
}
return $rules;