kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-15 00:27:30 +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

8
app/Api/V2/Controllers/Chart/AccountController.php
View File

@@ -56,7 +56,7 @@ class AccountController extends Controller
}
/**
* @param DateRequest $request
* @param DateRequest $request
* @return JsonResponse
*/
public function dashboard(DateRequest $request): JsonResponse
@@ -88,7 +88,7 @@ class AccountController extends Controller
}
$currentSet = [
'label' => $account->name,
'currency_id' => (string) $currency->id,
'currency_id' => (string)$currency->id,
'currency_code' => $currency->code,
'currency_symbol' => $currency->symbol,
'currency_decimal_places' => $currency->decimal_places,
@@ -107,7 +107,7 @@ class AccountController extends Controller
// 2022-10-11: this method no longer converts to floats
$previous = array_values($range)[0];
$previous = array_values($range)[0];
while ($currentStart <= $end) {
$format = $currentStart->format('Y-m-d');
$label = $currentStart->toAtomString();
@@ -116,7 +116,7 @@ class AccountController extends Controller
$currentStart->addDay();
$currentSet['entries'][$label] = $balance;
}
$currentSet = $this->cerChartSet($currentSet);
$currentSet = $this->cerChartSet($currentSet);
$chartData[] = $currentSet;
}

98
app/Api/V2/Controllers/Controller.php
View File

@@ -58,55 +58,10 @@ class Controller extends BaseController
$this->parameters = $this->getParameters();
$this->pageSize = 50;
if (auth()->check()) {
$this->pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$this->pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
}
}
/**
* Returns a JSON API object and returns it.
*
* @param string $key
* @param Model $object
* @param AbstractTransformer $transformer
* @return array
*/
final protected function jsonApiObject(string $key, Model $object, AbstractTransformer $transformer): array
{
// create some objects:
$manager = new Manager();
$baseUrl = request()->getSchemeAndHttpHost() . '/api/v2';
$manager->setSerializer(new JsonApiSerializer($baseUrl));
$transformer->collectMetaData(new Collection([$object]));
$resource = new Item($object, $transformer, $key);
return $manager->createData($resource)->toArray();
}
/**
* @param string $key
* @param LengthAwarePaginator $paginator
* @param AbstractTransformer $transformer
* @return array
*/
final protected function jsonApiList(string $key, LengthAwarePaginator $paginator, AbstractTransformer $transformer): array
{
$manager = new Manager();
$baseUrl = request()->getSchemeAndHttpHost() . '/api/v2';
$manager->setSerializer(new JsonApiSerializer($baseUrl));
$objects = $paginator->getCollection();
// the transformer, at this point, needs to collect information that ALL items in the collection
// require, like meta data and stuff like that, and save it for later.
$transformer->collectMetaData($objects);
$resource = new FractalCollection($objects, $transformer, $key);
$resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
return $manager->createData($resource)->toArray();
}
/**
* TODO duplicate from V1 controller
* Method to grab all parameters from the URL.
@@ -115,9 +70,9 @@ class Controller extends BaseController
*/
private function getParameters(): ParameterBag
{
$bag = new ParameterBag();
$bag = new ParameterBag();
try {
$page = (int) request()->get('page');
$page = (int)request()->get('page');
} catch (ContainerExceptionInterface|NotFoundExceptionInterface $e) {
$page = 1;
}
@@ -152,7 +107,7 @@ class Controller extends BaseController
foreach ($integers as $integer) {
$value = request()->query->get($integer);
if (null !== $value) {
$bag->set($integer, (int) $value);
$bag->set($integer, (int)$value);
}
}
@@ -161,4 +116,49 @@ class Controller extends BaseController
return $bag;
}
/**
* @param string $key
* @param LengthAwarePaginator $paginator
* @param AbstractTransformer $transformer
* @return array
*/
final protected function jsonApiList(string $key, LengthAwarePaginator $paginator, AbstractTransformer $transformer): array
{
$manager = new Manager();
$baseUrl = request()->getSchemeAndHttpHost().'/api/v2';
$manager->setSerializer(new JsonApiSerializer($baseUrl));
$objects = $paginator->getCollection();
// the transformer, at this point, needs to collect information that ALL items in the collection
// require, like meta data and stuff like that, and save it for later.
$transformer->collectMetaData($objects);
$resource = new FractalCollection($objects, $transformer, $key);
$resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
return $manager->createData($resource)->toArray();
}
/**
* Returns a JSON API object and returns it.
*
* @param string $key
* @param Model $object
* @param AbstractTransformer $transformer
* @return array
*/
final protected function jsonApiObject(string $key, Model $object, AbstractTransformer $transformer): array
{
// create some objects:
$manager = new Manager();
$baseUrl = request()->getSchemeAndHttpHost().'/api/v2';
$manager->setSerializer(new JsonApiSerializer($baseUrl));
$transformer->collectMetaData(new Collection([$object]));
$resource = new Item($object, $transformer, $key);
return $manager->createData($resource)->toArray();
}
}

