diff --git a/.ci/phpstan.neon b/.ci/phpstan.neon index f846b62d11..49c903b445 100644 --- a/.ci/phpstan.neon +++ b/.ci/phpstan.neon @@ -66,5 +66,5 @@ parameters: - ../bootstrap/app.php # The level 8 is the highest level. original was 5 - level: 4 + level: 1 diff --git a/app/Api/V2/Controllers/Chart/BalanceController.php b/app/Api/V2/Controllers/Chart/BalanceController.php index 8ba070f627..d19fc9dafd 100644 --- a/app/Api/V2/Controllers/Chart/BalanceController.php +++ b/app/Api/V2/Controllers/Chart/BalanceController.php @@ -45,23 +45,6 @@ class BalanceController extends Controller { use CleansChartData; - private AccountRepositoryInterface $repository; - - /** - * - */ - public function __construct() - { - parent::__construct(); - $this->middleware( - function ($request, $next) { - $this->repository = app(AccountRepositoryInterface::class); - - return $next($request); - } - ); - } - /** * The code is practically a duplicate of ReportController::operations. * diff --git a/app/Api/V2/Controllers/Model/Budget/ListController.php b/app/Api/V2/Controllers/Model/Budget/IndexController.php similarity index 86% rename from app/Api/V2/Controllers/Model/Budget/ListController.php rename to app/Api/V2/Controllers/Model/Budget/IndexController.php index 7b92c751ae..c9d0af5867 100644 --- a/app/Api/V2/Controllers/Model/Budget/ListController.php +++ b/app/Api/V2/Controllers/Model/Budget/IndexController.php @@ -33,9 +33,9 @@ use Illuminate\Http\Request; use Illuminate\Pagination\LengthAwarePaginator; /** - * Class ListController + * Class IndexController */ -class ListController extends Controller +class IndexController extends Controller { private BudgetRepositoryInterface $repository; @@ -61,13 +61,12 @@ class ListController extends Controller */ public function index(Request $request): JsonResponse { - echo 'this needs move to Administration'; - throw new FireflyException('Needs migration to IndexController'); + $pageSize = $this->parameters->get('limit'); $collection = $this->repository->getActiveBudgets(); $total = $collection->count(); - $collection->slice($this->pageXSize * $this->parameters->get('page'), $this->pXageSize); + $collection->slice($pageSize * $this->parameters->get('page'), $pageSize); - $paginator = new LengthAwarePaginator($collection, $total, $this->pagXeSize, $this->parameters->get('page')); + $paginator = new LengthAwarePaginator($collection, $total, $pageSize, $this->parameters->get('page')); $transformer = new BudgetTransformer(); return response() diff --git a/app/Api/V2/Controllers/Model/Budget/ShowController.php b/app/Api/V2/Controllers/Model/Budget/ShowController.php index 561be1e45d..537ebf34d6 100644 --- a/app/Api/V2/Controllers/Model/Budget/ShowController.php +++ b/app/Api/V2/Controllers/Model/Budget/ShowController.php @@ -59,18 +59,20 @@ class ShowController extends Controller } /** + * 2023-10-29 removed the cerSum reference, not sure where this is used atm + * so removed from api.php. Also applies to "spent" method. + * * This endpoint is documented at: * TODO add URL * */ public function budgeted(DateRequest $request, Budget $budget): JsonResponse { - throw new FireflyException('Needs refactoring, uses deprecated method.'); $data = $request->getAll(); $result = $this->repository->budgetedInPeriodForBudget($budget, $data['start'], $data['end']); - $converted = $this->cerSum(array_values($result)); + //$converted = $this->cerSum(array_values($result)); - return response()->json($converted); + return response()->json($result); } /** @@ -80,11 +82,10 @@ class ShowController extends Controller */ public function spent(DateRequest $request, Budget $budget): JsonResponse { - throw new FireflyException('Needs refactoring, uses deprecated method.'); $data = $request->getAll(); $result = $this->repository->spentInPeriodForBudget($budget, $data['start'], $data['end']); - $converted = $this->cerSum(array_values($result)); + // $converted = $this->cerSum(array_values($result)); - return response()->json($converted); + return response()->json($result); } } diff --git a/app/Helpers/Report/NetWorth.php b/app/Helpers/Report/NetWorth.php index d7027aa3f8..8efff7d7c4 100644 --- a/app/Helpers/Report/NetWorth.php +++ b/app/Helpers/Report/NetWorth.php @@ -186,6 +186,7 @@ class NetWorth implements NetWorthInterface /** * @inheritDoc + * @deprecated */ public function sumNetWorthByCurrency(Carbon $date): array { diff --git a/app/Helpers/Report/NetWorthInterface.php b/app/Helpers/Report/NetWorthInterface.php index 5604683ecd..548401a735 100644 --- a/app/Helpers/Report/NetWorthInterface.php +++ b/app/Helpers/Report/NetWorthInterface.php @@ -68,6 +68,7 @@ interface NetWorthInterface * @param Carbon $date * * @return array + * @deprecated */ public function sumNetWorthByCurrency(Carbon $date): array; } diff --git a/routes/api.php b/routes/api.php index 95a278a3bf..8f0976282e 100644 --- a/routes/api.php +++ b/routes/api.php @@ -186,8 +186,8 @@ Route::group( Route::get('{budget}/limits', ['uses' => 'BudgetLimit\IndexController@index', 'as' => 'budget-limits.index']); Route::get('sum/budgeted', ['uses' => 'Budget\IndexController@budgeted', 'as' => 'sum.budgeted']); Route::get('sum/spent', ['uses' => 'Budget\IndexController@spent', 'as' => 'sum.spent']); - Route::get('{budget}/budgeted', ['uses' => 'Budget\ShowController@budgeted', 'as' => 'budget.budgeted']); - Route::get('{budget}/spent', ['uses' => 'Budget\ShowController@spent', 'as' => 'budget.spent']); + //Route::get('{budget}/budgeted', ['uses' => 'Budget\ShowController@budgeted', 'as' => 'budget.budgeted']); + //Route::get('{budget}/spent', ['uses' => 'Budget\ShowController@spent', 'as' => 'budget.spent']); } );