kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-24 12:47:00 +00:00
Code Issues Projects Releases Wiki Activity

These are the first commits that make FF require php 7.

Browse Source
This commit is contained in:
James Cole
2016-02-05 08:03:26 +01:00
parent baecc256f6
commit 554640c345
10 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Console/Commands/UpgradeFireflyInstructions.php
View File

@@ -44,7 +44,7 @@ class UpgradeFireflyInstructions extends Command
// //
$version = Config::get('firefly.version'); $version = Config::get('firefly.version');
$config = Config::get('upgrade.text'); $config = Config::get('upgrade.text');
$text = isset($config[$version]) ? $config[$version] : null; $text = $config[$version] ?? null;
$this->line('+------------------------------------------------------------------------------+'); $this->line('+------------------------------------------------------------------------------+');
$this->line(''); $this->line('');

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

@@ -137,7 +137,7 @@ class ChartJsAccountChartGenerator implements AccountChartGeneratorInterface
while ($end >= $current) { while ($end >= $current) {
$theDate = $current->format('Y-m-d'); $theDate = $current->format('Y-m-d');
$balance = isset($range[$theDate]) ? $range[$theDate] : $previous; $balance = $range[$theDate] ?? $previous;
$data['labels'][] = $current->formatLocalized($format); $data['labels'][] = $current->formatLocalized($format);
$data['datasets'][0]['data'][] = $balance; $data['datasets'][0]['data'][] = $balance;

2
app/Helpers/Collection/BalanceLine.php
View File

@@ -122,7 +122,7 @@ class BalanceLine
*/ */
public function leftOfRepetition() public function leftOfRepetition()
{ {
$start = isset($this->budget->amount) ? $this->budget->amount : 0; $start = $this->budget->amount ?? 0;
/** @var BalanceEntry $balanceEntry */ /** @var BalanceEntry $balanceEntry */
foreach ($this->getBalanceEntries() as $balanceEntry) { foreach ($this->getBalanceEntries() as $balanceEntry) {
$start += $balanceEntry->getSpent(); $start += $balanceEntry->getSpent();

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

@@ -228,7 +228,7 @@ class Importer
$data = $this->getFiller(); // These fields are necessary to create a new transaction journal. Some are optional $data = $this->getFiller(); // These fields are necessary to create a new transaction journal. Some are optional
foreach ($row as $index => $value) { foreach ($row as $index => $value) {
$role = isset($this->roles[$index]) ? $this->roles[$index] : '_ignore'; $role = $this->roles[$index] ?? '_ignore';
$class = Config::get('csv.roles.' . $role . '.converter'); $class = Config::get('csv.roles.' . $role . '.converter');
$field = Config::get('csv.roles.' . $role . '.field'); $field = Config::get('csv.roles.' . $role . '.field');

2
app/Helpers/Report/BudgetReportHelper.php
View File

@@ -48,7 +48,7 @@ class BudgetReportHelper implements BudgetReportHelperInterface
return $rep->budget_id == $budget->id; return $rep->budget_id == $budget->id;
} }
); );
$totalSpent = isset($allTotalSpent[$budget->id]) ? $allTotalSpent[$budget->id] : []; $totalSpent = $allTotalSpent[$budget->id] ?? [];
// no repetition(s) for this budget: // no repetition(s) for this budget:
if ($repetitions->count() == 0) { if ($repetitions->count() == 0) {

4
app/Http/Controllers/Chart/CategoryController.php
View File

@@ -405,8 +405,8 @@ class CategoryController extends Controller
while ($start <= $end) { while ($start <= $end) {
$str = $start->format('Y-m-d'); $str = $start->format('Y-m-d');
$spent = isset($spentArray[$str]) ? $spentArray[$str] : 0; $spent = $spentArray[$str] ?? 0;
$earned = isset($earnedArray[$str]) ? $earnedArray[$str] : 0; $earned = $earnedArray[$str] ?? 0;
$date = Navigation::periodShow($start, '1D'); $date = Navigation::periodShow($start, '1D');
$entries->push([clone $start, $date, $spent, $earned]); $entries->push([clone $start, $date, $spent, $earned]);
$start->addDay(); $start->addDay();

4
app/Http/Controllers/Chart/ReportController.php
View File

@@ -133,7 +133,7 @@ class ReportController extends Controller
$count = 0; $count = 0;
while ($start < $end) { while ($start < $end) {
$date = $start->format('Y-m'); $date = $start->format('Y-m');
$currentIncome = isset($earned[$date]) ? $earned[$date] : 0; $currentIncome = $earned[$date] ?? 0;
$currentExpense = isset($spent[$date]) ? ($spent[$date] * -1) : 0; $currentExpense = isset($spent[$date]) ? ($spent[$date] * -1) : 0;
$income = bcadd($income, $currentIncome); $income = bcadd($income, $currentIncome);
$expense = bcadd($expense, $currentExpense); $expense = bcadd($expense, $currentExpense);
@@ -218,7 +218,7 @@ class ReportController extends Controller
while ($start < $end) { while ($start < $end) {
// total income and total expenses: // total income and total expenses:
$date = $start->format('Y-m'); $date = $start->format('Y-m');
$incomeSum = isset($earned[$date]) ? $earned[$date] : 0; $incomeSum = $earned[$date] ?? 0;
$expenseSum = isset($spent[$date]) ? ($spent[$date] * -1) : 0; $expenseSum = isset($spent[$date]) ? ($spent[$date] * -1) : 0;
$entries->push([clone $start, $incomeSum, $expenseSum]); $entries->push([clone $start, $incomeSum, $expenseSum]);

2
app/Models/Tag.php
View File

@@ -56,7 +56,7 @@ class Tag extends Model
} }
// create it! // create it!
$fields['tagMode'] = 'nothing'; $fields['tagMode'] = 'nothing';
$fields['description'] = isset($fields['description']) && !is_null($fields['description']) ? $fields['description'] : ''; $fields['description'] = $fields['description'] ?? '';
$tag = Tag::create($fields); $tag = Tag::create($fields);
return $tag; return $tag;

2
app/Support/Twig/General.php
View File

@@ -291,7 +291,7 @@ class General extends Twig_Extension
$args = func_get_args(); $args = func_get_args();
$route = $args[1]; // name of the route. $route = $args[1]; // name of the route.
$what = $args[2]; // name of the route. $what = $args[2]; // name of the route.
$activeWhat = isset($context['what']) ? $context['what'] : false; $activeWhat = $context['what'] ?? false;
if ($what == $activeWhat && !(strpos(Route::getCurrentRoute()->getName(), $route) === false)) { if ($what == $activeWhat && !(strpos(Route::getCurrentRoute()->getName(), $route) === false)) {
return 'active'; return 'active';

18
app/Validation/FireflyValidator.php
View File

@@ -49,7 +49,7 @@ class FireflyValidator extends Validator
*/ */
public function validateBelongsToUser($attribute, $value, $parameters) public function validateBelongsToUser($attribute, $value, $parameters)
{ {
$field = isset($parameters[1]) ? $parameters[1] : 'id'; $field = $parameters[1] ?? 'id';
$count = DB::table($parameters[0])->where('user_id', Auth::user()->id)->where($field, $value)->count(); $count = DB::table($parameters[0])->where('user_id', Auth::user()->id)->where($field, $value)->count();
@@ -105,8 +105,8 @@ class FireflyValidator extends Validator
// check if rule-action-value matches the thing. // check if rule-action-value matches the thing.
if (is_array($this->data['rule-action'])) { if (is_array($this->data['rule-action'])) {
$name = isset($this->data['rule-action'][$index]) ? $this->data['rule-action'][$index] : 'invalid'; $name = $this->data['rule-action'][$index] ?? 'invalid';
$value = isset($this->data['rule-action-value'][$index]) ? $this->data['rule-action-value'][$index] : false; $value = $this->data['rule-action-value'][$index] ?? false;
switch ($name) { switch ($name) {
default: default:
Log::debug(' (' . $attribute . ') (index:' . $index . ') Name is "' . $name . '" so no action is taken.'); Log::debug(' (' . $attribute . ') (index:' . $index . ') Name is "' . $name . '" so no action is taken.');
@@ -243,7 +243,7 @@ class FireflyValidator extends Validator
// exclude? // exclude?
$table = $parameters[0]; $table = $parameters[0];
$field = $parameters[1]; $field = $parameters[1];
$exclude = isset($parameters[2]) ? intval($parameters[2]) : 0; $exclude = $parameters[2] ?? 0;
// get entries from table // get entries from table
$set = DB::table($table)->where('user_id', Auth::user()->id) $set = DB::table($table)->where('user_id', Auth::user()->id)
@@ -272,7 +272,7 @@ class FireflyValidator extends Validator
*/ */
public function validateUniquePiggyBankForUser($attribute, $value, $parameters) public function validateUniquePiggyBankForUser($attribute, $value, $parameters)
{ {
$exclude = isset($parameters[0]) ? $parameters[0] : null; $exclude = $parameters[0] ?? null;
$query = DB::table('piggy_banks')->whereNull('piggy_banks.deleted_at') $query = DB::table('piggy_banks')->whereNull('piggy_banks.deleted_at')
->leftJoin('accounts', 'accounts.id', '=', 'piggy_banks.account_id')->where('accounts.user_id', Auth::user()->id); ->leftJoin('accounts', 'accounts.id', '=', 'piggy_banks.account_id')->where('accounts.user_id', Auth::user()->id);
if (!is_null($exclude)) { if (!is_null($exclude)) {
@@ -369,7 +369,7 @@ class FireflyValidator extends Validator
protected function validateByAccountTypeId($value, $parameters) protected function validateByAccountTypeId($value, $parameters)
{ {
$type = AccountType::find($this->data['account_type_id'])->first(); $type = AccountType::find($this->data['account_type_id'])->first();
$ignore = isset($parameters[0]) ? intval($parameters[0]) : 0; $ignore = $parameters[0] ?? 0;
$value = $this->tryDecrypt($value); $value = $this->tryDecrypt($value);
$set = Auth::user()->accounts()->where('account_type_id', $type->id)->where('id', '!=', $ignore)->get(); $set = Auth::user()->accounts()->where('account_type_id', $type->id)->where('id', '!=', $ignore)->get();
@@ -394,7 +394,7 @@ class FireflyValidator extends Validator
{ {
$search = Config::get('firefly.accountTypeByIdentifier.' . $this->data['what']); $search = Config::get('firefly.accountTypeByIdentifier.' . $this->data['what']);
$type = AccountType::whereType($search)->first(); $type = AccountType::whereType($search)->first();
$ignore = isset($parameters[0]) ? intval($parameters[0]) : 0; $ignore = $parameters[0] ?? 0;
$set = Auth::user()->accounts()->where('account_type_id', $type->id)->where('id', '!=', $ignore)->get(); $set = Auth::user()->accounts()->where('account_type_id', $type->id)->where('id', '!=', $ignore)->get();
/** @var Account $entry */ /** @var Account $entry */
@@ -414,7 +414,7 @@ class FireflyValidator extends Validator
*/ */
private function getRuleTriggerName($index) private function getRuleTriggerName($index)
{ {
return isset($this->data['rule-trigger'][$index]) ? $this->data['rule-trigger'][$index] : 'invalid'; return $this->data['rule-trigger'][$index] ?? 'invalid';
} }
@@ -425,7 +425,7 @@ class FireflyValidator extends Validator
*/ */
private function getRuleTriggerValue($index) private function getRuleTriggerValue($index)
{ {
return isset($this->data['rule-trigger-value'][$index]) ? $this->data['rule-trigger-value'][$index] : ''; return $this->data['rule-trigger-value'][$index] ?? '';
} }
} }