IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2024-12-28 01:41:14 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix tests.

Browse Source
This commit is contained in:
James Cole 2018-07-22 17:06:10 +02:00
parent a722dc4235
commit ea2c48bca5
8 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/Chart/AccountController.php
View File

@ -467,10 +467,14 @@ class AccountController extends Controller
/** @var CurrencyRepositoryInterface $repository */
$repository = app(CurrencyRepositoryInterface::class);
/** @var AccountRepositoryInterface $accountRepos */
$accountRepos = app(AccountRepositoryInterface::class);
$default = app('amount')->getDefaultCurrency();
$chartData = [];
/** @var Account $account */
foreach ($accounts as $account) {
$currency = $repository->findNull((int)$account->getMeta('currency_id'));
$currency = $repository->findNull((int)$accountRepos->getMetaValue($account, 'currency_id'));
if (null === $currency) {
$currency = $default;
}

4
app/Models/Bill.php
View File

@ -139,10 +139,10 @@ class Bill extends Model
*
* @param $value
*
* @return string
* @return string|null
* @throws \Illuminate\Contracts\Encryption\DecryptException
*/
public function getNameAttribute($value): string
public function getNameAttribute($value): ?string
{
if (1 === (int)$this->name_encrypted) {
return Crypt::decrypt($value);

4
app/Models/Budget.php
View File

@ -96,10 +96,10 @@ class Budget extends Model
*
* @param $value
*
* @return string
* @return string|null
* @throws \Illuminate\Contracts\Encryption\DecryptException
*/
public function getNameAttribute($value): string
public function getNameAttribute($value): ?string
{
if ($this->encrypted) {
return Crypt::decrypt($value);

4
app/Models/Category.php
View File

@ -85,10 +85,10 @@ class Category extends Model
*
* @param $value
*
* @return string
* @return string|null
* @throws \Illuminate\Contracts\Encryption\DecryptException
*/
public function getNameAttribute($value): string
public function getNameAttribute($value): ?string
{
if ($this->encrypted) {
return Crypt::decrypt($value);

4
app/Models/PiggyBank.php
View File

@ -107,10 +107,10 @@ class PiggyBank extends Model
*
* @param $value
*
* @return string
* @return string|null
* @throws \Illuminate\Contracts\Encryption\DecryptException
*/
public function getNameAttribute($value): string
public function getNameAttribute($value): ?string
{
if ($this->encrypted) {
return Crypt::decrypt($value);

4
app/Models/Tag.php
View File

@ -85,10 +85,10 @@ class Tag extends Model
*
* @param $value
*
* @return string
* @return string|null
* @throws \Illuminate\Contracts\Encryption\DecryptException
*/
public function getDescriptionAttribute($value): string
public function getDescriptionAttribute($value): ?string
{
if (null === $value) {
return $value;

4
app/Models/TransactionJournal.php
View File

@ -153,10 +153,10 @@ class TransactionJournal extends Model
*
* @param $value
*
* @return string
* @return string|null
* @throws \Illuminate\Contracts\Encryption\DecryptException
*/
public function getDescriptionAttribute($value): string
public function getDescriptionAttribute($value): ?string
{
if ($this->encrypted) {
return Crypt::decrypt($value);

2
app/Rules/IsAssetAccountId.php
View File

@ -1,6 +1,6 @@
<?php
namespace FireflyIII\Rules;
namespace FireflyIII\TransactionRules\Triggers;
use FireflyIII\Models\Account;
use FireflyIII\Models\AccountType;