From 995c43d832cb266803fd8285b85832581da58c35 Mon Sep 17 00:00:00 2001 From: Florian Dupret Date: Mon, 27 Jul 2020 10:53:36 +0200 Subject: [PATCH 1/9] First refactoring towards fixing #3382 --- app/Support/Twig/TransactionGroupTwig.php | 102 +++++++++++++--------- resources/views/v1/list/groups-tiny.twig | 4 +- 2 files changed, 65 insertions(+), 41 deletions(-) diff --git a/app/Support/Twig/TransactionGroupTwig.php b/app/Support/Twig/TransactionGroupTwig.php index e9313b62df..81329b4ccf 100644 --- a/app/Support/Twig/TransactionGroupTwig.php +++ b/app/Support/Twig/TransactionGroupTwig.php @@ -25,6 +25,7 @@ namespace FireflyIII\Support\Twig; use Carbon\Carbon; use DB; +use FireflyIII\Models\Account; use FireflyIII\Models\AccountType; use FireflyIII\Models\Transaction; use FireflyIII\Models\TransactionJournal; @@ -62,7 +63,7 @@ class TransactionGroupTwig extends AbstractExtension { return new TwigFunction( 'groupAmount', - static function (array $array): string { + function (array $array, Account $account): string { $sums = $array['sums']; $return = []; $first = reset($array['transactions']); @@ -77,15 +78,17 @@ class TransactionGroupTwig extends AbstractExtension foreach ($sums as $sum) { $amount = $sum['amount']; - // do multiplication thing. - if ($type !== TransactionType::WITHDRAWAL) { - $amount = bcmul($amount, '-1'); - } + $destinationType = $first['destination_account_type'] ?? 'invalid'; + $sourceAccountId = $first['source_account_id']; + $amount = $this->signAmount($amount, $type, $destinationType, $sourceAccountId, $account->id); $return[] = app('amount')->formatFlat($sum['currency_symbol'], (int)$sum['currency_decimal_places'], $amount, $colored); } - - return implode(', ', $return); + $result = implode(', ', $return); + if ($type === TransactionType::TRANSFER) { + $result = sprintf('%s', $result); + } + return $result; }, ['is_safe' => ['html']] ); @@ -169,12 +172,12 @@ class TransactionGroupTwig extends AbstractExtension { return new TwigFunction( 'journalArrayAmount', - function (array $array): string { + function (array $journal, Account $account): string { // if is not a withdrawal, amount positive. - $result = $this->normalJournalArrayAmount($array); + $result = $this->normalJournalArrayAmount($journal, $account); // now append foreign amount, if any. - if (null !== $array['foreign_amount']) { - $foreign = $this->foreignJournalArrayAmount($array); + if (null !== $journal['foreign_amount']) { + $foreign = $this->foreignJournalArrayAmount($journal, $account); $result = sprintf('%s (%s)', $result, $foreign); } @@ -194,7 +197,6 @@ class TransactionGroupTwig extends AbstractExtension return new TwigFunction( 'journalObjectAmount', function (TransactionJournal $journal): string { - // if is not a withdrawal, amount positive. $result = $this->normalJournalObjectAmount($journal); // now append foreign amount, if any. if ($this->journalObjectHasForeign($journal)) { @@ -211,22 +213,26 @@ class TransactionGroupTwig extends AbstractExtension /** * Generate foreign amount for transaction from a transaction group. * - * @param array $array + * @param array $journal + * @param Account $account * * @return string */ - private function foreignJournalArrayAmount(array $array): string + private function foreignJournalArrayAmount(array $journal, Account $account): string { - $type = $array['transaction_type_type'] ?? TransactionType::WITHDRAWAL; - $amount = $array['foreign_amount'] ?? '0'; + $type = $journal['transaction_type_type'] ?? TransactionType::WITHDRAWAL; + $amount = $journal['foreign_amount'] ?? '0'; $colored = true; - if ($type !== TransactionType::WITHDRAWAL) { - $amount = bcmul($amount, '-1'); - } + + $destinationType = $journal['destination_account_type'] ?? 'invalid'; + $sourceAccountId = $journal['source_account_id']; + $amount = $this->signAmount($amount, $type, $destinationType, $sourceAccountId, $account->id); + if ($type === TransactionType::TRANSFER) { $colored = false; } - $result = app('amount')->formatFlat($array['foreign_currency_symbol'], (int)$array['foreign_currency_decimal_places'], $amount, $colored); + + $result = app('amount')->formatFlat($journal['foreign_currency_symbol'], (int)$journal['foreign_currency_decimal_places'], $amount, $colored); if ($type === TransactionType::TRANSFER) { $result = sprintf('%s', $result); } @@ -249,9 +255,9 @@ class TransactionGroupTwig extends AbstractExtension $currency = $first->foreignCurrency; $amount = $first->foreign_amount ?? '0'; $colored = true; - if ($type !== TransactionType::WITHDRAWAL) { - $amount = bcmul($amount, '-1'); - } + + $amount = $this->signAmount($amount, $type); + if ($type === TransactionType::TRANSFER) { $colored = false; } @@ -267,28 +273,24 @@ class TransactionGroupTwig extends AbstractExtension * Generate normal amount for transaction from a transaction group. * * @param array $array + * @param Account $account * * @return string */ - private function normalJournalArrayAmount(array $array): string + private function normalJournalArrayAmount(array $journal, Account $account): string { - $type = $array['transaction_type_type'] ?? TransactionType::WITHDRAWAL; - $amount = $array['amount'] ?? '0'; + $type = $journal['transaction_type_type'] ?? TransactionType::WITHDRAWAL; + $amount = $journal['amount'] ?? '0'; $colored = true; - // withdrawals are negative - if ($type !== TransactionType::WITHDRAWAL) { - $amount = bcmul($amount, '-1'); - } - $destinationType = $array['destination_account_type'] ?? 'invalid'; - if ($type === TransactionType::OPENING_BALANCE && AccountType::INITIAL_BALANCE === $destinationType) { - $amount = bcmul($amount, '-1'); - } - + $destinationType = $journal['destination_account_type'] ?? 'invalid'; + $sourceAccountId = $journal['source_account_id']; + $amount = $this->signAmount($amount, $type, $destinationType, $sourceAccountId, $account->id); + if ($type === TransactionType::TRANSFER) { $colored = false; } - $result = app('amount')->formatFlat($array['currency_symbol'], (int)$array['currency_decimal_places'], $amount, $colored); + $result = app('amount')->formatFlat($journal['currency_symbol'], (int)$journal['currency_decimal_places'], $amount, $colored); if ($type === TransactionType::TRANSFER) { $result = sprintf('%s', $result); } @@ -310,9 +312,9 @@ class TransactionGroupTwig extends AbstractExtension $currency = $journal->transactionCurrency; $amount = $first->amount ?? '0'; $colored = true; - if ($type !== TransactionType::WITHDRAWAL) { - $amount = bcmul($amount, '-1'); - } + + $amount = $this->signAmount($amount, $type,); + if ($type === TransactionType::TRANSFER) { $colored = false; } @@ -335,4 +337,26 @@ class TransactionGroupTwig extends AbstractExtension return null !== $first->foreign_amount; } + + static function signAmount(string $amount, string $type, string $destinationType = null, int $sourceAccountId = null, int $displayedAccountId = null): string { + + // withdrawals stay negative + if ($type !== TransactionType::WITHDRAWAL) { + $amount = bcmul($amount, '-1'); + } + + // negative opening balance + if ($type === TransactionType::OPENING_BALANCE) + if (AccountType::INITIAL_BALANCE === $destinationType) { + $amount = bcmul($amount, '-1'); + } + + // transfers stay negative from source point of view + if ($type === TransactionType::TRANSFER + && !is_null($sourceAccountId) && $sourceAccountId === $displayedAccountId) { + $amount = bcmul($amount, '-1'); + } + + return $amount; + } } diff --git a/resources/views/v1/list/groups-tiny.twig b/resources/views/v1/list/groups-tiny.twig index 90d5b0d79b..9bbcc239e7 100644 --- a/resources/views/v1/list/groups-tiny.twig +++ b/resources/views/v1/list/groups-tiny.twig @@ -4,14 +4,14 @@ {% for transaction in group.transactions %} {{ transaction.description }} - {{ journalArrayAmount(transaction) }} + {{ journalArrayAmount(transaction, account) }}
{% endfor %} {% if group.count > 1 %}   - {{ groupAmount(group) }} + {{ groupAmount(group, account) }} {% endif %} From 261156588faf43ae9d2de3aa79d8cc901850c678 Mon Sep 17 00:00:00 2001 From: Florian Dupret Date: Mon, 27 Jul 2020 11:52:25 +0200 Subject: [PATCH 2/9] Fix broken merge from 294cda7 --- app/Support/Twig/TransactionGroupTwig.php | 7 ------- 1 file changed, 7 deletions(-) diff --git a/app/Support/Twig/TransactionGroupTwig.php b/app/Support/Twig/TransactionGroupTwig.php index e23a0902fe..fa9451185f 100644 --- a/app/Support/Twig/TransactionGroupTwig.php +++ b/app/Support/Twig/TransactionGroupTwig.php @@ -231,7 +231,6 @@ class TransactionGroupTwig extends AbstractExtension if ($type === TransactionType::TRANSFER) { $colored = false; } - $result = app('amount')->formatFlat($journal['foreign_currency_symbol'], (int)$journal['foreign_currency_decimal_places'], $amount, $colored); if ($type === TransactionType::TRANSFER) { $result = sprintf('%s', $result); @@ -286,12 +285,6 @@ class TransactionGroupTwig extends AbstractExtension $sourceAccountId = $journal['source_account_id']; $amount = $this->signAmount($amount, $type, $destinationType, $sourceAccountId, $account->id); - // withdrawals are negative - if ($type !== TransactionType::WITHDRAWAL) { - $amount = bcmul($amount, '-1'); - } - - if ($type === TransactionType::TRANSFER) { $colored = false; } From 977c78412fd8bb11e1c936dc324b9ced04d3cdcc Mon Sep 17 00:00:00 2001 From: Florian Dupret Date: Sat, 1 Aug 2020 14:08:03 +0200 Subject: [PATCH 3/9] Better refactorization for #3382 --- app/Support/Twig/TransactionGroupTwig.php | 50 +++++++++++++---------- 1 file changed, 29 insertions(+), 21 deletions(-) diff --git a/app/Support/Twig/TransactionGroupTwig.php b/app/Support/Twig/TransactionGroupTwig.php index fa9451185f..4aea2b1bdb 100644 --- a/app/Support/Twig/TransactionGroupTwig.php +++ b/app/Support/Twig/TransactionGroupTwig.php @@ -78,9 +78,9 @@ class TransactionGroupTwig extends AbstractExtension foreach ($sums as $sum) { $amount = $sum['amount']; - $destinationType = $first['destination_account_type'] ?? 'invalid'; + $sourceType = $first['source_account_type'] ?? 'invalid'; $sourceAccountId = $first['source_account_id']; - $amount = $this->signAmount($amount, $type, $destinationType, $sourceAccountId, $account->id); + $amount = $this->signAmountFromAccountPOV($amount, $type, $sourceType, $sourceAccountId, $account->id); $return[] = app('amount')->formatFlat($sum['currency_symbol'], (int)$sum['currency_decimal_places'], $amount, $colored); } @@ -224,9 +224,9 @@ class TransactionGroupTwig extends AbstractExtension $amount = $journal['foreign_amount'] ?? '0'; $colored = true; - $destinationType = $journal['destination_account_type'] ?? 'invalid'; + $sourceType = $journal['source_account_type'] ?? 'invalid'; $sourceAccountId = $journal['source_account_id']; - $amount = $this->signAmount($amount, $type, $destinationType, $sourceAccountId, $account->id); + $amount = $this->signAmountFromAccountPOV($amount, $type, $sourceType, $sourceAccountId, $account->id); if ($type === TransactionType::TRANSFER) { $colored = false; @@ -254,8 +254,9 @@ class TransactionGroupTwig extends AbstractExtension $currency = $first->foreignCurrency; $amount = $first->foreign_amount ?? '0'; $colored = true; - - $amount = $this->signAmount($amount, $type); + $sourceType = $first->account()->first()->accountType()->first()->type; + + $amount = $this->signAmount($amount, $type, $sourceType); if ($type === TransactionType::TRANSFER) { $colored = false; @@ -281,9 +282,9 @@ class TransactionGroupTwig extends AbstractExtension $type = $journal['transaction_type_type'] ?? TransactionType::WITHDRAWAL; $amount = $journal['amount'] ?? '0'; $colored = true; - $destinationType = $journal['destination_account_type'] ?? 'invalid'; + $sourceType = $journal['source_account_type'] ?? 'invalid'; $sourceAccountId = $journal['source_account_id']; - $amount = $this->signAmount($amount, $type, $destinationType, $sourceAccountId, $account->id); + $amount = $this->signAmount($amount, $type, $sourceType, $sourceAccountId, $account->id); if ($type === TransactionType::TRANSFER) { $colored = false; @@ -311,8 +312,9 @@ class TransactionGroupTwig extends AbstractExtension $currency = $journal->transactionCurrency; $amount = $first->amount ?? '0'; $colored = true; + $sourceType = $first->account()->first()->accountType()->first()->type; - $amount = $this->signAmount($amount, $type,); + $amount = $this->signAmount($amount, $type, $sourceType); if ($type === TransactionType::TRANSFER) { $colored = false; @@ -337,29 +339,35 @@ class TransactionGroupTwig extends AbstractExtension return null !== $first->foreign_amount; } - static function signAmount(string $amount, string $type, string $destinationType = null, int $sourceAccountId = null, int $displayedAccountId = null): string { + private function signAmount( string $amount, string $transactionType, string $sourceType ): string { // withdrawals stay negative - if ($type !== TransactionType::WITHDRAWAL) { + if ($transactionType !== TransactionType::WITHDRAWAL) { $amount = bcmul($amount, '-1'); } - // opening balance and it goes to initial balance? its expense. - if ($type === TransactionType::OPENING_BALANCE && AccountType::INITIAL_BALANCE === $destinationType) { + // opening balance and it comes from initial balance? its expense. + if ($transactionType === TransactionType::OPENING_BALANCE && AccountType::INITIAL_BALANCE !== $sourceType) { $amount = bcmul($amount, '-1'); } - // transfers stay negative from source point of view - if ($type === TransactionType::TRANSFER - && !is_null($sourceAccountId) && $sourceAccountId === $displayedAccountId) { - $amount = bcmul($amount, '-1'); - } - - // reconciliation and it goes to reconciliation? - if ($type === TransactionType::RECONCILIATION && AccountType::RECONCILIATION === $destinationType) { + // reconciliation and it comes from reconciliation? + if ($transactionType === TransactionType::RECONCILIATION && AccountType::RECONCILIATION !== $sourceType) { $amount = bcmul($amount, '-1'); } return $amount; } + + private function signAmountFromAccountPOV(string $amount, string $transactionType, string $sourceType, int $sourceAccountId, $displayedAccountId): string { + $amount = $this->signAmount( $amount, $transactionType, $sourceType ); + + // transfers stay negative from source point of view + if ($transactionType === TransactionType::TRANSFER + && $sourceAccountId === $displayedAccountId) { + $amount = bcmul($amount, '-1'); + } + + return $amount; + } } From f4b6a63514b84fc90cd11d9ae86a7819b30bcbb3 Mon Sep 17 00:00:00 2001 From: Florian Dupret Date: Sat, 1 Aug 2020 18:51:12 +0200 Subject: [PATCH 4/9] Rollback #3382 --- app/Support/Twig/TransactionGroupTwig.php | 47 ++++++++--------------- resources/views/v1/list/groups-tiny.twig | 4 +- 2 files changed, 17 insertions(+), 34 deletions(-) diff --git a/app/Support/Twig/TransactionGroupTwig.php b/app/Support/Twig/TransactionGroupTwig.php index 4aea2b1bdb..8186304b6c 100644 --- a/app/Support/Twig/TransactionGroupTwig.php +++ b/app/Support/Twig/TransactionGroupTwig.php @@ -25,7 +25,6 @@ namespace FireflyIII\Support\Twig; use Carbon\Carbon; use DB; -use FireflyIII\Models\Account; use FireflyIII\Models\AccountType; use FireflyIII\Models\Transaction; use FireflyIII\Models\TransactionJournal; @@ -63,7 +62,7 @@ class TransactionGroupTwig extends AbstractExtension { return new TwigFunction( 'groupAmount', - function (array $array, Account $account): string { + function (array $array): string { $sums = $array['sums']; $return = []; $first = reset($array['transactions']); @@ -79,8 +78,7 @@ class TransactionGroupTwig extends AbstractExtension $amount = $sum['amount']; $sourceType = $first['source_account_type'] ?? 'invalid'; - $sourceAccountId = $first['source_account_id']; - $amount = $this->signAmountFromAccountPOV($amount, $type, $sourceType, $sourceAccountId, $account->id); + $amount = $this->signAmount($amount, $type, $sourceType); $return[] = app('amount')->formatFlat($sum['currency_symbol'], (int)$sum['currency_decimal_places'], $amount, $colored); } @@ -172,12 +170,12 @@ class TransactionGroupTwig extends AbstractExtension { return new TwigFunction( 'journalArrayAmount', - function (array $journal, Account $account): string { + function (array $array): string { // if is not a withdrawal, amount positive. - $result = $this->normalJournalArrayAmount($journal, $account); + $result = $this->normalJournalArrayAmount($array); // now append foreign amount, if any. - if (null !== $journal['foreign_amount']) { - $foreign = $this->foreignJournalArrayAmount($journal, $account); + if (null !== $array['foreign_amount']) { + $foreign = $this->foreignJournalArrayAmount($array); $result = sprintf('%s (%s)', $result, $foreign); } @@ -213,25 +211,23 @@ class TransactionGroupTwig extends AbstractExtension /** * Generate foreign amount for transaction from a transaction group. * - * @param array $journal - * @param Account $account + * @param array $array * * @return string */ - private function foreignJournalArrayAmount(array $journal, Account $account): string + private function foreignJournalArrayAmount(array $array): string { - $type = $journal['transaction_type_type'] ?? TransactionType::WITHDRAWAL; - $amount = $journal['foreign_amount'] ?? '0'; + $type = $array['transaction_type_type'] ?? TransactionType::WITHDRAWAL; + $amount = $array['foreign_amount'] ?? '0'; $colored = true; - $sourceType = $journal['source_account_type'] ?? 'invalid'; - $sourceAccountId = $journal['source_account_id']; - $amount = $this->signAmountFromAccountPOV($amount, $type, $sourceType, $sourceAccountId, $account->id); + $sourceType = $array['source_account_type'] ?? 'invalid'; + $amount = $this->signAmount($amount, $type, $sourceType); if ($type === TransactionType::TRANSFER) { $colored = false; } - $result = app('amount')->formatFlat($journal['foreign_currency_symbol'], (int)$journal['foreign_currency_decimal_places'], $amount, $colored); + $result = app('amount')->formatFlat($array['foreign_currency_symbol'], (int)$array['foreign_currency_decimal_places'], $amount, $colored); if ($type === TransactionType::TRANSFER) { $result = sprintf('%s', $result); } @@ -277,14 +273,13 @@ class TransactionGroupTwig extends AbstractExtension * * @return string */ - private function normalJournalArrayAmount(array $journal, Account $account): string + private function normalJournalArrayAmount(array $journal): string { $type = $journal['transaction_type_type'] ?? TransactionType::WITHDRAWAL; $amount = $journal['amount'] ?? '0'; $colored = true; $sourceType = $journal['source_account_type'] ?? 'invalid'; - $sourceAccountId = $journal['source_account_id']; - $amount = $this->signAmount($amount, $type, $sourceType, $sourceAccountId, $account->id); + $amount = $this->signAmount($amount, $type, $sourceType); if ($type === TransactionType::TRANSFER) { $colored = false; @@ -358,16 +353,4 @@ class TransactionGroupTwig extends AbstractExtension return $amount; } - - private function signAmountFromAccountPOV(string $amount, string $transactionType, string $sourceType, int $sourceAccountId, $displayedAccountId): string { - $amount = $this->signAmount( $amount, $transactionType, $sourceType ); - - // transfers stay negative from source point of view - if ($transactionType === TransactionType::TRANSFER - && $sourceAccountId === $displayedAccountId) { - $amount = bcmul($amount, '-1'); - } - - return $amount; - } } diff --git a/resources/views/v1/list/groups-tiny.twig b/resources/views/v1/list/groups-tiny.twig index 9bbcc239e7..90d5b0d79b 100644 --- a/resources/views/v1/list/groups-tiny.twig +++ b/resources/views/v1/list/groups-tiny.twig @@ -4,14 +4,14 @@ {% for transaction in group.transactions %} {{ transaction.description }} - {{ journalArrayAmount(transaction, account) }} + {{ journalArrayAmount(transaction) }}
{% endfor %} {% if group.count > 1 %}   - {{ groupAmount(group, account) }} + {{ groupAmount(group) }} {% endif %} From 9db79c314204cd4d64cf6b8d74bad1da51cf75a2 Mon Sep 17 00:00:00 2001 From: Florian Dupret Date: Sat, 1 Aug 2020 18:53:42 +0200 Subject: [PATCH 5/9] Rollback #3382 part 2 --- app/Support/Twig/TransactionGroupTwig.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/Support/Twig/TransactionGroupTwig.php b/app/Support/Twig/TransactionGroupTwig.php index 8186304b6c..7fa0ca1fca 100644 --- a/app/Support/Twig/TransactionGroupTwig.php +++ b/app/Support/Twig/TransactionGroupTwig.php @@ -273,19 +273,19 @@ class TransactionGroupTwig extends AbstractExtension * * @return string */ - private function normalJournalArrayAmount(array $journal): string + private function normalJournalArrayAmount(array $array): string { - $type = $journal['transaction_type_type'] ?? TransactionType::WITHDRAWAL; - $amount = $journal['amount'] ?? '0'; + $type = $array['transaction_type_type'] ?? TransactionType::WITHDRAWAL; + $amount = $array['amount'] ?? '0'; $colored = true; - $sourceType = $journal['source_account_type'] ?? 'invalid'; + $sourceType = $array['source_account_type'] ?? 'invalid'; $amount = $this->signAmount($amount, $type, $sourceType); if ($type === TransactionType::TRANSFER) { $colored = false; } - $result = app('amount')->formatFlat($journal['currency_symbol'], (int)$journal['currency_decimal_places'], $amount, $colored); + $result = app('amount')->formatFlat($array['currency_symbol'], (int)$array['currency_decimal_places'], $amount, $colored); if ($type === TransactionType::TRANSFER) { $result = sprintf('%s', $result); } From 5d63f54fe25b76d913aba976be4e4b92461f8c31 Mon Sep 17 00:00:00 2001 From: Florian Dupret Date: Sat, 1 Aug 2020 18:57:58 +0200 Subject: [PATCH 6/9] Rollback #3382 part 3 --- app/Support/Twig/TransactionGroupTwig.php | 1 - 1 file changed, 1 deletion(-) diff --git a/app/Support/Twig/TransactionGroupTwig.php b/app/Support/Twig/TransactionGroupTwig.php index 7fa0ca1fca..6173121449 100644 --- a/app/Support/Twig/TransactionGroupTwig.php +++ b/app/Support/Twig/TransactionGroupTwig.php @@ -269,7 +269,6 @@ class TransactionGroupTwig extends AbstractExtension * Generate normal amount for transaction from a transaction group. * * @param array $array - * @param Account $account * * @return string */ From 3e372bb1d9c26d205ec3d2cc11258874fcb2e154 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 5 Aug 2020 05:31:38 +0000 Subject: [PATCH 7/9] Bump laravel/framework from 7.22.4 to 7.23.0 Bumps [laravel/framework](https://github.com/laravel/framework) from 7.22.4 to 7.23.0. - [Release notes](https://github.com/laravel/framework/releases) - [Changelog](https://github.com/laravel/framework/blob/7.x/CHANGELOG-7.x.md) - [Commits](https://github.com/laravel/framework/compare/v7.22.4...v7.23.0) Signed-off-by: dependabot[bot] --- composer.lock | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/composer.lock b/composer.lock index eb8dc3c585..61fe25a4b1 100644 --- a/composer.lock +++ b/composer.lock @@ -1532,16 +1532,16 @@ }, { "name": "laravel/framework", - "version": "v7.22.4", + "version": "v7.23.0", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "30e851a2b3a2af73fba0b7f4fa22b04260db98e7" + "reference": "17cbce101f2fc78e61a6135861823563c7cfb50b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/30e851a2b3a2af73fba0b7f4fa22b04260db98e7", - "reference": "30e851a2b3a2af73fba0b7f4fa22b04260db98e7", + "url": "https://api.github.com/repos/laravel/framework/zipball/17cbce101f2fc78e61a6135861823563c7cfb50b", + "reference": "17cbce101f2fc78e61a6135861823563c7cfb50b", "shasum": "" }, "require": { @@ -1685,7 +1685,7 @@ "framework", "laravel" ], - "time": "2020-07-27T18:25:06+00:00" + "time": "2020-08-04T14:36:37+00:00" }, { "name": "laravel/passport", @@ -2500,16 +2500,16 @@ }, { "name": "nesbot/carbon", - "version": "2.37.0", + "version": "2.38.0", "source": { "type": "git", "url": "https://github.com/briannesbitt/Carbon.git", - "reference": "1f61206de973d67f36ce50f041c792ddac663c3e" + "reference": "d8f6a6a91d1eb9304527b040500f61923e97674b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/1f61206de973d67f36ce50f041c792ddac663c3e", - "reference": "1f61206de973d67f36ce50f041c792ddac663c3e", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/d8f6a6a91d1eb9304527b040500f61923e97674b", + "reference": "d8f6a6a91d1eb9304527b040500f61923e97674b", "shasum": "" }, "require": { @@ -2524,7 +2524,7 @@ "kylekatarnls/multi-tester": "^2.0", "phpmd/phpmd": "^2.8", "phpstan/extension-installer": "^1.0", - "phpstan/phpstan": "^0.12.30", + "phpstan/phpstan": "^0.12.35", "phpunit/phpunit": "^7.5 || ^8.0", "squizlabs/php_codesniffer": "^3.4" }, @@ -2585,7 +2585,7 @@ "type": "tidelift" } ], - "time": "2020-07-28T06:04:54+00:00" + "time": "2020-08-04T19:12:46+00:00" }, { "name": "nyholm/psr7", @@ -4782,7 +4782,7 @@ }, { "name": "symfony/polyfill-ctype", - "version": "v1.18.0", + "version": "v1.18.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", @@ -4858,7 +4858,7 @@ }, { "name": "symfony/polyfill-iconv", - "version": "v1.18.0", + "version": "v1.18.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-iconv.git", @@ -4935,7 +4935,7 @@ }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.18.0", + "version": "v1.18.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", @@ -5013,16 +5013,16 @@ }, { "name": "symfony/polyfill-intl-idn", - "version": "v1.18.0", + "version": "v1.18.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-idn.git", - "reference": "bc6549d068d0160e0f10f7a5a23c7d1406b95ebe" + "reference": "5dcab1bc7146cf8c1beaa4502a3d9be344334251" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/bc6549d068d0160e0f10f7a5a23c7d1406b95ebe", - "reference": "bc6549d068d0160e0f10f7a5a23c7d1406b95ebe", + "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/5dcab1bc7146cf8c1beaa4502a3d9be344334251", + "reference": "5dcab1bc7146cf8c1beaa4502a3d9be344334251", "shasum": "" }, "require": { @@ -5094,11 +5094,11 @@ "type": "tidelift" } ], - "time": "2020-07-14T12:35:20+00:00" + "time": "2020-08-04T06:02:08+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.18.0", + "version": "v1.18.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", @@ -5179,7 +5179,7 @@ }, { "name": "symfony/polyfill-mbstring", - "version": "v1.18.0", + "version": "v1.18.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", @@ -5256,7 +5256,7 @@ }, { "name": "symfony/polyfill-php70", - "version": "v1.18.0", + "version": "v1.18.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php70.git", @@ -5333,7 +5333,7 @@ }, { "name": "symfony/polyfill-php72", - "version": "v1.18.0", + "version": "v1.18.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php72.git", @@ -5406,7 +5406,7 @@ }, { "name": "symfony/polyfill-php73", - "version": "v1.18.0", + "version": "v1.18.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php73.git", @@ -5482,7 +5482,7 @@ }, { "name": "symfony/polyfill-php80", - "version": "v1.18.0", + "version": "v1.18.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", From 9d6d15635ff7c3098bfa2f66e99ea2e2478893aa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 5 Aug 2020 05:32:45 +0000 Subject: [PATCH 8/9] Bump phpstan/phpstan from 0.12.34 to 0.12.35 Bumps [phpstan/phpstan](https://github.com/phpstan/phpstan) from 0.12.34 to 0.12.35. - [Release notes](https://github.com/phpstan/phpstan/releases) - [Commits](https://github.com/phpstan/phpstan/compare/0.12.34...0.12.35) Signed-off-by: dependabot[bot] --- composer.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.lock b/composer.lock index eb8dc3c585..53eac6b826 100644 --- a/composer.lock +++ b/composer.lock @@ -8691,16 +8691,16 @@ }, { "name": "phpstan/phpstan", - "version": "0.12.34", + "version": "0.12.35", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "ad75388d71fb0b4a954f71a852fd989915a51cb7" + "reference": "5230eb31d546e4df7aa725894d17436cb8afd5df" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/ad75388d71fb0b4a954f71a852fd989915a51cb7", - "reference": "ad75388d71fb0b4a954f71a852fd989915a51cb7", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/5230eb31d546e4df7aa725894d17436cb8afd5df", + "reference": "5230eb31d546e4df7aa725894d17436cb8afd5df", "shasum": "" }, "require": { @@ -8743,7 +8743,7 @@ "type": "tidelift" } ], - "time": "2020-07-30T15:31:10+00:00" + "time": "2020-08-04T09:48:39+00:00" }, { "name": "phpstan/phpstan-deprecation-rules", From d26331bd36527aa24da5d1bd65aa35ea80d0cd83 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 5 Aug 2020 07:05:26 +0000 Subject: [PATCH 9/9] Bump bootstrap from 4.5.0 to 4.5.1 in /frontend Bumps [bootstrap](https://github.com/twbs/bootstrap) from 4.5.0 to 4.5.1. - [Release notes](https://github.com/twbs/bootstrap/releases) - [Commits](https://github.com/twbs/bootstrap/compare/v4.5.0...v4.5.1) Signed-off-by: dependabot[bot] --- frontend/package-lock.json | 6 +++--- frontend/package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/frontend/package-lock.json b/frontend/package-lock.json index e5d22215be..da81aef6d1 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -1910,9 +1910,9 @@ "dev": true }, "bootstrap": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.5.0.tgz", - "integrity": "sha512-Z93QoXvodoVslA+PWNdk23Hze4RBYIkpb5h8I2HY2Tu2h7A0LpAgLcyrhrSUyo2/Oxm2l1fRZPs1e5hnxnliXA==" + "version": "4.5.1", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.5.1.tgz", + "integrity": "sha512-bxUooHBSbvefnIZfjD0LE8nfdPKrtiFy2sgrxQwUZ0UpFzpjVbVMUxaGIoo9XWT4B2LG1HX6UQg0UMOakT0prQ==" }, "brace-expansion": { "version": "1.1.11", diff --git a/frontend/package.json b/frontend/package.json index 1fcb2683f6..4b313a94f4 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -25,7 +25,7 @@ "dependencies": { "@fortawesome/fontawesome-free": "^5.14.0", "@popperjs/core": "^2.4.4", - "bootstrap": "^4.5.0", + "bootstrap": "^4.5.1", "chart.js": "^2.9.3", "icheck-bootstrap": "^3.0.1", "jquery": "^3.5.1",