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

Code cleanup.

Browse Source
This commit is contained in:
James Cole 2015-07-06 16:52:18 +02:00
parent 6bdb6db330
commit 3fb14b4708
31 changed files with 59 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Generator/Chart/Account/ChartJsAccountChartGenerator.php
View File

@ -20,6 +20,7 @@ class ChartJsAccountChartGenerator implements AccountChartGenerator
/**
* @codeCoverageIgnore
*
* @param Collection $accounts
* @param Carbon $start
* @param Carbon $end

1
app/Generator/Chart/Budget/GoogleBudgetChartGenerator.php
View File

@ -37,6 +37,7 @@ class GoogleBudgetChartGenerator implements BudgetChartGenerator
/**
* @codeCoverageIgnore
*
* @param Collection $entries
*
* @return array

3
app/Generator/Chart/Category/ChartJsCategoryChartGenerator.php
View File

@ -17,7 +17,7 @@ class ChartJsCategoryChartGenerator implements CategoryChartGenerator
/**
* @param Collection $entries
* @param string $dateFormat
* @param string $dateFormat
*
* @return array
*/
@ -76,6 +76,7 @@ class ChartJsCategoryChartGenerator implements CategoryChartGenerator
/**
* @codeCoverageIgnore
*
* @param Collection $entries
*
* @return array

1
app/Generator/Chart/Category/GoogleCategoryChartGenerator.php
View File

@ -99,6 +99,7 @@ class GoogleCategoryChartGenerator implements CategoryChartGenerator
$chart->addRowArray($entry);
}
$chart->generate();
return $chart->getData();
}

2
app/Generator/Chart/Report/ChartJsReportChartGenerator.php
View File

@ -3,7 +3,6 @@
namespace FireflyIII\Generator\Chart\Report;
use Config;
use Grumpydictator\Gchart\GChart;
use Illuminate\Support\Collection;
use Preferences;
@ -78,6 +77,7 @@ class ChartJsReportChartGenerator implements ReportChartGenerator
$data['datasets'][1]['data'][] = round($expense, 2);
$data['datasets'][0]['data'][] = round(($income / $count), 2);
$data['datasets'][1]['data'][] = round(($expense / $count), 2);
return $data;
}
}

22
app/Helpers/Csv/Converter/ConverterInterface.php
View File

@ -15,6 +15,17 @@ interface ConverterInterface
*/
public function convert();
/**
* @param array $data
*/
public function setData(array $data);
/**
* @param string $field
*
*/
public function setField($field);
/**
* @param int $index
*/
@ -35,15 +46,4 @@ interface ConverterInterface
*/
public function setValue($value);
/**
* @param array $data
*/
public function setData(array $data);
/**
* @param string $field
*
*/
public function setField($field);
}

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