2
app/Api/V2/Controllers/Model/Account/ShowController.php
View File

@@ -36,7 +36,7 @@ use Illuminate\Http\Request;
class ShowController extends Controller
{
/**
* @param Account $account
* @param Account $account
* @return JsonResponse
*/
public function show(Request $request, Account $account): JsonResponse

31
app/Api/V2/Controllers/Model/Bill/SumController.php
View File

@@ -36,6 +36,7 @@ use Illuminate\Http\JsonResponse;
class SumController extends Controller
{
use ConvertsExchangeRates;
private BillRepositoryInterface $repository;
/**
@@ -52,21 +53,7 @@ class SumController extends Controller
}
/**
* @param DateRequest $request
* @return JsonResponse
*/
public function unpaid(DateRequest $request): JsonResponse
{
$dates = $request->getAll();
$result = $this->repository->sumUnpaidInRange($dates['start'], $dates['end']);
$converted = $this->cerSum($result);
// convert to JSON response:
return response()->api($converted);
}
/**
* @param DateRequest $request
* @param DateRequest $request
* @return JsonResponse
*/
public function paid(DateRequest $request): JsonResponse
@@ -78,4 +65,18 @@ class SumController extends Controller
// convert to JSON response:
return response()->api($converted);
}
/**
* @param DateRequest $request
* @return JsonResponse
*/
public function unpaid(DateRequest $request): JsonResponse
{
$dates = $request->getAll();
$result = $this->repository->sumUnpaidInRange($dates['start'], $dates['end']);
$converted = $this->cerSum($result);
// convert to JSON response:
return response()->api($converted);
}
}

5
app/Api/V2/Controllers/Model/Budget/ListController.php
View File

@@ -30,7 +30,6 @@ use FireflyIII\Transformers\V2\BudgetTransformer;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Illuminate\Pagination\LengthAwarePaginator;
use Illuminate\Support\Collection;
class ListController extends Controller
{
@@ -52,8 +51,8 @@ class ListController extends Controller
*/
public function index(Request $request): JsonResponse
{
$collection = $this->repository->getActiveBudgets();
$total = $collection->count();
$collection = $this->repository->getActiveBudgets();
$total = $collection->count();
$collection->slice($this->pageSize * $this->parameters->get('page'), $this->pageSize);
$paginator = new LengthAwarePaginator($collection, $total, $this->pageSize, $this->parameters->get('page'));

4
app/Api/V2/Controllers/Model/Budget/SumController.php
View File

@@ -53,7 +53,7 @@ class SumController extends Controller
}
/**
* @param DateRequest $request
* @param DateRequest $request
* @return JsonResponse
*/
public function budgeted(DateRequest $request): JsonResponse
@@ -66,7 +66,7 @@ class SumController extends Controller
}
/**
* @param DateRequest $request
* @param DateRequest $request
* @return JsonResponse
*/
public function spent(DateRequest $request): JsonResponse

2
app/Api/V2/Controllers/NetWorthController.php
View File

@@ -57,7 +57,7 @@ class NetWorthController extends Controller
}
/**
* @param SingleDateRequest $request
* @param SingleDateRequest $request
* @return JsonResponse
*/
public function get(SingleDateRequest $request): JsonResponse

2
app/Api/V2/Controllers/System/PreferencesController.php
View File

@@ -35,7 +35,7 @@ use Illuminate\Http\JsonResponse;
class PreferencesController extends Controller
{
/**
* @param Preference $preference
* @param Preference $preference
* @return JsonResponse
*/
public function get(Preference $preference): JsonResponse

9
app/Api/V2/Controllers/Transaction/List/AccountController.php
View File

@@ -29,7 +29,6 @@ use FireflyIII\Api\V2\Request\Transaction\ListRequest;
use FireflyIII\Helpers\Collector\GroupCollectorInterface;
use FireflyIII\Models\Account;
use FireflyIII\Support\Http\Api\TransactionFilter;
use FireflyIII\Transformers\V2\PreferenceTransformer;
use FireflyIII\Transformers\V2\TransactionGroupTransformer;
use Illuminate\Http\JsonResponse;
use Illuminate\Support\Collection;
@@ -42,16 +41,16 @@ class AccountController extends Controller
use TransactionFilter;
/**
* @param ListRequest $request
* @param Account $account
* @param ListRequest $request
* @param Account $account
* @return JsonResponse
*/
public function listTransactions(ListRequest $request, Account $account): JsonResponse
{
// collect transactions:
$type = $request->get('type') ?? 'default';
$limit = (int) $request->get('limit');
$page = (int) $request->get('page');
$limit = (int)$request->get('limit');
$page = (int)$request->get('page');
$page = max($page, 1);
if ($limit > 0 && $limit <= $this->pageSize) {