IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Code cleanup.

Browse Source
This commit is contained in:
James Cole
2016-05-01 15:05:29 +02:00
parent b80db054e2
commit 5e1167b8ae
28 changed files with 40 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Helpers/Csv/Converter/AccountId.php
View File

@@ -19,7 +19,7 @@ class AccountId extends BasicConverter implements ConverterInterface
public function convert(): Account
{
/** @var AccountRepositoryInterface $repository */
$repository = app('FireflyIII\Repositories\Account\AccountRepositoryInterface');
$repository = app(AccountRepositoryInterface::class);
$var = isset($this->mapped[$this->index][$this->value]) ? $this->mapped[$this->index][$this->value] : $this->value;
$account = $repository->find($var);

3
app/Helpers/Csv/Converter/AssetAccountIban.php
View File

@@ -22,7 +22,7 @@ class AssetAccountIban extends BasicConverter implements ConverterInterface
public function convert(): Account
{
/** @var AccountRepositoryInterface $repository */
$repository = app('FireflyIII\Repositories\Account\AccountRepositoryInterface');
$repository = app(AccountRepositoryInterface::class);
// is mapped? Then it's easy!
if (isset($this->mapped[$this->index][$this->value])) {
@@ -44,7 +44,6 @@ class AssetAccountIban extends BasicConverter implements ConverterInterface
/**
* @param AccountRepositoryInterface $repository
* @param $value
*
* @return Account
*/

2
app/Helpers/Csv/Converter/AssetAccountName.php
View File

@@ -21,7 +21,7 @@ class AssetAccountName extends BasicConverter implements ConverterInterface
public function convert(): Account
{
/** @var AccountRepositoryInterface $repository */
$repository = app('FireflyIII\Repositories\Account\AccountRepositoryInterface');
$repository = app(AccountRepositoryInterface::class);
if (isset($this->mapped[$this->index][$this->value])) {
$account = $repository->find(intval($this->mapped[$this->index][$this->value]));

2
app/Helpers/Csv/Converter/AssetAccountNumber.php
View File

@@ -30,7 +30,7 @@ class AssetAccountNumber extends BasicConverter implements ConverterInterface
public function convert(): Account
{
/** @var AccountRepositoryInterface $repository */
$repository = app('FireflyIII\Repositories\Account\AccountRepositoryInterface');
$repository = app(AccountRepositoryInterface::class);
// is mapped? Then it's easy!
if (isset($this->mapped[$this->index][$this->value])) {

2
app/Helpers/Csv/Converter/BillId.php
View File

@@ -19,7 +19,7 @@ class BillId extends BasicConverter implements ConverterInterface
public function convert(): Bill
{
/** @var BillRepositoryInterface $repository */
$repository = app('FireflyIII\Repositories\Bill\BillRepositoryInterface');
$repository = app(BillRepositoryInterface::class);
$value = isset($this->mapped[$this->index][$this->value]) ? $this->mapped[$this->index][$this->value] : $this->value;
$bill = $repository->find($value);

2
app/Helpers/Csv/Converter/BillName.php
View File

@@ -19,7 +19,7 @@ class BillName extends BasicConverter implements ConverterInterface
public function convert(): Bill
{
/** @var BillRepositoryInterface $repository */
$repository = app('FireflyIII\Repositories\Bill\BillRepositoryInterface');
$repository = app(BillRepositoryInterface::class);
if (isset($this->mapped[$this->index][$this->value])) {
return $repository->find($this->mapped[$this->index][$this->value]);

2
app/Helpers/Csv/Converter/BudgetId.php
View File

@@ -19,7 +19,7 @@ class BudgetId extends BasicConverter implements ConverterInterface
public function convert(): Budget
{
/** @var BudgetRepositoryInterface $repository */
$repository = app('FireflyIII\Repositories\Budget\BudgetRepositoryInterface');
$repository = app(BudgetRepositoryInterface::class);
$value = isset($this->mapped[$this->index][$this->value]) ? $this->mapped[$this->index][$this->value] : $this->value;
$budget = $repository->find($value);

2
app/Helpers/Csv/Converter/BudgetName.php
View File

@@ -20,7 +20,7 @@ class BudgetName extends BasicConverter implements ConverterInterface
public function convert(): Budget
{
/** @var BudgetRepositoryInterface $repository */
$repository = app('FireflyIII\Repositories\Budget\BudgetRepositoryInterface');
$repository = app(BudgetRepositoryInterface::class);
// is mapped? Then it's easy!
if (isset($this->mapped[$this->index][$this->value])) {

2
app/Helpers/Csv/Converter/CategoryId.php
View File

@@ -19,7 +19,7 @@ class CategoryId extends BasicConverter implements ConverterInterface
public function convert(): Category
{
/** @var SingleCategoryRepositoryInterface $repository */
$repository = app('FireflyIII\Repositories\Category\SingleCategoryRepositoryInterface');
$repository = app(SingleCategoryRepositoryInterface::class);
$value = isset($this->mapped[$this->index][$this->value]) ? $this->mapped[$this->index][$this->value] : $this->value;
$category = $repository->find($value);

2
app/Helpers/Csv/Converter/CategoryName.php
View File

@@ -20,7 +20,7 @@ class CategoryName extends BasicConverter implements ConverterInterface
public function convert(): Category
{
/** @var SingleCategoryRepositoryInterface $repository */
$repository = app('FireflyIII\Repositories\Category\SingleCategoryRepositoryInterface');
$repository = app(SingleCategoryRepositoryInterface::class);
// is mapped? Then it's easy!
if (isset($this->mapped[$this->index][$this->value])) {

2
app/Helpers/Csv/Converter/CurrencyCode.php
View File

@@ -19,7 +19,7 @@ class CurrencyCode extends BasicConverter implements ConverterInterface
public function convert(): TransactionCurrency
{
/** @var CurrencyRepositoryInterface $repository */
$repository = app('FireflyIII\Repositories\Currency\CurrencyRepositoryInterface');
$repository = app(CurrencyRepositoryInterface::class);
if (isset($this->mapped[$this->index][$this->value])) {
$currency = $repository->find($this->mapped[$this->index][$this->value]);

2
app/Helpers/Csv/Converter/CurrencyId.php
View File

@@ -19,7 +19,7 @@ class CurrencyId extends BasicConverter implements ConverterInterface
public function convert(): TransactionCurrency
{
/** @var CurrencyRepositoryInterface $repository */
$repository = app('FireflyIII\Repositories\Currency\CurrencyRepositoryInterface');
$repository = app(CurrencyRepositoryInterface::class);
$value = isset($this->mapped[$this->index][$this->value]) ? $this->mapped[$this->index][$this->value] : $this->value;
$currency = $repository->find($value);

2
app/Helpers/Csv/Converter/CurrencyName.php
View File

@@ -19,7 +19,7 @@ class CurrencyName extends BasicConverter implements ConverterInterface
public function convert(): TransactionCurrency
{
/** @var CurrencyRepositoryInterface $repository */
$repository = app('FireflyIII\Repositories\Currency\CurrencyRepositoryInterface');
$repository = app(CurrencyRepositoryInterface::class);
if (isset($this->mapped[$this->index][$this->value])) {
$currency = $repository->find($this->mapped[$this->index][$this->value]);

2
app/Helpers/Csv/Converter/CurrencySymbol.php
View File

@@ -19,7 +19,7 @@ class CurrencySymbol extends BasicConverter implements ConverterInterface
public function convert(): TransactionCurrency
{
/** @var CurrencyRepositoryInterface $repository */
$repository = app('FireflyIII\Repositories\Currency\CurrencyRepositoryInterface');
$repository = app(CurrencyRepositoryInterface::class);
if (isset($this->mapped[$this->index][$this->value])) {
$currency = $repository->find($this->mapped[$this->index][$this->value]);

2
app/Helpers/Csv/Converter/OpposingAccountIban.php
View File

@@ -21,7 +21,7 @@ class OpposingAccountIban extends BasicConverter implements ConverterInterface
public function convert()
{
/** @var AccountRepositoryInterface $repository */
$repository = app('FireflyIII\Repositories\Account\AccountRepositoryInterface');
$repository = app(AccountRepositoryInterface::class);
if (isset($this->mapped[$this->index][$this->value])) {
$account = $repository->find($this->mapped[$this->index][$this->value]);

2
app/Helpers/Csv/Converter/OpposingAccountId.php
View File

@@ -20,7 +20,7 @@ class OpposingAccountId extends BasicConverter implements ConverterInterface
public function convert(): Account
{
/** @var AccountRepositoryInterface $repository */
$repository = app('FireflyIII\Repositories\Account\AccountRepositoryInterface');
$repository = app(AccountRepositoryInterface::class);
$value = isset($this->mapped[$this->index][$this->value]) ? $this->mapped[$this->index][$this->value] : $this->value;
$account = $repository->find($value);

2
app/Helpers/Csv/Converter/OpposingAccountName.php
View File

@@ -21,7 +21,7 @@ class OpposingAccountName extends BasicConverter implements ConverterInterface
public function convert()
{
/** @var AccountRepositoryInterface $repository */
$repository = app('FireflyIII\Repositories\Account\AccountRepositoryInterface');
$repository = app(AccountRepositoryInterface::class);
if (isset($this->mapped[$this->index][$this->value])) {
$account = $repository->find($this->mapped[$this->index][$this->value]);

2
app/Helpers/Csv/Converter/TagsComma.php
View File

@@ -19,7 +19,7 @@ class TagsComma extends BasicConverter implements ConverterInterface
public function convert(): Collection
{
/** @var TagRepositoryInterface $repository */
$repository = app('FireflyIII\Repositories\Tag\TagRepositoryInterface');
$repository = app(TagRepositoryInterface::class);
$tags = new Collection;
$strings = explode(',', $this->value);

2
app/Helpers/Csv/Converter/TagsSpace.php
View File

@@ -19,7 +19,7 @@ class TagsSpace extends BasicConverter implements ConverterInterface
public function convert(): Collection
{
/** @var TagRepositoryInterface $repository */
$repository = app('FireflyIII\Repositories\Tag\TagRepositoryInterface');
$repository = app(TagRepositoryInterface::class);
$tags = new Collection;

5
app/Helpers/Csv/PostProcessing/AssetAccount.php
View File

@@ -6,6 +6,7 @@ use Auth;
use Carbon\Carbon;
use FireflyIII\Models\Account;
use FireflyIII\Models\AccountType;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use Log;
use Validator;
@@ -244,8 +245,8 @@ class AssetAccount implements PostProcessorInterface
}
}
// create new if not exists and return that one:
/** @var \FireflyIII\Repositories\Account\AccountRepositoryInterface $repository */
$repository = app('FireflyIII\Repositories\Account\AccountRepositoryInterface');
/** @var AccountRepositoryInterface $repository */
$repository = app(AccountRepositoryInterface::class);
$accountData = [
'name' => $accountNumber,
'accountType' => 'asset',