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

Big refactor to remove the deprecated transaction collector.

Browse Source
This commit is contained in:
James Cole
2019-05-30 12:31:19 +02:00
parent 10a6ff9bf8
commit 8b7e87ae57
117 changed files with 1314 additions and 1208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Console/Commands/ApplyRules.php
View File

@@ -222,7 +222,7 @@ class ApplyRules extends Command
$finalList = new Collection;
$accountList = explode(',', $accountString);
if (0 === \count($accountList)) {
if (0 === count($accountList)) {
$this->error('Please use the --accounts to indicate the accounts to apply rules to.');
return false;
@@ -267,7 +267,7 @@ class ApplyRules extends Command
}
$ruleGroupList = explode(',', $ruleGroupString);
if (0 === \count($ruleGroupList)) {
if (0 === count($ruleGroupList)) {
// can be empty.
return true;
@@ -299,7 +299,7 @@ class ApplyRules extends Command
$finalList = new Collection;
$ruleList = explode(',', $ruleString);
if (0 === \count($ruleList)) {
if (0 === count($ruleList)) {
// can be empty.
return true;

4
app/Console/Commands/CreateImport.php
View File

@@ -225,8 +225,8 @@ class CreateImport extends Command
if (null === $importJob->tag) {
$this->errorLine('No transactions have been imported :(.');
}
if (\count($importJob->errors) > 0) {
$this->infoLine(sprintf('%d error(s) occurred:', \count($importJob->errors)));
if (count($importJob->errors) > 0) {
$this->infoLine(sprintf('%d error(s) occurred:', count($importJob->errors)));
foreach ($importJob->errors as $err) {
$this->errorLine('- ' . $err);
}

2
app/Console/Commands/Upgrade/MigrateToRules.php
View File

@@ -99,7 +99,7 @@ class MigrateToRules extends Command
if (null === $ruleGroup) {
$array = RuleGroup::get(['order'])->pluck('order')->toArray();
$order = \count($array) > 0 ? max($array) + 1 : 1;
$order = count($array) > 0 ? max($array) + 1 : 1;
$ruleGroup = RuleGroup::create(
[
'user_id' => $user->id,