gh-mirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-10 04:21:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Specify return types.

Browse Source
This commit is contained in:
James Cole
2018-07-08 12:28:42 +02:00
parent b315882f58
commit d05a1e0260
70 changed files with 254 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/Http/Controllers/Json/AutoCompleteController.php
View File

@@ -50,7 +50,7 @@ class AutoCompleteController extends Controller
*
* @return JsonResponse
*/
public function allAccounts(AccountRepositoryInterface $repository)
public function allAccounts(AccountRepositoryInterface $repository): JsonResponse
{
$return = array_unique(
$repository->getAccountsByType(
@@ -98,7 +98,7 @@ class AutoCompleteController extends Controller
*
* @return JsonResponse
*/
public function budgets(BudgetRepositoryInterface $repository)
public function budgets(BudgetRepositoryInterface $repository): JsonResponse
{
$return = array_unique($repository->getBudgets()->pluck('name')->toArray());
sort($return);
@@ -113,7 +113,7 @@ class AutoCompleteController extends Controller
*
* @return JsonResponse
*/
public function categories(CategoryRepositoryInterface $repository)
public function categories(CategoryRepositoryInterface $repository): JsonResponse
{
$return = array_unique($repository->getCategories()->pluck('name')->toArray());
sort($return);
@@ -126,7 +126,7 @@ class AutoCompleteController extends Controller
*
* @return JsonResponse
*/
public function currencyNames(CurrencyRepositoryInterface $repository)
public function currencyNames(CurrencyRepositoryInterface $repository): JsonResponse
{
$return = $repository->get()->pluck('name')->toArray();
sort($return);
@@ -141,7 +141,7 @@ class AutoCompleteController extends Controller
*
* @return JsonResponse
*/
public function expenseAccounts(AccountRepositoryInterface $repository)
public function expenseAccounts(AccountRepositoryInterface $repository): JsonResponse
{
$set = $repository->getAccountsByType([AccountType::EXPENSE, AccountType::BENEFICIARY]);
$filtered = $set->filter(
@@ -199,7 +199,7 @@ class AutoCompleteController extends Controller
*
* @return JsonResponse
*/
public function revenueAccounts(AccountRepositoryInterface $repository)
public function revenueAccounts(AccountRepositoryInterface $repository): JsonResponse
{
$set = $repository->getAccountsByType([AccountType::REVENUE]);
$filtered = $set->filter(
@@ -224,7 +224,7 @@ class AutoCompleteController extends Controller
*
* @return JsonResponse
*/
public function tags(TagRepositoryInterface $tagRepository)
public function tags(TagRepositoryInterface $tagRepository): JsonResponse
{
$return = array_unique($tagRepository->get()->pluck('tag')->toArray());
sort($return);
@@ -238,7 +238,7 @@ class AutoCompleteController extends Controller
*
* @return JsonResponse
*/
public function transactionJournals(JournalCollectorInterface $collector, string $what)
public function transactionJournals(JournalCollectorInterface $collector, string $what): JsonResponse
{
$type = config('firefly.transactionTypesByWhat.' . $what);
$types = [$type];
@@ -255,7 +255,7 @@ class AutoCompleteController extends Controller
*
* @return JsonResponse
*/
public function transactionTypes(JournalRepositoryInterface $repository)
public function transactionTypes(JournalRepositoryInterface $repository): JsonResponse
{
$return = array_unique($repository->getTransactionTypes()->pluck('type')->toArray());
sort($return);

17
app/Http/Controllers/Json/BoxController.php
View File

@@ -35,6 +35,7 @@ use FireflyIII\Repositories\Bill\BillRepositoryInterface;
use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
use FireflyIII\Support\CacheProperties;
use Illuminate\Http\JsonResponse;
/**
* Class BoxController.
@@ -45,9 +46,9 @@ class BoxController extends Controller
/**
* @param BudgetRepositoryInterface $repository
*
* @return \Illuminate\Http\JsonResponse
* @return JsonResponse
*/
public function available(BudgetRepositoryInterface $repository)
public function available(BudgetRepositoryInterface $repository): JsonResponse
{
$start = session('start', Carbon::now()->startOfMonth());
$end = session('end', Carbon::now()->endOfMonth());
@@ -97,9 +98,9 @@ class BoxController extends Controller
/**
* @param CurrencyRepositoryInterface $repository
*
* @return \Illuminate\Http\JsonResponse
* @return JsonResponse
*/
public function balance(CurrencyRepositoryInterface $repository)
public function balance(CurrencyRepositoryInterface $repository): JsonResponse
{
// Cache result, return cache if present.
$start = session('start', Carbon::now()->startOfMonth());
@@ -179,9 +180,9 @@ class BoxController extends Controller
/**
* @param BillRepositoryInterface $repository
*
* @return \Illuminate\Http\JsonResponse
* @return JsonResponse
*/
public function bills(BillRepositoryInterface $repository)
public function bills(BillRepositoryInterface $repository): JsonResponse
{
$start = session('start', Carbon::now()->startOfMonth());
$end = session('end', Carbon::now()->endOfMonth());
@@ -217,9 +218,9 @@ class BoxController extends Controller
*
* @param CurrencyRepositoryInterface $currencyRepos
*
* @return \Illuminate\Http\JsonResponse
* @return JsonResponse
*/
public function netWorth(AccountRepositoryInterface $repository, CurrencyRepositoryInterface $currencyRepos)
public function netWorth(AccountRepositoryInterface $repository, CurrencyRepositoryInterface $currencyRepos): JsonResponse
{
$date = new Carbon(date('Y-m-d')); // needed so its per day.
/** @var Carbon $start */

5
app/Http/Controllers/Json/ExchangeController.php
View File

@@ -27,6 +27,7 @@ use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Models\TransactionCurrency;
use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
use FireflyIII\Services\Currency\ExchangeRateInterface;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Log;
@@ -42,9 +43,9 @@ class ExchangeController extends Controller
* @param TransactionCurrency $toCurrency
* @param Carbon $date
*
* @return \Illuminate\Http\JsonResponse
* @return JsonResponse
*/
public function getRate(Request $request, TransactionCurrency $fromCurrency, TransactionCurrency $toCurrency, Carbon $date)
public function getRate(Request $request, TransactionCurrency $fromCurrency, TransactionCurrency $toCurrency, Carbon $date): JsonResponse
{
/** @var CurrencyRepositoryInterface $repository */
$repository = app(CurrencyRepositoryInterface::class);

5
app/Http/Controllers/Json/FrontpageController.php
View File

@@ -25,6 +25,7 @@ namespace FireflyIII\Http\Controllers\Json;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Models\PiggyBank;
use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
use Illuminate\Http\JsonResponse;
/**
* Class FrontpageController.
@@ -34,10 +35,10 @@ class FrontpageController extends Controller
/**
* @param PiggyBankRepositoryInterface $repository
*
* @return \Illuminate\Http\JsonResponse
* @return JsonResponse
* @throws \Throwable
*/
public function piggyBanks(PiggyBankRepositoryInterface $repository)
public function piggyBanks(PiggyBankRepositoryInterface $repository): JsonResponse
{
$set = $repository->getPiggyBanks();
$info = [];

13
app/Http/Controllers/Json/IntroController.php
View File

@@ -23,6 +23,7 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Json;
use FireflyIII\Support\Facades\Preferences;
use Illuminate\Http\JsonResponse;
use Log;
/**
@@ -34,9 +35,9 @@ class IntroController
* @param string $route
* @param string|null $specificPage
*
* @return \Illuminate\Http\JsonResponse
* @return JsonResponse
*/
public function getIntroSteps(string $route, string $specificPage = null)
public function getIntroSteps(string $route, string $specificPage = null): JsonResponse
{
Log::debug(sprintf('getIntroSteps for route "%s" and page "%s"', $route, $specificPage));
$specificPage = $specificPage ?? '';
@@ -92,9 +93,9 @@ class IntroController
* @param string $route
* @param string|null $specialPage
*
* @return \Illuminate\Http\JsonResponse
* @return JsonResponse
*/
public function postEnable(string $route, string $specialPage = null)
public function postEnable(string $route, string $specialPage = null): JsonResponse
{
$specialPage = $specialPage ?? '';
$route = str_replace('.', '_', $route);
@@ -112,9 +113,9 @@ class IntroController
* @param string $route
* @param string|null $specialPage
*
* @return \Illuminate\Http\JsonResponse
* @return JsonResponse
*/
public function postFinished(string $route, string $specialPage = null)
public function postFinished(string $route, string $specialPage = null): JsonResponse
{
$specialPage = $specialPage ?? '';
$key = 'shown_demo_' . $route;