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

Code cleanup

Browse Source
This commit is contained in:
James Cole
2018-04-28 06:23:13 +02:00
parent 6f0e1c79ac
commit 13b78bdc20
218 changed files with 621 additions and 681 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/Support/Twig/Extension/Transaction.php
View File

@@ -30,6 +30,7 @@ use FireflyIII\Models\TransactionType;
use Lang;
use Log;
use Twig_Extension;
use FireflyIII\Models\TransactionJournal;
/**
* Class Transaction.
@@ -205,7 +206,7 @@ class Transaction extends Twig_Extension
public function description(TransactionModel $transaction): string
{
$description = $transaction->description;
if (strlen((string)$transaction->transaction_description) > 0) {
if (\strlen((string)$transaction->transaction_description) > 0) {
$description = $transaction->transaction_description . ' (' . $transaction->description . ')';
}
@@ -278,7 +279,7 @@ class Transaction extends Twig_Extension
public function hasAttachments(TransactionModel $transaction): string
{
$res = '';
if (is_int($transaction->attachmentCount) && $transaction->attachmentCount > 0) {
if (\is_int($transaction->attachmentCount) && $transaction->attachmentCount > 0) {
$res = sprintf(
'<i class="fa fa-paperclip" title="%s"></i>', Lang::choice(
'firefly.nr_of_attachments',
@@ -289,7 +290,7 @@ class Transaction extends Twig_Extension
if ($transaction->attachmentCount === null) {
$journalId = (int)$transaction->journal_id;
$count = Attachment::whereNull('deleted_at')
->where('attachable_type', 'FireflyIII\Models\TransactionJournal')
->where('attachable_type', TransactionJournal::class)
->where('attachable_id', $journalId)
->count();
if ($count > 0) {

4
app/Support/Twig/Extension/TransactionJournal.php
View File

@@ -83,7 +83,7 @@ class TransactionJournal extends Twig_Extension
if (null === $result) {
return false;
}
if (strlen((string)$result) === 0) {
if (\strlen((string)$result) === 0) {
return false;
}
@@ -136,6 +136,6 @@ class TransactionJournal extends Twig_Extension
$array[] = app('amount')->formatAnything($total['currency'], $total['amount']);
}
return join(' / ', $array);
return implode(' / ', $array);
}
}

6
app/Support/Twig/General.php
View File

@@ -78,7 +78,7 @@ class General extends Twig_Extension
return new Twig_SimpleFunction(
'activeRoutePartial',
function (): string {
$args = func_get_args();
$args = \func_get_args();
$route = $args[0]; // name of the route.
$name = Route::getCurrentRoute()->getName() ?? '';
if (!(false === strpos($name, $route))) {
@@ -101,7 +101,7 @@ class General extends Twig_Extension
return new Twig_SimpleFunction(
'activeRoutePartialWhat',
function ($context): string {
$args = func_get_args();
$args = \func_get_args();
$route = $args[1]; // name of the route.
$what = $args[2]; // name of the route.
$activeWhat = $context['what'] ?? false;
@@ -127,7 +127,7 @@ class General extends Twig_Extension
return new Twig_SimpleFunction(
'activeRouteStrict',
function (): string {
$args = func_get_args();
$args = \func_get_args();
$route = $args[0]; // name of the route.
if (Route::getCurrentRoute()->getName() === $route) {

2
app/Support/Twig/Journal.php
View File

@@ -192,7 +192,7 @@ class Journal extends Twig_Extension
foreach ($journal->categories as $category) {
$categories[] = sprintf('<a title="%1$s" href="%2$s">%1$s</a>', e($category->name), route('categories.show', $category->id));
}
if (0 === count($categories)) {
if (0 === \count($categories)) {
$set = Category::distinct()->leftJoin('category_transaction', 'categories.id', '=', 'category_transaction.category_id')
->leftJoin('transactions', 'category_transaction.transaction_id', '=', 'transactions.id')
->leftJoin('transaction_journals', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')