kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-29 18:20:01 +00:00
Code Issues Projects Releases Wiki Activity

PHP7 compatible type hinting [skip ci]

Browse Source
This commit is contained in:
James Cole
2016-02-18 07:21:48 +01:00
parent 7a7ce7fcea
commit e7be4e3e49
22 changed files with 87 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Generator/Chart/Account/AccountChartGeneratorInterface.php
View File

@@ -29,7 +29,7 @@ interface AccountChartGeneratorInterface
*
* @return array
*/
public function expenseAccounts(Collection $accounts, Carbon $start, Carbon $end);
public function expenseAccounts(Collection $accounts, Carbon $start, Carbon $end): array;
/**
* @param Collection $accounts
@@ -38,7 +38,7 @@ interface AccountChartGeneratorInterface
*
* @return array
*/
public function frontpage(Collection $accounts, Carbon $start, Carbon $end);
public function frontpage(Collection $accounts, Carbon $start, Carbon $end): array;
/**
* @param Account $account
@@ -47,5 +47,5 @@ interface AccountChartGeneratorInterface
*
* @return array
*/
public function single(Account $account, Carbon $start, Carbon $end);
public function single(Account $account, Carbon $start, Carbon $end): array;
}

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

@@ -22,7 +22,7 @@ class ChartJsAccountChartGenerator implements AccountChartGeneratorInterface
*
* @return array
*/
public function expenseAccounts(Collection $accounts, Carbon $start, Carbon $end)
public function expenseAccounts(Collection $accounts, Carbon $start, Carbon $end): array
{
$data = [
'count' => 1,
@@ -69,7 +69,7 @@ class ChartJsAccountChartGenerator implements AccountChartGeneratorInterface
*
* @return array
*/
public function frontpage(Collection $accounts, Carbon $start, Carbon $end)
public function frontpage(Collection $accounts, Carbon $start, Carbon $end): array
{
// language:
$format = (string)trans('config.month_and_day');
@@ -116,7 +116,7 @@ class ChartJsAccountChartGenerator implements AccountChartGeneratorInterface
*
* @return array
*/
public function single(Account $account, Carbon $start, Carbon $end)
public function single(Account $account, Carbon $start, Carbon $end): array
{
// language:
$format = (string)trans('config.month_and_day');
@@ -153,7 +153,7 @@ class ChartJsAccountChartGenerator implements AccountChartGeneratorInterface
*
* @return array
*/
protected function getIdsFromCollection(Collection $collection)
protected function getIdsFromCollection(Collection $collection): array
{
$ids = [];
foreach ($collection as $entry) {
@@ -170,7 +170,7 @@ class ChartJsAccountChartGenerator implements AccountChartGeneratorInterface
*
* @return string
*/
protected function isInArray($array, $entryId)
protected function isInArray($array, $entryId): string
{
if (isset($array[$entryId])) {
return $array[$entryId];

4
app/Generator/Chart/Bill/BillChartGeneratorInterface.php
View File

@@ -28,7 +28,7 @@ interface BillChartGeneratorInterface
*
* @return array
*/
public function frontpage(string $paid, string $unpaid);
public function frontpage(string $paid, string $unpaid): array;
/**
* @param Bill $bill
@@ -36,6 +36,6 @@ interface BillChartGeneratorInterface
*
* @return array
*/
public function single(Bill $bill, Collection $entries);
public function single(Bill $bill, Collection $entries): array;
}

4
app/Generator/Chart/Bill/ChartJsBillChartGenerator.php
View File

@@ -28,7 +28,7 @@ class ChartJsBillChartGenerator implements BillChartGeneratorInterface
*
* @return array
*/
public function frontpage(string $paid, string $unpaid)
public function frontpage(string $paid, string $unpaid): array
{
bcscale(2);
$data = [
@@ -55,7 +55,7 @@ class ChartJsBillChartGenerator implements BillChartGeneratorInterface
*
* @return array
*/
public function single(Bill $bill, Collection $entries)
public function single(Bill $bill, Collection $entries): array
{
bcscale(2);
$format = (string)trans('config.month');

10
app/Generator/Chart/Budget/BudgetChartGeneratorInterface.php
View File

@@ -24,28 +24,28 @@ interface BudgetChartGeneratorInterface
*
* @return array
*/
public function budget(Collection $entries);
public function budget(Collection $entries): array;
/**
* @param Collection $entries
*
* @return array
*/
public function budgetLimit(Collection $entries);
public function budgetLimit(Collection $entries): array;
/**
* @param Collection $entries
*
* @return array
*/
public function frontpage(Collection $entries);
public function frontpage(Collection $entries): array;
/**
* @param Collection $entries
*
* @return array
*/
public function multiYear(Collection $entries);
public function multiYear(Collection $entries): array;
/**
* @param Collection $budgets
@@ -53,6 +53,6 @@ interface BudgetChartGeneratorInterface
*
* @return array
*/
public function year(Collection $budgets, Collection $entries);
public function year(Collection $budgets, Collection $entries): array;
}

10
app/Generator/Chart/Budget/ChartJsBudgetChartGenerator.php
View File

@@ -21,7 +21,7 @@ class ChartJsBudgetChartGenerator implements BudgetChartGeneratorInterface
*
* @return array
*/
public function budget(Collection $entries, $dateFormat = 'month')
public function budget(Collection $entries, $dateFormat = 'month'): array
{
// language:
$language = Preferences::get('language', env('DEFAULT_LANGUAGE', 'en_US'))->data;
@@ -56,7 +56,7 @@ class ChartJsBudgetChartGenerator implements BudgetChartGeneratorInterface
*
* @return array
*/
public function budgetLimit(Collection $entries)
public function budgetLimit(Collection $entries): array
{
return $this->budget($entries, 'monthAndDay');
}
@@ -66,7 +66,7 @@ class ChartJsBudgetChartGenerator implements BudgetChartGeneratorInterface
*
* @return array
*/
public function frontpage(Collection $entries)
public function frontpage(Collection $entries): array
{
bcscale(2);
$data = [
@@ -112,7 +112,7 @@ class ChartJsBudgetChartGenerator implements BudgetChartGeneratorInterface
*
* @return array
*/
public function multiYear(Collection $entries)
public function multiYear(Collection $entries): array
{
// dataset:
$data = [
@@ -147,7 +147,7 @@ class ChartJsBudgetChartGenerator implements BudgetChartGeneratorInterface
*
* @return array
*/
public function year(Collection $budgets, Collection $entries)
public function year(Collection $budgets, Collection $entries): array
{
// language:
$format = (string)trans('config.month');

10
app/Generator/Chart/Category/CategoryChartGeneratorInterface.php
View File

@@ -33,28 +33,28 @@ interface CategoryChartGeneratorInterface
*
* @return array
*/
public function earnedInPeriod(Collection $categories, Collection $entries);
public function earnedInPeriod(Collection $categories, Collection $entries): array;
/**
* @param Collection $entries
*
* @return array
*/
public function frontpage(Collection $entries);
public function frontpage(Collection $entries): array;
/**
* @param Collection $entries
*
* @return array
*/
public function multiYear(Collection $entries);
public function multiYear(Collection $entries): array;
/**
* @param Collection $entries
*
* @return array
*/
public function period(Collection $entries);
public function period(Collection $entries): array;
/**
* @param Collection $categories
@@ -62,5 +62,5 @@ interface CategoryChartGeneratorInterface
*
* @return array
*/
public function spentInPeriod(Collection $categories, Collection $entries);
public function spentInPeriod(Collection $categories, Collection $entries): array;
}

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

@@ -18,7 +18,7 @@ class ChartJsCategoryChartGenerator implements CategoryChartGeneratorInterface
*
* @return array
*/
public function all(Collection $entries)
public function all(Collection $entries): array
{
@@ -55,7 +55,7 @@ class ChartJsCategoryChartGenerator implements CategoryChartGeneratorInterface
*
* @return array
*/
public function earnedInPeriod(Collection $categories, Collection $entries)
public function earnedInPeriod(Collection $categories, Collection $entries): array
{
// language:
@@ -87,7 +87,7 @@ class ChartJsCategoryChartGenerator implements CategoryChartGeneratorInterface
*
* @return array
*/
public function frontpage(Collection $entries)
public function frontpage(Collection $entries): array
{
bcscale(2);
$data = [
@@ -115,7 +115,7 @@ class ChartJsCategoryChartGenerator implements CategoryChartGeneratorInterface
*
* @return array
*/
public function multiYear(Collection $entries)
public function multiYear(Collection $entries): array
{
// dataset:
$data = [
@@ -155,7 +155,7 @@ class ChartJsCategoryChartGenerator implements CategoryChartGeneratorInterface
*
* @return array
*/
public function period(Collection $entries)
public function period(Collection $entries): array
{
return $this->all($entries);
@@ -167,7 +167,7 @@ class ChartJsCategoryChartGenerator implements CategoryChartGeneratorInterface
*
* @return array
*/
public function spentInPeriod(Collection $categories, Collection $entries)
public function spentInPeriod(Collection $categories, Collection $entries): array
{
// language:

2
app/Generator/Chart/PiggyBank/ChartJsPiggyBankChartGenerator.php
View File

@@ -19,7 +19,7 @@ class ChartJsPiggyBankChartGenerator implements PiggyBankChartGeneratorInterface
*
* @return array
*/
public function history(Collection $set)
public function history(Collection $set): array
{
// language:

2
app/Generator/Chart/PiggyBank/PiggyBankChartGeneratorInterface.php
View File

@@ -24,5 +24,5 @@ interface PiggyBankChartGeneratorInterface
*
* @return array
*/
public function history(Collection $set);
public function history(Collection $set): array;
}

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

@@ -19,7 +19,7 @@ class ChartJsReportChartGenerator implements ReportChartGeneratorInterface
*
* @return array
*/
public function multiYearInOut(Collection $entries)
public function multiYearInOut(Collection $entries): array
{
$data = [
'count' => 2,
@@ -52,7 +52,7 @@ class ChartJsReportChartGenerator implements ReportChartGeneratorInterface
*
* @return array
*/
public function multiYearInOutSummarized(string $income, string $expense, int $count)
public function multiYearInOutSummarized(string $income, string $expense, int $count): array
{
$data = [
'count' => 2,
@@ -81,7 +81,7 @@ class ChartJsReportChartGenerator implements ReportChartGeneratorInterface
*
* @return array
*/
public function yearInOut(Collection $entries)
public function yearInOut(Collection $entries): array
{
// language:
$format = (string)trans('config.month');
@@ -117,7 +117,7 @@ class ChartJsReportChartGenerator implements ReportChartGeneratorInterface
*
* @return array
*/
public function yearInOutSummarized(string $income, string $expense, int $count)
public function yearInOutSummarized(string $income, string $expense, int $count): array
{
$data = [

8
app/Generator/Chart/Report/ReportChartGeneratorInterface.php
View File

@@ -25,7 +25,7 @@ interface ReportChartGeneratorInterface
*
* @return array
*/
public function multiYearInOut(Collection $entries);
public function multiYearInOut(Collection $entries): array;
/**
* @param string $income
@@ -34,14 +34,14 @@ interface ReportChartGeneratorInterface
*
* @return array
*/
public function multiYearInOutSummarized(string $income, string $expense, int $count);
public function multiYearInOutSummarized(string $income, string $expense, int $count): array;
/**
* @param Collection $entries
*
* @return array
*/
public function yearInOut(Collection $entries);
public function yearInOut(Collection $entries): array;
/**
* @param string $income
@@ -50,6 +50,6 @@ interface ReportChartGeneratorInterface
*
* @return array
*/
public function yearInOutSummarized(string $income, string $expense, int $count);
public function yearInOutSummarized(string $income, string $expense, int $count): array;
}