@ -1,6 +1,7 @@
<?php
namespace FireflyIII\Helpers\Csv\Converter;
use FireflyIII\Models\TransactionCurrency;
/**

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

@ -1,6 +1,7 @@
<?php
namespace FireflyIII\Helpers\Csv\Converter;
use FireflyIII\Models\TransactionCurrency;
/**

2
app/Helpers/Csv/Mapper/AnyAccount.php
View File

@ -20,7 +20,7 @@ class AnyAccount implements MapperInterface
{
$result = Auth::user()->accounts()->with('accountType')->orderBy('accounts.name', 'ASC')->get(['accounts.*']);
$list = [];
$list = [];
/** @var Account $account */
foreach ($result as $account) {
$list[$account->id] = $account->name . ' (' . $account->accountType->type . ')';

7
app/Helpers/Csv/PostProcessing/Currency.php
View File

@ -1,8 +1,9 @@
<?php
namespace FireflyIII\Helpers\Csv\PostProcessing;
use Preferences;
use FireflyIII\Models\TransactionCurrency;
use Preferences;
/**
* Class Currency
@ -23,8 +24,8 @@ class Currency implements PostProcessorInterface
// fix currency
if (is_null($this->data['currency'])) {
$currencyPreference = Preferences::get('currencyPreference', 'EUR');
$this->data['currency'] = TransactionCurrency::whereCode($currencyPreference->data)->first();
$currencyPreference = Preferences::get('currencyPreference', 'EUR');
$this->data['currency'] = TransactionCurrency::whereCode($currencyPreference->data)->first();
}
return $this->data;

13
app/Helpers/Csv/PostProcessing/PostProcessorInterface.php
View File

@ -14,15 +14,16 @@ namespace FireflyIII\Helpers\Csv\PostProcessing;
*
* @package FireflyIII\Helpers\Csv\PostProcessing
*/
interface PostProcessorInterface {
/**
* @param array $data
*/
public function setData(array $data);
interface PostProcessorInterface
{
/**
* @return array
*/
public function process();
/**
* @param array $data
*/
public function setData(array $data);
}

2
app/Helpers/Csv/Wizard.php
View File

@ -129,7 +129,7 @@ class Wizard implements WizardInterface
*/
public function showOptions(array $map)
{
$options = [];
$options = [];
foreach ($map as $index => $columnRole) {
$mapper = Config::get('csv.roles.' . $columnRole . '.mapper');

1
app/Helpers/Csv/WizardInterface.php
View File

@ -1,6 +1,7 @@
<?php
namespace FireflyIII\Helpers\Csv;
use League\Csv\Reader;
/**

2
app/Models/AccountMeta.php
View File

@ -6,7 +6,7 @@ use Watson\Validating\ValidatingTrait;
/**
* Class AccountMeta
*
* @codeCoverageIgnore
* @codeCoverageIgnore
* @package FireflyIII\Models
* @property integer $id
* @property \Carbon\Carbon $created_at

2
app/Models/AccountType.php
View File

@ -5,7 +5,7 @@ use Illuminate\Database\Eloquent\Model;
/**
* Class AccountType
*
* @codeCoverageIgnore
* @codeCoverageIgnore
* @package FireflyIII\Models
* @property integer $id
* @property \Carbon\Carbon $created_at

2
app/Models/Bill.php
View File

@ -7,7 +7,7 @@ use Illuminate\Database\Eloquent\Model;
* FireflyIII\Models\Bill
*
* @codeCoverageIgnore Class Bill
* @package FireflyIII\Models
* @package FireflyIII\Models
* @property integer $id
* @property \Carbon\Carbon $created_at
* @property \Carbon\Carbon $updated_at

3
app/Models/Budget.php
View File

@ -7,7 +7,7 @@ use Illuminate\Database\Eloquent\SoftDeletes;
/**
* Class Budget
*
* @codeCoverageIgnore
* @codeCoverageIgnore
* @package FireflyIII\Models
* @property integer $id
* @property \Carbon\Carbon $created_at
@ -40,6 +40,7 @@ class Budget extends Model
/**
* @param array $fields
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
*
* @codeCoverageIgnore
*
* @return Budget

2
app/Models/BudgetLimit.php
View File

@ -5,7 +5,7 @@ use Illuminate\Database\Eloquent\Model;
/**
* Class BudgetLimit
*
* @codeCoverageIgnore
* @codeCoverageIgnore
* @package FireflyIII\Models
* @property integer $id
* @property \Carbon\Carbon $created_at

2
app/Models/Component.php
View File

@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\SoftDeletes;
/**
* Class Component
*
* @codeCoverageIgnore
* @codeCoverageIgnore
* @package FireflyIII\Models
* @property integer $id
* @property \Carbon\Carbon $created_at

2
app/Models/LimitRepetition.php
View File

@ -5,7 +5,7 @@ use Illuminate\Database\Eloquent\Model;
/**
* Class LimitRepetition
*
* @codeCoverageIgnore
* @codeCoverageIgnore
* @package FireflyIII\Models
* @property integer $id
* @property \Carbon\Carbon $created_at

8
app/Models/PiggyBank.php
View File

@ -7,7 +7,7 @@ use Illuminate\Database\Eloquent\SoftDeletes;
/**
* Class PiggyBank
*
* @codeCoverageIgnore
* @codeCoverageIgnore
* @package FireflyIII\Models
* @property integer $id
* @property \Carbon\Carbon $created_at
@ -37,9 +37,9 @@ use Illuminate\Database\Eloquent\SoftDeletes;
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereOrder($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereEncrypted($value)
* @property PiggyBankRepetition currentRep
* @property string $reminder
* @property integer $reminder_skip
* @property boolean $remind_me
* @property string $reminder
* @property integer $reminder_skip
* @property boolean $remind_me
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereReminder($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereReminderSkip($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereRemindMe($value)

2
app/Models/PiggyBankEvent.php
View File

@ -5,7 +5,7 @@ use Illuminate\Database\Eloquent\Model;
/**
* Class PiggyBankEvent
*
* @codeCoverageIgnore
* @codeCoverageIgnore
* @package FireflyIII\Models
* @property integer $id
* @property \Carbon\Carbon $created_at

2
app/Models/PiggyBankRepetition.php
View File

@ -7,7 +7,7 @@ use Illuminate\Database\Eloquent\Model;
/**
* Class PiggyBankRepetition
*
* @codeCoverageIgnore
* @codeCoverageIgnore
* @package FireflyIII\Models
* @property integer $id
* @property \Carbon\Carbon $created_at

2
app/Models/Preference.php
View File

@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model;
/**
* Class Preference
*
* @codeCoverageIgnore
* @codeCoverageIgnore
* @package FireflyIII\Models
* @property integer $id
* @property \Carbon\Carbon $created_at

2
app/Models/Transaction.php
View File

@ -9,7 +9,7 @@ use Watson\Validating\ValidatingTrait;
/**
* Class Transaction
*
* @codeCoverageIgnore
* @codeCoverageIgnore
* @package FireflyIII\Models
* @property integer $id
* @property \Carbon\Carbon $created_at

2
app/Models/TransactionCurrency.php
View File

@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\SoftDeletes;
/**
* Class TransactionCurrency
*
* @codeCoverageIgnore
* @codeCoverageIgnore
* @package FireflyIII\Models
* @property integer $id
* @property \Carbon\Carbon $created_at

2
app/Models/TransactionGroup.php
View File

@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\SoftDeletes;
/**
* Class TransactionGroup
*
* @codeCoverageIgnore
* @codeCoverageIgnore
* @package FireflyIII\Models
* @property integer $id
* @property \Carbon\Carbon $created_at

2
app/Models/TransactionRelation.php
View File

@ -5,7 +5,7 @@ use Illuminate\Database\Eloquent\Model;
/**
* Class TransactionRelation
*
* @codeCoverageIgnore
* @codeCoverageIgnore
* @package FireflyIII\Models
*/
class TransactionRelation extends Model

2
app/Models/TransactionType.php
View File

@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\SoftDeletes;
/**
* Class TransactionType
*
* @codeCoverageIgnore
* @codeCoverageIgnore
* @package FireflyIII\Models
* @property integer $id
* @property \Carbon\Carbon $created_at

10
app/Support/Navigation.php
View File

@ -83,7 +83,7 @@ class Navigation
$subDay = ['week', 'weekly', '1W', 'month', 'monthly', '1M', '3M', 'quarter', 'quarterly', '6M', 'half-year', 'year', 'yearly'];
if (!isset($functionMap[$repeatFreq])) {
throw new FireflyException('Cannot do endOfPeriod for $repeat_freq "' . $repeatFreq.'"');
throw new FireflyException('Cannot do endOfPeriod for $repeat_freq "' . $repeatFreq . '"');
}
$function = $functionMap[$repeatFreq];
if (isset($modifierMap[$repeatFreq])) {
@ -204,7 +204,7 @@ class Navigation
return $date;
}
throw new FireflyException('Cannot do startOfPeriod for $repeat_freq "' . $repeatFreq.'"');
throw new FireflyException('Cannot do startOfPeriod for $repeat_freq "' . $repeatFreq . '"');
}
/**
@ -246,7 +246,7 @@ class Navigation
return $date;
}
throw new FireflyException('Cannot do subtractPeriod for $repeat_freq "' . $repeatFreq.'"');
throw new FireflyException('Cannot do subtractPeriod for $repeat_freq "' . $repeatFreq . '"');
}
/**
@ -282,7 +282,7 @@ class Navigation
return $end;
}
throw new FireflyException('updateEndDate cannot handle $range "' . $range.'"');
throw new FireflyException('updateEndDate cannot handle $range "' . $range . '"');
}
/**
@ -316,7 +316,7 @@ class Navigation
return $start;
}
throw new FireflyException('updateStartDate cannot handle $range "' . $range.'"');
throw new FireflyException('updateStartDate cannot handle $range "' . $range . '"');
}

2
app/User.php
View File

@ -10,7 +10,7 @@ use Zizaco\Entrust\Traits\EntrustUserTrait;
/**
* Class User
*
* @codeCoverageIgnore
* @codeCoverageIgnore
* @package FireflyIII
* @property integer $id
* @property \Carbon\Carbon $created_at