Improve test coverage.

2025-10-31 02:36:28 +00:00 · 2019-06-10 20:14:00 +02:00
parent 8efb73694d
commit 2ab9d2e6ee
75 changed files with 4672 additions and 484 deletions
--- a/app/Api/V1/Controllers/Chart/AccountController.php
+++ b/app/Api/V1/Controllers/Chart/AccountController.php
@@ -27,7 +27,6 @@ namespace FireflyIII\Api\V1\Controllers\Chart;
 use Carbon\Carbon;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\DateRequest;
-use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\AccountType;
 use FireflyIII\Models\TransactionCurrency;
@@ -74,7 +73,6 @@ class AccountController extends Controller
     * @param DateRequest $request
     *
     * @return JsonResponse
-     * @throws FireflyException
     */
    public function expenseOverview(DateRequest $request): JsonResponse
    {
@@ -161,7 +159,6 @@ class AccountController extends Controller
     * @param DateRequest $request
     *
     * @return JsonResponse
-     * @throws FireflyException
     */
    public function overview(DateRequest $request): JsonResponse
    {
@@ -224,7 +221,6 @@ class AccountController extends Controller
     * @param DateRequest $request
     *
     * @return JsonResponse
-     * @throws FireflyException
     */
    public function revenueOverview(DateRequest $request): JsonResponse
    {
--- a/app/Api/V1/Controllers/Chart/CategoryController.php
+++ b/app/Api/V1/Controllers/Chart/CategoryController.php
@@ -27,11 +27,9 @@ namespace FireflyIII\Api\V1\Controllers\Chart;
 use Carbon\Carbon;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\DateRequest;
-use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
 use Illuminate\Support\Collection;

 /**
@@ -66,7 +64,6 @@ class CategoryController extends Controller
     * @param DateRequest $request
     *
     * @return JsonResponse
-     * @throws FireflyException
     */
    public function overview(DateRequest $request): JsonResponse
    {
--- a/app/Api/V1/Controllers/CurrencyController.php
+++ b/app/Api/V1/Controllers/CurrencyController.php
@@ -128,7 +128,7 @@ class CurrencyController extends Controller

        // filter list on currency preference:
        $collection = $unfiltered->filter(
-            function (Account $account) use ($currency, $accountRepository) {
+            static function (Account $account) use ($currency, $accountRepository) {
                $currencyId = (int)$accountRepository->getMetaValue($account, 'currency_id');

                return $currencyId === $currency->id;
@@ -229,7 +229,7 @@ class CurrencyController extends Controller

        // filter and paginate list:
        $collection = $unfiltered->filter(
-            function (Bill $bill) use ($currency) {
+            static function (Bill $bill) use ($currency) {
                return $bill->transaction_currency_id === $currency->id;
            }
        );
@@ -505,7 +505,7 @@ class CurrencyController extends Controller

        // filter selection
        $collection = $unfiltered->filter(
-            function (Recurrence $recurrence) use ($currency) {
+            static function (Recurrence $recurrence) use ($currency) {
                /** @var RecurrenceTransaction $transaction */
                foreach ($recurrence->recurrenceTransactions as $transaction) {
                    if ($transaction->transaction_currency_id === $currency->id || $transaction->foreign_currency_id === $currency->id) {
@@ -560,7 +560,7 @@ class CurrencyController extends Controller
        $unfiltered = $repository->getAll();

        $collection = $unfiltered->filter(
-            function (Rule $rule) use ($currency) {
+            static function (Rule $rule) use ($currency) {
                /** @var RuleTrigger $trigger */
                foreach ($rule->ruleTriggers as $trigger) {
                    if ('currency_is' === $trigger->trigger_type && $currency->name === $trigger->trigger_value) {
--- a/app/Api/V1/Controllers/PreferenceController.php
+++ b/app/Api/V1/Controllers/PreferenceController.php
@@ -52,7 +52,7 @@ class PreferenceController extends Controller
    {
        parent::__construct();
        $this->middleware(
-            function ($request, $next) {
+            static function ($request, $next) {
                /** @var User $user */
                $user       = auth()->user();
                $repository = app(AccountRepositoryInterface::class);
--- a/app/Api/V1/Controllers/RuleGroupController.php
+++ b/app/Api/V1/Controllers/RuleGroupController.php
@@ -258,7 +258,8 @@ class RuleGroupController extends Controller
            $matcher->setTriggeredLimit($parameters['trigger_limit']);
            $matcher->setAccounts($parameters['accounts']);

-            $result               = $matcher->findTransactionsByRule();
+            $result = $matcher->findTransactionsByRule();
+            /** @noinspection AdditionOperationOnArraysInspection */
            $matchingTransactions = $result + $matchingTransactions;
        }

--- a/app/Api/V1/Controllers/SummaryController.php
+++ b/app/Api/V1/Controllers/SummaryController.php
@@ -28,7 +28,6 @@ namespace FireflyIII\Api\V1\Controllers;
 use Carbon\Carbon;
 use Exception;
 use FireflyIII\Api\V1\Requests\DateRequest;
-use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Helpers\Report\NetWorthInterface;
 use FireflyIII\Models\Account;
@@ -41,7 +40,6 @@ use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
 use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
 use Illuminate\Support\Collection;

 /**
@@ -86,10 +84,9 @@ class SummaryController extends Controller
    }

    /**
-     * @param Request $request
+     * @param DateRequest $request
     *
     * @return JsonResponse
-     * @throws FireflyException
     * @throws Exception
     */
    public function basic(DateRequest $request): JsonResponse
--- a/app/Api/V1/Controllers/TagController.php
+++ b/app/Api/V1/Controllers/TagController.php
@@ -26,7 +26,6 @@ namespace FireflyIII\Api\V1\Controllers;
 use Carbon\Carbon;
 use FireflyIII\Api\V1\Requests\DateRequest;
 use FireflyIII\Api\V1\Requests\TagRequest;
-use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Models\Tag;
 use FireflyIII\Repositories\Tag\TagRepositoryInterface;
@@ -79,7 +78,6 @@ class TagController extends Controller
     * @param DateRequest $request
     *
     * @return JsonResponse
-     * @throws FireflyException
     */
    public function cloud(DateRequest $request): JsonResponse
    {
--- a/app/Api/V1/Controllers/TransactionLinkController.php
+++ b/app/Api/V1/Controllers/TransactionLinkController.php
@@ -105,7 +105,7 @@ class TransactionLinkController extends Controller
        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';

        // read type from URI
-        $name = $request->get('name') ?? null;
+        $name = $request->get('name');

        // types to get, page size:
        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
--- a/app/Api/V1/Requests/AccountStoreRequest.php
+++ b/app/Api/V1/Requests/AccountStoreRequest.php
@@ -56,7 +56,7 @@ class AccountStoreRequest extends Request
        $ccPaymentTypes = implode(',', array_keys(config('firefly.ccTypes')));
        $rules          = [
            'name'                 => 'required|min:1|uniqueAccountForUser',
-            'type'                 => sprintf('in:%s', $types),
+            'type'                 => 'required|' . sprintf('in:%s', $types),
            'iban'                 => 'iban|nullable',
            'bic'                  => 'bic|nullable',
            'account_number'       => 'between:1,255|nullable|uniqueAccountNumberForUser',
--- a/app/Api/V1/Requests/BillRequest.php
+++ b/app/Api/V1/Requests/BillRequest.php
@@ -119,7 +119,7 @@ class BillRequest extends Request
    public function withValidator(Validator $validator): void
    {
        $validator->after(
-            function (Validator $validator) {
+            static function (Validator $validator) {
                $data = $validator->getData();
                $min  = (float)($data['amount_min'] ?? 0);
                $max  = (float)($data['amount_max'] ?? 0);
--- a/app/Api/V1/Requests/RuleGroupTestRequest.php
+++ b/app/Api/V1/Requests/RuleGroupTestRequest.php
@@ -123,6 +123,7 @@ class RuleGroupTestRequest extends Request
            Log::debug(sprintf('Searching for asset account with id "%s"', $accountId));
            $account = $accountRepository->findNull((int)$accountId);
            if ($this->validAccount($account)) {
+                /** @noinspection NullPointerExceptionInspection */
                Log::debug(sprintf('Found account #%d ("%s") and its an asset account', $account->id, $account->name));
                $accounts->push($account);
            }
--- a/app/Api/V1/Requests/RuleTestRequest.php
+++ b/app/Api/V1/Requests/RuleTestRequest.php
@@ -123,6 +123,7 @@ class RuleTestRequest extends Request
            Log::debug(sprintf('Searching for asset account with id "%s"', $accountId));
            $account = $accountRepository->findNull((int)$accountId);
            if ($this->validAccount($account)) {
+                /** @noinspection NullPointerExceptionInspection */
                Log::debug(sprintf('Found account #%d ("%s") and its an asset account', $account->id, $account->name));
                $accounts->push($account);
            }
--- a/app/Api/V1/Requests/RuleTriggerRequest.php
+++ b/app/Api/V1/Requests/RuleTriggerRequest.php
@@ -98,6 +98,7 @@ class RuleTriggerRequest extends Request
            Log::debug(sprintf('Searching for asset account with id "%s"', $accountId));
            $account = $accountRepository->findNull((int)$accountId);
            if ($this->validAccount($account)) {
+                /** @noinspection NullPointerExceptionInspection */
                Log::debug(sprintf('Found account #%d ("%s") and its an asset account', $account->id, $account->name));
                $accounts->push($account);
            }