kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-16 06:38:09 +00:00
Code Issues Projects Releases Wiki Activity

Various PSR12 code cleanup

Browse Source
This commit is contained in:
James Cole
2022-12-29 19:41:57 +01:00
parent 0022009dd5
commit dbf3e76ecc
340 changed files with 4079 additions and 3816 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
app/Http/Controllers/SearchController.php
View File

@@ -1,4 +1,5 @@
<?php
/**
* SearchController.php
* Copyright (c) 2019 james@firefly-iii.org
@@ -47,7 +48,7 @@ class SearchController extends Controller
$this->middleware(
static function ($request, $next) {
app('view')->share('mainTitleIcon', 'fa-search');
app('view')->share('title', (string) trans('firefly.search'));
app('view')->share('title', (string)trans('firefly.search'));
return $next($request);
}
@@ -57,8 +58,8 @@ class SearchController extends Controller
/**
* Do the search.
*
* @param Request $request
* @param SearchInterface $searcher
* @param Request $request
* @param SearchInterface $searcher
*
* @return Factory|View
*/
@@ -69,9 +70,9 @@ class SearchController extends Controller
if (is_array($request->get('search'))) {
$fullQuery = '';
}
$fullQuery = (string) $fullQuery;
$page = 0 === (int) $request->get('page') ? 1 : (int) $request->get('page');
$ruleId = (int) $request->get('rule');
$fullQuery = (string)$fullQuery;
$page = 0 === (int)$request->get('page') ? 1 : (int)$request->get('page');
$ruleId = (int)$request->get('rule');
$ruleChanged = false;
// find rule, check if query is different, offer to update.
@@ -90,7 +91,7 @@ class SearchController extends Controller
$query = $searcher->getWordsAsString();
$operators = $searcher->getOperators();
$invalidOperators = $searcher->getInvalidOperators();
$subTitle = (string) trans('breadcrumbs.search_result', ['query' => $fullQuery]);
$subTitle = (string)trans('breadcrumbs.search_result', ['query' => $fullQuery]);
return view('search.index', compact('query', 'operators', 'page', 'rule', 'fullQuery', 'subTitle', 'ruleId', 'ruleChanged', 'invalidOperators'));
}
@@ -98,15 +99,15 @@ class SearchController extends Controller
/**
* JSON request that does the work.
*
* @param Request $request
* @param SearchInterface $searcher
* @param Request $request
* @param SearchInterface $searcher
*
* @return JsonResponse
*/
public function search(Request $request, SearchInterface $searcher): JsonResponse
{
$fullQuery = (string) $request->get('query');
$page = 0 === (int) $request->get('page') ? 1 : (int) $request->get('page');
$fullQuery = (string)$request->get('query');
$page = 0 === (int)$request->get('page') ? 1 : (int)$request->get('page');
$searcher->parseQuery($fullQuery);
@@ -115,7 +116,7 @@ class SearchController extends Controller
$hasPages = $groups->hasPages();
$searchTime = round($searcher->searchTime(), 3); // in seconds
$parameters = ['search' => $fullQuery];
$url = route('search.index') . '?' . http_build_query($parameters);
$url = route('search.index').'?'.http_build_query($parameters);
$groups->setPath($url);
try {