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

Code cleanup that (hopefully) matches style CI

Browse Source
This commit is contained in:
James Cole
2020-03-17 15:01:00 +01:00
parent bd2f064eeb
commit 2b6c3fd743
110 changed files with 2060 additions and 1660 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,6 +22,7 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Json;
use Amount;
use Carbon\Carbon;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Models\Account;
@@ -78,7 +79,7 @@ class AutoCompleteController extends Controller
Log::debug(sprintf('Now in accounts("%s"). Filtering results.', $search), $filteredAccountTypes);
$return = [];
$result = $repository->searchAccount((string)$search, $filteredAccountTypes);
$result = $repository->searchAccount((string) $search, $filteredAccountTypes);
$defaultCurrency = app('amount')->getDefaultCurrency();
/** @var Account $account */
@@ -117,7 +118,7 @@ class AutoCompleteController extends Controller
*/
public function allJournals(Request $request): JsonResponse
{
$search = (string)$request->get('search');
$search = (string) $request->get('search');
/** @var JournalRepositoryInterface $repository */
$repository = app(JournalRepositoryInterface::class);
$result = $repository->searchJournalDescriptions($search);
@@ -132,7 +133,8 @@ class AutoCompleteController extends Controller
$journal['name'] = $journal['description'];
return $journal;
}, $array
},
$array
);
return response()->json(array_values($array));
@@ -150,7 +152,7 @@ class AutoCompleteController extends Controller
*/
public function allJournalsWithID(Request $request): JsonResponse
{
$search = (string)$request->get('search');
$search = (string) $request->get('search');
/** @var JournalRepositoryInterface $repository */
$repository = app(JournalRepositoryInterface::class);
@@ -161,7 +163,7 @@ class AutoCompleteController extends Controller
$array = [];
if (is_numeric($search)) {
// search for group, not journal.
$firstResult = $groupRepos->find((int)$search);
$firstResult = $groupRepos->find((int) $search);
if (null !== $firstResult) {
// group may contain multiple journals, each a result:
foreach ($firstResult->transactionJournals as $journal) {
@@ -201,7 +203,7 @@ class AutoCompleteController extends Controller
Log::debug(sprintf('Now in expenseAccounts(%s). Filtering results.', $search), $allowedAccountTypes);
$return = [];
$result = $repository->searchAccount((string)$search, $allowedAccountTypes);
$result = $repository->searchAccount((string) $search, $allowedAccountTypes);
/** @var Account $account */
foreach ($result as $account) {
@@ -223,7 +225,7 @@ class AutoCompleteController extends Controller
*/
public function bills(Request $request): JsonResponse
{
$query = (string)$request->get('search');
$query = (string) $request->get('search');
/** @var BillRepositoryInterface $repository */
$repository = app(BillRepositoryInterface::class);
$result = $repository->searchBill($query);
@@ -239,7 +241,7 @@ class AutoCompleteController extends Controller
*/
public function budgets(Request $request): JsonResponse
{
$search = (string)$request->get('search');
$search = (string) $request->get('search');
/** @var BudgetRepositoryInterface $repository */
$repository = app(BudgetRepositoryInterface::class);
$result = $repository->searchBudget($search);
@@ -255,7 +257,7 @@ class AutoCompleteController extends Controller
*/
public function categories(Request $request): JsonResponse
{
$query = (string)$request->get('search');
$query = (string) $request->get('search');
/** @var CategoryRepositoryInterface $repository */
$repository = app(CategoryRepositoryInterface::class);
$result = $repository->searchCategory($query);
@@ -297,7 +299,7 @@ class AutoCompleteController extends Controller
*/
public function currencyNames(Request $request): JsonResponse
{
$query = (string)$request->get('search');
$query = (string) $request->get('search');
/** @var CurrencyRepositoryInterface $repository */
$repository = app(CurrencyRepositoryInterface::class);
$result = $repository->searchCurrency($query)->toArray();
@@ -326,7 +328,7 @@ class AutoCompleteController extends Controller
Log::debug(sprintf('Now in expenseAccounts(%s). Filtering results.', $search), $allowedAccountTypes);
$return = [];
$result = $repository->searchAccount((string)$search, $allowedAccountTypes);
$result = $repository->searchAccount((string) $search, $allowedAccountTypes);
/** @var Account $account */
foreach ($result as $account) {
@@ -353,7 +355,7 @@ class AutoCompleteController extends Controller
$accountRepos = app(AccountRepositoryInterface::class);
$piggies = $repository->getPiggyBanks();
$defaultCurrency = \Amount::getDefaultCurrency();
$defaultCurrency = Amount::getDefaultCurrency();
$response = [];
/** @var PiggyBank $piggy */
foreach ($piggies as $piggy) {
@@ -389,7 +391,7 @@ class AutoCompleteController extends Controller
Log::debug('Now in revenueAccounts(). Filtering results.', $allowedAccountTypes);
$return = [];
$result = $repository->searchAccount((string)$search, $allowedAccountTypes);
$result = $repository->searchAccount((string) $search, $allowedAccountTypes);
/** @var Account $account */
foreach ($result as $account) {
@@ -411,7 +413,7 @@ class AutoCompleteController extends Controller
*/
public function tags(Request $request): JsonResponse
{
$search = (string)$request->get('search');
$search = (string) $request->get('search');
/** @var TagRepositoryInterface $repository */
$repository = app(TagRepositoryInterface::class);
$result = $repository->searchTags($search);
@@ -432,7 +434,7 @@ class AutoCompleteController extends Controller
*/
public function transactionTypes(Request $request): JsonResponse
{
$query = (string)$request->get('search');
$query = (string) $request->get('search');
/** @var TransactionTypeRepositoryInterface $repository */
$repository = app(TransactionTypeRepositoryInterface::class);
$array = $repository->searchTypes($query)->toArray();
@@ -444,5 +446,4 @@ class AutoCompleteController extends Controller
return response()->json($array);
}
}