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

Update deprecated Twig code.

Browse Source
This commit is contained in:
James Cole
2019-12-28 09:44:56 +01:00
parent 48a0eafa0c
commit 156e2e79c7
8 changed files with 153 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
app/Support/Twig/TransactionGroupTwig.php
View File

@@ -30,13 +30,13 @@ use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\Models\TransactionType;
use Log;
use Twig_Extension;
use Twig_SimpleFunction;
use Twig\Extension\AbstractExtension;
use Twig\TwigFunction;
/**
* Class TransactionGroupTwig
*/
class TransactionGroupTwig extends Twig_Extension
class TransactionGroupTwig extends AbstractExtension
{
/** @noinspection PhpMissingParentCallCommonInspection */
/**
@@ -56,11 +56,11 @@ class TransactionGroupTwig extends Twig_Extension
}
/**
* @return Twig_SimpleFunction
* @return TwigFunction
*/
public function groupAmount(): Twig_SimpleFunction
public function groupAmount(): TwigFunction
{
return new Twig_SimpleFunction(
return new TwigFunction(
'groupAmount',
static function (array $array): string {
$sums = $array['sums'];
@@ -92,11 +92,11 @@ class TransactionGroupTwig extends Twig_Extension
}
/**
* @return Twig_SimpleFunction
* @return TwigFunction
*/
public function journalGetMetaDate(): Twig_SimpleFunction
public function journalGetMetaDate(): TwigFunction
{
return new Twig_SimpleFunction(
return new TwigFunction(
'journalGetMetaDate',
static function (int $journalId, string $metaField) {
if ('testing' === config('app.env')) {
@@ -117,11 +117,11 @@ class TransactionGroupTwig extends Twig_Extension
}
/**
* @return Twig_SimpleFunction
* @return TwigFunction
*/
public function journalGetMetaField(): Twig_SimpleFunction
public function journalGetMetaField(): TwigFunction
{
return new Twig_SimpleFunction(
return new TwigFunction(
'journalGetMetaField',
static function (int $journalId, string $metaField) {
if ('testing' === config('app.env')) {
@@ -142,11 +142,11 @@ class TransactionGroupTwig extends Twig_Extension
}
/**
* @return Twig_SimpleFunction
* @return TwigFunction
*/
public function journalHasMeta(): Twig_SimpleFunction
public function journalHasMeta(): TwigFunction
{
return new Twig_SimpleFunction(
return new TwigFunction(
'journalHasMeta',
static function (int $journalId, string $metaField) {
$count = DB::table('journal_meta')
@@ -163,11 +163,11 @@ class TransactionGroupTwig extends Twig_Extension
/**
* Shows the amount for a single journal array.
*
* @return Twig_SimpleFunction
* @return TwigFunction
*/
public function journalArrayAmount(): Twig_SimpleFunction
public function journalArrayAmount(): TwigFunction
{
return new Twig_SimpleFunction(
return new TwigFunction(
'journalArrayAmount',
function (array $array): string {
// if is not a withdrawal, amount positive.
@@ -187,11 +187,11 @@ class TransactionGroupTwig extends Twig_Extension
/**
* Shows the amount for a single journal object.
*
* @return Twig_SimpleFunction
* @return TwigFunction
*/
public function journalObjectAmount(): Twig_SimpleFunction
public function journalObjectAmount(): TwigFunction
{
return new Twig_SimpleFunction(
return new TwigFunction(
'journalObjectAmount',
function (TransactionJournal $journal): string {
// if is not a withdrawal, amount positive.
@@ -283,6 +283,7 @@ class TransactionGroupTwig extends Twig_Extension
if ($type === TransactionType::OPENING_BALANCE && AccountType::INITIAL_BALANCE === $destinationType) {
$amount = bcmul($amount, '-1');
}
if ($type === TransactionType::TRANSFER) {
$colored = false;
}