diff --git a/.ci/phpstan.sh b/.ci/phpstan.sh index 4efa51ed6c..3b3beea910 100755 --- a/.ci/phpstan.sh +++ b/.ci/phpstan.sh @@ -31,3 +31,5 @@ SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) # Do static code analysis. # ./vendor/bin/phpstan analyse -c .ci/phpstan.neon --no-progress ./vendor/bin/phpstan analyse -c .ci/phpstan.neon --xdebug --error-format=table > phpstan-report.txt + +echo 'The PHPstan report can be found in phpstan-report.txt' diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3171afaf2b..22e73f5bce 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -6,11 +6,11 @@ jobs: name: SonarCloud runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis - name: SonarCloud Scan uses: SonarSource/sonarcloud-github-action@master env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any - SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} \ No newline at end of file + SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} diff --git a/.github/workflows/closed-issues.yml b/.github/workflows/closed-issues.yml index 0a50158079..56de291986 100644 --- a/.github/workflows/closed-issues.yml +++ b/.github/workflows/closed-issues.yml @@ -1,21 +1,21 @@ name: "Reply to closed issue" -on: - issues: - types: +on: + issues: + types: - closed -jobs: - auto_comment: +jobs: + auto_comment: runs-on: ubuntu-latest - steps: - - + steps: + - uses: aws-actions/closed-issue-message@v1 - with: + with: message: | Hi there! This is an automatic reply. `Share and enjoy` This issue is now closed. Please be aware that closed issues are not actively monitored. If you reply, you may get no response. - - If the original bug is not actually fixed, please feel free to open a new ticket. Please refer to this issue for clarity. + - If the original bug is not actually fixed, please feel free to open a new issue. Please refer to this issue for clarity. - Follow-up questions can also be posted in a new [discussion](https://github.com/firefly-iii/firefly-iii/discussions/) Thank you for your consideration. diff --git a/.github/workflows/depsreview.yaml b/.github/workflows/depsreview.yaml index f2605b7a7e..da99d0c548 100644 --- a/.github/workflows/depsreview.yaml +++ b/.github/workflows/depsreview.yaml @@ -11,4 +11,4 @@ jobs: - name: 'Checkout Repository' uses: actions/checkout@v3 - name: 'Dependency Review' - uses: actions/dependency-review-action@v1 + uses: actions/dependency-review-action@v3 diff --git a/.github/workflows/laravel.yml b/.github/workflows/laravel.yml index 4d07ea000f..75babbfe2d 100644 --- a/.github/workflows/laravel.yml +++ b/.github/workflows/laravel.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Copy .env run: test -f .env || cp .ci/.env.ci .env - name: Prepare dependencies @@ -51,7 +51,7 @@ jobs: - prepare steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Copy .env run: test -f .env || cp .ci/.env.ci .env - name: Download database @@ -86,7 +86,7 @@ jobs: - prepare steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Copy .env run: test -f .env || cp .ci/.env.ci .env - name: Download database @@ -120,7 +120,7 @@ jobs: - prepare steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Copy .env run: test -f .env || cp .ci/.env.ci .env - name: Download database diff --git a/.github/workflows/lock.yml b/.github/workflows/lock.yml index 48367b8949..94c2c5cd11 100644 --- a/.github/workflows/lock.yml +++ b/.github/workflows/lock.yml @@ -15,7 +15,16 @@ jobs: pull-requests: write # for dessant/lock-threads to lock PRs runs-on: ubuntu-latest steps: - - uses: dessant/lock-threads@v2 + - uses: dessant/lock-threads@v4 with: github-token: ${{ github.token }} issue-lock-inactive-days: '90' + issue-comment: > + Hi there! This is an automatic reply. `Share and enjoy` + + This issue is now `locked` :lock:. + + - If you feel there is more to be said about this specific issue, please feel free to open a new issue. Please refer to this issue for clarity. + - Follow-up questions and comments can also be posted in a new [discussion](https://github.com/firefly-iii/firefly-iii/discussions/) + + Thank you for your consideration. diff --git a/.github/workflows/qodana.yml b/.github/workflows/qodana.yml index 04ffc908bb..cb933a2508 100644 --- a/.github/workflows/qodana.yml +++ b/.github/workflows/qodana.yml @@ -24,8 +24,13 @@ jobs: with: fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis - name: Install dependencies - run: composer install --no-scripts - + run: | + composer install --no-scripts + cp .env.example .env + php artisan key:generate + php artisan clear-compiled + php artisan ide-helper:generate; + - name: 'Qodana Scan' uses: JetBrains/qodana-action@main env: diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index 142b371703..d3a264a71f 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -18,13 +18,17 @@ jobs: with: repo-token: ${{ secrets.GITHUB_TOKEN }} stale-issue-message: > - This issue has been automatically marked as stale because it has not had - recent activity. It will be closed if no further activity occurs. Thank you - for your contributions. + Hi there! This is an automatic reply. `Share and enjoy` + + This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. + + Thank you for your contributions. stale-pr-message: > - This issue has been automatically marked as stale because it has not had - recent activity. It will be closed if no further activity occurs. Thank you - for your contributions. + Hi there! This is an automatic reply. `Share and enjoy` + + This PR has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. + + Thank you for your contributions. days-before-stale: 14 days-before-close: 7 exempt-issue-labels: 'enhancement,feature,bug,announcement,layout-v3' diff --git a/app/Api/V1/Controllers/Autocomplete/AccountController.php b/app/Api/V1/Controllers/Autocomplete/AccountController.php index 1bb4f62100..841dcd0c38 100644 --- a/app/Api/V1/Controllers/Autocomplete/AccountController.php +++ b/app/Api/V1/Controllers/Autocomplete/AccountController.php @@ -65,7 +65,7 @@ class AccountController extends Controller /** * Documentation for this endpoint: - * https://api-docs.firefly-iii.org/#/autocomplete/getAccountsAC + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/autocomplete/getAccountsAC * * @param AutocompleteRequest $request * diff --git a/app/Api/V1/Controllers/Autocomplete/BillController.php b/app/Api/V1/Controllers/Autocomplete/BillController.php index bd1caa2478..b9e0894fec 100644 --- a/app/Api/V1/Controllers/Autocomplete/BillController.php +++ b/app/Api/V1/Controllers/Autocomplete/BillController.php @@ -57,7 +57,7 @@ class BillController extends Controller /** * Documentation for this endpoint is at: - * https://api-docs.firefly-iii.org/#/autocomplete/getBillsAC + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/autocomplete/getBillsAC * TODO expand API to add active field. * * @param AutocompleteRequest $request @@ -71,9 +71,9 @@ class BillController extends Controller $filtered = $result->map( static function (Bill $item) { return [ - 'id' => (string)$item->id, - 'name' => $item->name, - 'active' => $item->active + 'id' => (string)$item->id, + 'name' => $item->name, + 'active' => $item->active, ]; } ); diff --git a/app/Api/V1/Controllers/Autocomplete/BudgetController.php b/app/Api/V1/Controllers/Autocomplete/BudgetController.php index 48f6b69f2a..db69b6e4ee 100644 --- a/app/Api/V1/Controllers/Autocomplete/BudgetController.php +++ b/app/Api/V1/Controllers/Autocomplete/BudgetController.php @@ -57,7 +57,7 @@ class BudgetController extends Controller /** * Documentation for this endpoint is at: - * https://api-docs.firefly-iii.org/#/autocomplete/getBudgetsAC + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/autocomplete/getBudgetsAC * * @param AutocompleteRequest $request * diff --git a/app/Api/V1/Controllers/Autocomplete/CategoryController.php b/app/Api/V1/Controllers/Autocomplete/CategoryController.php index e98a20e4e1..957ec7fd14 100644 --- a/app/Api/V1/Controllers/Autocomplete/CategoryController.php +++ b/app/Api/V1/Controllers/Autocomplete/CategoryController.php @@ -57,7 +57,7 @@ class CategoryController extends Controller /** * Documentation for this endpoint is at: - * https://api-docs.firefly-iii.org/#/autocomplete/getCategoriesAC + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/autocomplete/getCategoriesAC * * @param AutocompleteRequest $request * diff --git a/app/Api/V1/Controllers/Autocomplete/CurrencyController.php b/app/Api/V1/Controllers/Autocomplete/CurrencyController.php index 50fd139f90..c287191a23 100644 --- a/app/Api/V1/Controllers/Autocomplete/CurrencyController.php +++ b/app/Api/V1/Controllers/Autocomplete/CurrencyController.php @@ -57,7 +57,7 @@ class CurrencyController extends Controller /** * Documentation for this endpoint is at: - * https://api-docs.firefly-iii.org/#/autocomplete/getCurrenciesAC + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/autocomplete/getCurrenciesAC * * @param AutocompleteRequest $request * @@ -85,7 +85,7 @@ class CurrencyController extends Controller /** * Documentation for this endpoint is at: - * https://api-docs.firefly-iii.org/#/autocomplete/getCurrenciesCodeAC + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/autocomplete/getCurrenciesCodeAC * * @param AutocompleteRequest $request * diff --git a/app/Api/V1/Controllers/Autocomplete/ObjectGroupController.php b/app/Api/V1/Controllers/Autocomplete/ObjectGroupController.php index 10b119dd71..f0a206e4a7 100644 --- a/app/Api/V1/Controllers/Autocomplete/ObjectGroupController.php +++ b/app/Api/V1/Controllers/Autocomplete/ObjectGroupController.php @@ -57,7 +57,7 @@ class ObjectGroupController extends Controller /** * Documentation for this endpoint is at: - * https://api-docs.firefly-iii.org/#/autocomplete/getObjectGroupsAC + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/autocomplete/getObjectGroupsAC * * @param AutocompleteRequest $request * diff --git a/app/Api/V1/Controllers/Autocomplete/PiggyBankController.php b/app/Api/V1/Controllers/Autocomplete/PiggyBankController.php index 65d784f501..2cfeb90ac0 100644 --- a/app/Api/V1/Controllers/Autocomplete/PiggyBankController.php +++ b/app/Api/V1/Controllers/Autocomplete/PiggyBankController.php @@ -61,7 +61,7 @@ class PiggyBankController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/autocomplete/getPiggiesAC + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/autocomplete/getPiggiesAC * * @param AutocompleteRequest $request * @@ -76,15 +76,18 @@ class PiggyBankController extends Controller /** @var PiggyBank $piggy */ foreach ($piggies as $piggy) { - $currency = $this->accountRepository->getAccountCurrency($piggy->account) ?? $defaultCurrency; - $response[] = [ + $currency = $this->accountRepository->getAccountCurrency($piggy->account) ?? $defaultCurrency; + $objectGroup = $piggy->objectGroups()->first(); + $response[] = [ 'id' => (string)$piggy->id, 'name' => $piggy->name, - 'currency_id' => $currency->id, + 'currency_id' => (string)$currency->id, 'currency_name' => $currency->name, 'currency_code' => $currency->code, 'currency_symbol' => $currency->symbol, 'currency_decimal_places' => $currency->decimal_places, + 'object_group_id' => null === $objectGroup ? null : (string)$objectGroup->id, + 'object_group_title' => $objectGroup?->title, ]; } @@ -93,7 +96,7 @@ class PiggyBankController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/autocomplete/getPiggiesBalanceAC + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/autocomplete/getPiggiesBalanceAC * * @param AutocompleteRequest $request * @@ -109,6 +112,7 @@ class PiggyBankController extends Controller foreach ($piggies as $piggy) { $currency = $this->accountRepository->getAccountCurrency($piggy->account) ?? $defaultCurrency; $currentAmount = $this->piggyRepository->getRepetition($piggy)->currentamount ?? '0'; + $objectGroup = $piggy->objectGroups()->first(); $response[] = [ 'id' => (string)$piggy->id, 'name' => $piggy->name, @@ -118,11 +122,13 @@ class PiggyBankController extends Controller app('amount')->formatAnything($currency, $currentAmount, false), app('amount')->formatAnything($currency, $piggy->targetamount, false), ), - 'currency_id' => $currency->id, + 'currency_id' => (string)$currency->id, 'currency_name' => $currency->name, 'currency_code' => $currency->code, 'currency_symbol' => $currency->symbol, 'currency_decimal_places' => $currency->decimal_places, + 'object_group_id' => null === $objectGroup ? null : (string)$objectGroup->id, + 'object_group_title' => $objectGroup?->title, ]; } diff --git a/app/Api/V1/Controllers/Autocomplete/RecurrenceController.php b/app/Api/V1/Controllers/Autocomplete/RecurrenceController.php index 79a104ac91..1065b9ea1a 100644 --- a/app/Api/V1/Controllers/Autocomplete/RecurrenceController.php +++ b/app/Api/V1/Controllers/Autocomplete/RecurrenceController.php @@ -45,6 +45,7 @@ class RecurrenceController extends Controller $this->middleware( function ($request, $next) { $this->repository = app(RecurringRepositoryInterface::class); + $this->repository->setUser(auth()->user()); return $next($request); @@ -54,7 +55,7 @@ class RecurrenceController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/autocomplete/getRecurringAC + * * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/autocomplete/getRecurringAC * * @param AutocompleteRequest $request * diff --git a/app/Api/V1/Controllers/Autocomplete/RuleController.php b/app/Api/V1/Controllers/Autocomplete/RuleController.php index 1ab2cd1399..4a8c503d10 100644 --- a/app/Api/V1/Controllers/Autocomplete/RuleController.php +++ b/app/Api/V1/Controllers/Autocomplete/RuleController.php @@ -54,7 +54,7 @@ class RuleController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/autocomplete/getRulesAC + * * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/autocomplete/getRulesAC * * @param AutocompleteRequest $request * diff --git a/app/Api/V1/Controllers/Autocomplete/RuleGroupController.php b/app/Api/V1/Controllers/Autocomplete/RuleGroupController.php index 10e6fd3697..249c971faa 100644 --- a/app/Api/V1/Controllers/Autocomplete/RuleGroupController.php +++ b/app/Api/V1/Controllers/Autocomplete/RuleGroupController.php @@ -54,7 +54,7 @@ class RuleGroupController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/autocomplete/getRuleGroupsAC + * * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/autocomplete/getRuleGroupsAC * * @param AutocompleteRequest $request * diff --git a/app/Api/V1/Controllers/Autocomplete/TagController.php b/app/Api/V1/Controllers/Autocomplete/TagController.php index 0175aa138c..4e80ce5531 100644 --- a/app/Api/V1/Controllers/Autocomplete/TagController.php +++ b/app/Api/V1/Controllers/Autocomplete/TagController.php @@ -57,7 +57,7 @@ class TagController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/autocomplete/getTagAC + * * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/autocomplete/getTagAC * * @param AutocompleteRequest $request * diff --git a/app/Api/V1/Controllers/Autocomplete/TransactionController.php b/app/Api/V1/Controllers/Autocomplete/TransactionController.php index dfb9f00f22..fe8a5a2099 100644 --- a/app/Api/V1/Controllers/Autocomplete/TransactionController.php +++ b/app/Api/V1/Controllers/Autocomplete/TransactionController.php @@ -62,7 +62,7 @@ class TransactionController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/autocomplete/getTransactionsAC + * * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/autocomplete/getTransactionsAC * * @param AutocompleteRequest $request * @@ -92,7 +92,7 @@ class TransactionController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/autocomplete/getTransactionsIDAC + * * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/autocomplete/getTransactionsIDAC * * @param AutocompleteRequest $request * diff --git a/app/Api/V1/Controllers/Autocomplete/TransactionTypeController.php b/app/Api/V1/Controllers/Autocomplete/TransactionTypeController.php index 036b614cad..36fdc0f296 100644 --- a/app/Api/V1/Controllers/Autocomplete/TransactionTypeController.php +++ b/app/Api/V1/Controllers/Autocomplete/TransactionTypeController.php @@ -53,12 +53,12 @@ class TransactionTypeController extends Controller /** * This endpoint is documented at - * https://api-docs.firefly-iii.org/#/autocomplete/getTransactionTypesAC + * * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/autocomplete/getTransactionTypesAC * * @param AutocompleteRequest $request * * @return JsonResponse - * @codeCoverageIgnore + */ public function transactionTypes(AutocompleteRequest $request): JsonResponse { diff --git a/app/Api/V1/Controllers/Chart/AccountController.php b/app/Api/V1/Controllers/Chart/AccountController.php index abbc314245..76b1173797 100644 --- a/app/Api/V1/Controllers/Chart/AccountController.php +++ b/app/Api/V1/Controllers/Chart/AccountController.php @@ -52,7 +52,7 @@ class AccountController extends Controller /** * AccountController constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -74,7 +74,7 @@ class AccountController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/charts/getChartAccountOverview + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/charts/getChartAccountOverview * * @param DateRequest $request * diff --git a/app/Api/V1/Controllers/Controller.php b/app/Api/V1/Controllers/Controller.php index c80ee5c2e0..69dea0db2e 100644 --- a/app/Api/V1/Controllers/Controller.php +++ b/app/Api/V1/Controllers/Controller.php @@ -42,7 +42,7 @@ use Symfony\Component\HttpFoundation\ParameterBag; /** * Class Controller. * - * @codeCoverageIgnore + */ abstract class Controller extends BaseController { @@ -97,6 +97,7 @@ abstract class Controller extends BaseController // some date fields: $dates = ['start', 'end', 'date']; foreach ($dates as $field) { + $date = null; try { $date = request()->query->get($field); } catch (BadRequestException $e) { diff --git a/app/Api/V1/Controllers/Data/Bulk/AccountController.php b/app/Api/V1/Controllers/Data/Bulk/AccountController.php deleted file mode 100644 index defb3596c5..0000000000 --- a/app/Api/V1/Controllers/Data/Bulk/AccountController.php +++ /dev/null @@ -1,78 +0,0 @@ -. - */ - -declare(strict_types=1); - -namespace FireflyIII\Api\V1\Controllers\Data\Bulk; - -use FireflyIII\Api\V1\Controllers\Controller; -use FireflyIII\Api\V1\Requests\Data\Bulk\MoveTransactionsRequest; -use FireflyIII\Repositories\Account\AccountRepositoryInterface; -use FireflyIII\Services\Internal\Destroy\AccountDestroyService; -use Illuminate\Http\JsonResponse; - -/** - * Class AccountController - * - * @deprecated - */ -class AccountController extends Controller -{ - private AccountRepositoryInterface $repository; - - /** - * - */ - public function __construct() - { - parent::__construct(); - $this->middleware( - function ($request, $next) { - $this->repository = app(AccountRepositoryInterface::class); - $this->repository->setUser(auth()->user()); - - return $next($request); - } - ); - } - - /** - * This endpoint is deprecated and not documented. - * - * @param MoveTransactionsRequest $request - * - * @return JsonResponse - * @deprecated - */ - public function moveTransactions(MoveTransactionsRequest $request): JsonResponse - { - $accountIds = $request->getAll(); - $original = $this->repository->find($accountIds['original_account']); - $destination = $this->repository->find($accountIds['destination_account']); - - /** @var AccountDestroyService $service */ - $service = app(AccountDestroyService::class); - $service->moveTransactions($original, $destination); - - return response()->json([], 204); - } -} diff --git a/app/Api/V1/Controllers/Data/Bulk/TransactionController.php b/app/Api/V1/Controllers/Data/Bulk/TransactionController.php index 77e898306c..ff4528fe82 100644 --- a/app/Api/V1/Controllers/Data/Bulk/TransactionController.php +++ b/app/Api/V1/Controllers/Data/Bulk/TransactionController.php @@ -62,6 +62,7 @@ class TransactionController extends Controller /** * This endpoint is documented at: + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/data/bulkUpdateTransactions * * @param TransactionRequest $request * diff --git a/app/Api/V1/Controllers/Data/DestroyController.php b/app/Api/V1/Controllers/Data/DestroyController.php index 6809353a61..18de6b961c 100644 --- a/app/Api/V1/Controllers/Data/DestroyController.php +++ b/app/Api/V1/Controllers/Data/DestroyController.php @@ -56,7 +56,7 @@ class DestroyController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/data/destroyData + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/data/destroyData * * @param DestroyRequest $request * diff --git a/app/Api/V1/Controllers/Data/Export/ExportController.php b/app/Api/V1/Controllers/Data/Export/ExportController.php index 187ef28c4d..0363438b09 100644 --- a/app/Api/V1/Controllers/Data/Export/ExportController.php +++ b/app/Api/V1/Controllers/Data/Export/ExportController.php @@ -55,7 +55,7 @@ class ExportController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/data/exportAccounts + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/data/exportAccounts * * @param ExportRequest $request * @@ -99,7 +99,7 @@ class ExportController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/data/exportBills + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/data/exportBills * * @param ExportRequest $request * @@ -115,7 +115,7 @@ class ExportController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/data/exportBudgets + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/data/exportBudgets * * @param ExportRequest $request * @@ -131,7 +131,7 @@ class ExportController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/data/exportCategories + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/data/exportCategories * * @param ExportRequest $request * @@ -147,7 +147,7 @@ class ExportController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/data/exportPiggies + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/data/exportPiggies * * @param ExportRequest $request * @@ -163,7 +163,7 @@ class ExportController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/data/exportRecurring + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/data/exportRecurring * * @param ExportRequest $request * @@ -179,7 +179,7 @@ class ExportController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/data/exportRules + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/data/exportRules * * @param ExportRequest $request * @@ -195,7 +195,7 @@ class ExportController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/data/exportTags + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/data/exportTags * * @param ExportRequest $request * @@ -211,7 +211,7 @@ class ExportController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/data/exportTransactions + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/data/exportTransactions * * @param ExportRequest $request * diff --git a/app/Api/V1/Controllers/Data/PurgeController.php b/app/Api/V1/Controllers/Data/PurgeController.php index b8db2215b6..15023bca3b 100644 --- a/app/Api/V1/Controllers/Data/PurgeController.php +++ b/app/Api/V1/Controllers/Data/PurgeController.php @@ -40,6 +40,9 @@ use Illuminate\Http\JsonResponse; class PurgeController extends Controller { /** + * TODO cleanup and use repositories. + * This endpoint is documented at: + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/data/purgeData * @return JsonResponse */ public function purge(): JsonResponse @@ -47,7 +50,6 @@ class PurgeController extends Controller $user = auth()->user(); // some manual code, too lazy to call all repositories. - //,transactions,withdrawals,deposits,transfers'; // budgets: Budget::whereUserId($user->id)->onlyTrashed()->forceDelete(); diff --git a/app/Api/V1/Controllers/Insight/Expense/AccountController.php b/app/Api/V1/Controllers/Insight/Expense/AccountController.php index 1f9510e262..12621a0f3a 100644 --- a/app/Api/V1/Controllers/Insight/Expense/AccountController.php +++ b/app/Api/V1/Controllers/Insight/Expense/AccountController.php @@ -50,7 +50,7 @@ class AccountController extends Controller /** * AccountController constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -74,7 +74,7 @@ class AccountController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/insight/insightExpenseAsset + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightExpenseAsset * * @param GenericRequest $request * @@ -105,7 +105,7 @@ class AccountController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/insight/insightExpenseExpense + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightExpenseExpense * * @param GenericRequest $request * diff --git a/app/Api/V1/Controllers/Insight/Expense/BillController.php b/app/Api/V1/Controllers/Insight/Expense/BillController.php index 84b40d3ba2..37e53893de 100644 --- a/app/Api/V1/Controllers/Insight/Expense/BillController.php +++ b/app/Api/V1/Controllers/Insight/Expense/BillController.php @@ -57,7 +57,7 @@ class BillController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/insight/insightExpenseBill + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightExpenseBill * * Expenses per bill, possibly filtered by bill and account. * @@ -120,7 +120,7 @@ class BillController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/insight/insightExpenseNoBill + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightExpenseNoBill * * Expenses for no bill filtered by account. * diff --git a/app/Api/V1/Controllers/Insight/Expense/BudgetController.php b/app/Api/V1/Controllers/Insight/Expense/BudgetController.php index fc0578a002..698c54470c 100644 --- a/app/Api/V1/Controllers/Insight/Expense/BudgetController.php +++ b/app/Api/V1/Controllers/Insight/Expense/BudgetController.php @@ -44,7 +44,7 @@ class BudgetController extends Controller /** * AccountController constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -66,7 +66,7 @@ class BudgetController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/insight/insightExpenseBudget + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightExpenseBudget * * @param GenericRequest $request * @@ -103,7 +103,7 @@ class BudgetController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/insight/insightExpenseNoBudget + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightExpenseNoBudget * * @param GenericRequest $request * diff --git a/app/Api/V1/Controllers/Insight/Expense/CategoryController.php b/app/Api/V1/Controllers/Insight/Expense/CategoryController.php index 32a60c321f..2f17ffe12e 100644 --- a/app/Api/V1/Controllers/Insight/Expense/CategoryController.php +++ b/app/Api/V1/Controllers/Insight/Expense/CategoryController.php @@ -45,7 +45,7 @@ class CategoryController extends Controller /** * AccountController constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -67,7 +67,7 @@ class CategoryController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/insight/insightTransferCategory + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightTransferCategory * * @param GenericRequest $request * @@ -104,7 +104,7 @@ class CategoryController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/insight/insightTransferNoCategory + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightTransferNoCategory * * @param GenericRequest $request * diff --git a/app/Api/V1/Controllers/Insight/Expense/PeriodController.php b/app/Api/V1/Controllers/Insight/Expense/PeriodController.php index 4a97dea7bb..0814a1467c 100644 --- a/app/Api/V1/Controllers/Insight/Expense/PeriodController.php +++ b/app/Api/V1/Controllers/Insight/Expense/PeriodController.php @@ -36,7 +36,7 @@ class PeriodController extends Controller { /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/insight/insightExpenseTotal + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightExpenseTotal * * @param GenericRequest $request * diff --git a/app/Api/V1/Controllers/Insight/Expense/TagController.php b/app/Api/V1/Controllers/Insight/Expense/TagController.php index 76aa7bd795..4101391089 100644 --- a/app/Api/V1/Controllers/Insight/Expense/TagController.php +++ b/app/Api/V1/Controllers/Insight/Expense/TagController.php @@ -56,7 +56,7 @@ class TagController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/insight/insightExpenseNoTag + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightExpenseNoTag * * Expenses for no tag filtered by account. * @@ -109,7 +109,7 @@ class TagController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/insight/insightExpenseTag + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightExpenseTag * * Expenses per tag, possibly filtered by tag and account. * diff --git a/app/Api/V1/Controllers/Insight/Income/AccountController.php b/app/Api/V1/Controllers/Insight/Income/AccountController.php index 4ea6a591cc..7b96bc9488 100644 --- a/app/Api/V1/Controllers/Insight/Income/AccountController.php +++ b/app/Api/V1/Controllers/Insight/Income/AccountController.php @@ -37,7 +37,7 @@ use Illuminate\Http\JsonResponse; * Class AccountController * * Shows income information grouped or limited by date. - * Ie. all income grouped by account + currency. + * I.e. all income grouped by account + currency. */ class AccountController extends Controller { @@ -50,7 +50,7 @@ class AccountController extends Controller /** * AccountController constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -74,7 +74,7 @@ class AccountController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/insight/insightIncomeAsset + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightIncomeAsset * * @param GenericRequest $request * @@ -104,7 +104,7 @@ class AccountController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/insight/insightIncomeRevenue + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightIncomeRevenue * * @param GenericRequest $request * diff --git a/app/Api/V1/Controllers/Insight/Income/CategoryController.php b/app/Api/V1/Controllers/Insight/Income/CategoryController.php index 898bcac9c7..762f2f5f84 100644 --- a/app/Api/V1/Controllers/Insight/Income/CategoryController.php +++ b/app/Api/V1/Controllers/Insight/Income/CategoryController.php @@ -45,7 +45,7 @@ class CategoryController extends Controller /** * AccountController constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -67,7 +67,7 @@ class CategoryController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/insight/insightIncomeCategory + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightIncomeCategory * * @param GenericRequest $request * @@ -104,7 +104,7 @@ class CategoryController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/insight/insightIncomeNoCategory + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightIncomeNoCategory * * @param GenericRequest $request * diff --git a/app/Api/V1/Controllers/Insight/Income/PeriodController.php b/app/Api/V1/Controllers/Insight/Income/PeriodController.php index e748b4a5db..11f9ac967b 100644 --- a/app/Api/V1/Controllers/Insight/Income/PeriodController.php +++ b/app/Api/V1/Controllers/Insight/Income/PeriodController.php @@ -36,7 +36,7 @@ class PeriodController extends Controller { /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/insight/insightIncomeTotal + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightIncomeTotal * * @param GenericRequest $request * diff --git a/app/Api/V1/Controllers/Insight/Income/TagController.php b/app/Api/V1/Controllers/Insight/Income/TagController.php index 31e61ade91..cad86cb2fb 100644 --- a/app/Api/V1/Controllers/Insight/Income/TagController.php +++ b/app/Api/V1/Controllers/Insight/Income/TagController.php @@ -57,7 +57,7 @@ class TagController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/insight/insightIncomeTag + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightIncomeTag * * Expenses for no tag filtered by account. * @@ -113,7 +113,7 @@ class TagController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/insight/insightIncomeNoTag + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightIncomeNoTag * * Expenses per tag, possibly filtered by tag and account. * diff --git a/app/Api/V1/Controllers/Insight/Transfer/AccountController.php b/app/Api/V1/Controllers/Insight/Transfer/AccountController.php index 451bc60c5a..3ce3081a2e 100644 --- a/app/Api/V1/Controllers/Insight/Transfer/AccountController.php +++ b/app/Api/V1/Controllers/Insight/Transfer/AccountController.php @@ -41,7 +41,7 @@ class AccountController extends Controller /** * AccountController constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -59,7 +59,7 @@ class AccountController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/insight/insightTransfers + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightTransfers * * @param GenericRequest $request * diff --git a/app/Api/V1/Controllers/Insight/Transfer/CategoryController.php b/app/Api/V1/Controllers/Insight/Transfer/CategoryController.php index 93e24ee0d0..1071db8b1b 100644 --- a/app/Api/V1/Controllers/Insight/Transfer/CategoryController.php +++ b/app/Api/V1/Controllers/Insight/Transfer/CategoryController.php @@ -44,7 +44,7 @@ class CategoryController extends Controller /** * AccountController constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -66,7 +66,7 @@ class CategoryController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/insight/insightTransferCategory + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightTransferCategory * * @param GenericRequest $request * @@ -103,7 +103,7 @@ class CategoryController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/insight/insightTransferNoCategory + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightTransferNoCategory * * @param GenericRequest $request * diff --git a/app/Api/V1/Controllers/Insight/Transfer/PeriodController.php b/app/Api/V1/Controllers/Insight/Transfer/PeriodController.php index 7f57c15593..6a0167296c 100644 --- a/app/Api/V1/Controllers/Insight/Transfer/PeriodController.php +++ b/app/Api/V1/Controllers/Insight/Transfer/PeriodController.php @@ -36,7 +36,7 @@ class PeriodController extends Controller { /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/insight/insightTransferTotal + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightTransferTotal * * @param GenericRequest $request * diff --git a/app/Api/V1/Controllers/Insight/Transfer/TagController.php b/app/Api/V1/Controllers/Insight/Transfer/TagController.php index 78d5b5e282..50f977f3fc 100644 --- a/app/Api/V1/Controllers/Insight/Transfer/TagController.php +++ b/app/Api/V1/Controllers/Insight/Transfer/TagController.php @@ -56,7 +56,7 @@ class TagController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/insight/insightTransferNoTag + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightTransferNoTag * * @param GenericRequest $request * @@ -110,7 +110,7 @@ class TagController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/insight/insightTransferTag + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightTransferTag * * Transfers per tag, possibly filtered by tag and account. * diff --git a/app/Api/V1/Controllers/Models/Account/DestroyController.php b/app/Api/V1/Controllers/Models/Account/DestroyController.php index 5430bd68df..c87276d1ad 100644 --- a/app/Api/V1/Controllers/Models/Account/DestroyController.php +++ b/app/Api/V1/Controllers/Models/Account/DestroyController.php @@ -40,7 +40,7 @@ class DestroyController extends Controller /** * AccountController constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -57,13 +57,13 @@ class DestroyController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/accounts/deleteAccount + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/accounts/deleteAccount * * Remove the specified resource from storage. * * @param Account $account * - * @codeCoverageIgnore + * @return JsonResponse */ public function destroy(Account $account): JsonResponse diff --git a/app/Api/V1/Controllers/Models/Account/ListController.php b/app/Api/V1/Controllers/Models/Account/ListController.php index 866779725a..63c409b04f 100644 --- a/app/Api/V1/Controllers/Models/Account/ListController.php +++ b/app/Api/V1/Controllers/Models/Account/ListController.php @@ -54,7 +54,7 @@ class ListController extends Controller /** * AccountController constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -71,12 +71,12 @@ class ListController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/accounts/listAttachmentByAccount + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/accounts/listAttachmentByAccount * * @param Account $account * * @return JsonResponse - * @codeCoverageIgnore + * @throws FireflyException */ public function attachments(Account $account): JsonResponse @@ -104,13 +104,13 @@ class ListController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/accounts/listPiggyBankByAccount + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/accounts/listPiggyBankByAccount * * @param Account $account * * @return JsonResponse * @throws FireflyException - * @codeCoverageIgnore + */ public function piggyBanks(Account $account): JsonResponse { @@ -127,7 +127,7 @@ class ListController extends Controller // make paginator: $paginator = new LengthAwarePaginator($piggyBanks, $count, $pageSize, $this->parameters->get('page')); - $paginator->setPath(route('api.v1.accounts.piggy_banks', [$account->id]).$this->buildParams()); + $paginator->setPath(route('api.v1.accounts.piggy-banks', [$account->id]).$this->buildParams()); /** @var PiggyBankTransformer $transformer */ $transformer = app(PiggyBankTransformer::class); @@ -141,11 +141,11 @@ class ListController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/accounts/listTransactionByAccount + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/accounts/listTransactionByAccount * * Show all transaction groups related to the account. * - * @codeCoverageIgnore + * * @param Request $request * @param Account $account diff --git a/app/Api/V1/Controllers/Models/Account/ShowController.php b/app/Api/V1/Controllers/Models/Account/ShowController.php index f251faaf4f..b8f53bef12 100644 --- a/app/Api/V1/Controllers/Models/Account/ShowController.php +++ b/app/Api/V1/Controllers/Models/Account/ShowController.php @@ -50,7 +50,7 @@ class ShowController extends Controller /** * AccountController constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -67,7 +67,7 @@ class ShowController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/accounts/listAccount + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/accounts/listAccount * * Display a listing of the resource. * @@ -75,7 +75,7 @@ class ShowController extends Controller * * @return JsonResponse * @throws FireflyException - * @codeCoverageIgnore + */ public function index(Request $request): JsonResponse { @@ -113,7 +113,7 @@ class ShowController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/accounts/getAccount + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/accounts/getAccount * * Show single instance. * diff --git a/app/Api/V1/Controllers/Models/Account/StoreController.php b/app/Api/V1/Controllers/Models/Account/StoreController.php index 0e4d530018..2ccdb5c267 100644 --- a/app/Api/V1/Controllers/Models/Account/StoreController.php +++ b/app/Api/V1/Controllers/Models/Account/StoreController.php @@ -42,7 +42,7 @@ class StoreController extends Controller /** * AccountController constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -59,7 +59,7 @@ class StoreController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/accounts/storeAccount + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/accounts/storeAccount * * Store a new instance. * diff --git a/app/Api/V1/Controllers/Models/Account/UpdateController.php b/app/Api/V1/Controllers/Models/Account/UpdateController.php index 5c90221b79..93df5e9444 100644 --- a/app/Api/V1/Controllers/Models/Account/UpdateController.php +++ b/app/Api/V1/Controllers/Models/Account/UpdateController.php @@ -45,7 +45,7 @@ class UpdateController extends Controller /** * AccountController constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -62,7 +62,7 @@ class UpdateController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/accounts/updateAccount + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/accounts/updateAccount * * Update account. * diff --git a/app/Api/V1/Controllers/Models/Attachment/DestroyController.php b/app/Api/V1/Controllers/Models/Attachment/DestroyController.php index 287f621df8..f9a0f3caa7 100644 --- a/app/Api/V1/Controllers/Models/Attachment/DestroyController.php +++ b/app/Api/V1/Controllers/Models/Attachment/DestroyController.php @@ -40,7 +40,7 @@ class DestroyController extends Controller /** * DestroyController constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -60,11 +60,11 @@ class DestroyController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/attachments/deleteAttachment + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/attachments/deleteAttachment * * Remove the specified resource from storage. * - * @codeCoverageIgnore + * * @param Attachment $attachment * diff --git a/app/Api/V1/Controllers/Models/Attachment/ShowController.php b/app/Api/V1/Controllers/Models/Attachment/ShowController.php index aacb5b461f..7483eb1829 100644 --- a/app/Api/V1/Controllers/Models/Attachment/ShowController.php +++ b/app/Api/V1/Controllers/Models/Attachment/ShowController.php @@ -47,7 +47,7 @@ class ShowController extends Controller /** * ShowController constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -67,13 +67,13 @@ class ShowController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/attachments/downloadAttachment + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/attachments/downloadAttachment * * Download an attachment. * * @param Attachment $attachment * - * @codeCoverageIgnore + * @return LaravelResponse * @throws FireflyException */ @@ -112,13 +112,13 @@ class ShowController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/attachments/listAttachment + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/attachments/listAttachment * * Display a listing of the resource. * * @return JsonResponse * @throws FireflyException - * @codeCoverageIgnore + */ public function index(): JsonResponse { @@ -148,7 +148,7 @@ class ShowController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/attachments/getAttachment + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/attachments/getAttachment * * Display the specified resource. * diff --git a/app/Api/V1/Controllers/Models/Attachment/StoreController.php b/app/Api/V1/Controllers/Models/Attachment/StoreController.php index 8fd517f65c..179283af43 100644 --- a/app/Api/V1/Controllers/Models/Attachment/StoreController.php +++ b/app/Api/V1/Controllers/Models/Attachment/StoreController.php @@ -47,7 +47,7 @@ class StoreController extends Controller /** * StoreController constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -67,7 +67,7 @@ class StoreController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/attachments/uploadAttachment + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/attachments/uploadAttachment * * Store a newly created resource in storage. * @@ -95,7 +95,7 @@ class StoreController extends Controller /** * Upload an attachment. * - * @codeCoverageIgnore + * * @param Request $request * @param Attachment $attachment diff --git a/app/Api/V1/Controllers/Models/Attachment/UpdateController.php b/app/Api/V1/Controllers/Models/Attachment/UpdateController.php index fc33e64d85..2a9c6afdab 100644 --- a/app/Api/V1/Controllers/Models/Attachment/UpdateController.php +++ b/app/Api/V1/Controllers/Models/Attachment/UpdateController.php @@ -43,7 +43,7 @@ class UpdateController extends Controller /** * UpdateController constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -63,7 +63,7 @@ class UpdateController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/attachments/updateAttachment + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/attachments/updateAttachment * * Update the specified resource in storage. * diff --git a/app/Api/V1/Controllers/Models/AvailableBudget/ShowController.php b/app/Api/V1/Controllers/Models/AvailableBudget/ShowController.php index fef07373de..f41fc16b2a 100644 --- a/app/Api/V1/Controllers/Models/AvailableBudget/ShowController.php +++ b/app/Api/V1/Controllers/Models/AvailableBudget/ShowController.php @@ -45,7 +45,7 @@ class ShowController extends Controller /** * AvailableBudgetController constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -64,13 +64,13 @@ class ShowController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/available_budgets/getAvailableBudget + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/available_budgets/getAvailableBudget * * Display a listing of the resource. * * @return JsonResponse * @throws FireflyException - * @codeCoverageIgnore + */ public function index(): JsonResponse { @@ -89,7 +89,7 @@ class ShowController extends Controller // make paginator: $paginator = new LengthAwarePaginator($availableBudgets, $count, $pageSize, $this->parameters->get('page')); - $paginator->setPath(route('api.v1.available_budgets.index').$this->buildParams()); + $paginator->setPath(route('api.v1.available-budgets.index').$this->buildParams()); /** @var AvailableBudgetTransformer $transformer */ $transformer = app(AvailableBudgetTransformer::class); @@ -103,14 +103,14 @@ class ShowController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/available_budgets/getAvailableBudget + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/available_budgets/getAvailableBudget * * Display the specified resource. * * @param AvailableBudget $availableBudget * * @return JsonResponse - * @codeCoverageIgnore + */ public function show(AvailableBudget $availableBudget): JsonResponse { diff --git a/app/Api/V1/Controllers/Models/Bill/DestroyController.php b/app/Api/V1/Controllers/Models/Bill/DestroyController.php index bffce79962..c2e89623ad 100644 --- a/app/Api/V1/Controllers/Models/Bill/DestroyController.php +++ b/app/Api/V1/Controllers/Models/Bill/DestroyController.php @@ -38,7 +38,7 @@ class DestroyController extends Controller /** * BillController constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -55,14 +55,14 @@ class DestroyController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/bills/deleteBill + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/bills/deleteBill * * Remove the specified resource from storage. * * @param Bill $bill * * @return JsonResponse - * @codeCoverageIgnore + */ public function destroy(Bill $bill): JsonResponse { diff --git a/app/Api/V1/Controllers/Models/Bill/ListController.php b/app/Api/V1/Controllers/Models/Bill/ListController.php index eb39fff345..2386e4920d 100644 --- a/app/Api/V1/Controllers/Models/Bill/ListController.php +++ b/app/Api/V1/Controllers/Models/Bill/ListController.php @@ -51,7 +51,7 @@ class ListController extends Controller /** * BillController constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -68,7 +68,7 @@ class ListController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/bills/listAttachmentByBill + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/bills/listAttachmentByBill * * Display a listing of the resource. * @@ -76,7 +76,7 @@ class ListController extends Controller * * @return JsonResponse * @throws FireflyException - * @codeCoverageIgnore + */ public function attachments(Bill $bill): JsonResponse { @@ -103,7 +103,7 @@ class ListController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/bills/listRuleByBill + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/bills/listRuleByBill * * List all of them. * @@ -111,7 +111,7 @@ class ListController extends Controller * * @return JsonResponse * @throws FireflyException - * @codeCoverageIgnore + */ public function rules(Bill $bill): JsonResponse { @@ -140,7 +140,7 @@ class ListController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/bills/listTransactionByBill + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/bills/listTransactionByBill * * Show all transactions. * @@ -150,7 +150,7 @@ class ListController extends Controller * * @return JsonResponse * @throws FireflyException - * @codeCoverageIgnore + */ public function transactions(Request $request, Bill $bill): JsonResponse { diff --git a/app/Api/V1/Controllers/Models/Bill/ShowController.php b/app/Api/V1/Controllers/Models/Bill/ShowController.php index 43bd076f5a..02d9a57f09 100644 --- a/app/Api/V1/Controllers/Models/Bill/ShowController.php +++ b/app/Api/V1/Controllers/Models/Bill/ShowController.php @@ -44,7 +44,7 @@ class ShowController extends Controller /** * BillController constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -61,13 +61,13 @@ class ShowController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/bills/listBill + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/bills/listBill * * Display a listing of the resource. * * @return JsonResponse * @throws FireflyException - * @codeCoverageIgnore + */ public function index(): JsonResponse { @@ -91,14 +91,14 @@ class ShowController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/bills/getBill + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/bills/getBill * * Show the specified bill. * * @param Bill $bill * * @return JsonResponse - * @codeCoverageIgnore + */ public function show(Bill $bill): JsonResponse { diff --git a/app/Api/V1/Controllers/Models/Bill/StoreController.php b/app/Api/V1/Controllers/Models/Bill/StoreController.php index 1e05b2eccf..373f49851e 100644 --- a/app/Api/V1/Controllers/Models/Bill/StoreController.php +++ b/app/Api/V1/Controllers/Models/Bill/StoreController.php @@ -44,7 +44,7 @@ class StoreController extends Controller /** * BillController constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -61,7 +61,7 @@ class StoreController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/bills/storeBill + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/bills/storeBill * * Store a bill. * diff --git a/app/Api/V1/Controllers/Models/Bill/UpdateController.php b/app/Api/V1/Controllers/Models/Bill/UpdateController.php index d02eba7979..e249231510 100644 --- a/app/Api/V1/Controllers/Models/Bill/UpdateController.php +++ b/app/Api/V1/Controllers/Models/Bill/UpdateController.php @@ -41,7 +41,7 @@ class UpdateController extends Controller /** * BillController constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -58,7 +58,7 @@ class UpdateController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/bills/updateBill + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/bills/updateBill * * Update a bill. * diff --git a/app/Api/V1/Controllers/Models/Budget/DestroyController.php b/app/Api/V1/Controllers/Models/Budget/DestroyController.php index a8119c1e93..5b7313058e 100644 --- a/app/Api/V1/Controllers/Models/Budget/DestroyController.php +++ b/app/Api/V1/Controllers/Models/Budget/DestroyController.php @@ -38,7 +38,7 @@ class DestroyController extends Controller /** * DestroyController constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -55,14 +55,14 @@ class DestroyController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/budgets/deleteBudget + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/budgets/deleteBudget * * Remove the specified resource from storage. * * @param Budget $budget * * @return JsonResponse - * @codeCoverageIgnore + */ public function destroy(Budget $budget): JsonResponse { diff --git a/app/Api/V1/Controllers/Models/Budget/ListController.php b/app/Api/V1/Controllers/Models/Budget/ListController.php index 7f8911b7c7..a6b2cfc73a 100644 --- a/app/Api/V1/Controllers/Models/Budget/ListController.php +++ b/app/Api/V1/Controllers/Models/Budget/ListController.php @@ -53,7 +53,7 @@ class ListController extends Controller /** * ListController constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -72,13 +72,13 @@ class ListController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/budgets/listAttachmentByBudget + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/budgets/listAttachmentByBudget * * @param Budget $budget * * @return JsonResponse * @throws FireflyException - * @codeCoverageIgnore + */ public function attachments(Budget $budget): JsonResponse { @@ -105,7 +105,7 @@ class ListController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/budgets/listBudgetLimitByBudget + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/budgets/listBudgetLimitByBudget * * Display a listing of the resource. * @@ -113,7 +113,7 @@ class ListController extends Controller * * @return JsonResponse * @throws FireflyException - * @codeCoverageIgnore + */ public function budgetLimits(Budget $budget): JsonResponse { @@ -124,7 +124,7 @@ class ListController extends Controller $count = $collection->count(); $budgetLimits = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); $paginator = new LengthAwarePaginator($budgetLimits, $count, $pageSize, $this->parameters->get('page')); - $paginator->setPath(route('api.v1.budgets.budget_limits', [$budget->id]).$this->buildParams()); + $paginator->setPath(route('api.v1.budgets.budget-limits', [$budget->id]).$this->buildParams()); /** @var BudgetLimitTransformer $transformer */ $transformer = app(BudgetLimitTransformer::class); @@ -137,7 +137,7 @@ class ListController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/budgets/listTransactionByBudget + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/budgets/listTransactionByBudget * * Show all transactions. * @@ -147,7 +147,7 @@ class ListController extends Controller * * @return JsonResponse * @throws FireflyException - * @codeCoverageIgnore + */ public function transactions(Request $request, Budget $budget): JsonResponse { @@ -203,7 +203,7 @@ class ListController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/budgets/listTransactionWithoutBudget + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/budgets/listTransactionWithoutBudget * * Show all transactions. * @@ -211,7 +211,7 @@ class ListController extends Controller * * @return JsonResponse * @throws FireflyException - * @codeCoverageIgnore + */ public function withoutBudget(Request $request): JsonResponse { diff --git a/app/Api/V1/Controllers/Models/Budget/ShowController.php b/app/Api/V1/Controllers/Models/Budget/ShowController.php index 80f413acf2..8715fcb8ca 100644 --- a/app/Api/V1/Controllers/Models/Budget/ShowController.php +++ b/app/Api/V1/Controllers/Models/Budget/ShowController.php @@ -46,7 +46,7 @@ class ShowController extends Controller /** * ListController constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -65,13 +65,13 @@ class ShowController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/budgets/listBudget + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/budgets/listBudget * * Display a listing of the resource. * * @return JsonResponse * @throws FireflyException - * @codeCoverageIgnore + */ public function index(): JsonResponse { @@ -105,7 +105,7 @@ class ShowController extends Controller * @param Budget $budget * * @return JsonResponse - * @codeCoverageIgnore + */ public function show(Budget $budget): JsonResponse { diff --git a/app/Api/V1/Controllers/Models/Budget/StoreController.php b/app/Api/V1/Controllers/Models/Budget/StoreController.php index e8bc6269ca..cc413fc3d2 100644 --- a/app/Api/V1/Controllers/Models/Budget/StoreController.php +++ b/app/Api/V1/Controllers/Models/Budget/StoreController.php @@ -41,7 +41,7 @@ class StoreController extends Controller /** * StoreController constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -58,7 +58,7 @@ class StoreController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/budgets/storeBudget + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/budgets/storeBudget * * Store a budget. * diff --git a/app/Api/V1/Controllers/Models/Budget/UpdateController.php b/app/Api/V1/Controllers/Models/Budget/UpdateController.php index a8efcd80bb..c9e97f6dea 100644 --- a/app/Api/V1/Controllers/Models/Budget/UpdateController.php +++ b/app/Api/V1/Controllers/Models/Budget/UpdateController.php @@ -41,7 +41,7 @@ class UpdateController extends Controller /** * UpdateController constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -58,7 +58,7 @@ class UpdateController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/budgets/updateBudget + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/budgets/updateBudget * * Update a budget. * diff --git a/app/Api/V1/Controllers/Models/BudgetLimit/DestroyController.php b/app/Api/V1/Controllers/Models/BudgetLimit/DestroyController.php index 2f1b55e2c2..e828e9060b 100644 --- a/app/Api/V1/Controllers/Models/BudgetLimit/DestroyController.php +++ b/app/Api/V1/Controllers/Models/BudgetLimit/DestroyController.php @@ -41,7 +41,7 @@ class DestroyController extends Controller /** * BudgetLimitController constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -60,7 +60,7 @@ class DestroyController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/budgets/deleteBudgetLimit + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/budgets/deleteBudgetLimit * * Remove the specified resource from storage. * @@ -69,7 +69,7 @@ class DestroyController extends Controller * * @return JsonResponse * @throws FireflyException - * @codeCoverageIgnore + */ public function destroy(Budget $budget, BudgetLimit $budgetLimit): JsonResponse { diff --git a/app/Api/V1/Controllers/Models/BudgetLimit/ListController.php b/app/Api/V1/Controllers/Models/BudgetLimit/ListController.php index e4860564b2..a5933599a6 100644 --- a/app/Api/V1/Controllers/Models/BudgetLimit/ListController.php +++ b/app/Api/V1/Controllers/Models/BudgetLimit/ListController.php @@ -49,7 +49,7 @@ class ListController extends Controller /** * BudgetLimitController constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -68,7 +68,7 @@ class ListController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/budgets/listTransactionByBudgetLimit + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/budgets/listTransactionByBudgetLimit * Show all transactions. * * @param Request $request @@ -77,7 +77,7 @@ class ListController extends Controller * * @return JsonResponse * @throws FireflyException - * @codeCoverageIgnore + */ public function transactions(Request $request, Budget $budget, BudgetLimit $budgetLimit): JsonResponse { diff --git a/app/Api/V1/Controllers/Models/BudgetLimit/ShowController.php b/app/Api/V1/Controllers/Models/BudgetLimit/ShowController.php index a4e812fedd..d1990f5cc0 100644 --- a/app/Api/V1/Controllers/Models/BudgetLimit/ShowController.php +++ b/app/Api/V1/Controllers/Models/BudgetLimit/ShowController.php @@ -50,7 +50,7 @@ class ShowController extends Controller /** * BudgetLimitController constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -71,7 +71,7 @@ class ShowController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/budgets/listBudgetLimitByBudget + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/budgets/listBudgetLimitByBudget * * Display a listing of the budget limits for this budget. * @@ -80,7 +80,7 @@ class ShowController extends Controller * * @return JsonResponse * @throws FireflyException - * @codeCoverageIgnore + */ public function index(Request $request, Budget $budget): JsonResponse { @@ -105,7 +105,7 @@ class ShowController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/budgets/listBudgetLimit + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/budgets/listBudgetLimit * * Display a listing of the budget limits for this budget. * @@ -113,7 +113,7 @@ class ShowController extends Controller * * @return JsonResponse * @throws FireflyException - * @codeCoverageIgnore + */ public function indexAll(DateRequest $request): JsonResponse { @@ -138,7 +138,7 @@ class ShowController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/budgets/getBudgetLimit + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/budgets/getBudgetLimit * * @param Request $request * @param Budget $budget diff --git a/app/Api/V1/Controllers/Models/BudgetLimit/StoreController.php b/app/Api/V1/Controllers/Models/BudgetLimit/StoreController.php index d868777485..8707b21ac7 100644 --- a/app/Api/V1/Controllers/Models/BudgetLimit/StoreController.php +++ b/app/Api/V1/Controllers/Models/BudgetLimit/StoreController.php @@ -42,7 +42,7 @@ class StoreController extends Controller /** * BudgetLimitController constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -61,7 +61,7 @@ class StoreController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/budgets/storeBudgetLimit + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/budgets/storeBudgetLimit * * Store a newly created resource in storage. * diff --git a/app/Api/V1/Controllers/Models/BudgetLimit/UpdateController.php b/app/Api/V1/Controllers/Models/BudgetLimit/UpdateController.php index baa0217a80..1ccbfbebbd 100644 --- a/app/Api/V1/Controllers/Models/BudgetLimit/UpdateController.php +++ b/app/Api/V1/Controllers/Models/BudgetLimit/UpdateController.php @@ -43,11 +43,11 @@ class UpdateController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/budgets/updateBudgetLimit + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/budgets/updateBudgetLimit * * BudgetLimitController constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -66,6 +66,8 @@ class UpdateController extends Controller /** * Update the specified resource in storage. + * This endpoint is documented at: + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/budgets/updateBudgetLimit * * @param UpdateRequest $request * @param Budget $budget diff --git a/app/Api/V1/Controllers/Models/Category/DestroyController.php b/app/Api/V1/Controllers/Models/Category/DestroyController.php index c28e976324..84ce43eca9 100644 --- a/app/Api/V1/Controllers/Models/Category/DestroyController.php +++ b/app/Api/V1/Controllers/Models/Category/DestroyController.php @@ -38,7 +38,7 @@ class DestroyController extends Controller /** * CategoryController constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -55,14 +55,14 @@ class DestroyController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/categories/deleteCategory + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/categories/deleteCategory * * Remove the specified resource from storage. * * @param Category $category * * @return JsonResponse - * @codeCoverageIgnore + */ public function destroy(Category $category): JsonResponse { diff --git a/app/Api/V1/Controllers/Models/Category/ListController.php b/app/Api/V1/Controllers/Models/Category/ListController.php index 4c0c8b2acd..aca21976c9 100644 --- a/app/Api/V1/Controllers/Models/Category/ListController.php +++ b/app/Api/V1/Controllers/Models/Category/ListController.php @@ -50,7 +50,7 @@ class ListController extends Controller /** * CategoryController constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -67,13 +67,13 @@ class ListController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/categories/listAttachmentByCategory + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/categories/listAttachmentByCategory * * @param Category $category * * @return JsonResponse * @throws FireflyException - * @codeCoverageIgnore + */ public function attachments(Category $category): JsonResponse { @@ -100,7 +100,7 @@ class ListController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/categories/listTransactionByCategory + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/categories/listTransactionByCategory * * Show all transactions. * @@ -110,7 +110,7 @@ class ListController extends Controller * * @return JsonResponse * @throws FireflyException - * @codeCoverageIgnore + */ public function transactions(Request $request, Category $category): JsonResponse { diff --git a/app/Api/V1/Controllers/Models/Category/ShowController.php b/app/Api/V1/Controllers/Models/Category/ShowController.php index 009739d4a8..01b36dbe4c 100644 --- a/app/Api/V1/Controllers/Models/Category/ShowController.php +++ b/app/Api/V1/Controllers/Models/Category/ShowController.php @@ -44,7 +44,7 @@ class ShowController extends Controller /** * CategoryController constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -61,13 +61,13 @@ class ShowController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/categories/listCategory + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/categories/listCategory * * Display a listing of the resource. * * @return JsonResponse * @throws FireflyException - * @codeCoverageIgnore + */ public function index(): JsonResponse { @@ -96,14 +96,14 @@ class ShowController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/categories/getCategory + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/categories/getCategory * * Show the category. * * @param Category $category * * @return JsonResponse - * @codeCoverageIgnore + */ public function show(Category $category): JsonResponse { diff --git a/app/Api/V1/Controllers/Models/Category/StoreController.php b/app/Api/V1/Controllers/Models/Category/StoreController.php index 80918e0c54..76d1b6b0e4 100644 --- a/app/Api/V1/Controllers/Models/Category/StoreController.php +++ b/app/Api/V1/Controllers/Models/Category/StoreController.php @@ -41,7 +41,7 @@ class StoreController extends Controller /** * CategoryController constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -58,7 +58,7 @@ class StoreController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/categories/storeCategory + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/categories/storeCategory * * Store new category. * diff --git a/app/Api/V1/Controllers/Models/Category/UpdateController.php b/app/Api/V1/Controllers/Models/Category/UpdateController.php index d72794be9a..95ce97598a 100644 --- a/app/Api/V1/Controllers/Models/Category/UpdateController.php +++ b/app/Api/V1/Controllers/Models/Category/UpdateController.php @@ -41,7 +41,7 @@ class UpdateController extends Controller /** * CategoryController constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -58,7 +58,7 @@ class UpdateController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/categories/updateCategory + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/categories/updateCategory * * Update the category. * diff --git a/app/Api/V1/Controllers/Models/ObjectGroup/DestroyController.php b/app/Api/V1/Controllers/Models/ObjectGroup/DestroyController.php index 72bbb5665b..1cac08ed80 100644 --- a/app/Api/V1/Controllers/Models/ObjectGroup/DestroyController.php +++ b/app/Api/V1/Controllers/Models/ObjectGroup/DestroyController.php @@ -39,7 +39,7 @@ class DestroyController extends Controller /** * ObjectGroupController constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -58,13 +58,13 @@ class DestroyController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/object_groups/deleteObjectGroup + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/object_groups/deleteObjectGroup * * Remove the specified resource from storage. * * @param ObjectGroup $objectGroup * - * @codeCoverageIgnore + * @return JsonResponse */ public function destroy(ObjectGroup $objectGroup): JsonResponse diff --git a/app/Api/V1/Controllers/Models/ObjectGroup/ListController.php b/app/Api/V1/Controllers/Models/ObjectGroup/ListController.php index f82a2ad335..2e702f457e 100644 --- a/app/Api/V1/Controllers/Models/ObjectGroup/ListController.php +++ b/app/Api/V1/Controllers/Models/ObjectGroup/ListController.php @@ -45,7 +45,7 @@ class ListController extends Controller /** * ObjectGroupController constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -64,7 +64,7 @@ class ListController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/object_groups/listBillByObjectGroup + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/object_groups/listBillByObjectGroup * * List all bills in this object group * @@ -72,7 +72,7 @@ class ListController extends Controller * * @return JsonResponse * @throws FireflyException - * @codeCoverageIgnore + */ public function bills(ObjectGroup $objectGroup): JsonResponse { @@ -100,7 +100,7 @@ class ListController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/object_groups/listPiggyBankByObjectGroup + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/object_groups/listPiggyBankByObjectGroup * * List all piggies under the object group. * @@ -108,7 +108,7 @@ class ListController extends Controller * * @return JsonResponse * @throws FireflyException - * @codeCoverageIgnore + */ public function piggyBanks(ObjectGroup $objectGroup): JsonResponse { @@ -125,7 +125,7 @@ class ListController extends Controller // make paginator: $paginator = new LengthAwarePaginator($piggyBanks, $count, $pageSize, $this->parameters->get('page')); - $paginator->setPath(route('api.v1.object-groups.piggy_banks', [$objectGroup->id]).$this->buildParams()); + $paginator->setPath(route('api.v1.object-groups.piggy-banks', [$objectGroup->id]).$this->buildParams()); /** @var PiggyBankTransformer $transformer */ $transformer = app(PiggyBankTransformer::class); diff --git a/app/Api/V1/Controllers/Models/ObjectGroup/ShowController.php b/app/Api/V1/Controllers/Models/ObjectGroup/ShowController.php index 3fe8b0b41a..3f4d8d6e01 100644 --- a/app/Api/V1/Controllers/Models/ObjectGroup/ShowController.php +++ b/app/Api/V1/Controllers/Models/ObjectGroup/ShowController.php @@ -46,7 +46,7 @@ class ShowController extends Controller /** * ObjectGroupController constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -65,7 +65,7 @@ class ShowController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/object_groups/listObjectGroups + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/object_groups/listObjectGroups * * Display a listing of the resource. * @@ -73,7 +73,7 @@ class ShowController extends Controller * * @return JsonResponse * @throws FireflyException - * @codeCoverageIgnore + */ public function index(Request $request): JsonResponse { @@ -103,7 +103,7 @@ class ShowController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/object_groups/getObjectGroup + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/object_groups/getObjectGroup * * Show single instance. * diff --git a/app/Api/V1/Controllers/Models/ObjectGroup/UpdateController.php b/app/Api/V1/Controllers/Models/ObjectGroup/UpdateController.php index a9d5ce11c8..b1ba8f8cb7 100644 --- a/app/Api/V1/Controllers/Models/ObjectGroup/UpdateController.php +++ b/app/Api/V1/Controllers/Models/ObjectGroup/UpdateController.php @@ -42,7 +42,7 @@ class UpdateController extends Controller /** * ObjectGroupController constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -61,7 +61,7 @@ class UpdateController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/object_groups/updateObjectGroup + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/object_groups/updateObjectGroup * * @param UpdateRequest $request * @param ObjectGroup $objectGroup diff --git a/app/Api/V1/Controllers/Models/PiggyBank/DestroyController.php b/app/Api/V1/Controllers/Models/PiggyBank/DestroyController.php index 87d78ebc8d..d2cc4930ac 100644 --- a/app/Api/V1/Controllers/Models/PiggyBank/DestroyController.php +++ b/app/Api/V1/Controllers/Models/PiggyBank/DestroyController.php @@ -38,7 +38,7 @@ class DestroyController extends Controller /** * Constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -55,14 +55,14 @@ class DestroyController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/piggy_banks/deletePiggyBank + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/piggy_banks/deletePiggyBank * * Delete the resource. * * @param PiggyBank $piggyBank * * @return JsonResponse - * @codeCoverageIgnore + */ public function destroy(PiggyBank $piggyBank): JsonResponse { diff --git a/app/Api/V1/Controllers/Models/PiggyBank/ListController.php b/app/Api/V1/Controllers/Models/PiggyBank/ListController.php index 8ae793aba3..c0bcadf28c 100644 --- a/app/Api/V1/Controllers/Models/PiggyBank/ListController.php +++ b/app/Api/V1/Controllers/Models/PiggyBank/ListController.php @@ -44,7 +44,7 @@ class ListController extends Controller /** * Constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -61,13 +61,13 @@ class ListController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/piggy_banks/listAttachmentByPiggyBank + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/piggy_banks/listAttachmentByPiggyBank * * @param PiggyBank $piggyBank * * @return JsonResponse * @throws FireflyException - * @codeCoverageIgnore + */ public function attachments(PiggyBank $piggyBank): JsonResponse { @@ -80,7 +80,7 @@ class ListController extends Controller // make paginator: $paginator = new LengthAwarePaginator($attachments, $count, $pageSize, $this->parameters->get('page')); - $paginator->setPath(route('api.v1.piggy_banks.attachments', [$piggyBank->id]).$this->buildParams()); + $paginator->setPath(route('api.v1.piggy-banks.attachments', [$piggyBank->id]).$this->buildParams()); /** @var AttachmentTransformer $transformer */ $transformer = app(AttachmentTransformer::class); @@ -94,7 +94,7 @@ class ListController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/piggy_banks/listEventByPiggyBank + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/piggy_banks/listEventByPiggyBank * * List single resource. * @@ -102,7 +102,7 @@ class ListController extends Controller * * @return JsonResponse * @throws FireflyException - * @codeCoverageIgnore + */ public function piggyBankEvents(PiggyBank $piggyBank): JsonResponse { @@ -116,7 +116,7 @@ class ListController extends Controller // make paginator: $paginator = new LengthAwarePaginator($events, $count, $pageSize, $this->parameters->get('page')); - $paginator->setPath(route('api.v1.piggy_banks.events', [$piggyBank->id]).$this->buildParams()); + $paginator->setPath(route('api.v1.piggy-banks.events', [$piggyBank->id]).$this->buildParams()); /** @var PiggyBankEventTransformer $transformer */ $transformer = app(PiggyBankEventTransformer::class); diff --git a/app/Api/V1/Controllers/Models/PiggyBank/ShowController.php b/app/Api/V1/Controllers/Models/PiggyBank/ShowController.php index 748607cc51..17539575ec 100644 --- a/app/Api/V1/Controllers/Models/PiggyBank/ShowController.php +++ b/app/Api/V1/Controllers/Models/PiggyBank/ShowController.php @@ -44,7 +44,7 @@ class ShowController extends Controller /** * Constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -61,13 +61,13 @@ class ShowController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/piggy_banks/listPiggyBank + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/piggy_banks/listPiggyBank * * List all of them. * * @return JsonResponse * @throws FireflyException - * @codeCoverageIgnore + */ public function index(): JsonResponse { @@ -82,7 +82,7 @@ class ShowController extends Controller // make paginator: $paginator = new LengthAwarePaginator($piggyBanks, $count, $pageSize, $this->parameters->get('page')); - $paginator->setPath(route('api.v1.piggy_banks.index').$this->buildParams()); + $paginator->setPath(route('api.v1.piggy-banks.index').$this->buildParams()); /** @var PiggyBankTransformer $transformer */ $transformer = app(PiggyBankTransformer::class); @@ -96,14 +96,14 @@ class ShowController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/piggy_banks/getPiggyBank + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/piggy_banks/getPiggyBank * * List single resource. * * @param PiggyBank $piggyBank * * @return JsonResponse - * @codeCoverageIgnore + */ public function show(PiggyBank $piggyBank): JsonResponse { diff --git a/app/Api/V1/Controllers/Models/PiggyBank/StoreController.php b/app/Api/V1/Controllers/Models/PiggyBank/StoreController.php index b24ce9c958..25850bb4d8 100644 --- a/app/Api/V1/Controllers/Models/PiggyBank/StoreController.php +++ b/app/Api/V1/Controllers/Models/PiggyBank/StoreController.php @@ -41,7 +41,7 @@ class StoreController extends Controller /** * Constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -58,7 +58,7 @@ class StoreController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/piggy_banks/storePiggyBank + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/piggy_banks/storePiggyBank * * Store new object. * diff --git a/app/Api/V1/Controllers/Models/PiggyBank/UpdateController.php b/app/Api/V1/Controllers/Models/PiggyBank/UpdateController.php index b4da94b7d1..08ff2fe971 100644 --- a/app/Api/V1/Controllers/Models/PiggyBank/UpdateController.php +++ b/app/Api/V1/Controllers/Models/PiggyBank/UpdateController.php @@ -41,7 +41,7 @@ class UpdateController extends Controller /** * Constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -58,7 +58,7 @@ class UpdateController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/piggy_banks/updatePiggyBank + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/piggy_banks/updatePiggyBank * * Update piggy bank. * diff --git a/app/Api/V1/Controllers/Models/Recurrence/DestroyController.php b/app/Api/V1/Controllers/Models/Recurrence/DestroyController.php index f623884984..9b0abb146f 100644 --- a/app/Api/V1/Controllers/Models/Recurrence/DestroyController.php +++ b/app/Api/V1/Controllers/Models/Recurrence/DestroyController.php @@ -38,7 +38,7 @@ class DestroyController extends Controller /** * RecurrenceController constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -55,14 +55,14 @@ class DestroyController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/recurrences/deleteRecurrence + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/recurrences/deleteRecurrence * * Delete the resource. * * @param Recurrence $recurrence * * @return JsonResponse - * @codeCoverageIgnore + */ public function destroy(Recurrence $recurrence): JsonResponse { diff --git a/app/Api/V1/Controllers/Models/Recurrence/ListController.php b/app/Api/V1/Controllers/Models/Recurrence/ListController.php index 04617cd30a..d18fa29d7d 100644 --- a/app/Api/V1/Controllers/Models/Recurrence/ListController.php +++ b/app/Api/V1/Controllers/Models/Recurrence/ListController.php @@ -48,7 +48,7 @@ class ListController extends Controller /** * RecurrenceController constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -65,7 +65,7 @@ class ListController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/recurrences/listTransactionByRecurrence + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/recurrences/listTransactionByRecurrence * * Show transactions for this recurrence. * @@ -74,7 +74,7 @@ class ListController extends Controller * * @return JsonResponse * @throws FireflyException - * @codeCoverageIgnore + */ public function transactions(Request $request, Recurrence $recurrence): JsonResponse { diff --git a/app/Api/V1/Controllers/Models/Recurrence/ShowController.php b/app/Api/V1/Controllers/Models/Recurrence/ShowController.php index fe42cb7374..ba4536338e 100644 --- a/app/Api/V1/Controllers/Models/Recurrence/ShowController.php +++ b/app/Api/V1/Controllers/Models/Recurrence/ShowController.php @@ -44,7 +44,7 @@ class ShowController extends Controller /** * RecurrenceController constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -61,13 +61,13 @@ class ShowController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/recurrences/listRecurrence + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/recurrences/listRecurrence * * List all of them. * * @return JsonResponse * @throws FireflyException - * @codeCoverageIgnore + */ public function index(): JsonResponse { @@ -97,14 +97,14 @@ class ShowController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/recurrences/getRecurrence + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/recurrences/getRecurrence * * List single resource. * * @param Recurrence $recurrence * * @return JsonResponse - * @codeCoverageIgnore + */ public function show(Recurrence $recurrence): JsonResponse { diff --git a/app/Api/V1/Controllers/Models/Recurrence/StoreController.php b/app/Api/V1/Controllers/Models/Recurrence/StoreController.php index f7a2f33a26..18fe32772e 100644 --- a/app/Api/V1/Controllers/Models/Recurrence/StoreController.php +++ b/app/Api/V1/Controllers/Models/Recurrence/StoreController.php @@ -41,7 +41,7 @@ class StoreController extends Controller /** * RecurrenceController constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -58,7 +58,7 @@ class StoreController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/recurrences/storeRecurrence + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/recurrences/storeRecurrence * * Store new object. * diff --git a/app/Api/V1/Controllers/Models/Recurrence/UpdateController.php b/app/Api/V1/Controllers/Models/Recurrence/UpdateController.php index d77aaa6928..74b0b21001 100644 --- a/app/Api/V1/Controllers/Models/Recurrence/UpdateController.php +++ b/app/Api/V1/Controllers/Models/Recurrence/UpdateController.php @@ -41,7 +41,7 @@ class UpdateController extends Controller /** * RecurrenceController constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -58,7 +58,7 @@ class UpdateController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/recurrences/updateRecurrence + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/recurrences/updateRecurrence * * Update single recurrence. * diff --git a/app/Api/V1/Controllers/Models/Rule/DestroyController.php b/app/Api/V1/Controllers/Models/Rule/DestroyController.php index a7ad885b96..bc550bbb41 100644 --- a/app/Api/V1/Controllers/Models/Rule/DestroyController.php +++ b/app/Api/V1/Controllers/Models/Rule/DestroyController.php @@ -39,7 +39,7 @@ class DestroyController extends Controller /** * RuleController constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -59,14 +59,14 @@ class DestroyController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/rules/deleteRule + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/rules/deleteRule * * Delete the resource. * * @param Rule $rule * * @return JsonResponse - * @codeCoverageIgnore + */ public function destroy(Rule $rule): JsonResponse { diff --git a/app/Api/V1/Controllers/Models/Rule/ListController.php b/app/Api/V1/Controllers/Models/Rule/ListController.php deleted file mode 100644 index bf7c95c283..0000000000 --- a/app/Api/V1/Controllers/Models/Rule/ListController.php +++ /dev/null @@ -1,62 +0,0 @@ -. - */ - -declare(strict_types=1); - -namespace FireflyIII\Api\V1\Controllers\Models\Rule; - -use FireflyIII\Api\V1\Controllers\Controller; -use FireflyIII\Repositories\Account\AccountRepositoryInterface; -use FireflyIII\Repositories\Rule\RuleRepositoryInterface; -use FireflyIII\User; - -/** - * Class ListController - */ -class ListController extends Controller -{ - private AccountRepositoryInterface $accountRepository; - private RuleRepositoryInterface $ruleRepository; - - /** - * RuleController constructor. - * - * @codeCoverageIgnore - */ - public function __construct() - { - parent::__construct(); - $this->middleware( - function ($request, $next) { - /** @var User $user */ - $user = auth()->user(); - - $this->ruleRepository = app(RuleRepositoryInterface::class); - $this->ruleRepository->setUser($user); - - $this->accountRepository = app(AccountRepositoryInterface::class); - $this->accountRepository->setUser($user); - - return $next($request); - } - ); - } -} diff --git a/app/Api/V1/Controllers/Models/Rule/ShowController.php b/app/Api/V1/Controllers/Models/Rule/ShowController.php index 8b12d1c3f6..2c60911989 100644 --- a/app/Api/V1/Controllers/Models/Rule/ShowController.php +++ b/app/Api/V1/Controllers/Models/Rule/ShowController.php @@ -45,7 +45,7 @@ class ShowController extends Controller /** * RuleController constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -65,13 +65,13 @@ class ShowController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/rules/listRule + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/rules/listRule * * List all of them. * * @return JsonResponse * @throws FireflyException - * @codeCoverageIgnore + */ public function index(): JsonResponse { @@ -101,14 +101,14 @@ class ShowController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/rules/getRule + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/rules/getRule * * List single resource. * * @param Rule $rule * * @return JsonResponse - * @codeCoverageIgnore + */ public function show(Rule $rule): JsonResponse { diff --git a/app/Api/V1/Controllers/Models/Rule/StoreController.php b/app/Api/V1/Controllers/Models/Rule/StoreController.php index 4cfe601f7f..c94c250579 100644 --- a/app/Api/V1/Controllers/Models/Rule/StoreController.php +++ b/app/Api/V1/Controllers/Models/Rule/StoreController.php @@ -41,7 +41,7 @@ class StoreController extends Controller /** * RuleController constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -61,7 +61,7 @@ class StoreController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/rules/storeRule + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/rules/storeRule * * Store new object. * diff --git a/app/Api/V1/Controllers/Models/Rule/TriggerController.php b/app/Api/V1/Controllers/Models/Rule/TriggerController.php index f3eef085b5..d1ef9a4bca 100644 --- a/app/Api/V1/Controllers/Models/Rule/TriggerController.php +++ b/app/Api/V1/Controllers/Models/Rule/TriggerController.php @@ -47,7 +47,7 @@ class TriggerController extends Controller /** * RuleController constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -67,7 +67,7 @@ class TriggerController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/rules/testRule + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/rules/testRule * * @param TestRequest $request * @param Rule $rule @@ -117,7 +117,7 @@ class TriggerController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/rules/fireRule + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/rules/fireRule * * Execute the given rule group on a set of existing transactions. * diff --git a/app/Api/V1/Controllers/Models/Rule/UpdateController.php b/app/Api/V1/Controllers/Models/Rule/UpdateController.php index df81811814..7aef0ed6e4 100644 --- a/app/Api/V1/Controllers/Models/Rule/UpdateController.php +++ b/app/Api/V1/Controllers/Models/Rule/UpdateController.php @@ -42,7 +42,7 @@ class UpdateController extends Controller /** * RuleController constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -62,7 +62,7 @@ class UpdateController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/rules/updateRule + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/rules/updateRule * * Update a rule. * diff --git a/app/Api/V1/Controllers/Models/RuleGroup/DestroyController.php b/app/Api/V1/Controllers/Models/RuleGroup/DestroyController.php index a137a56ac8..9312e561f1 100644 --- a/app/Api/V1/Controllers/Models/RuleGroup/DestroyController.php +++ b/app/Api/V1/Controllers/Models/RuleGroup/DestroyController.php @@ -39,7 +39,7 @@ class DestroyController extends Controller /** * RuleGroupController constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -59,14 +59,14 @@ class DestroyController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/rule_groups/deleteRuleGroup + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/rule_groups/deleteRuleGroup * * Delete the resource. * * @param RuleGroup $ruleGroup * * @return JsonResponse - * @codeCoverageIgnore + */ public function destroy(RuleGroup $ruleGroup): JsonResponse { diff --git a/app/Api/V1/Controllers/Models/RuleGroup/ListController.php b/app/Api/V1/Controllers/Models/RuleGroup/ListController.php index 73027a0e6e..2145ecb8fc 100644 --- a/app/Api/V1/Controllers/Models/RuleGroup/ListController.php +++ b/app/Api/V1/Controllers/Models/RuleGroup/ListController.php @@ -44,7 +44,7 @@ class ListController extends Controller /** * RuleGroupController constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -64,13 +64,13 @@ class ListController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/rule_groups/listRuleByGroup + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/rule_groups/listRuleByGroup * * @param RuleGroup $group * * @return JsonResponse * @throws FireflyException - * @codeCoverageIgnore + */ public function rules(RuleGroup $group): JsonResponse { @@ -85,7 +85,7 @@ class ListController extends Controller // make paginator: $paginator = new LengthAwarePaginator($rules, $count, $pageSize, $this->parameters->get('page')); - $paginator->setPath(route('api.v1.rule_groups.rules', [$group->id]).$this->buildParams()); + $paginator->setPath(route('api.v1.rule-groups.rules', [$group->id]).$this->buildParams()); /** @var RuleTransformer $transformer */ $transformer = app(RuleTransformer::class); diff --git a/app/Api/V1/Controllers/Models/RuleGroup/ShowController.php b/app/Api/V1/Controllers/Models/RuleGroup/ShowController.php index ed525de037..6a74f88c9e 100644 --- a/app/Api/V1/Controllers/Models/RuleGroup/ShowController.php +++ b/app/Api/V1/Controllers/Models/RuleGroup/ShowController.php @@ -45,7 +45,7 @@ class ShowController extends Controller /** * RuleGroupController constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -65,12 +65,12 @@ class ShowController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/rule_groups/listRuleGroup + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/rule_groups/listRuleGroup * List all of them. * * @return JsonResponse * @throws FireflyException - * @codeCoverageIgnore + */ public function index(): JsonResponse { @@ -85,7 +85,7 @@ class ShowController extends Controller // make paginator: $paginator = new LengthAwarePaginator($ruleGroups, $count, $pageSize, $this->parameters->get('page')); - $paginator->setPath(route('api.v1.rule_groups.index').$this->buildParams()); + $paginator->setPath(route('api.v1.rule-groups.index').$this->buildParams()); /** @var RuleGroupTransformer $transformer */ $transformer = app(RuleGroupTransformer::class); @@ -99,14 +99,14 @@ class ShowController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/rule_groups/getRuleGroup + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/rule_groups/getRuleGroup * * List single resource. * * @param RuleGroup $ruleGroup * * @return JsonResponse - * @codeCoverageIgnore + */ public function show(RuleGroup $ruleGroup): JsonResponse { diff --git a/app/Api/V1/Controllers/Models/RuleGroup/StoreController.php b/app/Api/V1/Controllers/Models/RuleGroup/StoreController.php index 34455a4cf6..eaa7de0ee2 100644 --- a/app/Api/V1/Controllers/Models/RuleGroup/StoreController.php +++ b/app/Api/V1/Controllers/Models/RuleGroup/StoreController.php @@ -43,7 +43,7 @@ class StoreController extends Controller /** * RuleGroupController constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -66,7 +66,7 @@ class StoreController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/rule_groups/storeRuleGroup + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/rule_groups/storeRuleGroup * * Store new object. * diff --git a/app/Api/V1/Controllers/Models/RuleGroup/TriggerController.php b/app/Api/V1/Controllers/Models/RuleGroup/TriggerController.php index c909f736c0..a174613ec3 100644 --- a/app/Api/V1/Controllers/Models/RuleGroup/TriggerController.php +++ b/app/Api/V1/Controllers/Models/RuleGroup/TriggerController.php @@ -48,7 +48,7 @@ class TriggerController extends Controller /** * RuleGroupController constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -68,7 +68,7 @@ class TriggerController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/rule_groups/testRuleGroup + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/rule_groups/testRuleGroup * * @param TestRequest $request * @param RuleGroup $group @@ -108,7 +108,7 @@ class TriggerController extends Controller $count = $transactions->count(); $paginator = new LengthAwarePaginator($transactions, $count, 31337, $this->parameters->get('page')); - $paginator->setPath(route('api.v1.rule_groups.test', [$group->id]).$this->buildParams()); + $paginator->setPath(route('api.v1.rule-groups.test', [$group->id]).$this->buildParams()); // resulting list is presented as JSON thing. $manager = $this->getManager(); @@ -124,7 +124,7 @@ class TriggerController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/rule_groups/fireRuleGroup + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/rule_groups/fireRuleGroup * * Execute the given rule group on a set of existing transactions. * diff --git a/app/Api/V1/Controllers/Models/RuleGroup/UpdateController.php b/app/Api/V1/Controllers/Models/RuleGroup/UpdateController.php index 8a8115c991..28ebab8249 100644 --- a/app/Api/V1/Controllers/Models/RuleGroup/UpdateController.php +++ b/app/Api/V1/Controllers/Models/RuleGroup/UpdateController.php @@ -42,7 +42,7 @@ class UpdateController extends Controller /** * RuleGroupController constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -62,7 +62,7 @@ class UpdateController extends Controller /** * This is endpoint is documented at: - * https://api-docs.firefly-iii.org/#/rule_groups/updateRuleGroup + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/rule_groups/updateRuleGroup * * Update a rule group. * diff --git a/app/Api/V1/Controllers/Models/Tag/DestroyController.php b/app/Api/V1/Controllers/Models/Tag/DestroyController.php index ba83bae637..fdd6279af5 100644 --- a/app/Api/V1/Controllers/Models/Tag/DestroyController.php +++ b/app/Api/V1/Controllers/Models/Tag/DestroyController.php @@ -39,7 +39,7 @@ class DestroyController extends Controller /** * TagController constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -59,14 +59,14 @@ class DestroyController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/tags/deleteTag + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/tags/deleteTag * * Delete the resource. * * @param Tag $tag * * @return JsonResponse - * @codeCoverageIgnore + */ public function destroy(Tag $tag): JsonResponse { diff --git a/app/Api/V1/Controllers/Models/Tag/ListController.php b/app/Api/V1/Controllers/Models/Tag/ListController.php index 7f4196ea52..6c0b24a542 100644 --- a/app/Api/V1/Controllers/Models/Tag/ListController.php +++ b/app/Api/V1/Controllers/Models/Tag/ListController.php @@ -50,7 +50,7 @@ class ListController extends Controller /** * TagController constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -70,13 +70,13 @@ class ListController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/tags/listAttachmentByTag + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/tags/listAttachmentByTag * * @param Tag $tag * * @return JsonResponse * @throws FireflyException - * @codeCoverageIgnore + */ public function attachments(Tag $tag): JsonResponse { @@ -103,7 +103,7 @@ class ListController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/tags/listTransactionByTag + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/tags/listTransactionByTag * * Show all transactions. * @@ -112,7 +112,7 @@ class ListController extends Controller * * @return JsonResponse * @throws FireflyException - * @codeCoverageIgnore + */ public function transactions(Request $request, Tag $tag): JsonResponse { diff --git a/app/Api/V1/Controllers/Models/Tag/ShowController.php b/app/Api/V1/Controllers/Models/Tag/ShowController.php index 17620e0fcd..f8cac40f39 100644 --- a/app/Api/V1/Controllers/Models/Tag/ShowController.php +++ b/app/Api/V1/Controllers/Models/Tag/ShowController.php @@ -45,7 +45,7 @@ class ShowController extends Controller /** * TagController constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -65,13 +65,13 @@ class ShowController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/tags/listTag + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/tags/listTag * * List all of them. * * @return JsonResponse * @throws FireflyException - * @codeCoverageIgnore + */ public function index(): JsonResponse { @@ -100,14 +100,14 @@ class ShowController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/tags/getTag + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/tags/getTag * * List single resource. * * @param Tag $tag * * @return JsonResponse - * @codeCoverageIgnore + */ public function show(Tag $tag): JsonResponse { diff --git a/app/Api/V1/Controllers/Models/Tag/StoreController.php b/app/Api/V1/Controllers/Models/Tag/StoreController.php index ab277913a9..0417abe83a 100644 --- a/app/Api/V1/Controllers/Models/Tag/StoreController.php +++ b/app/Api/V1/Controllers/Models/Tag/StoreController.php @@ -41,7 +41,7 @@ class StoreController extends Controller /** * TagController constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -61,7 +61,7 @@ class StoreController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/tags/storeTag + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/tags/storeTag * * Store new object. * diff --git a/app/Api/V1/Controllers/Models/Tag/UpdateController.php b/app/Api/V1/Controllers/Models/Tag/UpdateController.php index 952b2ac513..baa25fdcef 100644 --- a/app/Api/V1/Controllers/Models/Tag/UpdateController.php +++ b/app/Api/V1/Controllers/Models/Tag/UpdateController.php @@ -42,7 +42,7 @@ class UpdateController extends Controller /** * TagController constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -62,7 +62,7 @@ class UpdateController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/tags/updateTag + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/tags/updateTag * * Update a rule. * diff --git a/app/Api/V1/Controllers/Models/Transaction/DestroyController.php b/app/Api/V1/Controllers/Models/Transaction/DestroyController.php index e78c5b676a..e6bf2148d7 100644 --- a/app/Api/V1/Controllers/Models/Transaction/DestroyController.php +++ b/app/Api/V1/Controllers/Models/Transaction/DestroyController.php @@ -46,7 +46,7 @@ class DestroyController extends Controller /** * TransactionController constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -69,14 +69,14 @@ class DestroyController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/transactions/deleteTransaction + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/transactions/deleteTransaction * * Remove the specified resource from storage. * * @param TransactionGroup $transactionGroup * * @return JsonResponse - * @codeCoverageIgnore + */ public function destroy(TransactionGroup $transactionGroup): JsonResponse { @@ -110,13 +110,13 @@ class DestroyController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/transactions/deleteTransactionJournal + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/transactions/deleteTransactionJournal * * Remove the specified resource from storage. * * @param TransactionJournal $transactionJournal * - * @codeCoverageIgnore + * @return JsonResponse */ public function destroyJournal(TransactionJournal $transactionJournal): JsonResponse diff --git a/app/Api/V1/Controllers/Models/Transaction/ListController.php b/app/Api/V1/Controllers/Models/Transaction/ListController.php index 0da0a2b5b4..dff8789088 100644 --- a/app/Api/V1/Controllers/Models/Transaction/ListController.php +++ b/app/Api/V1/Controllers/Models/Transaction/ListController.php @@ -48,7 +48,7 @@ class ListController extends Controller /** * TransactionController constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -68,13 +68,13 @@ class ListController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/transactions/listAttachmentByTransaction + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/transactions/listAttachmentByTransaction * * @param TransactionGroup $transactionGroup * * @return JsonResponse * @throws FireflyException - * @codeCoverageIgnore + */ public function attachments(TransactionGroup $transactionGroup): JsonResponse { @@ -104,13 +104,13 @@ class ListController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/transactions/listEventByTransaction + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/transactions/listEventByTransaction * * @param TransactionGroup $transactionGroup * * @return JsonResponse * @throws FireflyException - * @codeCoverageIgnore + */ public function piggyBankEvents(TransactionGroup $transactionGroup): JsonResponse { @@ -124,7 +124,7 @@ class ListController extends Controller $events = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); // make paginator: $paginator = new LengthAwarePaginator($events, $count, $pageSize, $this->parameters->get('page')); - $paginator->setPath(route('api.v1.transactions.piggy_bank_events', [$transactionGroup->id]).$this->buildParams()); + $paginator->setPath(route('api.v1.transactions.piggy-bank-events', [$transactionGroup->id]).$this->buildParams()); /** @var PiggyBankEventTransformer $transformer */ $transformer = app(PiggyBankEventTransformer::class); @@ -143,13 +143,13 @@ class ListController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/transactions/listLinksByJournal + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/transactions/listLinksByJournal * * @param TransactionJournal $transactionJournal * * @return JsonResponse * @throws FireflyException - * @codeCoverageIgnore + */ public function transactionLinks(TransactionJournal $transactionJournal): JsonResponse { @@ -161,7 +161,7 @@ class ListController extends Controller // make paginator: $paginator = new LengthAwarePaginator($journalLinks, $count, $pageSize, $this->parameters->get('page')); - $paginator->setPath(route('api.v1.transaction-journals.transaction_links', [$transactionJournal->id]).$this->buildParams()); + $paginator->setPath(route('api.v1.transaction-journals.transaction-links', [$transactionJournal->id]).$this->buildParams()); /** @var TransactionLinkTransformer $transformer */ $transformer = app(TransactionLinkTransformer::class); diff --git a/app/Api/V1/Controllers/Models/Transaction/ShowController.php b/app/Api/V1/Controllers/Models/Transaction/ShowController.php index 383796dae2..90d5f18157 100644 --- a/app/Api/V1/Controllers/Models/Transaction/ShowController.php +++ b/app/Api/V1/Controllers/Models/Transaction/ShowController.php @@ -47,7 +47,7 @@ class ShowController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/transactions/listTransaction + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/transactions/listTransaction * * Show all transactions. * @@ -55,7 +55,7 @@ class ShowController extends Controller * * @return JsonResponse * @throws FireflyException - * @codeCoverageIgnore + */ public function index(Request $request): JsonResponse { @@ -100,14 +100,14 @@ class ShowController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/transactions/getTransactionByJournal + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/transactions/getTransactionByJournal * * Show a single transaction, by transaction journal. * * @param TransactionJournal $transactionJournal * * @return JsonResponse - * @codeCoverageIgnore + */ public function showJournal(TransactionJournal $transactionJournal): JsonResponse { @@ -116,14 +116,14 @@ class ShowController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/transactions/getTransaction + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/transactions/getTransaction * * Show a single transaction. * * @param TransactionGroup $transactionGroup * * @return JsonResponse - * @codeCoverageIgnore + */ public function show(TransactionGroup $transactionGroup): JsonResponse { diff --git a/app/Api/V1/Controllers/Models/Transaction/StoreController.php b/app/Api/V1/Controllers/Models/Transaction/StoreController.php index 5f1bbcda96..295ff6fe6c 100644 --- a/app/Api/V1/Controllers/Models/Transaction/StoreController.php +++ b/app/Api/V1/Controllers/Models/Transaction/StoreController.php @@ -52,7 +52,7 @@ class StoreController extends Controller /** * TransactionController constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -72,7 +72,7 @@ class StoreController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/transactions/storeTransaction + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/transactions/storeTransaction * * Store a new transaction. * diff --git a/app/Api/V1/Controllers/Models/Transaction/UpdateController.php b/app/Api/V1/Controllers/Models/Transaction/UpdateController.php index 9e5c8978a4..5b37799b90 100644 --- a/app/Api/V1/Controllers/Models/Transaction/UpdateController.php +++ b/app/Api/V1/Controllers/Models/Transaction/UpdateController.php @@ -46,7 +46,7 @@ class UpdateController extends Controller /** * TransactionController constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -66,7 +66,7 @@ class UpdateController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/transactions/updateTransaction + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/transactions/updateTransaction * * Update a transaction. * diff --git a/app/Api/V1/Controllers/Models/TransactionCurrency/DestroyController.php b/app/Api/V1/Controllers/Models/TransactionCurrency/DestroyController.php index ee90fdba7d..0a85e77d7d 100644 --- a/app/Api/V1/Controllers/Models/TransactionCurrency/DestroyController.php +++ b/app/Api/V1/Controllers/Models/TransactionCurrency/DestroyController.php @@ -44,7 +44,7 @@ class DestroyController extends Controller /** * CurrencyRepository constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -62,7 +62,7 @@ class DestroyController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/currencies/deleteCurrency + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/currencies/deleteCurrency * * Remove the specified resource from storage. * @@ -70,7 +70,7 @@ class DestroyController extends Controller * * @return JsonResponse * @throws FireflyException - * @codeCoverageIgnore + */ public function destroy(TransactionCurrency $currency): JsonResponse { diff --git a/app/Api/V1/Controllers/Models/TransactionCurrency/ListController.php b/app/Api/V1/Controllers/Models/TransactionCurrency/ListController.php index fbe18135eb..0761cda12f 100644 --- a/app/Api/V1/Controllers/Models/TransactionCurrency/ListController.php +++ b/app/Api/V1/Controllers/Models/TransactionCurrency/ListController.php @@ -70,7 +70,7 @@ class ListController extends Controller /** * CurrencyRepository constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -87,7 +87,7 @@ class ListController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/currencies/listAccountByCurrency + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/currencies/listAccountByCurrency * Display a list of accounts. * * @param Request $request @@ -95,7 +95,7 @@ class ListController extends Controller * * @return JsonResponse * @throws FireflyException - * @codeCoverageIgnore + */ public function accounts(Request $request, TransactionCurrency $currency): JsonResponse { @@ -141,7 +141,7 @@ class ListController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/currencies/listAvailableBudgetByCurrency + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/currencies/listAvailableBudgetByCurrency * * Display a listing of the resource. * @@ -149,7 +149,7 @@ class ListController extends Controller * * @return JsonResponse * @throws FireflyException - * @codeCoverageIgnore + */ public function availableBudgets(TransactionCurrency $currency): JsonResponse { @@ -166,7 +166,7 @@ class ListController extends Controller $availableBudgets = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); // make paginator: $paginator = new LengthAwarePaginator($availableBudgets, $count, $pageSize, $this->parameters->get('page')); - $paginator->setPath(route('api.v1.currencies.available_budgets', [$currency->code]).$this->buildParams()); + $paginator->setPath(route('api.v1.currencies.available-budgets', [$currency->code]).$this->buildParams()); /** @var AvailableBudgetTransformer $transformer */ $transformer = app(AvailableBudgetTransformer::class); @@ -180,7 +180,7 @@ class ListController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/currencies/listBillByCurrency + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/currencies/listBillByCurrency * * List all bills * @@ -188,7 +188,7 @@ class ListController extends Controller * * @return JsonResponse * @throws FireflyException - * @codeCoverageIgnore + */ public function bills(TransactionCurrency $currency): JsonResponse { @@ -224,7 +224,7 @@ class ListController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/currencies/listBudgetLimitByCurrency + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/currencies/listBudgetLimitByCurrency * * List all budget limits * @@ -232,7 +232,7 @@ class ListController extends Controller * * @return JsonResponse * @throws FireflyException - * @codeCoverageIgnore + */ public function budgetLimits(TransactionCurrency $currency): JsonResponse { @@ -245,7 +245,7 @@ class ListController extends Controller $count = $collection->count(); $budgetLimits = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); $paginator = new LengthAwarePaginator($budgetLimits, $count, $pageSize, $this->parameters->get('page')); - $paginator->setPath(route('api.v1.currencies.budget_limits', [$currency->code]).$this->buildParams()); + $paginator->setPath(route('api.v1.currencies.budget-limits', [$currency->code]).$this->buildParams()); /** @var BudgetLimitTransformer $transformer */ $transformer = app(BudgetLimitTransformer::class); @@ -259,7 +259,7 @@ class ListController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/currencies/listRecurrenceByCurrency + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/currencies/listRecurrenceByCurrency * * List all recurring transactions. * @@ -267,7 +267,7 @@ class ListController extends Controller * * @return JsonResponse * @throws FireflyException - * @codeCoverageIgnore + */ public function recurrences(TransactionCurrency $currency): JsonResponse { @@ -312,7 +312,7 @@ class ListController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/currencies/listRuleByCurrency + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/currencies/listRuleByCurrency * * List all of them. * @@ -320,7 +320,7 @@ class ListController extends Controller * * @return JsonResponse * @throws FireflyException - * @codeCoverageIgnore + */ public function rules(TransactionCurrency $currency): JsonResponse { @@ -364,7 +364,7 @@ class ListController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/currencies/listTransactionByCurrency + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/currencies/listTransactionByCurrency * * Show all transactions. * @@ -374,7 +374,7 @@ class ListController extends Controller * * @return JsonResponse * @throws FireflyException - * @codeCoverageIgnore + */ public function transactions(Request $request, TransactionCurrency $currency): JsonResponse { diff --git a/app/Api/V1/Controllers/Models/TransactionCurrency/ShowController.php b/app/Api/V1/Controllers/Models/TransactionCurrency/ShowController.php index 98dc10efef..f2f8106738 100644 --- a/app/Api/V1/Controllers/Models/TransactionCurrency/ShowController.php +++ b/app/Api/V1/Controllers/Models/TransactionCurrency/ShowController.php @@ -51,7 +51,7 @@ class ShowController extends Controller /** * CurrencyRepository constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -68,14 +68,14 @@ class ShowController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/currencies/listCurrency + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/currencies/listCurrency * * Display a listing of the resource. * * @return JsonResponse * @throws FireflyException * @throws JsonException - * @codeCoverageIgnore + */ public function index(): JsonResponse { @@ -102,7 +102,7 @@ class ShowController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/currencies/getCurrency + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/currencies/getCurrency * * Show a currency. * @@ -111,7 +111,7 @@ class ShowController extends Controller * @return JsonResponse * @throws FireflyException * @throws JsonException - * @codeCoverageIgnore + */ public function show(TransactionCurrency $currency): JsonResponse { @@ -130,14 +130,14 @@ class ShowController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/currencies/getDefaultCurrency + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/currencies/getDefaultCurrency * * Show a currency. * * @return JsonResponse * @throws FireflyException * @throws JsonException - * @codeCoverageIgnore + */ public function showDefault(): JsonResponse { diff --git a/app/Api/V1/Controllers/Models/TransactionCurrency/StoreController.php b/app/Api/V1/Controllers/Models/TransactionCurrency/StoreController.php index 04f1489512..6853c1be71 100644 --- a/app/Api/V1/Controllers/Models/TransactionCurrency/StoreController.php +++ b/app/Api/V1/Controllers/Models/TransactionCurrency/StoreController.php @@ -48,7 +48,7 @@ class StoreController extends Controller /** * CurrencyRepository constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -65,7 +65,7 @@ class StoreController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/currencies/storeCurrency + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/currencies/storeCurrency * * Store new currency. * diff --git a/app/Api/V1/Controllers/Models/TransactionCurrency/UpdateController.php b/app/Api/V1/Controllers/Models/TransactionCurrency/UpdateController.php index 8ab744ea78..f749a2b925 100644 --- a/app/Api/V1/Controllers/Models/TransactionCurrency/UpdateController.php +++ b/app/Api/V1/Controllers/Models/TransactionCurrency/UpdateController.php @@ -50,7 +50,7 @@ class UpdateController extends Controller /** * CurrencyRepository constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -67,7 +67,7 @@ class UpdateController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/currencies/disableCurrency + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/currencies/disableCurrency * * Disable a currency. * @@ -76,7 +76,7 @@ class UpdateController extends Controller * @return JsonResponse * @throws FireflyException * @throws JsonException - * @codeCoverageIgnore + */ public function disable(TransactionCurrency $currency): JsonResponse { @@ -101,7 +101,7 @@ class UpdateController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/currencies/defaultCurrency + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/currencies/defaultCurrency * * Make the currency a default currency. * @@ -109,7 +109,7 @@ class UpdateController extends Controller * * @return JsonResponse * @throws FireflyException - * @codeCoverageIgnore + */ public function makeDefault(TransactionCurrency $currency): JsonResponse { @@ -133,7 +133,7 @@ class UpdateController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/currencies/enableCurrency + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/currencies/enableCurrency * * Enable a currency. * @@ -142,7 +142,7 @@ class UpdateController extends Controller * @return JsonResponse * @throws FireflyException * @throws JsonException - * @codeCoverageIgnore + */ public function enable(TransactionCurrency $currency): JsonResponse { @@ -163,7 +163,7 @@ class UpdateController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/currencies/updateCurrency + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/currencies/updateCurrency * * Update a currency. * diff --git a/app/Api/V1/Controllers/Models/TransactionLink/DestroyController.php b/app/Api/V1/Controllers/Models/TransactionLink/DestroyController.php index ff5b2cdb1e..c09fade3da 100644 --- a/app/Api/V1/Controllers/Models/TransactionLink/DestroyController.php +++ b/app/Api/V1/Controllers/Models/TransactionLink/DestroyController.php @@ -37,7 +37,7 @@ class DestroyController extends Controller /** * TransactionLinkController constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -58,14 +58,14 @@ class DestroyController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/links/deleteTransactionLink + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/links/deleteTransactionLink * * Delete the resource. * * @param TransactionJournalLink $link * * @return JsonResponse - * @codeCoverageIgnore + */ public function destroy(TransactionJournalLink $link): JsonResponse { diff --git a/app/Api/V1/Controllers/Models/TransactionLink/ShowController.php b/app/Api/V1/Controllers/Models/TransactionLink/ShowController.php index aef868534f..d3631ea9ac 100644 --- a/app/Api/V1/Controllers/Models/TransactionLink/ShowController.php +++ b/app/Api/V1/Controllers/Models/TransactionLink/ShowController.php @@ -44,7 +44,7 @@ class ShowController extends Controller /** * TransactionLinkController constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -65,7 +65,7 @@ class ShowController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/links/listTransactionLink + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/links/listTransactionLink * * List all transaction links there are. * @@ -73,7 +73,7 @@ class ShowController extends Controller * * @return JsonResponse * @throws FireflyException - * @codeCoverageIgnore + */ public function index(Request $request): JsonResponse { @@ -93,7 +93,7 @@ class ShowController extends Controller // make paginator: $paginator = new LengthAwarePaginator($journalLinks, $count, $pageSize, $this->parameters->get('page')); - $paginator->setPath(route('api.v1.transaction_links.index').$this->buildParams()); + $paginator->setPath(route('api.v1.transaction-links.index').$this->buildParams()); /** @var TransactionLinkTransformer $transformer */ $transformer = app(TransactionLinkTransformer::class); @@ -107,14 +107,14 @@ class ShowController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/links/getTransactionLink + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/links/getTransactionLink * * List single resource. * * @param TransactionJournalLink $journalLink * * @return JsonResponse - * @codeCoverageIgnore + */ public function show(TransactionJournalLink $journalLink): JsonResponse { diff --git a/app/Api/V1/Controllers/Models/TransactionLink/StoreController.php b/app/Api/V1/Controllers/Models/TransactionLink/StoreController.php index 6558cdd423..c8c94d0300 100644 --- a/app/Api/V1/Controllers/Models/TransactionLink/StoreController.php +++ b/app/Api/V1/Controllers/Models/TransactionLink/StoreController.php @@ -45,7 +45,7 @@ class StoreController extends Controller /** * TransactionLinkController constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -68,7 +68,7 @@ class StoreController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/links/storeTransactionLink + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/links/storeTransactionLink * * Store new object. * diff --git a/app/Api/V1/Controllers/Models/TransactionLink/UpdateController.php b/app/Api/V1/Controllers/Models/TransactionLink/UpdateController.php index 2db52ca859..ba3af64ecf 100644 --- a/app/Api/V1/Controllers/Models/TransactionLink/UpdateController.php +++ b/app/Api/V1/Controllers/Models/TransactionLink/UpdateController.php @@ -42,7 +42,7 @@ class UpdateController extends Controller /** * TransactionLinkController constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -65,7 +65,7 @@ class UpdateController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/links/updateTransactionLink + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/links/updateTransactionLink * * Update object. * diff --git a/app/Api/V1/Controllers/Models/TransactionLinkType/DestroyController.php b/app/Api/V1/Controllers/Models/TransactionLinkType/DestroyController.php index c734e31c66..48f3f57dc0 100644 --- a/app/Api/V1/Controllers/Models/TransactionLinkType/DestroyController.php +++ b/app/Api/V1/Controllers/Models/TransactionLinkType/DestroyController.php @@ -28,7 +28,6 @@ use FireflyIII\Api\V1\Controllers\Controller; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Models\LinkType; use FireflyIII\Repositories\LinkType\LinkTypeRepositoryInterface; -use FireflyIII\Repositories\User\UserRepositoryInterface; use FireflyIII\Support\Http\Api\TransactionFilter; use FireflyIII\User; use Illuminate\Http\JsonResponse; @@ -41,12 +40,11 @@ class DestroyController extends Controller use TransactionFilter; private LinkTypeRepositoryInterface $repository; - private UserRepositoryInterface $userRepository; /** * LinkTypeController constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -54,9 +52,8 @@ class DestroyController extends Controller $this->middleware( function ($request, $next) { /** @var User $user */ - $user = auth()->user(); - $this->repository = app(LinkTypeRepositoryInterface::class); - $this->userRepository = app(UserRepositoryInterface::class); + $user = auth()->user(); + $this->repository = app(LinkTypeRepositoryInterface::class); $this->repository->setUser($user); return $next($request); @@ -66,7 +63,7 @@ class DestroyController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/links/deleteLinkType + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/links/deleteLinkType * * Delete the resource. * @@ -74,7 +71,6 @@ class DestroyController extends Controller * * @return JsonResponse * @throws FireflyException - * @codeCoverageIgnore */ public function destroy(LinkType $linkType): JsonResponse { diff --git a/app/Api/V1/Controllers/Models/TransactionLinkType/ListController.php b/app/Api/V1/Controllers/Models/TransactionLinkType/ListController.php index 52cad81493..872e1f5c60 100644 --- a/app/Api/V1/Controllers/Models/TransactionLinkType/ListController.php +++ b/app/Api/V1/Controllers/Models/TransactionLinkType/ListController.php @@ -50,7 +50,7 @@ class ListController extends Controller /** * LinkTypeController constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -69,14 +69,14 @@ class ListController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/links/listTransactionByLinkType + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/links/listTransactionByLinkType * * @param Request $request * @param LinkType $linkType * * @return JsonResponse * @throws FireflyException - * @codeCoverageIgnore + */ public function transactions(Request $request, LinkType $linkType): JsonResponse { diff --git a/app/Api/V1/Controllers/Models/TransactionLinkType/ShowController.php b/app/Api/V1/Controllers/Models/TransactionLinkType/ShowController.php index 181e1a2962..2890aae7dc 100644 --- a/app/Api/V1/Controllers/Models/TransactionLinkType/ShowController.php +++ b/app/Api/V1/Controllers/Models/TransactionLinkType/ShowController.php @@ -50,7 +50,7 @@ class ShowController extends Controller /** * LinkTypeController constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -69,12 +69,12 @@ class ShowController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/links/listLinkType + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/links/listLinkType * * * @return JsonResponse * @throws FireflyException - * @codeCoverageIgnore + */ public function index(): JsonResponse { @@ -89,7 +89,7 @@ class ShowController extends Controller // make paginator: $paginator = new LengthAwarePaginator($linkTypes, $count, $pageSize, $this->parameters->get('page')); - $paginator->setPath(route('api.v1.link_types.index').$this->buildParams()); + $paginator->setPath(route('api.v1.link-types.index').$this->buildParams()); /** @var LinkTypeTransformer $transformer */ $transformer = app(LinkTypeTransformer::class); @@ -103,14 +103,14 @@ class ShowController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/links/getLinkType + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/links/getLinkType * * List single resource. * * @param LinkType $linkType * * @return JsonResponse - * @codeCoverageIgnore + */ public function show(LinkType $linkType): JsonResponse { diff --git a/app/Api/V1/Controllers/Models/TransactionLinkType/StoreController.php b/app/Api/V1/Controllers/Models/TransactionLinkType/StoreController.php index 5b54dae645..1694e03c85 100644 --- a/app/Api/V1/Controllers/Models/TransactionLinkType/StoreController.php +++ b/app/Api/V1/Controllers/Models/TransactionLinkType/StoreController.php @@ -49,7 +49,7 @@ class StoreController extends Controller /** * LinkTypeController constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -69,7 +69,7 @@ class StoreController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/links/storeLinkType + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/links/storeLinkType * * Store new object. * diff --git a/app/Api/V1/Controllers/Models/TransactionLinkType/UpdateController.php b/app/Api/V1/Controllers/Models/TransactionLinkType/UpdateController.php index e48fa2ac6d..74778b8509 100644 --- a/app/Api/V1/Controllers/Models/TransactionLinkType/UpdateController.php +++ b/app/Api/V1/Controllers/Models/TransactionLinkType/UpdateController.php @@ -50,7 +50,7 @@ class UpdateController extends Controller /** * LinkTypeController constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -70,7 +70,7 @@ class UpdateController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/links/updateLinkType + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/links/updateLinkType * * Update object. * diff --git a/app/Api/V1/Controllers/Search/AccountController.php b/app/Api/V1/Controllers/Search/AccountController.php index e79ba13306..6db73f9a0e 100644 --- a/app/Api/V1/Controllers/Search/AccountController.php +++ b/app/Api/V1/Controllers/Search/AccountController.php @@ -60,7 +60,7 @@ class AccountController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/search/searchAccounts + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/search/searchAccounts * @param Request $request * * @return JsonResponse|Response diff --git a/app/Api/V1/Controllers/Search/TransactionController.php b/app/Api/V1/Controllers/Search/TransactionController.php index 9255da7713..2a157532f9 100644 --- a/app/Api/V1/Controllers/Search/TransactionController.php +++ b/app/Api/V1/Controllers/Search/TransactionController.php @@ -40,7 +40,7 @@ class TransactionController extends Controller { /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/search/searchTransactions + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/search/searchTransactions * * @param Request $request * @param SearchInterface $searcher diff --git a/app/Api/V1/Controllers/Summary/BasicController.php b/app/Api/V1/Controllers/Summary/BasicController.php index 54e7f0990e..2f1e4e75bc 100644 --- a/app/Api/V1/Controllers/Summary/BasicController.php +++ b/app/Api/V1/Controllers/Summary/BasicController.php @@ -58,7 +58,7 @@ class BasicController extends Controller /** * BasicController constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -88,7 +88,7 @@ class BasicController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/summary/getBasicSummary + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/summary/getBasicSummary * * @param DateRequest $request * diff --git a/app/Api/V1/Controllers/System/AboutController.php b/app/Api/V1/Controllers/System/AboutController.php index b78a995d3f..dd3347c23f 100644 --- a/app/Api/V1/Controllers/System/AboutController.php +++ b/app/Api/V1/Controllers/System/AboutController.php @@ -33,14 +33,14 @@ use League\Fractal\Resource\Item; /** * Returns basic information about this installation. * - * @codeCoverageIgnore + * Class AboutController. */ class AboutController extends Controller { /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/about/getAbout + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/about/getAbout * * Returns system information. * @@ -67,7 +67,7 @@ class AboutController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/about/getCurrentUser + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/about/getCurrentUser * * Returns information about the user. * diff --git a/app/Api/V1/Controllers/System/ConfigurationController.php b/app/Api/V1/Controllers/System/ConfigurationController.php index 09a8dff8b7..8d6fd7c73e 100644 --- a/app/Api/V1/Controllers/System/ConfigurationController.php +++ b/app/Api/V1/Controllers/System/ConfigurationController.php @@ -58,7 +58,7 @@ class ConfigurationController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/configuration/getConfiguration + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/configuration/getConfiguration * * @return JsonResponse * @throws FireflyException @@ -131,7 +131,7 @@ class ConfigurationController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/configuration/getSingleConfiguration + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/configuration/getSingleConfiguration * * @param string $configKey * @@ -163,7 +163,7 @@ class ConfigurationController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/configuration/setConfiguration + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/configuration/setConfiguration * * Update the configuration. * diff --git a/app/Api/V1/Controllers/System/CronController.php b/app/Api/V1/Controllers/System/CronController.php index c76a39c097..23e129ec81 100644 --- a/app/Api/V1/Controllers/System/CronController.php +++ b/app/Api/V1/Controllers/System/CronController.php @@ -38,7 +38,7 @@ class CronController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/about/getCron + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/about/getCron * * @param CronRequest $request * @param string $token diff --git a/app/Api/V1/Controllers/System/UserController.php b/app/Api/V1/Controllers/System/UserController.php index 85bc1c10b8..dbb744a92e 100644 --- a/app/Api/V1/Controllers/System/UserController.php +++ b/app/Api/V1/Controllers/System/UserController.php @@ -48,7 +48,7 @@ class UserController extends Controller /** * UserController constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -64,7 +64,7 @@ class UserController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/users/deleteUser + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/users/deleteUser * * Remove the specified resource from storage. * @@ -72,7 +72,7 @@ class UserController extends Controller * * @return JsonResponse * @throws FireflyException - * @codeCoverageIgnore + */ public function destroy(User $user): JsonResponse { @@ -92,13 +92,13 @@ class UserController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/users/listUser + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/users/listUser * * Display a listing of the resource. * * @return JsonResponse * @throws FireflyException - * @codeCoverageIgnore + */ public function index(): JsonResponse { @@ -128,14 +128,14 @@ class UserController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/users/getUser + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/users/getUser * * Show a single user. * * @param User $user * * @return JsonResponse - * @codeCoverageIgnore + */ public function show(User $user): JsonResponse { @@ -153,7 +153,7 @@ class UserController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/users/storeUser + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/users/storeUser * * Store a new user. * @@ -180,7 +180,7 @@ class UserController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/users/updateUser + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/users/updateUser * * Update a user. * diff --git a/app/Api/V1/Controllers/User/PreferencesController.php b/app/Api/V1/Controllers/User/PreferencesController.php index 4baf172ba3..d49e2cd752 100644 --- a/app/Api/V1/Controllers/User/PreferencesController.php +++ b/app/Api/V1/Controllers/User/PreferencesController.php @@ -46,13 +46,13 @@ class PreferencesController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/preferences/listPreference + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/preferences/listPreference * * List all of them. * * @return JsonResponse * @throws FireflyException - * @codeCoverageIgnore + */ public function index(): JsonResponse { @@ -78,14 +78,14 @@ class PreferencesController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/preferences/getPreference + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/preferences/getPreference * * Return a single preference by name. * * @param Preference $preference * * @return JsonResponse - * @codeCoverageIgnore + */ public function show(Preference $preference): JsonResponse { @@ -101,7 +101,7 @@ class PreferencesController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/preferences/storePreference + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/preferences/storePreference * * @param PreferenceStoreRequest $request * @@ -125,7 +125,7 @@ class PreferencesController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/preferences/updatePreference + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/preferences/updatePreference * * @param PreferenceUpdateRequest $request * @param Preference $preference diff --git a/app/Api/V1/Controllers/Webhook/AttemptController.php b/app/Api/V1/Controllers/Webhook/AttemptController.php index e8efa205a6..2e856bb105 100644 --- a/app/Api/V1/Controllers/Webhook/AttemptController.php +++ b/app/Api/V1/Controllers/Webhook/AttemptController.php @@ -45,7 +45,7 @@ class AttemptController extends Controller private WebhookRepositoryInterface $repository; /** - * @codeCoverageIgnore + */ public function __construct() { @@ -62,7 +62,7 @@ class AttemptController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/webhooks/getWebhookMessageAttempts + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/webhooks/getWebhookMessageAttempts * * @param Webhook $webhook * @param WebhookMessage $message @@ -98,7 +98,7 @@ class AttemptController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/webhooks/getSingleWebhookMessageAttempt + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/webhooks/getSingleWebhookMessageAttempt * * Show single instance. * diff --git a/app/Api/V1/Controllers/Webhook/DestroyController.php b/app/Api/V1/Controllers/Webhook/DestroyController.php index c89d79e9ec..b7db2796ec 100644 --- a/app/Api/V1/Controllers/Webhook/DestroyController.php +++ b/app/Api/V1/Controllers/Webhook/DestroyController.php @@ -40,7 +40,7 @@ class DestroyController extends Controller private WebhookRepositoryInterface $repository; /** - * @codeCoverageIgnore + */ public function __construct() { @@ -57,14 +57,14 @@ class DestroyController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/webhooks/deleteWebhook + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/webhooks/deleteWebhook * * Remove the specified resource from storage. * * @param Webhook $webhook * * @return JsonResponse - * @codeCoverageIgnore + */ public function destroy(Webhook $webhook): JsonResponse { @@ -76,7 +76,7 @@ class DestroyController extends Controller /** * This webhook is documented at: - * https://api-docs.firefly-iii.org/#/webhooks/deleteWebhookMessageAttempt + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/webhooks/deleteWebhookMessageAttempt * * Remove the specified resource from storage. * @@ -86,7 +86,7 @@ class DestroyController extends Controller * * @return JsonResponse * @throws FireflyException - * @codeCoverageIgnore + */ public function destroyAttempt(Webhook $webhook, WebhookMessage $message, WebhookAttempt $attempt): JsonResponse { @@ -105,7 +105,7 @@ class DestroyController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/webhooks/deleteWebhookMessage + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/webhooks/deleteWebhookMessage * * Remove the specified resource from storage. * @@ -114,7 +114,7 @@ class DestroyController extends Controller * * @return JsonResponse * @throws FireflyException - * @codeCoverageIgnore + */ public function destroyMessage(Webhook $webhook, WebhookMessage $message): JsonResponse { diff --git a/app/Api/V1/Controllers/Webhook/MessageController.php b/app/Api/V1/Controllers/Webhook/MessageController.php index 6ec715ef5c..d94a936c4f 100644 --- a/app/Api/V1/Controllers/Webhook/MessageController.php +++ b/app/Api/V1/Controllers/Webhook/MessageController.php @@ -41,7 +41,7 @@ class MessageController extends Controller private WebhookRepositoryInterface $repository; /** - * @codeCoverageIgnore + */ public function __construct() { @@ -58,7 +58,7 @@ class MessageController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/webhooks/getWebhookMessages + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/webhooks/getWebhookMessages * * @param Webhook $webhook * @@ -90,7 +90,7 @@ class MessageController extends Controller /** * This endpoint is documented: - * https://api-docs.firefly-iii.org/#/webhooks/getSingleWebhookMessage + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/webhooks/getSingleWebhookMessage * * Show single instance. * diff --git a/app/Api/V1/Controllers/Webhook/ShowController.php b/app/Api/V1/Controllers/Webhook/ShowController.php index 57cd0d6f24..1a6f43db10 100644 --- a/app/Api/V1/Controllers/Webhook/ShowController.php +++ b/app/Api/V1/Controllers/Webhook/ShowController.php @@ -49,7 +49,7 @@ class ShowController extends Controller private WebhookRepositoryInterface $repository; /** - * @codeCoverageIgnore + */ public function __construct() { @@ -66,13 +66,13 @@ class ShowController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/webhooks/listWebhook + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/webhooks/listWebhook * * Display a listing of the webhooks of the user. * * @return JsonResponse * @throws FireflyException - * @codeCoverageIgnore + */ public function index(): JsonResponse { @@ -98,7 +98,7 @@ class ShowController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/webhooks/getWebhook + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/webhooks/getWebhook * * Show single instance. * @@ -120,7 +120,7 @@ class ShowController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/webhooks/triggerWebhookTransaction + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/webhooks/triggerWebhookTransaction * * This method recycles part of the code of the StoredGroupEventHandler. * diff --git a/app/Api/V1/Controllers/Webhook/StoreController.php b/app/Api/V1/Controllers/Webhook/StoreController.php index 057e1a8c25..e7043815e7 100644 --- a/app/Api/V1/Controllers/Webhook/StoreController.php +++ b/app/Api/V1/Controllers/Webhook/StoreController.php @@ -39,7 +39,7 @@ class StoreController extends Controller private WebhookRepositoryInterface $repository; /** - * @codeCoverageIgnore + */ public function __construct() { @@ -56,7 +56,7 @@ class StoreController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/webhooks/storeWebhook + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/webhooks/storeWebhook * * @param CreateRequest $request * diff --git a/app/Api/V1/Controllers/Webhook/SubmitController.php b/app/Api/V1/Controllers/Webhook/SubmitController.php index 8c5cd1b391..75490362e0 100644 --- a/app/Api/V1/Controllers/Webhook/SubmitController.php +++ b/app/Api/V1/Controllers/Webhook/SubmitController.php @@ -37,7 +37,7 @@ class SubmitController extends Controller private WebhookRepositoryInterface $repository; /** - * @codeCoverageIgnore + */ public function __construct() { @@ -54,12 +54,12 @@ class SubmitController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/webhooks/submitWebook + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/webhooks/submitWebook * * @param Webhook $webhook * * @return JsonResponse - * @codeCoverageIgnore + */ public function submit(Webhook $webhook): JsonResponse { diff --git a/app/Api/V1/Controllers/Webhook/UpdateController.php b/app/Api/V1/Controllers/Webhook/UpdateController.php index 54b9f850d0..0189ac3f35 100644 --- a/app/Api/V1/Controllers/Webhook/UpdateController.php +++ b/app/Api/V1/Controllers/Webhook/UpdateController.php @@ -39,7 +39,7 @@ class UpdateController extends Controller private WebhookRepositoryInterface $repository; /** - * @codeCoverageIgnore + */ public function __construct() { @@ -56,7 +56,7 @@ class UpdateController extends Controller /** * This endpoint is documented at: - * https://api-docs.firefly-iii.org/#/webhooks/updateWebhook + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/webhooks/updateWebhook * * @param Webhook $webhook * @param UpdateRequest $request diff --git a/app/Api/V1/Requests/Insight/GenericRequest.php b/app/Api/V1/Requests/Insight/GenericRequest.php index 3e9f3b255e..0eb22bc584 100644 --- a/app/Api/V1/Requests/Insight/GenericRequest.php +++ b/app/Api/V1/Requests/Insight/GenericRequest.php @@ -297,7 +297,7 @@ class GenericRequest extends FormRequest */ public function rules(): array { - // this is cheating but it works to initialize the collections. + // this is cheating, but it works to initialize the collections. $this->accounts = new Collection(); $this->budgets = new Collection(); $this->categories = new Collection(); @@ -306,7 +306,7 @@ class GenericRequest extends FormRequest return [ 'start' => 'required|date', - 'end' => 'required|date|after:start', + 'end' => 'required|date|after_or_equal:start', ]; } } diff --git a/app/Api/V1/Requests/Models/Account/StoreRequest.php b/app/Api/V1/Requests/Models/Account/StoreRequest.php index a1bfff913d..cdaa7e28b7 100644 --- a/app/Api/V1/Requests/Models/Account/StoreRequest.php +++ b/app/Api/V1/Requests/Models/Account/StoreRequest.php @@ -36,7 +36,7 @@ use Illuminate\Foundation\Http\FormRequest; /** * Class StoreRequest * - * @codeCoverageIgnore + */ class StoreRequest extends FormRequest { diff --git a/app/Api/V1/Requests/Models/Account/UpdateRequest.php b/app/Api/V1/Requests/Models/Account/UpdateRequest.php index aabec9fc15..dd2058e119 100644 --- a/app/Api/V1/Requests/Models/Account/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/Account/UpdateRequest.php @@ -38,7 +38,7 @@ use Log; /** * Class UpdateRequest * - * @codeCoverageIgnore + */ class UpdateRequest extends FormRequest { diff --git a/app/Api/V1/Requests/Models/Attachment/StoreRequest.php b/app/Api/V1/Requests/Models/Attachment/StoreRequest.php index cfd78e9291..565c8a4cd4 100644 --- a/app/Api/V1/Requests/Models/Attachment/StoreRequest.php +++ b/app/Api/V1/Requests/Models/Attachment/StoreRequest.php @@ -31,7 +31,7 @@ use Illuminate\Foundation\Http\FormRequest; /** * Class StoreRequest * - * @codeCoverageIgnore + */ class StoreRequest extends FormRequest { diff --git a/app/Api/V1/Requests/Models/Attachment/UpdateRequest.php b/app/Api/V1/Requests/Models/Attachment/UpdateRequest.php index d3d50b5811..854a156df4 100644 --- a/app/Api/V1/Requests/Models/Attachment/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/Attachment/UpdateRequest.php @@ -31,7 +31,7 @@ use Illuminate\Foundation\Http\FormRequest; /** * Class UpdateRequest * - * @codeCoverageIgnore + */ class UpdateRequest extends FormRequest { diff --git a/app/Api/V1/Requests/Models/AvailableBudget/Request.php b/app/Api/V1/Requests/Models/AvailableBudget/Request.php index 3e7fcb126a..b839f0b26c 100644 --- a/app/Api/V1/Requests/Models/AvailableBudget/Request.php +++ b/app/Api/V1/Requests/Models/AvailableBudget/Request.php @@ -32,7 +32,7 @@ use Illuminate\Validation\Validator; /** * Class Request * - * @codeCoverageIgnore + */ class Request extends FormRequest { diff --git a/app/Api/V1/Requests/Models/Bill/StoreRequest.php b/app/Api/V1/Requests/Models/Bill/StoreRequest.php index deb73635c0..15d6e401ac 100644 --- a/app/Api/V1/Requests/Models/Bill/StoreRequest.php +++ b/app/Api/V1/Requests/Models/Bill/StoreRequest.php @@ -34,7 +34,7 @@ use Log; /** * Class StoreRequest * - * @codeCoverageIgnore + */ class StoreRequest extends FormRequest { diff --git a/app/Api/V1/Requests/Models/Bill/UpdateRequest.php b/app/Api/V1/Requests/Models/Bill/UpdateRequest.php index 26de59a084..482fe68a00 100644 --- a/app/Api/V1/Requests/Models/Bill/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/Bill/UpdateRequest.php @@ -34,7 +34,7 @@ use Illuminate\Validation\Validator; /** * Class UpdateRequest * - * @codeCoverageIgnore + */ class UpdateRequest extends FormRequest { diff --git a/app/Api/V1/Requests/Models/Budget/StoreRequest.php b/app/Api/V1/Requests/Models/Budget/StoreRequest.php index c5344bb8b7..4ab222f327 100644 --- a/app/Api/V1/Requests/Models/Budget/StoreRequest.php +++ b/app/Api/V1/Requests/Models/Budget/StoreRequest.php @@ -33,7 +33,7 @@ use Illuminate\Validation\Validator; /** * Class StoreRequest * - * @codeCoverageIgnore + */ class StoreRequest extends FormRequest { diff --git a/app/Api/V1/Requests/Models/Budget/UpdateRequest.php b/app/Api/V1/Requests/Models/Budget/UpdateRequest.php index 46550b434e..ea584488ee 100644 --- a/app/Api/V1/Requests/Models/Budget/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/Budget/UpdateRequest.php @@ -34,7 +34,7 @@ use Illuminate\Validation\Validator; /** * Class UpdateRequest * - * @codeCoverageIgnore + */ class UpdateRequest extends FormRequest { diff --git a/app/Api/V1/Requests/Models/BudgetLimit/StoreRequest.php b/app/Api/V1/Requests/Models/BudgetLimit/StoreRequest.php index 247697e707..b3a1c30ae4 100644 --- a/app/Api/V1/Requests/Models/BudgetLimit/StoreRequest.php +++ b/app/Api/V1/Requests/Models/BudgetLimit/StoreRequest.php @@ -30,7 +30,7 @@ use Illuminate\Foundation\Http\FormRequest; /** * Class StoreRequest * - * @codeCoverageIgnore + */ class StoreRequest extends FormRequest { diff --git a/app/Api/V1/Requests/Models/BudgetLimit/UpdateRequest.php b/app/Api/V1/Requests/Models/BudgetLimit/UpdateRequest.php index 02aab4659d..552ecb8201 100644 --- a/app/Api/V1/Requests/Models/BudgetLimit/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/BudgetLimit/UpdateRequest.php @@ -32,7 +32,7 @@ use Illuminate\Validation\Validator; /** * Class UpdateRequest * - * @codeCoverageIgnore + */ class UpdateRequest extends FormRequest { diff --git a/app/Api/V1/Requests/Models/Category/StoreRequest.php b/app/Api/V1/Requests/Models/Category/StoreRequest.php index 8a5512f2f3..5bff239013 100644 --- a/app/Api/V1/Requests/Models/Category/StoreRequest.php +++ b/app/Api/V1/Requests/Models/Category/StoreRequest.php @@ -31,7 +31,7 @@ use Illuminate\Foundation\Http\FormRequest; /** * Class StoreRequest * - * @codeCoverageIgnore + */ class StoreRequest extends FormRequest { diff --git a/app/Api/V1/Requests/Models/Category/UpdateRequest.php b/app/Api/V1/Requests/Models/Category/UpdateRequest.php index 25d3e3d86f..aaaf9bfde1 100644 --- a/app/Api/V1/Requests/Models/Category/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/Category/UpdateRequest.php @@ -31,7 +31,7 @@ use Illuminate\Foundation\Http\FormRequest; /** * Class UpdateRequest * - * @codeCoverageIgnore + */ class UpdateRequest extends FormRequest { diff --git a/app/Api/V1/Requests/Models/ObjectGroup/UpdateRequest.php b/app/Api/V1/Requests/Models/ObjectGroup/UpdateRequest.php index 1303cf21f1..9ea7f8dbf0 100644 --- a/app/Api/V1/Requests/Models/ObjectGroup/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/ObjectGroup/UpdateRequest.php @@ -32,7 +32,7 @@ use Illuminate\Foundation\Http\FormRequest; /** * Class UpdateRequest * - * @codeCoverageIgnore + */ class UpdateRequest extends FormRequest { diff --git a/app/Api/V1/Requests/Models/PiggyBank/StoreRequest.php b/app/Api/V1/Requests/Models/PiggyBank/StoreRequest.php index c7fe30e6ea..d737a7e00e 100644 --- a/app/Api/V1/Requests/Models/PiggyBank/StoreRequest.php +++ b/app/Api/V1/Requests/Models/PiggyBank/StoreRequest.php @@ -30,7 +30,7 @@ use Illuminate\Foundation\Http\FormRequest; /** * Class StoreRequest * - * @codeCoverageIgnore + */ class StoreRequest extends FormRequest { diff --git a/app/Api/V1/Requests/Models/PiggyBank/UpdateRequest.php b/app/Api/V1/Requests/Models/PiggyBank/UpdateRequest.php index 14af9dd6ae..f5f2b6b096 100644 --- a/app/Api/V1/Requests/Models/PiggyBank/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/PiggyBank/UpdateRequest.php @@ -33,7 +33,7 @@ use Illuminate\Foundation\Http\FormRequest; /** * Class UpdateRequest * - * @codeCoverageIgnore + */ class UpdateRequest extends FormRequest { diff --git a/app/Api/V1/Requests/Models/RuleGroup/StoreRequest.php b/app/Api/V1/Requests/Models/RuleGroup/StoreRequest.php index de4a99f7fc..63e42dd273 100644 --- a/app/Api/V1/Requests/Models/RuleGroup/StoreRequest.php +++ b/app/Api/V1/Requests/Models/RuleGroup/StoreRequest.php @@ -29,7 +29,7 @@ use FireflyIII\Support\Request\ConvertsDataTypes; use Illuminate\Foundation\Http\FormRequest; /** - * @codeCoverageIgnore + * Class StoreRequest */ class StoreRequest extends FormRequest diff --git a/app/Api/V1/Requests/Models/RuleGroup/UpdateRequest.php b/app/Api/V1/Requests/Models/RuleGroup/UpdateRequest.php index 3d354e475a..53356b15f2 100644 --- a/app/Api/V1/Requests/Models/RuleGroup/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/RuleGroup/UpdateRequest.php @@ -30,7 +30,7 @@ use FireflyIII\Support\Request\ConvertsDataTypes; use Illuminate\Foundation\Http\FormRequest; /** - * @codeCoverageIgnore + * Class UpdateRequest */ class UpdateRequest extends FormRequest diff --git a/app/Api/V1/Requests/Models/Tag/StoreRequest.php b/app/Api/V1/Requests/Models/Tag/StoreRequest.php index a1e4c82af1..2717114b0b 100644 --- a/app/Api/V1/Requests/Models/Tag/StoreRequest.php +++ b/app/Api/V1/Requests/Models/Tag/StoreRequest.php @@ -32,7 +32,7 @@ use Illuminate\Foundation\Http\FormRequest; /** * Class StoreRequest * - * @codeCoverageIgnore + */ class StoreRequest extends FormRequest { diff --git a/app/Api/V1/Requests/Models/Tag/UpdateRequest.php b/app/Api/V1/Requests/Models/Tag/UpdateRequest.php index a5e2e059d7..c63bebdc87 100644 --- a/app/Api/V1/Requests/Models/Tag/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/Tag/UpdateRequest.php @@ -34,7 +34,7 @@ use Illuminate\Foundation\Http\FormRequest; /** * Class UpdateRequest * - * @codeCoverageIgnore + */ class UpdateRequest extends FormRequest { diff --git a/app/Api/V1/Requests/Models/TransactionCurrency/StoreRequest.php b/app/Api/V1/Requests/Models/TransactionCurrency/StoreRequest.php index f048c336a3..7314acbf27 100644 --- a/app/Api/V1/Requests/Models/TransactionCurrency/StoreRequest.php +++ b/app/Api/V1/Requests/Models/TransactionCurrency/StoreRequest.php @@ -31,7 +31,7 @@ use Illuminate\Foundation\Http\FormRequest; /** * Class StoreRequest * - * @codeCoverageIgnore + */ class StoreRequest extends FormRequest { diff --git a/app/Api/V1/Requests/Models/TransactionCurrency/UpdateRequest.php b/app/Api/V1/Requests/Models/TransactionCurrency/UpdateRequest.php index 5c9b5bfa0f..f9086b99ca 100644 --- a/app/Api/V1/Requests/Models/TransactionCurrency/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/TransactionCurrency/UpdateRequest.php @@ -32,7 +32,7 @@ use Illuminate\Foundation\Http\FormRequest; /** * Class UpdateRequest * - * @codeCoverageIgnore + */ class UpdateRequest extends FormRequest { diff --git a/app/Api/V1/Requests/Models/TransactionLinkType/StoreRequest.php b/app/Api/V1/Requests/Models/TransactionLinkType/StoreRequest.php index 3cd392ed30..4d819b3740 100644 --- a/app/Api/V1/Requests/Models/TransactionLinkType/StoreRequest.php +++ b/app/Api/V1/Requests/Models/TransactionLinkType/StoreRequest.php @@ -30,7 +30,7 @@ use Illuminate\Foundation\Http\FormRequest; /** * Class StoreRequest * - * @codeCoverageIgnore + */ class StoreRequest extends FormRequest { diff --git a/app/Api/V1/Requests/Models/TransactionLinkType/UpdateRequest.php b/app/Api/V1/Requests/Models/TransactionLinkType/UpdateRequest.php index 5f4aaa79f0..d2ca921c43 100644 --- a/app/Api/V1/Requests/Models/TransactionLinkType/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/TransactionLinkType/UpdateRequest.php @@ -32,7 +32,7 @@ use Illuminate\Validation\Rule; /** * Class UpdateRequest * - * @codeCoverageIgnore + */ class UpdateRequest extends FormRequest { diff --git a/app/Api/V1/Requests/System/CronRequest.php b/app/Api/V1/Requests/System/CronRequest.php index 499f7ce6da..550c0c1033 100644 --- a/app/Api/V1/Requests/System/CronRequest.php +++ b/app/Api/V1/Requests/System/CronRequest.php @@ -31,7 +31,7 @@ use Illuminate\Foundation\Http\FormRequest; /** * Class CronRequest * - * @codeCoverageIgnore + */ class CronRequest extends FormRequest { diff --git a/app/Api/V1/Requests/System/UpdateRequest.php b/app/Api/V1/Requests/System/UpdateRequest.php index d5be18248c..5c6c59fe07 100644 --- a/app/Api/V1/Requests/System/UpdateRequest.php +++ b/app/Api/V1/Requests/System/UpdateRequest.php @@ -32,7 +32,7 @@ use Illuminate\Foundation\Http\FormRequest; /** * Class UpdateRequest * - * @codeCoverageIgnore + */ class UpdateRequest extends FormRequest { diff --git a/app/Api/V2/Controllers/Chart/AccountController.php b/app/Api/V2/Controllers/Chart/AccountController.php index a9e396cc68..95ab24c5d4 100644 --- a/app/Api/V2/Controllers/Chart/AccountController.php +++ b/app/Api/V2/Controllers/Chart/AccountController.php @@ -47,6 +47,7 @@ class AccountController extends Controller */ public function __construct() { + parent::__construct(); $this->middleware( function ($request, $next) { $this->repository = app(AccountRepositoryInterface::class); @@ -56,6 +57,9 @@ class AccountController extends Controller } /** + * This endpoint is documented at + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v2)#/charts/getChartAccountOverview + * * @param DateRequest $request * @return JsonResponse */ diff --git a/app/Api/V2/Controllers/Controller.php b/app/Api/V2/Controllers/Controller.php index d7a57e4c26..d34d2c3c0b 100644 --- a/app/Api/V2/Controllers/Controller.php +++ b/app/Api/V2/Controllers/Controller.php @@ -92,6 +92,7 @@ class Controller extends BaseController // some date fields: foreach ($dates as $field) { + $date = null; try { $date = request()->query->get($field); } catch (BadRequestException $e) { diff --git a/app/Api/V2/Controllers/Model/Account/ShowController.php b/app/Api/V2/Controllers/Model/Account/ShowController.php index 8755071334..d197005add 100644 --- a/app/Api/V2/Controllers/Model/Account/ShowController.php +++ b/app/Api/V2/Controllers/Model/Account/ShowController.php @@ -36,6 +36,7 @@ use Illuminate\Http\Request; class ShowController extends Controller { /** + * TODO this endpoint is not yet reachable. * @param Account $account * @return JsonResponse */ diff --git a/app/Api/V2/Controllers/Model/Bill/SumController.php b/app/Api/V2/Controllers/Model/Bill/SumController.php index ebb486953f..eacb1513d7 100644 --- a/app/Api/V2/Controllers/Model/Bill/SumController.php +++ b/app/Api/V2/Controllers/Model/Bill/SumController.php @@ -44,6 +44,7 @@ class SumController extends Controller */ public function __construct() { + parent::__construct(); $this->middleware( function ($request, $next) { $this->repository = app(BillRepositoryInterface::class); @@ -53,6 +54,9 @@ class SumController extends Controller } /** + * This endpoint is documented at: + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v2)#/transactions-sum/getBillsPaidTrSum + * * @param DateRequest $request * @return JsonResponse */ @@ -67,6 +71,9 @@ class SumController extends Controller } /** + * This endpoint is documented at: + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v2)#/transactions-sum/getBillsUnpaidTrSum + * * @param DateRequest $request * @return JsonResponse */ diff --git a/app/Api/V2/Controllers/Model/Budget/ListController.php b/app/Api/V2/Controllers/Model/Budget/ListController.php index 1e1c0ac56c..b3f0cf53d1 100644 --- a/app/Api/V2/Controllers/Model/Budget/ListController.php +++ b/app/Api/V2/Controllers/Model/Budget/ListController.php @@ -47,6 +47,10 @@ class ListController extends Controller } /** + * This endpoint is documented at: + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v2)#/budgets/listBudgets + * + * @param Request $request * @return JsonResponse */ public function index(Request $request): JsonResponse diff --git a/app/Api/V2/Controllers/Model/Budget/ShowController.php b/app/Api/V2/Controllers/Model/Budget/ShowController.php new file mode 100644 index 0000000000..3dfa41460f --- /dev/null +++ b/app/Api/V2/Controllers/Model/Budget/ShowController.php @@ -0,0 +1,87 @@ +. + */ + +namespace FireflyIII\Api\V2\Controllers\Model\Budget; + +use FireflyIII\Api\V2\Controllers\Controller; +use FireflyIII\Api\V2\Request\Generic\DateRequest; +use FireflyIII\Models\Budget; +use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; +use FireflyIII\Support\Http\Api\ConvertsExchangeRates; +use Illuminate\Http\JsonResponse; + +/** + * Class ShowController + */ +class ShowController extends Controller +{ + use ConvertsExchangeRates; + + private BudgetRepositoryInterface $repository; + + /** + * + */ + public function __construct() + { + parent::__construct(); + $this->middleware( + function ($request, $next) { + $this->repository = app(BudgetRepositoryInterface::class); + return $next($request); + } + ); + } + + /** + * This endpoint is documented at: + * TODO add URL + * + * @param DateRequest $request + * @return JsonResponse + */ + public function budgeted(DateRequest $request, Budget $budget): JsonResponse + { + $data = $request->getAll(); + $result = $this->repository->budgetedInPeriodForBudget($budget, $data['start'], $data['end']); + $converted = $this->cerSum(array_values($result)); + + return response()->json($converted); + } + + /** + * This endpoint is documented at: + * TODO add URL + * + * @param DateRequest $request + * @return JsonResponse + */ + public function spent(DateRequest $request, Budget $budget): JsonResponse + { + $data = $request->getAll(); + $result = $this->repository->spentInPeriodForBudget($budget, $data['start'], $data['end']); + $converted = $this->cerSum(array_values($result)); + + return response()->json($converted); + } +} diff --git a/app/Api/V2/Controllers/Model/Budget/SumController.php b/app/Api/V2/Controllers/Model/Budget/SumController.php index ebd2f71591..9f7b34dd56 100644 --- a/app/Api/V2/Controllers/Model/Budget/SumController.php +++ b/app/Api/V2/Controllers/Model/Budget/SumController.php @@ -44,6 +44,7 @@ class SumController extends Controller */ public function __construct() { + parent::__construct(); $this->middleware( function ($request, $next) { $this->repository = app(BudgetRepositoryInterface::class); @@ -53,6 +54,9 @@ class SumController extends Controller } /** + * This endpoint is documented at: + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v2)#/budgets/getBudgetedForBudget + * * @param DateRequest $request * @return JsonResponse */ @@ -66,6 +70,8 @@ class SumController extends Controller } /** + * This endpoint is documented at: + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v2)#/budgets/getSpentForBudget * @param DateRequest $request * @return JsonResponse */ diff --git a/app/Api/V2/Controllers/Model/BudgetLimit/ListController.php b/app/Api/V2/Controllers/Model/BudgetLimit/ListController.php index 2c4732671e..35f1de3479 100644 --- a/app/Api/V2/Controllers/Model/BudgetLimit/ListController.php +++ b/app/Api/V2/Controllers/Model/BudgetLimit/ListController.php @@ -48,6 +48,8 @@ class ListController extends Controller } /** + * This endpoint is documented at: + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v2)#/budgets/listBudgetLimitByBudget * @return JsonResponse */ public function index(DateRequest $request, Budget $budget): JsonResponse diff --git a/app/Api/V2/Controllers/NetWorthController.php b/app/Api/V2/Controllers/NetWorthController.php index f4e1730be0..1ea52301c4 100644 --- a/app/Api/V2/Controllers/NetWorthController.php +++ b/app/Api/V2/Controllers/NetWorthController.php @@ -55,6 +55,8 @@ class NetWorthController extends Controller } /** + * This endpoint is documented at: + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v2)#/net-worth/getNetWorth * @param SingleDateRequest $request * @return JsonResponse */ diff --git a/app/Api/V2/Controllers/System/PreferencesController.php b/app/Api/V2/Controllers/System/PreferencesController.php index cd3ac6bd31..46b11a1a81 100644 --- a/app/Api/V2/Controllers/System/PreferencesController.php +++ b/app/Api/V2/Controllers/System/PreferencesController.php @@ -35,6 +35,8 @@ use Illuminate\Http\JsonResponse; class PreferencesController extends Controller { /** + * This endpoint is documented at: + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v2)#/preferences/getPreference * @param Preference $preference * @return JsonResponse */ diff --git a/app/Api/V2/Controllers/Transaction/List/AccountController.php b/app/Api/V2/Controllers/Transaction/List/AccountController.php index 07d6d126d6..b85f88b4ac 100644 --- a/app/Api/V2/Controllers/Transaction/List/AccountController.php +++ b/app/Api/V2/Controllers/Transaction/List/AccountController.php @@ -41,6 +41,9 @@ class AccountController extends Controller use TransactionFilter; /** + * This endpoint is documented at: + * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v2)#/accounts/listTransactionByAccount + * * @param ListRequest $request * @param Account $account * @return JsonResponse diff --git a/app/Console/Commands/Correction/CorrectDatabase.php b/app/Console/Commands/Correction/CorrectDatabase.php index 0696987b9c..1d34acd1be 100644 --- a/app/Console/Commands/Correction/CorrectDatabase.php +++ b/app/Console/Commands/Correction/CorrectDatabase.php @@ -30,7 +30,7 @@ use Schema; /** * Class CorrectDatabase * - * @codeCoverageIgnore + */ class CorrectDatabase extends Command { diff --git a/app/Console/Commands/Correction/FixAccountOrder.php b/app/Console/Commands/Correction/FixAccountOrder.php index f5df607411..b2b214e7f8 100644 --- a/app/Console/Commands/Correction/FixAccountOrder.php +++ b/app/Console/Commands/Correction/FixAccountOrder.php @@ -74,7 +74,7 @@ class FixAccountOrder extends Command * executed. This leads to noticeable slow-downs and class calls. To prevent this, this method should * be called from the handle method instead of using the constructor to initialize the command. * - * @codeCoverageIgnore + */ private function stupidLaravel(): void { diff --git a/app/Console/Commands/Correction/FixAccountTypes.php b/app/Console/Commands/Correction/FixAccountTypes.php index e3da62893d..cbc369391b 100644 --- a/app/Console/Commands/Correction/FixAccountTypes.php +++ b/app/Console/Commands/Correction/FixAccountTypes.php @@ -91,7 +91,7 @@ class FixAccountTypes extends Command * executed. This leads to noticeable slow-downs and class calls. To prevent this, this method should * be called from the handle method instead of using the constructor to initialize the command. * - * @codeCoverageIgnore + */ private function stupidLaravel(): void { diff --git a/app/Console/Commands/Correction/FixRecurringTransactions.php b/app/Console/Commands/Correction/FixRecurringTransactions.php index 58329f08d6..99e1a08b18 100644 --- a/app/Console/Commands/Correction/FixRecurringTransactions.php +++ b/app/Console/Commands/Correction/FixRecurringTransactions.php @@ -75,7 +75,7 @@ class FixRecurringTransactions extends Command * executed. This leads to noticeable slow-downs and class calls. To prevent this, this method should * be called from the handle method instead of using the constructor to initialize the command. * - * @codeCoverageIgnore + */ private function stupidLaravel(): void { diff --git a/app/Console/Commands/CreateFirstUser.php b/app/Console/Commands/CreateFirstUser.php index 427ef53727..5f8d5152a5 100644 --- a/app/Console/Commands/CreateFirstUser.php +++ b/app/Console/Commands/CreateFirstUser.php @@ -92,7 +92,7 @@ class CreateFirstUser extends Command * executed. This leads to noticeable slow-downs and class calls. To prevent this, this method should * be called from the handle method instead of using the constructor to initialize the command. * - * @codeCoverageIgnore + */ private function stupidLaravel(): void { diff --git a/app/Console/Commands/Export/ExportData.php b/app/Console/Commands/Export/ExportData.php index 3fbc54d3a2..6aac72da36 100644 --- a/app/Console/Commands/Export/ExportData.php +++ b/app/Console/Commands/Export/ExportData.php @@ -143,7 +143,7 @@ class ExportData extends Command * executed. This leads to noticeable slow-downs and class calls. To prevent this, this method should * be called from the handle method instead of using the constructor to initialize the command. * - * @codeCoverageIgnore + */ private function stupidLaravel(): void { diff --git a/app/Console/Commands/Integrity/ReportIntegrity.php b/app/Console/Commands/Integrity/ReportIntegrity.php index e9bc2dbfa2..42d1459b84 100644 --- a/app/Console/Commands/Integrity/ReportIntegrity.php +++ b/app/Console/Commands/Integrity/ReportIntegrity.php @@ -30,7 +30,7 @@ use Schema; /** * Class ReportIntegrity * - * @codeCoverageIgnore + */ class ReportIntegrity extends Command { diff --git a/app/Console/Commands/ScanAttachments.php b/app/Console/Commands/ScanAttachments.php index 0ffc35747e..4df28bf92b 100644 --- a/app/Console/Commands/ScanAttachments.php +++ b/app/Console/Commands/ScanAttachments.php @@ -33,7 +33,7 @@ use Storage; /** * Class ScanAttachments. * - * @codeCoverageIgnore + */ class ScanAttachments extends Command { diff --git a/app/Console/Commands/Tools/ApplyRules.php b/app/Console/Commands/Tools/ApplyRules.php index b0ac460f7e..88e706daf3 100644 --- a/app/Console/Commands/Tools/ApplyRules.php +++ b/app/Console/Commands/Tools/ApplyRules.php @@ -156,7 +156,7 @@ class ApplyRules extends Command * executed. This leads to noticeable slow-downs and class calls. To prevent this, this method should * be called from the handle method instead of using the constructor to initialize the command. * - * @codeCoverageIgnore + */ private function stupidLaravel(): void { diff --git a/app/Console/Commands/Tools/Cron.php b/app/Console/Commands/Tools/Cron.php index 9b7269e90b..d8cfaa2919 100644 --- a/app/Console/Commands/Tools/Cron.php +++ b/app/Console/Commands/Tools/Cron.php @@ -37,7 +37,7 @@ use Log; /** * Class Cron * - * @codeCoverageIgnore + */ class Cron extends Command { diff --git a/app/Console/Commands/Upgrade/AccountCurrencies.php b/app/Console/Commands/Upgrade/AccountCurrencies.php index 8734353548..b3addddfcb 100644 --- a/app/Console/Commands/Upgrade/AccountCurrencies.php +++ b/app/Console/Commands/Upgrade/AccountCurrencies.php @@ -99,7 +99,7 @@ class AccountCurrencies extends Command * executed. This leads to noticeable slow-downs and class calls. To prevent this, this method should * be called from the handle method instead of using the constructor to initialize the command. * - * @codeCoverageIgnore + */ private function stupidLaravel(): void { diff --git a/app/Console/Commands/Upgrade/MigrateToGroups.php b/app/Console/Commands/Upgrade/MigrateToGroups.php index 2266b06b96..26b665b416 100644 --- a/app/Console/Commands/Upgrade/MigrateToGroups.php +++ b/app/Console/Commands/Upgrade/MigrateToGroups.php @@ -117,7 +117,7 @@ class MigrateToGroups extends Command * executed. This leads to noticeable slow-downs and class calls. To prevent this, this method should * be called from the handle method instead of using the constructor to initialize the command. * - * @codeCoverageIgnore + */ private function stupidLaravel(): void { diff --git a/app/Console/Commands/Upgrade/MigrateToRules.php b/app/Console/Commands/Upgrade/MigrateToRules.php index fd2c3b41d0..a07e0d312d 100644 --- a/app/Console/Commands/Upgrade/MigrateToRules.php +++ b/app/Console/Commands/Upgrade/MigrateToRules.php @@ -108,7 +108,7 @@ class MigrateToRules extends Command * executed. This leads to noticeable slow-downs and class calls. To prevent this, this method should * be called from the handle method instead of using the constructor to initialize the command. * - * @codeCoverageIgnore + */ private function stupidLaravel(): void { diff --git a/app/Console/Commands/Upgrade/OtherCurrenciesCorrections.php b/app/Console/Commands/Upgrade/OtherCurrenciesCorrections.php index dd3761e175..3e15c73425 100644 --- a/app/Console/Commands/Upgrade/OtherCurrenciesCorrections.php +++ b/app/Console/Commands/Upgrade/OtherCurrenciesCorrections.php @@ -96,7 +96,7 @@ class OtherCurrenciesCorrections extends Command * executed. This leads to noticeable slow-downs and class calls. To prevent this, this method should * be called from the handle method instead of using the constructor to initialize the command. * - * @codeCoverageIgnore + */ private function stupidLaravel(): void { diff --git a/app/Console/Commands/Upgrade/TransactionIdentifier.php b/app/Console/Commands/Upgrade/TransactionIdentifier.php index bb04bb7bb1..de4ec730b8 100644 --- a/app/Console/Commands/Upgrade/TransactionIdentifier.php +++ b/app/Console/Commands/Upgrade/TransactionIdentifier.php @@ -111,7 +111,7 @@ class TransactionIdentifier extends Command * executed. This leads to noticeable slow-downs and class calls. To prevent this, this method should * be called from the handle method instead of using the constructor to initialize the command. * - * @codeCoverageIgnore + */ private function stupidLaravel(): void { diff --git a/app/Console/Commands/Upgrade/TransferCurrenciesCorrections.php b/app/Console/Commands/Upgrade/TransferCurrenciesCorrections.php index 295b8e6e87..8133018813 100644 --- a/app/Console/Commands/Upgrade/TransferCurrenciesCorrections.php +++ b/app/Console/Commands/Upgrade/TransferCurrenciesCorrections.php @@ -110,7 +110,7 @@ class TransferCurrenciesCorrections extends Command * executed. This leads to noticeable slow-downs and class calls. To prevent this, this method should * be called from the handle method instead of using the constructor to initialize the command. * - * @codeCoverageIgnore + */ private function stupidLaravel(): void { @@ -124,7 +124,7 @@ class TransferCurrenciesCorrections extends Command /** * Reset all the class fields for the current transfer. * - * @codeCoverageIgnore + */ private function resetInformation(): void { @@ -238,7 +238,7 @@ class TransferCurrenciesCorrections extends Command * @param TransactionJournal $transfer * * @return bool - * @codeCoverageIgnore + */ private function isSplitJournal(TransactionJournal $transfer): bool { @@ -250,7 +250,7 @@ class TransferCurrenciesCorrections extends Command * * @param TransactionJournal $journal * - * @codeCoverageIgnore + */ private function getSourceInformation(TransactionJournal $journal): void { @@ -263,7 +263,7 @@ class TransferCurrenciesCorrections extends Command * @param TransactionJournal $transfer * * @return Transaction|null - * @codeCoverageIgnore + */ private function getSourceTransaction(TransactionJournal $transfer): ?Transaction { @@ -300,7 +300,7 @@ class TransferCurrenciesCorrections extends Command * * @param TransactionJournal $journal * - * @codeCoverageIgnore + */ private function getDestinationInformation(TransactionJournal $journal): void { @@ -313,7 +313,7 @@ class TransferCurrenciesCorrections extends Command * @param TransactionJournal $transfer * * @return Transaction|null - * @codeCoverageIgnore + */ private function getDestinationTransaction(TransactionJournal $transfer): ?Transaction { @@ -324,7 +324,7 @@ class TransferCurrenciesCorrections extends Command * Is either the source or destination transaction NULL? * * @return bool - * @codeCoverageIgnore + */ private function isEmptyTransactions(): bool { @@ -335,7 +335,7 @@ class TransferCurrenciesCorrections extends Command /** * @return bool - * @codeCoverageIgnore + */ private function isNoCurrencyPresent(): bool { diff --git a/app/Console/Commands/Upgrade/UpgradeDatabase.php b/app/Console/Commands/Upgrade/UpgradeDatabase.php index 3354503394..411276367e 100644 --- a/app/Console/Commands/Upgrade/UpgradeDatabase.php +++ b/app/Console/Commands/Upgrade/UpgradeDatabase.php @@ -31,7 +31,7 @@ use Illuminate\Console\Command; /** * Class UpgradeDatabase * - * @codeCoverageIgnore + */ class UpgradeDatabase extends Command { diff --git a/app/Console/Commands/Upgrade/UpgradeLiabilitiesEight.php b/app/Console/Commands/Upgrade/UpgradeLiabilitiesEight.php index 1233391940..1757c975cc 100644 --- a/app/Console/Commands/Upgrade/UpgradeLiabilitiesEight.php +++ b/app/Console/Commands/Upgrade/UpgradeLiabilitiesEight.php @@ -160,7 +160,7 @@ class UpgradeLiabilitiesEight extends Command /** * @param $account - * @return void + * @return int */ private function deleteTransactions($account): int { @@ -279,9 +279,9 @@ class UpgradeLiabilitiesEight extends Command ->where('transactions.account_id', $account->id) ->where('transaction_journals.transaction_type_id', $openingBalanceType->id) ->first(['transaction_journals.*']); - /** @var Transaction $source */ + /** @var Transaction|null $source */ $source = $openingJournal->transactions()->where('amount', '<', 0)->first(); - /** @var Transaction $dest */ + /** @var Transaction|null $dest */ $dest = $openingJournal->transactions()->where('amount', '>', 0)->first(); if ($source && $dest) { $sourceId = $source->account_id; diff --git a/app/Console/Commands/UpgradeFireflyInstructions.php b/app/Console/Commands/UpgradeFireflyInstructions.php index 06c27d32fa..17f52cc165 100644 --- a/app/Console/Commands/UpgradeFireflyInstructions.php +++ b/app/Console/Commands/UpgradeFireflyInstructions.php @@ -29,7 +29,7 @@ use Illuminate\Console\Command; /** * Class UpgradeFireflyInstructions. * - * @codeCoverageIgnore + */ class UpgradeFireflyInstructions extends Command { diff --git a/app/Console/Commands/VerifiesAccessToken.php b/app/Console/Commands/VerifiesAccessToken.php index 1f209c4329..a9a302a30a 100644 --- a/app/Console/Commands/VerifiesAccessToken.php +++ b/app/Console/Commands/VerifiesAccessToken.php @@ -33,7 +33,7 @@ use Log; * * Verifies user access token for sensitive commands. * - * @codeCoverageIgnore + */ trait VerifiesAccessToken { diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index 53d1d5ef07..b0dda017fe 100644 --- a/app/Console/Kernel.php +++ b/app/Console/Kernel.php @@ -31,7 +31,7 @@ use Log; /** * File to make sure commands work. * - * @codeCoverageIgnore + */ class Kernel extends ConsoleKernel { diff --git a/app/Events/AdminRequestedTestMessage.php b/app/Events/AdminRequestedTestMessage.php index ed83fd47d0..b320518fc0 100644 --- a/app/Events/AdminRequestedTestMessage.php +++ b/app/Events/AdminRequestedTestMessage.php @@ -31,7 +31,7 @@ use Log; /** * Class AdminRequestedTestMessage. * - * @codeCoverageIgnore + */ class AdminRequestedTestMessage extends Event { diff --git a/app/Events/DestroyedTransactionGroup.php b/app/Events/DestroyedTransactionGroup.php index 1b6e8aa4ae..3fee8983c9 100644 --- a/app/Events/DestroyedTransactionGroup.php +++ b/app/Events/DestroyedTransactionGroup.php @@ -31,7 +31,7 @@ use Illuminate\Support\Facades\Log; /** * Class DestroyedTransactionGroup. * - * @codeCoverageIgnore + */ class DestroyedTransactionGroup extends Event { diff --git a/app/Events/Event.php b/app/Events/Event.php index 2ab5509c44..ff329a8c3a 100644 --- a/app/Events/Event.php +++ b/app/Events/Event.php @@ -27,7 +27,7 @@ namespace FireflyIII\Events; /** * Class Event. * - * @codeCoverageIgnore + */ abstract class Event { diff --git a/app/Events/RegisteredUser.php b/app/Events/RegisteredUser.php index 01070ef152..02b4aff53d 100644 --- a/app/Events/RegisteredUser.php +++ b/app/Events/RegisteredUser.php @@ -30,7 +30,7 @@ use Illuminate\Queue\SerializesModels; /** * Class RegisteredUser. * - * @codeCoverageIgnore + */ class RegisteredUser extends Event { diff --git a/app/Events/RequestedNewPassword.php b/app/Events/RequestedNewPassword.php index 17dc3fe6dd..e983fda7bd 100644 --- a/app/Events/RequestedNewPassword.php +++ b/app/Events/RequestedNewPassword.php @@ -30,7 +30,7 @@ use Illuminate\Queue\SerializesModels; /** * Class RequestedNewPassword. * - * @codeCoverageIgnore + */ class RequestedNewPassword extends Event { diff --git a/app/Events/RequestedReportOnJournals.php b/app/Events/RequestedReportOnJournals.php index 93cdf990d1..10e8af5af4 100644 --- a/app/Events/RequestedReportOnJournals.php +++ b/app/Events/RequestedReportOnJournals.php @@ -34,7 +34,7 @@ use Log; /** * Class RequestedReportOnJournals * - * @codeCoverageIgnore + */ class RequestedReportOnJournals { diff --git a/app/Events/RequestedVersionCheckStatus.php b/app/Events/RequestedVersionCheckStatus.php index 2f16f75f01..b4c37c32ac 100644 --- a/app/Events/RequestedVersionCheckStatus.php +++ b/app/Events/RequestedVersionCheckStatus.php @@ -30,7 +30,7 @@ use Illuminate\Queue\SerializesModels; /** * Class RequestedVersionCheckStatus * - * @codeCoverageIgnore + */ class RequestedVersionCheckStatus extends Event { diff --git a/app/Events/StoredTransactionGroup.php b/app/Events/StoredTransactionGroup.php index 147b56f68e..d399253077 100644 --- a/app/Events/StoredTransactionGroup.php +++ b/app/Events/StoredTransactionGroup.php @@ -30,7 +30,7 @@ use Illuminate\Queue\SerializesModels; /** * Class StoredTransactionGroup. * - * @codeCoverageIgnore + */ class StoredTransactionGroup extends Event { diff --git a/app/Events/UpdatedTransactionGroup.php b/app/Events/UpdatedTransactionGroup.php index ce4e61252e..af7d481bc7 100644 --- a/app/Events/UpdatedTransactionGroup.php +++ b/app/Events/UpdatedTransactionGroup.php @@ -30,7 +30,7 @@ use Illuminate\Queue\SerializesModels; /** * Class UpdatedTransactionGroup. * - * @codeCoverageIgnore + */ class UpdatedTransactionGroup extends Event { diff --git a/app/Events/UserChangedEmail.php b/app/Events/UserChangedEmail.php index 0f2e90428b..3d695fb487 100644 --- a/app/Events/UserChangedEmail.php +++ b/app/Events/UserChangedEmail.php @@ -30,7 +30,7 @@ use Illuminate\Queue\SerializesModels; /** * Class UserChangedEmail. * - * @codeCoverageIgnore + */ class UserChangedEmail extends Event { diff --git a/app/Events/WarnUserAboutBill.php b/app/Events/WarnUserAboutBill.php index f1cba5aa1e..e101444ef5 100644 --- a/app/Events/WarnUserAboutBill.php +++ b/app/Events/WarnUserAboutBill.php @@ -30,7 +30,7 @@ use Illuminate\Queue\SerializesModels; /** * Class WarnUserAboutBill. * - * @codeCoverageIgnore + */ class WarnUserAboutBill extends Event { diff --git a/app/Exceptions/FireflyException.php b/app/Exceptions/FireflyException.php index 33aa8cad85..9d57980b0e 100644 --- a/app/Exceptions/FireflyException.php +++ b/app/Exceptions/FireflyException.php @@ -29,7 +29,7 @@ use Exception; /** * Class FireflyException. * - * @codeCoverageIgnore + */ class FireflyException extends Exception { diff --git a/app/Exceptions/GracefulNotFoundHandler.php b/app/Exceptions/GracefulNotFoundHandler.php index 7b444427e2..33bbf0cf17 100644 --- a/app/Exceptions/GracefulNotFoundHandler.php +++ b/app/Exceptions/GracefulNotFoundHandler.php @@ -221,7 +221,7 @@ class GracefulNotFoundHandler extends ExceptionHandler $user = auth()->user(); $route = $request->route(); $attachmentId = (int)$route->parameter('attachment'); - /** @var Attachment $attachment */ + /** @var Attachment|null $attachment */ $attachment = $user->attachments()->withTrashed()->find($attachmentId); if (null === $attachment) { Log::error(sprintf('Could not find attachment %d, so give big fat error.', $attachmentId)); diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php index 4521edcdee..ade308c320 100644 --- a/app/Exceptions/Handler.php +++ b/app/Exceptions/Handler.php @@ -49,7 +49,7 @@ use Throwable; /** * Class Handler * - * @codeCoverageIgnore + */ class Handler extends ExceptionHandler { diff --git a/app/Exceptions/NotImplementedException.php b/app/Exceptions/NotImplementedException.php index 3bcf0c42d0..31ce17a23f 100644 --- a/app/Exceptions/NotImplementedException.php +++ b/app/Exceptions/NotImplementedException.php @@ -29,7 +29,7 @@ use Exception; /** * Class NotImplementedException. * - * @codeCoverageIgnore + */ class NotImplementedException extends Exception { diff --git a/app/Exceptions/ValidationException.php b/app/Exceptions/ValidationException.php index cc3b45fb21..f8f3db344f 100644 --- a/app/Exceptions/ValidationException.php +++ b/app/Exceptions/ValidationException.php @@ -29,7 +29,7 @@ use Exception; /** * Class ValidationExceptions. * - * @codeCoverageIgnore + */ class ValidationException extends Exception { diff --git a/app/Factory/AccountFactory.php b/app/Factory/AccountFactory.php index 6bc903098c..83274334cb 100644 --- a/app/Factory/AccountFactory.php +++ b/app/Factory/AccountFactory.php @@ -57,7 +57,7 @@ class AccountFactory /** * AccountFactory constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Factory/RecurrenceFactory.php b/app/Factory/RecurrenceFactory.php index 4ac23e9375..c739b657b7 100644 --- a/app/Factory/RecurrenceFactory.php +++ b/app/Factory/RecurrenceFactory.php @@ -46,7 +46,7 @@ class RecurrenceFactory /** * Constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Factory/TransactionCurrencyFactory.php b/app/Factory/TransactionCurrencyFactory.php index 0068e63352..9cc9c9f265 100644 --- a/app/Factory/TransactionCurrencyFactory.php +++ b/app/Factory/TransactionCurrencyFactory.php @@ -41,6 +41,11 @@ class TransactionCurrencyFactory */ public function create(array $data): TransactionCurrency { + $data['code'] = e($data['code']); + $data['symbol'] = e($data['symbol']); + $data['name'] = e($data['name']); + $data['decimal_places'] = (int)$data['decimal_places']; + $data['enabled'] = (bool)$data['enabled']; // if the code already exists (deleted) // force delete it and then create the transaction: $count = TransactionCurrency::withTrashed()->whereCode($data['code'])->count(); @@ -78,7 +83,7 @@ class TransactionCurrencyFactory */ public function find(?int $currencyId, ?string $currencyCode): ?TransactionCurrency { - $currencyCode = (string)$currencyCode; + $currencyCode = (string)e($currencyCode); $currencyId = (int)$currencyId; if ('' === $currencyCode && 0 === $currencyId) { diff --git a/app/Factory/TransactionFactory.php b/app/Factory/TransactionFactory.php index 40e9e9d27b..ded41e19fb 100644 --- a/app/Factory/TransactionFactory.php +++ b/app/Factory/TransactionFactory.php @@ -29,9 +29,12 @@ use FireflyIII\Models\Account; use FireflyIII\Models\Transaction; use FireflyIII\Models\TransactionCurrency; use FireflyIII\Models\TransactionJournal; +use FireflyIII\Rules\UniqueIban; +use FireflyIII\Services\Internal\Update\AccountUpdateService; use FireflyIII\User; use Illuminate\Database\QueryException; use Log; +use Validator; /** * Class TransactionFactory @@ -43,15 +46,17 @@ class TransactionFactory private ?TransactionCurrency $foreignCurrency; private TransactionJournal $journal; private bool $reconciled; + private array $accountInformation; /** * Constructor. * - * @codeCoverageIgnore + */ public function __construct() { - $this->reconciled = false; + $this->reconciled = false; + $this->accountInformation = []; } /** @@ -129,6 +134,9 @@ class TransactionFactory } $result->save(); + // if present, update account with relevant account information from the array + $this->updateAccountInformation(); + return $result; } @@ -156,7 +164,7 @@ class TransactionFactory /** * @param Account $account * - * @codeCoverageIgnore + */ public function setAccount(Account $account): void { @@ -166,7 +174,7 @@ class TransactionFactory /** * @param TransactionCurrency $currency * - * @codeCoverageIgnore + */ public function setCurrency(TransactionCurrency $currency): void { @@ -176,7 +184,7 @@ class TransactionFactory /** * @param TransactionCurrency|null $foreignCurrency |null * - * @codeCoverageIgnore + */ public function setForeignCurrency(?TransactionCurrency $foreignCurrency): void { @@ -186,7 +194,7 @@ class TransactionFactory /** * @param TransactionJournal $journal * - * @codeCoverageIgnore + */ public function setJournal(TransactionJournal $journal): void { @@ -196,7 +204,7 @@ class TransactionFactory /** * @param bool $reconciled * - * @codeCoverageIgnore + */ public function setReconciled(bool $reconciled): void { @@ -206,10 +214,51 @@ class TransactionFactory /** * @param User $user * - * @codeCoverageIgnore + */ public function setUser(User $user): void { // empty function. } + + /** + * @param array $accountInformation + */ + public function setAccountInformation(array $accountInformation): void + { + $this->accountInformation = $accountInformation; + } + + + /** + * @return void + * @throws FireflyException + */ + private function updateAccountInformation(): void + { + if (!array_key_exists('iban', $this->accountInformation)) { + Log::debug('No IBAN information in array, will not update.'); + return; + } + if ('' !== (string)$this->account->iban) { + Log::debug('Account already has IBAN information, will not update.'); + return; + } + if ($this->account->iban === $this->accountInformation['iban']) { + Log::debug('Account already has this IBAN, will not update.'); + return; + } + // validate info: + $validator = Validator::make(['iban' => $this->accountInformation['iban']], [ + 'iban' => ['required', new UniqueIban($this->account, $this->account->accountType->type)], + ]); + if ($validator->fails()) { + Log::debug('Invalid or non-unique IBAN, will not update.'); + return; + } + + Log::debug('Will update account with IBAN information.'); + $service = app(AccountUpdateService::class); + $service->update($this->account, ['iban' => $this->accountInformation['iban']]); + } } diff --git a/app/Factory/TransactionGroupFactory.php b/app/Factory/TransactionGroupFactory.php index d71880386a..45b366531e 100644 --- a/app/Factory/TransactionGroupFactory.php +++ b/app/Factory/TransactionGroupFactory.php @@ -33,7 +33,7 @@ use Log; /** * Class TransactionGroupFactory * - * @codeCoverageIgnore + */ class TransactionGroupFactory { diff --git a/app/Factory/TransactionJournalFactory.php b/app/Factory/TransactionJournalFactory.php index 662a3d3b8b..4a324362f5 100644 --- a/app/Factory/TransactionJournalFactory.php +++ b/app/Factory/TransactionJournalFactory.php @@ -73,7 +73,7 @@ class TransactionJournalFactory * Constructor. * * @throws Exception - * @codeCoverageIgnore + */ public function __construct() { @@ -244,6 +244,7 @@ class TransactionJournalFactory $transactionFactory->setJournal($journal); $transactionFactory->setAccount($sourceAccount); $transactionFactory->setCurrency($currency); + $transactionFactory->setAccountInformation($sourceInfo); $transactionFactory->setForeignCurrency($foreignCurrency); $transactionFactory->setReconciled($row['reconciled'] ?? false); try { @@ -262,6 +263,7 @@ class TransactionJournalFactory $transactionFactory->setUser($this->user); $transactionFactory->setJournal($journal); $transactionFactory->setAccount($destinationAccount); + $transactionFactory->setAccountInformation($destInfo); $transactionFactory->setCurrency($currency); $transactionFactory->setForeignCurrency($foreignCurrency); $transactionFactory->setReconciled($row['reconciled'] ?? false); @@ -451,7 +453,7 @@ class TransactionJournalFactory */ private function getCurrencyByAccount(string $type, ?TransactionCurrency $currency, Account $source, Account $destination): TransactionCurrency { - Log::debug('Now ingetCurrencyByAccount()'); + Log::debug('Now in getCurrencyByAccount()'); return match ($type) { default => $this->getCurrency($currency, $source), diff --git a/app/Generator/Report/Account/MonthReportGenerator.php b/app/Generator/Report/Account/MonthReportGenerator.php index d14f6d6bb6..e8a5ffdaa8 100644 --- a/app/Generator/Report/Account/MonthReportGenerator.php +++ b/app/Generator/Report/Account/MonthReportGenerator.php @@ -33,7 +33,7 @@ use Throwable; /** * Class MonthReportGenerator. * - * @codeCoverageIgnore + */ class MonthReportGenerator implements ReportGeneratorInterface { diff --git a/app/Generator/Report/Account/MultiYearReportGenerator.php b/app/Generator/Report/Account/MultiYearReportGenerator.php index 0d2e3db05e..8ac4322348 100644 --- a/app/Generator/Report/Account/MultiYearReportGenerator.php +++ b/app/Generator/Report/Account/MultiYearReportGenerator.php @@ -26,7 +26,7 @@ namespace FireflyIII\Generator\Report\Account; /** * Class MultiYearReportGenerator. * - * @codeCoverageIgnore + */ class MultiYearReportGenerator extends MonthReportGenerator { diff --git a/app/Generator/Report/Account/YearReportGenerator.php b/app/Generator/Report/Account/YearReportGenerator.php index 3060f5aa23..0f73b14d13 100644 --- a/app/Generator/Report/Account/YearReportGenerator.php +++ b/app/Generator/Report/Account/YearReportGenerator.php @@ -26,7 +26,7 @@ namespace FireflyIII\Generator\Report\Account; /** * Class YearReportGenerator. * - * @codeCoverageIgnore + */ class YearReportGenerator extends MonthReportGenerator { diff --git a/app/Generator/Report/Audit/MonthReportGenerator.php b/app/Generator/Report/Audit/MonthReportGenerator.php index ad8d5d623a..7c4e0963b9 100644 --- a/app/Generator/Report/Audit/MonthReportGenerator.php +++ b/app/Generator/Report/Audit/MonthReportGenerator.php @@ -50,7 +50,7 @@ class MonthReportGenerator implements ReportGeneratorInterface * @return string * @throws FireflyException * @throws JsonException - * @codeCoverageIgnore + */ public function generate(): string { @@ -186,7 +186,7 @@ class MonthReportGenerator implements ReportGeneratorInterface * @param Collection $accounts * * @return ReportGeneratorInterface - * @codeCoverageIgnore + */ public function setAccounts(Collection $accounts): ReportGeneratorInterface { @@ -201,7 +201,7 @@ class MonthReportGenerator implements ReportGeneratorInterface * @param Collection $budgets * * @return ReportGeneratorInterface - * @codeCoverageIgnore + */ public function setBudgets(Collection $budgets): ReportGeneratorInterface { @@ -214,7 +214,7 @@ class MonthReportGenerator implements ReportGeneratorInterface * @param Collection $categories * * @return ReportGeneratorInterface - * @codeCoverageIgnore + */ public function setCategories(Collection $categories): ReportGeneratorInterface { @@ -227,7 +227,7 @@ class MonthReportGenerator implements ReportGeneratorInterface * @param Carbon $date * * @return ReportGeneratorInterface - * @codeCoverageIgnore + */ public function setEndDate(Carbon $date): ReportGeneratorInterface { @@ -242,7 +242,7 @@ class MonthReportGenerator implements ReportGeneratorInterface * @param Collection $expense * * @return ReportGeneratorInterface - * @codeCoverageIgnore + */ public function setExpense(Collection $expense): ReportGeneratorInterface { @@ -256,7 +256,7 @@ class MonthReportGenerator implements ReportGeneratorInterface * @param Carbon $date * * @return ReportGeneratorInterface - * @codeCoverageIgnore + */ public function setStartDate(Carbon $date): ReportGeneratorInterface { @@ -271,7 +271,7 @@ class MonthReportGenerator implements ReportGeneratorInterface * @param Collection $tags * * @return ReportGeneratorInterface - * @codeCoverageIgnore + */ public function setTags(Collection $tags): ReportGeneratorInterface { diff --git a/app/Generator/Report/Audit/MultiYearReportGenerator.php b/app/Generator/Report/Audit/MultiYearReportGenerator.php index ff654bc090..1677320748 100644 --- a/app/Generator/Report/Audit/MultiYearReportGenerator.php +++ b/app/Generator/Report/Audit/MultiYearReportGenerator.php @@ -26,7 +26,7 @@ namespace FireflyIII\Generator\Report\Audit; /** * Class MultiYearReportGenerator. * - * @codeCoverageIgnore + */ class MultiYearReportGenerator extends MonthReportGenerator { diff --git a/app/Generator/Report/Audit/YearReportGenerator.php b/app/Generator/Report/Audit/YearReportGenerator.php index 1f63a1a7d9..df7144b367 100644 --- a/app/Generator/Report/Audit/YearReportGenerator.php +++ b/app/Generator/Report/Audit/YearReportGenerator.php @@ -26,7 +26,7 @@ namespace FireflyIII\Generator\Report\Audit; /** * Class YearReportGenerator. * - * @codeCoverageIgnore + */ class YearReportGenerator extends MonthReportGenerator { diff --git a/app/Generator/Report/Budget/MonthReportGenerator.php b/app/Generator/Report/Budget/MonthReportGenerator.php index dc83bfe32b..7505d80ba8 100644 --- a/app/Generator/Report/Budget/MonthReportGenerator.php +++ b/app/Generator/Report/Budget/MonthReportGenerator.php @@ -36,7 +36,7 @@ use Throwable; * Class MonthReportGenerator. * TODO include info about tags. * - * @codeCoverageIgnore + */ class MonthReportGenerator implements ReportGeneratorInterface { diff --git a/app/Generator/Report/Budget/MultiYearReportGenerator.php b/app/Generator/Report/Budget/MultiYearReportGenerator.php index 54b36d8566..a470db9a99 100644 --- a/app/Generator/Report/Budget/MultiYearReportGenerator.php +++ b/app/Generator/Report/Budget/MultiYearReportGenerator.php @@ -26,7 +26,7 @@ namespace FireflyIII\Generator\Report\Budget; /** * Class MultiYearReportGenerator. * - * @codeCoverageIgnore + */ class MultiYearReportGenerator extends MonthReportGenerator { diff --git a/app/Generator/Report/Budget/YearReportGenerator.php b/app/Generator/Report/Budget/YearReportGenerator.php index 037325a227..8b0cd930b7 100644 --- a/app/Generator/Report/Budget/YearReportGenerator.php +++ b/app/Generator/Report/Budget/YearReportGenerator.php @@ -26,7 +26,7 @@ namespace FireflyIII\Generator\Report\Budget; /** * Class YearReportGenerator. * - * @codeCoverageIgnore + */ class YearReportGenerator extends MonthReportGenerator { diff --git a/app/Generator/Report/Category/MonthReportGenerator.php b/app/Generator/Report/Category/MonthReportGenerator.php index 087d33f68c..906d0fc17c 100644 --- a/app/Generator/Report/Category/MonthReportGenerator.php +++ b/app/Generator/Report/Category/MonthReportGenerator.php @@ -36,7 +36,7 @@ use Throwable; * Class MonthReportGenerator. * TODO include info about tags * - * @codeCoverageIgnore + */ class MonthReportGenerator implements ReportGeneratorInterface { diff --git a/app/Generator/Report/Category/MultiYearReportGenerator.php b/app/Generator/Report/Category/MultiYearReportGenerator.php index 832836929a..f8525587c0 100644 --- a/app/Generator/Report/Category/MultiYearReportGenerator.php +++ b/app/Generator/Report/Category/MultiYearReportGenerator.php @@ -26,7 +26,7 @@ namespace FireflyIII\Generator\Report\Category; /** * Class MultiYearReportGenerator. * - * @codeCoverageIgnore + */ class MultiYearReportGenerator extends MonthReportGenerator { diff --git a/app/Generator/Report/Category/YearReportGenerator.php b/app/Generator/Report/Category/YearReportGenerator.php index 31de9d2f4b..982ef37fe5 100644 --- a/app/Generator/Report/Category/YearReportGenerator.php +++ b/app/Generator/Report/Category/YearReportGenerator.php @@ -26,7 +26,7 @@ namespace FireflyIII\Generator\Report\Category; /** * Class YearReportGenerator. * - * @codeCoverageIgnore + */ class YearReportGenerator extends MonthReportGenerator { diff --git a/app/Generator/Report/ReportGeneratorFactory.php b/app/Generator/Report/ReportGeneratorFactory.php index 5ac01f897c..bc717a92fb 100644 --- a/app/Generator/Report/ReportGeneratorFactory.php +++ b/app/Generator/Report/ReportGeneratorFactory.php @@ -29,7 +29,7 @@ use FireflyIII\Exceptions\FireflyException; /** * Class ReportGeneratorFactory. * - * @codeCoverageIgnore + */ class ReportGeneratorFactory { diff --git a/app/Generator/Report/Standard/MonthReportGenerator.php b/app/Generator/Report/Standard/MonthReportGenerator.php index de98825895..6114b761f7 100644 --- a/app/Generator/Report/Standard/MonthReportGenerator.php +++ b/app/Generator/Report/Standard/MonthReportGenerator.php @@ -33,7 +33,7 @@ use Throwable; /** * Class MonthReportGenerator. * - * @codeCoverageIgnore + */ class MonthReportGenerator implements ReportGeneratorInterface { diff --git a/app/Generator/Report/Standard/MultiYearReportGenerator.php b/app/Generator/Report/Standard/MultiYearReportGenerator.php index 79c5441a1e..ac405e93c2 100644 --- a/app/Generator/Report/Standard/MultiYearReportGenerator.php +++ b/app/Generator/Report/Standard/MultiYearReportGenerator.php @@ -33,7 +33,7 @@ use Throwable; /** * Class MonthReportGenerator. * - * @codeCoverageIgnore + */ class MultiYearReportGenerator implements ReportGeneratorInterface { diff --git a/app/Generator/Report/Standard/YearReportGenerator.php b/app/Generator/Report/Standard/YearReportGenerator.php index 2d537f0ec5..d3dd23628c 100644 --- a/app/Generator/Report/Standard/YearReportGenerator.php +++ b/app/Generator/Report/Standard/YearReportGenerator.php @@ -33,7 +33,7 @@ use Throwable; /** * Class MonthReportGenerator. * - * @codeCoverageIgnore + */ class YearReportGenerator implements ReportGeneratorInterface { diff --git a/app/Generator/Report/Tag/MonthReportGenerator.php b/app/Generator/Report/Tag/MonthReportGenerator.php index bc974e2943..b380305d87 100644 --- a/app/Generator/Report/Tag/MonthReportGenerator.php +++ b/app/Generator/Report/Tag/MonthReportGenerator.php @@ -33,7 +33,7 @@ use Throwable; /** * Class MonthReportGenerator. * - * @codeCoverageIgnore + */ class MonthReportGenerator implements ReportGeneratorInterface { diff --git a/app/Generator/Report/Tag/MultiYearReportGenerator.php b/app/Generator/Report/Tag/MultiYearReportGenerator.php index 493b9eea88..6830d8aea2 100644 --- a/app/Generator/Report/Tag/MultiYearReportGenerator.php +++ b/app/Generator/Report/Tag/MultiYearReportGenerator.php @@ -26,7 +26,7 @@ namespace FireflyIII\Generator\Report\Tag; /** * Class MultiYearReportGenerator. * - * @codeCoverageIgnore + */ class MultiYearReportGenerator extends MonthReportGenerator { diff --git a/app/Generator/Report/Tag/YearReportGenerator.php b/app/Generator/Report/Tag/YearReportGenerator.php index 562696c6c2..0dd2aaa36f 100644 --- a/app/Generator/Report/Tag/YearReportGenerator.php +++ b/app/Generator/Report/Tag/YearReportGenerator.php @@ -26,7 +26,7 @@ namespace FireflyIII\Generator\Report\Tag; /** * Class YearReportGenerator. * - * @codeCoverageIgnore + */ class YearReportGenerator extends MonthReportGenerator { diff --git a/app/Helpers/Attachments/AttachmentHelper.php b/app/Helpers/Attachments/AttachmentHelper.php index 0d566bfd4c..6a33a0fe4a 100644 --- a/app/Helpers/Attachments/AttachmentHelper.php +++ b/app/Helpers/Attachments/AttachmentHelper.php @@ -54,7 +54,7 @@ class AttachmentHelper implements AttachmentHelperInterface /** * AttachmentHelper constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -69,7 +69,7 @@ class AttachmentHelper implements AttachmentHelperInterface /** * Returns the content of an attachment. * - * @codeCoverageIgnore + * * @param Attachment $attachment * @@ -93,7 +93,7 @@ class AttachmentHelper implements AttachmentHelperInterface * * @param Attachment $attachment * - * @codeCoverageIgnore + * @return string */ public function getAttachmentLocation(Attachment $attachment): string @@ -104,7 +104,7 @@ class AttachmentHelper implements AttachmentHelperInterface /** * Get all attachments. * - * @codeCoverageIgnore + * @return Collection */ public function getAttachments(): Collection @@ -116,7 +116,7 @@ class AttachmentHelper implements AttachmentHelperInterface * Get all errors. * * @return MessageBag - * @codeCoverageIgnore + */ public function getErrors(): MessageBag { @@ -127,7 +127,7 @@ class AttachmentHelper implements AttachmentHelperInterface * Get all messages. * * @return MessageBag - * @codeCoverageIgnore + */ public function getMessages(): MessageBag { @@ -336,7 +336,7 @@ class AttachmentHelper implements AttachmentHelperInterface /** * Verify if the size of a file is valid. * - * @codeCoverageIgnore + * * @param UploadedFile $file * diff --git a/app/Helpers/Collector/GroupCollector.php b/app/Helpers/Collector/GroupCollector.php index a4fcb71568..d84e88e4a9 100644 --- a/app/Helpers/Collector/GroupCollector.php +++ b/app/Helpers/Collector/GroupCollector.php @@ -48,7 +48,7 @@ use Log; /** * Class GroupCollector * - * @codeCoverageIgnore + */ class GroupCollector implements GroupCollectorInterface { diff --git a/app/Helpers/Report/PopupReport.php b/app/Helpers/Report/PopupReport.php index 15a2a8ea34..430d7b1740 100644 --- a/app/Helpers/Report/PopupReport.php +++ b/app/Helpers/Report/PopupReport.php @@ -36,7 +36,7 @@ use Illuminate\Support\Collection; /** * Class PopupReport. * - * @codeCoverageIgnore + */ class PopupReport implements PopupReportInterface { diff --git a/app/Helpers/Report/ReportHelper.php b/app/Helpers/Report/ReportHelper.php index e7f7e1ee34..0d3107f121 100644 --- a/app/Helpers/Report/ReportHelper.php +++ b/app/Helpers/Report/ReportHelper.php @@ -34,7 +34,7 @@ use Illuminate\Support\Collection; /** * Class ReportHelper. * - * @codeCoverageIgnore + */ class ReportHelper implements ReportHelperInterface { diff --git a/app/Helpers/Webhook/Sha3SignatureGenerator.php b/app/Helpers/Webhook/Sha3SignatureGenerator.php index 74fb96dfdd..06d38701b8 100644 --- a/app/Helpers/Webhook/Sha3SignatureGenerator.php +++ b/app/Helpers/Webhook/Sha3SignatureGenerator.php @@ -51,7 +51,7 @@ class Sha3SignatureGenerator implements SignatureGeneratorInterface $json = json_encode($message->message, JSON_THROW_ON_ERROR); } catch (JsonException $e) { Log::error('Could not generate hash.'); - Log::error(sprintf('JSON value: %s', $message->message)); + Log::error(sprintf('JSON value: %s', $json)); Log::error($e->getMessage()); Log::error($e->getTraceAsString()); throw new FireflyException('Could not generate JSON for SHA3 hash.', 0, $e); diff --git a/app/Http/Controllers/Account/CreateController.php b/app/Http/Controllers/Account/CreateController.php index 475ebf9924..abb79eca3a 100644 --- a/app/Http/Controllers/Account/CreateController.php +++ b/app/Http/Controllers/Account/CreateController.php @@ -53,7 +53,7 @@ class CreateController extends Controller /** * CreateController constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Http/Controllers/Account/DeleteController.php b/app/Http/Controllers/Account/DeleteController.php index 51776f196a..ea72eba0c8 100644 --- a/app/Http/Controllers/Account/DeleteController.php +++ b/app/Http/Controllers/Account/DeleteController.php @@ -43,7 +43,7 @@ class DeleteController extends Controller /** * DeleteController constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Http/Controllers/Account/IndexController.php b/app/Http/Controllers/Account/IndexController.php index 212a588888..6d52d29b25 100644 --- a/app/Http/Controllers/Account/IndexController.php +++ b/app/Http/Controllers/Account/IndexController.php @@ -51,7 +51,7 @@ class IndexController extends Controller /** * IndexController constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Http/Controllers/Account/ReconcileController.php b/app/Http/Controllers/Account/ReconcileController.php index 3baa389142..98d9651e6e 100644 --- a/app/Http/Controllers/Account/ReconcileController.php +++ b/app/Http/Controllers/Account/ReconcileController.php @@ -55,7 +55,7 @@ class ReconcileController extends Controller /** * ReconcileController constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Http/Controllers/Account/ShowController.php b/app/Http/Controllers/Account/ShowController.php index 2fa0c9d14d..f51028f9e7 100644 --- a/app/Http/Controllers/Account/ShowController.php +++ b/app/Http/Controllers/Account/ShowController.php @@ -53,7 +53,7 @@ class ShowController extends Controller /** * ShowController constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Http/Controllers/Admin/ConfigurationController.php b/app/Http/Controllers/Admin/ConfigurationController.php index 1fbcfd7fa3..a5c03deff9 100644 --- a/app/Http/Controllers/Admin/ConfigurationController.php +++ b/app/Http/Controllers/Admin/ConfigurationController.php @@ -42,7 +42,7 @@ class ConfigurationController extends Controller /** * ConfigurationController constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Http/Controllers/Admin/HomeController.php b/app/Http/Controllers/Admin/HomeController.php index 55f945d397..ee64b72401 100644 --- a/app/Http/Controllers/Admin/HomeController.php +++ b/app/Http/Controllers/Admin/HomeController.php @@ -46,7 +46,7 @@ class HomeController extends Controller /** * ConfigurationController constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Http/Controllers/Admin/LinkController.php b/app/Http/Controllers/Admin/LinkController.php index 7adf4717fe..5be62d08a8 100644 --- a/app/Http/Controllers/Admin/LinkController.php +++ b/app/Http/Controllers/Admin/LinkController.php @@ -45,7 +45,7 @@ class LinkController extends Controller /** * LinkController constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Http/Controllers/AttachmentController.php b/app/Http/Controllers/AttachmentController.php index db72125f8a..33d78335e8 100644 --- a/app/Http/Controllers/AttachmentController.php +++ b/app/Http/Controllers/AttachmentController.php @@ -47,7 +47,7 @@ class AttachmentController extends Controller /** * AttachmentController constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Http/Controllers/Auth/ForgotPasswordController.php b/app/Http/Controllers/Auth/ForgotPasswordController.php index bd0004d992..b43a7d4833 100644 --- a/app/Http/Controllers/Auth/ForgotPasswordController.php +++ b/app/Http/Controllers/Auth/ForgotPasswordController.php @@ -39,7 +39,7 @@ use Psr\Container\NotFoundExceptionInterface; /** * Class ForgotPasswordController * - * @codeCoverageIgnore + */ class ForgotPasswordController extends Controller { @@ -109,7 +109,7 @@ class ForgotPasswordController extends Controller /** * Show form for email recovery. * - * @codeCoverageIgnore + * * @return Factory|View * @throws FireflyException diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index 1c6f2ae1d5..4fa018248b 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -50,7 +50,7 @@ use Psr\Container\NotFoundExceptionInterface; * redirecting them to your home screen. The controller uses a trait * to conveniently provide its functionality to your applications. * - * @codeCoverageIgnore + */ class LoginController extends Controller { diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php index e82f23449e..3eed0fe336 100644 --- a/app/Http/Controllers/Auth/RegisterController.php +++ b/app/Http/Controllers/Auth/RegisterController.php @@ -48,7 +48,7 @@ use Psr\Container\NotFoundExceptionInterface; * validation and creation. By default this controller uses a trait to * provide this functionality without requiring any additional code. * - * @codeCoverageIgnore + */ class RegisterController extends Controller { diff --git a/app/Http/Controllers/Auth/ResetPasswordController.php b/app/Http/Controllers/Auth/ResetPasswordController.php index a81b36a5e3..6faba65151 100644 --- a/app/Http/Controllers/Auth/ResetPasswordController.php +++ b/app/Http/Controllers/Auth/ResetPasswordController.php @@ -44,7 +44,7 @@ use Psr\Container\NotFoundExceptionInterface; * and uses a simple trait to include this behavior. You're free to * explore this trait and override any methods you wish to tweak. * - * @codeCoverageIgnore + */ class ResetPasswordController extends Controller { diff --git a/app/Http/Controllers/Bill/CreateController.php b/app/Http/Controllers/Bill/CreateController.php index 0035275412..da116f6936 100644 --- a/app/Http/Controllers/Bill/CreateController.php +++ b/app/Http/Controllers/Bill/CreateController.php @@ -46,7 +46,7 @@ class CreateController extends Controller /** * BillController constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Http/Controllers/Bill/DeleteController.php b/app/Http/Controllers/Bill/DeleteController.php index 7b812f28ac..97e1bb433f 100644 --- a/app/Http/Controllers/Bill/DeleteController.php +++ b/app/Http/Controllers/Bill/DeleteController.php @@ -43,7 +43,7 @@ class DeleteController extends Controller /** * BillController constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Http/Controllers/Bill/EditController.php b/app/Http/Controllers/Bill/EditController.php index 4c9c716b90..c909db419a 100644 --- a/app/Http/Controllers/Bill/EditController.php +++ b/app/Http/Controllers/Bill/EditController.php @@ -45,7 +45,7 @@ class EditController extends Controller /** * BillController constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Http/Controllers/Bill/IndexController.php b/app/Http/Controllers/Bill/IndexController.php index ba5fbba79c..f8d43ca274 100644 --- a/app/Http/Controllers/Bill/IndexController.php +++ b/app/Http/Controllers/Bill/IndexController.php @@ -49,7 +49,7 @@ class IndexController extends Controller /** * BillController constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -215,12 +215,19 @@ class IndexController extends Controller // per period: $division = [ - '1Y' => '1', - '6M' => '2', - '3M' => '4', - '1M' => '12', - '1W' => '52.16', - '1D' => '365.24', + '1Y' => '1', + '6M' => '2', + '3M' => '4', + '1M' => '12', + '1W' => '52.16', + '1D' => '365.24', + 'YTD' => '1', + 'QTD' => '4', + 'MTD' => '12', + 'last7' => '52.16', + 'last30' => '12', + 'last90' => '4', + 'last365' => '1', ]; $perPeriod = bcdiv($yearAmount, $division[$range]); diff --git a/app/Http/Controllers/Bill/ShowController.php b/app/Http/Controllers/Bill/ShowController.php index 5abc4d9fe3..98c4d32323 100644 --- a/app/Http/Controllers/Bill/ShowController.php +++ b/app/Http/Controllers/Bill/ShowController.php @@ -56,7 +56,7 @@ class ShowController extends Controller /** * BillController constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Http/Controllers/Budget/CreateController.php b/app/Http/Controllers/Budget/CreateController.php index ad97bd998a..0ae5c47199 100644 --- a/app/Http/Controllers/Budget/CreateController.php +++ b/app/Http/Controllers/Budget/CreateController.php @@ -45,7 +45,7 @@ class CreateController extends Controller /** * CreateController constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Http/Controllers/Budget/DeleteController.php b/app/Http/Controllers/Budget/DeleteController.php index de6394536b..a0672a531f 100644 --- a/app/Http/Controllers/Budget/DeleteController.php +++ b/app/Http/Controllers/Budget/DeleteController.php @@ -44,7 +44,7 @@ class DeleteController extends Controller /** * DeleteController constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Http/Controllers/Budget/EditController.php b/app/Http/Controllers/Budget/EditController.php index 66cb21d983..dd2847d82c 100644 --- a/app/Http/Controllers/Budget/EditController.php +++ b/app/Http/Controllers/Budget/EditController.php @@ -46,7 +46,7 @@ class EditController extends Controller /** * EditController constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Http/Controllers/Budget/IndexController.php b/app/Http/Controllers/Budget/IndexController.php index 7110ece221..30556efee9 100644 --- a/app/Http/Controllers/Budget/IndexController.php +++ b/app/Http/Controllers/Budget/IndexController.php @@ -63,7 +63,7 @@ class IndexController extends Controller /** * IndexController constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Http/Controllers/Budget/ShowController.php b/app/Http/Controllers/Budget/ShowController.php index 28110ae4dd..860d38d8a9 100644 --- a/app/Http/Controllers/Budget/ShowController.php +++ b/app/Http/Controllers/Budget/ShowController.php @@ -56,7 +56,7 @@ class ShowController extends Controller /** * ShowController constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Http/Controllers/Category/CreateController.php b/app/Http/Controllers/Category/CreateController.php index 9643859d73..ed7f656260 100644 --- a/app/Http/Controllers/Category/CreateController.php +++ b/app/Http/Controllers/Category/CreateController.php @@ -45,7 +45,7 @@ class CreateController extends Controller /** * CategoryController constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Http/Controllers/Category/DeleteController.php b/app/Http/Controllers/Category/DeleteController.php index 4d8bb058f1..b661b26046 100644 --- a/app/Http/Controllers/Category/DeleteController.php +++ b/app/Http/Controllers/Category/DeleteController.php @@ -43,7 +43,7 @@ class DeleteController extends Controller /** * CategoryController constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Http/Controllers/Category/EditController.php b/app/Http/Controllers/Category/EditController.php index 45496408c4..412a4cebfe 100644 --- a/app/Http/Controllers/Category/EditController.php +++ b/app/Http/Controllers/Category/EditController.php @@ -45,7 +45,7 @@ class EditController extends Controller /** * CategoryController constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Http/Controllers/Category/IndexController.php b/app/Http/Controllers/Category/IndexController.php index 768e469b6c..2c20057fcd 100644 --- a/app/Http/Controllers/Category/IndexController.php +++ b/app/Http/Controllers/Category/IndexController.php @@ -46,7 +46,7 @@ class IndexController extends Controller /** * CategoryController constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Http/Controllers/Category/NoCategoryController.php b/app/Http/Controllers/Category/NoCategoryController.php index 9873883387..9194cf1790 100644 --- a/app/Http/Controllers/Category/NoCategoryController.php +++ b/app/Http/Controllers/Category/NoCategoryController.php @@ -52,7 +52,7 @@ class NoCategoryController extends Controller /** * CategoryController constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Http/Controllers/Category/ShowController.php b/app/Http/Controllers/Category/ShowController.php index cd1ff6b524..5af240529d 100644 --- a/app/Http/Controllers/Category/ShowController.php +++ b/app/Http/Controllers/Category/ShowController.php @@ -53,7 +53,7 @@ class ShowController extends Controller /** * CategoryController constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Http/Controllers/Chart/AccountController.php b/app/Http/Controllers/Chart/AccountController.php index ddc0c8ec86..afbe4629ce 100644 --- a/app/Http/Controllers/Chart/AccountController.php +++ b/app/Http/Controllers/Chart/AccountController.php @@ -62,7 +62,7 @@ class AccountController extends Controller /** * AccountController constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Http/Controllers/Chart/BillController.php b/app/Http/Controllers/Chart/BillController.php index 204d9b8d9c..ae3ed729a2 100644 --- a/app/Http/Controllers/Chart/BillController.php +++ b/app/Http/Controllers/Chart/BillController.php @@ -45,7 +45,7 @@ class BillController extends Controller /** * BillController constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Http/Controllers/Chart/BudgetController.php b/app/Http/Controllers/Chart/BudgetController.php index be143de454..0a407a9cbc 100644 --- a/app/Http/Controllers/Chart/BudgetController.php +++ b/app/Http/Controllers/Chart/BudgetController.php @@ -61,7 +61,7 @@ class BudgetController extends Controller /** * BudgetController constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Http/Controllers/Chart/BudgetReportController.php b/app/Http/Controllers/Chart/BudgetReportController.php index 02de0fe349..9476d3c4be 100644 --- a/app/Http/Controllers/Chart/BudgetReportController.php +++ b/app/Http/Controllers/Chart/BudgetReportController.php @@ -53,7 +53,7 @@ class BudgetReportController extends Controller /** * BudgetReportController constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Http/Controllers/Chart/CategoryController.php b/app/Http/Controllers/Chart/CategoryController.php index 0aa5c67e93..bed0c3eaf0 100644 --- a/app/Http/Controllers/Chart/CategoryController.php +++ b/app/Http/Controllers/Chart/CategoryController.php @@ -57,7 +57,7 @@ class CategoryController extends Controller /** * CategoryController constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Http/Controllers/Chart/CategoryReportController.php b/app/Http/Controllers/Chart/CategoryReportController.php index 32daf8d3c1..8884796ef2 100644 --- a/app/Http/Controllers/Chart/CategoryReportController.php +++ b/app/Http/Controllers/Chart/CategoryReportController.php @@ -51,7 +51,7 @@ class CategoryReportController extends Controller /** * CategoryReportController constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Http/Controllers/Chart/DoubleReportController.php b/app/Http/Controllers/Chart/DoubleReportController.php index cd665346c9..733e4337b3 100644 --- a/app/Http/Controllers/Chart/DoubleReportController.php +++ b/app/Http/Controllers/Chart/DoubleReportController.php @@ -49,7 +49,7 @@ class DoubleReportController extends Controller /** * CategoryReportController constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Http/Controllers/Chart/ExpenseReportController.php b/app/Http/Controllers/Chart/ExpenseReportController.php index 09af4994c7..eb31f4aed9 100644 --- a/app/Http/Controllers/Chart/ExpenseReportController.php +++ b/app/Http/Controllers/Chart/ExpenseReportController.php @@ -53,7 +53,7 @@ class ExpenseReportController extends Controller /** * ExpenseReportController constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Http/Controllers/Chart/PiggyBankController.php b/app/Http/Controllers/Chart/PiggyBankController.php index 7e5c609470..47880cf858 100644 --- a/app/Http/Controllers/Chart/PiggyBankController.php +++ b/app/Http/Controllers/Chart/PiggyBankController.php @@ -47,7 +47,7 @@ class PiggyBankController extends Controller /** * PiggyBankController constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Http/Controllers/Chart/ReportController.php b/app/Http/Controllers/Chart/ReportController.php index 915934fd44..fc35edf437 100644 --- a/app/Http/Controllers/Chart/ReportController.php +++ b/app/Http/Controllers/Chart/ReportController.php @@ -54,7 +54,7 @@ class ReportController extends Controller /** * ReportController constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Http/Controllers/Chart/TagReportController.php b/app/Http/Controllers/Chart/TagReportController.php index 355b240a4c..ad37e32740 100644 --- a/app/Http/Controllers/Chart/TagReportController.php +++ b/app/Http/Controllers/Chart/TagReportController.php @@ -50,7 +50,7 @@ class TagReportController extends Controller /** * TagReportController constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php index b71dd07d2a..cc51f90b53 100644 --- a/app/Http/Controllers/Controller.php +++ b/app/Http/Controllers/Controller.php @@ -51,7 +51,7 @@ abstract class Controller extends BaseController /** * Controller constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Http/Controllers/CurrencyController.php b/app/Http/Controllers/CurrencyController.php index b63cf9030a..ef4455323f 100644 --- a/app/Http/Controllers/CurrencyController.php +++ b/app/Http/Controllers/CurrencyController.php @@ -51,7 +51,7 @@ class CurrencyController extends Controller /** * CurrencyController constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Http/Controllers/DebugController.php b/app/Http/Controllers/DebugController.php index 90974d0572..0cc8b02bd5 100644 --- a/app/Http/Controllers/DebugController.php +++ b/app/Http/Controllers/DebugController.php @@ -24,7 +24,6 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers; use Artisan; -use Carbon\Carbon; use DB; use Exception; use FireflyConfig; @@ -35,11 +34,9 @@ use Illuminate\Contracts\View\Factory; use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; use Illuminate\Routing\Redirector; -use Illuminate\Routing\Route; use Illuminate\View\View; use Log; use Monolog\Handler\RotatingFileHandler; -use Route as RouteFacade; /** * Class DebugController @@ -52,7 +49,7 @@ class DebugController extends Controller /** * DebugController constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -141,6 +138,9 @@ class DebugController extends Controller $cacheDriver = config('cache.default'); $logChannel = config('logging.default'); $appLogLevel = config('logging.level'); + $maxFileSize = app('steam')->phpBytes(ini_get('upload_max_filesize')); + $maxPostSize = app('steam')->phpBytes(ini_get('post_max_size')); + $uploadSize = min($maxFileSize, $maxPostSize); $displayErrors = ini_get('display_errors'); $errorReporting = $this->errorReporting((int)ini_get('error_reporting')); $interface = PHP_SAPI; @@ -179,7 +179,7 @@ class DebugController extends Controller setlocale(LC_ALL, $original); // get latest log file: - $logger = Log::driver(); + $logger = Log::driver(); // PHPstan doesn't recognize the method because of its polymorphic nature. $handlers = $logger->getHandlers(); // @phpstan-ignore-line $logContent = ''; @@ -208,6 +208,7 @@ class DebugController extends Controller 'logChannel', 'stateful', 'tz', + 'uploadSize', 'appLogLevel', 'remoteHeader', 'remoteMailHeader', diff --git a/app/Http/Controllers/Export/IndexController.php b/app/Http/Controllers/Export/IndexController.php index ba72ae174b..05872cb77e 100644 --- a/app/Http/Controllers/Export/IndexController.php +++ b/app/Http/Controllers/Export/IndexController.php @@ -43,7 +43,7 @@ class IndexController extends Controller /** * IndexController constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index b8f4a0d722..0405ba75a7 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -46,7 +46,7 @@ class HomeController extends Controller /** * HomeController constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Http/Controllers/Json/BudgetController.php b/app/Http/Controllers/Json/BudgetController.php index 2b1475b1ec..08ad5062a6 100644 --- a/app/Http/Controllers/Json/BudgetController.php +++ b/app/Http/Controllers/Json/BudgetController.php @@ -47,7 +47,7 @@ class BudgetController extends Controller /** * IndexController constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Http/Controllers/Json/ReconcileController.php b/app/Http/Controllers/Json/ReconcileController.php index 562c569474..78d115408a 100644 --- a/app/Http/Controllers/Json/ReconcileController.php +++ b/app/Http/Controllers/Json/ReconcileController.php @@ -51,7 +51,7 @@ class ReconcileController extends Controller /** * ReconcileController constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Http/Controllers/Json/RecurrenceController.php b/app/Http/Controllers/Json/RecurrenceController.php index 0f31644735..72a566be14 100644 --- a/app/Http/Controllers/Json/RecurrenceController.php +++ b/app/Http/Controllers/Json/RecurrenceController.php @@ -44,7 +44,7 @@ class RecurrenceController extends Controller /** * RecurrenceController constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Http/Controllers/ObjectGroup/DeleteController.php b/app/Http/Controllers/ObjectGroup/DeleteController.php index b53c5fa710..bcce7db010 100644 --- a/app/Http/Controllers/ObjectGroup/DeleteController.php +++ b/app/Http/Controllers/ObjectGroup/DeleteController.php @@ -41,7 +41,7 @@ class DeleteController extends Controller /** * PiggyBankController constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Http/Controllers/ObjectGroup/EditController.php b/app/Http/Controllers/ObjectGroup/EditController.php index cdb35c0b81..cc1a20ec68 100644 --- a/app/Http/Controllers/ObjectGroup/EditController.php +++ b/app/Http/Controllers/ObjectGroup/EditController.php @@ -44,7 +44,7 @@ class EditController extends Controller /** * PiggyBankController constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Http/Controllers/ObjectGroup/IndexController.php b/app/Http/Controllers/ObjectGroup/IndexController.php index 5a5c0fc59e..c970054544 100644 --- a/app/Http/Controllers/ObjectGroup/IndexController.php +++ b/app/Http/Controllers/ObjectGroup/IndexController.php @@ -43,7 +43,7 @@ class IndexController extends Controller /** * IndexController constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Http/Controllers/PiggyBank/AmountController.php b/app/Http/Controllers/PiggyBank/AmountController.php index b7e4d3af04..3a0b2aab4b 100644 --- a/app/Http/Controllers/PiggyBank/AmountController.php +++ b/app/Http/Controllers/PiggyBank/AmountController.php @@ -46,7 +46,7 @@ class AmountController extends Controller /** * PiggyBankController constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Http/Controllers/PiggyBank/CreateController.php b/app/Http/Controllers/PiggyBank/CreateController.php index 9347bda81b..2253f0b18c 100644 --- a/app/Http/Controllers/PiggyBank/CreateController.php +++ b/app/Http/Controllers/PiggyBank/CreateController.php @@ -45,7 +45,7 @@ class CreateController extends Controller /** * PiggyBankController constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Http/Controllers/PiggyBank/DeleteController.php b/app/Http/Controllers/PiggyBank/DeleteController.php index 1c019b2839..2515a1cc35 100644 --- a/app/Http/Controllers/PiggyBank/DeleteController.php +++ b/app/Http/Controllers/PiggyBank/DeleteController.php @@ -41,7 +41,7 @@ class DeleteController extends Controller /** * PiggyBankController constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Http/Controllers/PiggyBank/EditController.php b/app/Http/Controllers/PiggyBank/EditController.php index a789f6c8c3..48c925e050 100644 --- a/app/Http/Controllers/PiggyBank/EditController.php +++ b/app/Http/Controllers/PiggyBank/EditController.php @@ -48,7 +48,7 @@ class EditController extends Controller /** * PiggyBankController constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Http/Controllers/PiggyBank/IndexController.php b/app/Http/Controllers/PiggyBank/IndexController.php index ea2fa095c3..47c240c952 100644 --- a/app/Http/Controllers/PiggyBank/IndexController.php +++ b/app/Http/Controllers/PiggyBank/IndexController.php @@ -51,7 +51,7 @@ class IndexController extends Controller /** * PiggyBankController constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Http/Controllers/PiggyBank/ShowController.php b/app/Http/Controllers/PiggyBank/ShowController.php index e74a32ef5c..00047a61a4 100644 --- a/app/Http/Controllers/PiggyBank/ShowController.php +++ b/app/Http/Controllers/PiggyBank/ShowController.php @@ -43,7 +43,7 @@ class ShowController extends Controller /** * PiggyBankController constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Http/Controllers/PreferencesController.php b/app/Http/Controllers/PreferencesController.php index 9cf77680b1..ae56d03797 100644 --- a/app/Http/Controllers/PreferencesController.php +++ b/app/Http/Controllers/PreferencesController.php @@ -46,7 +46,7 @@ class PreferencesController extends Controller /** * PreferencesController constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php index 7a6a8e171a..e7b8d8a30d 100644 --- a/app/Http/Controllers/ProfileController.php +++ b/app/Http/Controllers/ProfileController.php @@ -74,7 +74,7 @@ class ProfileController extends Controller /** * ProfileController constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Http/Controllers/Recurring/CreateController.php b/app/Http/Controllers/Recurring/CreateController.php index 884155e1e9..aebb15bfd7 100644 --- a/app/Http/Controllers/Recurring/CreateController.php +++ b/app/Http/Controllers/Recurring/CreateController.php @@ -53,7 +53,7 @@ class CreateController extends Controller /** * CreateController constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Http/Controllers/Recurring/DeleteController.php b/app/Http/Controllers/Recurring/DeleteController.php index c45bdb1bdb..0e3eb64aa5 100644 --- a/app/Http/Controllers/Recurring/DeleteController.php +++ b/app/Http/Controllers/Recurring/DeleteController.php @@ -43,7 +43,7 @@ class DeleteController extends Controller /** * DeleteController constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Http/Controllers/Recurring/EditController.php b/app/Http/Controllers/Recurring/EditController.php index a0a908ac62..484189c99c 100644 --- a/app/Http/Controllers/Recurring/EditController.php +++ b/app/Http/Controllers/Recurring/EditController.php @@ -54,7 +54,7 @@ class EditController extends Controller /** * EditController constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Http/Controllers/Recurring/IndexController.php b/app/Http/Controllers/Recurring/IndexController.php index 3e0d426941..2cd093e608 100644 --- a/app/Http/Controllers/Recurring/IndexController.php +++ b/app/Http/Controllers/Recurring/IndexController.php @@ -51,7 +51,7 @@ class IndexController extends Controller /** * IndexController constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Http/Controllers/Recurring/ShowController.php b/app/Http/Controllers/Recurring/ShowController.php index 055518626a..6d4c1a60f7 100644 --- a/app/Http/Controllers/Recurring/ShowController.php +++ b/app/Http/Controllers/Recurring/ShowController.php @@ -48,7 +48,7 @@ class ShowController extends Controller /** * IndexController constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Http/Controllers/Report/BudgetController.php b/app/Http/Controllers/Report/BudgetController.php index cac91f5608..2320bd83de 100644 --- a/app/Http/Controllers/Report/BudgetController.php +++ b/app/Http/Controllers/Report/BudgetController.php @@ -51,7 +51,7 @@ class BudgetController extends Controller /** * ExpenseReportController constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Http/Controllers/Report/CategoryController.php b/app/Http/Controllers/Report/CategoryController.php index d6f7706592..fcc394091d 100644 --- a/app/Http/Controllers/Report/CategoryController.php +++ b/app/Http/Controllers/Report/CategoryController.php @@ -53,7 +53,7 @@ class CategoryController extends Controller /** * ExpenseReportController constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Http/Controllers/Report/DoubleController.php b/app/Http/Controllers/Report/DoubleController.php index 50605fb754..cfce332b9e 100644 --- a/app/Http/Controllers/Report/DoubleController.php +++ b/app/Http/Controllers/Report/DoubleController.php @@ -53,7 +53,7 @@ class DoubleController extends Controller /** * Constructor for ExpenseController * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Http/Controllers/Report/OperationsController.php b/app/Http/Controllers/Report/OperationsController.php index 6569fddad0..3621aab212 100644 --- a/app/Http/Controllers/Report/OperationsController.php +++ b/app/Http/Controllers/Report/OperationsController.php @@ -43,7 +43,7 @@ class OperationsController extends Controller /** * OperationsController constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Http/Controllers/Report/TagController.php b/app/Http/Controllers/Report/TagController.php index 557cb75f84..47dc192ac8 100644 --- a/app/Http/Controllers/Report/TagController.php +++ b/app/Http/Controllers/Report/TagController.php @@ -46,7 +46,7 @@ class TagController extends Controller /** * ExpenseReportController constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Http/Controllers/Rule/CreateController.php b/app/Http/Controllers/Rule/CreateController.php index db1bbe7e0d..e74afa10d1 100644 --- a/app/Http/Controllers/Rule/CreateController.php +++ b/app/Http/Controllers/Rule/CreateController.php @@ -52,7 +52,7 @@ class CreateController extends Controller /** * RuleController constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Http/Controllers/Rule/DeleteController.php b/app/Http/Controllers/Rule/DeleteController.php index 36c4cba793..c38652d5f2 100644 --- a/app/Http/Controllers/Rule/DeleteController.php +++ b/app/Http/Controllers/Rule/DeleteController.php @@ -41,7 +41,7 @@ class DeleteController extends Controller /** * RuleController constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Http/Controllers/Rule/EditController.php b/app/Http/Controllers/Rule/EditController.php index 5d617a5f7d..5d397098e8 100644 --- a/app/Http/Controllers/Rule/EditController.php +++ b/app/Http/Controllers/Rule/EditController.php @@ -53,7 +53,7 @@ class EditController extends Controller /** * RuleController constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Http/Controllers/Rule/IndexController.php b/app/Http/Controllers/Rule/IndexController.php index 47dd5178db..eec5193b90 100644 --- a/app/Http/Controllers/Rule/IndexController.php +++ b/app/Http/Controllers/Rule/IndexController.php @@ -48,7 +48,7 @@ class IndexController extends Controller /** * RuleController constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Http/Controllers/RuleGroup/CreateController.php b/app/Http/Controllers/RuleGroup/CreateController.php index 04df9b1a5f..9bcb38f7d0 100644 --- a/app/Http/Controllers/RuleGroup/CreateController.php +++ b/app/Http/Controllers/RuleGroup/CreateController.php @@ -42,7 +42,7 @@ class CreateController extends Controller /** * CreateController constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Http/Controllers/RuleGroup/DeleteController.php b/app/Http/Controllers/RuleGroup/DeleteController.php index eaddb527a3..fd3d6de3dc 100644 --- a/app/Http/Controllers/RuleGroup/DeleteController.php +++ b/app/Http/Controllers/RuleGroup/DeleteController.php @@ -43,7 +43,7 @@ class DeleteController extends Controller /** * DeleteController constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Http/Controllers/RuleGroup/EditController.php b/app/Http/Controllers/RuleGroup/EditController.php index b18e66c888..20c7d5873a 100644 --- a/app/Http/Controllers/RuleGroup/EditController.php +++ b/app/Http/Controllers/RuleGroup/EditController.php @@ -44,7 +44,7 @@ class EditController extends Controller /** * EditController constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Http/Controllers/RuleGroup/ExecutionController.php b/app/Http/Controllers/RuleGroup/ExecutionController.php index 3a20f3fdaf..336179f203 100644 --- a/app/Http/Controllers/RuleGroup/ExecutionController.php +++ b/app/Http/Controllers/RuleGroup/ExecutionController.php @@ -45,7 +45,7 @@ class ExecutionController extends Controller /** * ExecutionController constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Http/Controllers/System/InstallController.php b/app/Http/Controllers/System/InstallController.php index 37dad69c3e..bb85b88a08 100644 --- a/app/Http/Controllers/System/InstallController.php +++ b/app/Http/Controllers/System/InstallController.php @@ -42,7 +42,7 @@ use phpseclib3\Crypt\RSA; /** * Class InstallController * - * @codeCoverageIgnore + */ class InstallController extends Controller { diff --git a/app/Http/Controllers/Transaction/BulkController.php b/app/Http/Controllers/Transaction/BulkController.php index ea63afab36..02fa8b4175 100644 --- a/app/Http/Controllers/Transaction/BulkController.php +++ b/app/Http/Controllers/Transaction/BulkController.php @@ -48,7 +48,7 @@ class BulkController extends Controller /** * BulkController constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Http/Controllers/Transaction/ConvertController.php b/app/Http/Controllers/Transaction/ConvertController.php index b64474d184..f0a29ea83e 100644 --- a/app/Http/Controllers/Transaction/ConvertController.php +++ b/app/Http/Controllers/Transaction/ConvertController.php @@ -60,7 +60,7 @@ class ConvertController extends Controller /** * ConvertController constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Http/Controllers/Transaction/CreateController.php b/app/Http/Controllers/Transaction/CreateController.php index cdca03ae74..6f433bc529 100644 --- a/app/Http/Controllers/Transaction/CreateController.php +++ b/app/Http/Controllers/Transaction/CreateController.php @@ -47,7 +47,7 @@ class CreateController extends Controller /** * CreateController constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Http/Controllers/Transaction/DeleteController.php b/app/Http/Controllers/Transaction/DeleteController.php index 6769ccde2b..ed0c7c3e12 100644 --- a/app/Http/Controllers/Transaction/DeleteController.php +++ b/app/Http/Controllers/Transaction/DeleteController.php @@ -47,7 +47,7 @@ class DeleteController extends Controller /** * IndexController constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Http/Controllers/Transaction/EditController.php b/app/Http/Controllers/Transaction/EditController.php index f34121a3ab..c7123a510b 100644 --- a/app/Http/Controllers/Transaction/EditController.php +++ b/app/Http/Controllers/Transaction/EditController.php @@ -39,7 +39,7 @@ class EditController extends Controller /** * EditController constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Http/Controllers/Transaction/IndexController.php b/app/Http/Controllers/Transaction/IndexController.php index e7c01542fc..6a1bb0fa54 100644 --- a/app/Http/Controllers/Transaction/IndexController.php +++ b/app/Http/Controllers/Transaction/IndexController.php @@ -47,7 +47,7 @@ class IndexController extends Controller /** * IndexController constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Http/Controllers/Transaction/LinkController.php b/app/Http/Controllers/Transaction/LinkController.php index 3534bb7b95..41bf3ce9f7 100644 --- a/app/Http/Controllers/Transaction/LinkController.php +++ b/app/Http/Controllers/Transaction/LinkController.php @@ -47,7 +47,7 @@ class LinkController extends Controller /** * LinkController constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Http/Controllers/Transaction/MassController.php b/app/Http/Controllers/Transaction/MassController.php index e173c659c8..aa1297252c 100644 --- a/app/Http/Controllers/Transaction/MassController.php +++ b/app/Http/Controllers/Transaction/MassController.php @@ -54,7 +54,7 @@ class MassController extends Controller /** * MassController constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -239,7 +239,7 @@ class MassController extends Controller * @param string $key * * @return Carbon|null - * @codeCoverageIgnore + */ private function getDateFromRequest(MassEditJournalRequest $request, int $journalId, string $key): ?Carbon { @@ -267,7 +267,7 @@ class MassController extends Controller * @param string $string * * @return string|null - * @codeCoverageIgnore + */ private function getStringFromRequest(MassEditJournalRequest $request, int $journalId, string $string): ?string { @@ -288,7 +288,7 @@ class MassController extends Controller * @param string $string * * @return int|null - * @codeCoverageIgnore + */ private function getIntFromRequest(MassEditJournalRequest $request, int $journalId, string $string): ?int { diff --git a/app/Http/Controllers/Webhooks/DeleteController.php b/app/Http/Controllers/Webhooks/DeleteController.php index 6ed53c278a..4d2ba7627a 100644 --- a/app/Http/Controllers/Webhooks/DeleteController.php +++ b/app/Http/Controllers/Webhooks/DeleteController.php @@ -38,7 +38,7 @@ class DeleteController extends Controller /** * DeleteController constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Http/Controllers/Webhooks/EditController.php b/app/Http/Controllers/Webhooks/EditController.php index 6f630855ca..76a89a23f1 100644 --- a/app/Http/Controllers/Webhooks/EditController.php +++ b/app/Http/Controllers/Webhooks/EditController.php @@ -38,7 +38,7 @@ class EditController extends Controller /** * DeleteController constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Http/Controllers/Webhooks/ShowController.php b/app/Http/Controllers/Webhooks/ShowController.php index 236461d339..8954de784b 100644 --- a/app/Http/Controllers/Webhooks/ShowController.php +++ b/app/Http/Controllers/Webhooks/ShowController.php @@ -38,7 +38,7 @@ class ShowController extends Controller /** * DeleteController constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index 85d77b6fff..cb6a51aef6 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -55,7 +55,7 @@ use PragmaRX\Google2FALaravel\Middleware as MFAMiddleware; /** * Class Kernel * - * @codeCoverageIgnore + */ class Kernel extends HttpKernel { diff --git a/app/Http/Middleware/EncryptCookies.php b/app/Http/Middleware/EncryptCookies.php index d0c0ba7f8e..def51a126c 100644 --- a/app/Http/Middleware/EncryptCookies.php +++ b/app/Http/Middleware/EncryptCookies.php @@ -28,7 +28,7 @@ use Illuminate\Cookie\Middleware\EncryptCookies as Middleware; /** * Class EncryptCookies * - * @codeCoverageIgnore + */ class EncryptCookies extends Middleware { diff --git a/app/Http/Middleware/Installer.php b/app/Http/Middleware/Installer.php index de0b794358..7d28ecc803 100644 --- a/app/Http/Middleware/Installer.php +++ b/app/Http/Middleware/Installer.php @@ -35,7 +35,7 @@ use Log; /** * Class Installer * - * @codeCoverageIgnore + * */ class Installer diff --git a/app/Http/Middleware/RedirectIfAuthenticated.php b/app/Http/Middleware/RedirectIfAuthenticated.php index d48dbcb893..68216e5758 100644 --- a/app/Http/Middleware/RedirectIfAuthenticated.php +++ b/app/Http/Middleware/RedirectIfAuthenticated.php @@ -30,7 +30,7 @@ use Illuminate\Support\Facades\Auth; /** * Class RedirectIfAuthenticated * - * @codeCoverageIgnore + */ class RedirectIfAuthenticated { diff --git a/app/Http/Middleware/StartFireflySession.php b/app/Http/Middleware/StartFireflySession.php index 2ae301774c..162f7d3f20 100644 --- a/app/Http/Middleware/StartFireflySession.php +++ b/app/Http/Middleware/StartFireflySession.php @@ -30,7 +30,7 @@ use Illuminate\Session\Middleware\StartSession; /** * Class StartFireflySession. * - * @codeCoverageIgnore + */ class StartFireflySession extends StartSession { diff --git a/app/Http/Middleware/TrimStrings.php b/app/Http/Middleware/TrimStrings.php index fc3a8d14da..049725b850 100644 --- a/app/Http/Middleware/TrimStrings.php +++ b/app/Http/Middleware/TrimStrings.php @@ -28,7 +28,7 @@ use Illuminate\Foundation\Http\Middleware\TrimStrings as Middleware; /** * Class TrimStrings * - * @codeCoverageIgnore + */ class TrimStrings extends Middleware { diff --git a/app/Http/Middleware/TrustProxies.php b/app/Http/Middleware/TrustProxies.php index aaa48350c7..b622b72050 100644 --- a/app/Http/Middleware/TrustProxies.php +++ b/app/Http/Middleware/TrustProxies.php @@ -29,7 +29,7 @@ use Symfony\Component\HttpFoundation\Request; /** * Class TrustProxies * - * @codeCoverageIgnore + */ class TrustProxies extends Middleware { diff --git a/app/Http/Middleware/VerifyCsrfToken.php b/app/Http/Middleware/VerifyCsrfToken.php index 8f53afdccd..2e981f1aae 100644 --- a/app/Http/Middleware/VerifyCsrfToken.php +++ b/app/Http/Middleware/VerifyCsrfToken.php @@ -28,7 +28,7 @@ use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken as Middleware; /** * Class VerifyCsrfToken. * - * @codeCoverageIgnore + */ class VerifyCsrfToken extends Middleware { diff --git a/app/Http/Requests/AttachmentFormRequest.php b/app/Http/Requests/AttachmentFormRequest.php index c02d58d1ca..c09915b069 100644 --- a/app/Http/Requests/AttachmentFormRequest.php +++ b/app/Http/Requests/AttachmentFormRequest.php @@ -30,7 +30,7 @@ use Illuminate\Foundation\Http\FormRequest; /** * Class AttachmentFormRequest. * - * @codeCoverageIgnore + */ class AttachmentFormRequest extends FormRequest { diff --git a/app/Http/Requests/BudgetFormStoreRequest.php b/app/Http/Requests/BudgetFormStoreRequest.php index 3788013236..1a457a8891 100644 --- a/app/Http/Requests/BudgetFormStoreRequest.php +++ b/app/Http/Requests/BudgetFormStoreRequest.php @@ -30,7 +30,7 @@ use Illuminate\Foundation\Http\FormRequest; use Illuminate\Validation\Validator; /** - * @codeCoverageIgnore + * Class BudgetFormStoreRequest */ class BudgetFormStoreRequest extends FormRequest diff --git a/app/Http/Requests/BudgetFormUpdateRequest.php b/app/Http/Requests/BudgetFormUpdateRequest.php index c4ef14971e..0587a72b2a 100644 --- a/app/Http/Requests/BudgetFormUpdateRequest.php +++ b/app/Http/Requests/BudgetFormUpdateRequest.php @@ -31,7 +31,7 @@ use Illuminate\Foundation\Http\FormRequest; use Illuminate\Validation\Validator; /** - * @codeCoverageIgnore + * Class BudgetFormUpdateRequest */ class BudgetFormUpdateRequest extends FormRequest diff --git a/app/Http/Requests/BudgetIncomeRequest.php b/app/Http/Requests/BudgetIncomeRequest.php index bc500c7e8b..43ed98c284 100644 --- a/app/Http/Requests/BudgetIncomeRequest.php +++ b/app/Http/Requests/BudgetIncomeRequest.php @@ -29,7 +29,7 @@ use Illuminate\Foundation\Http\FormRequest; /** * Class BudgetIncomeRequest. * - * @codeCoverageIgnore + */ class BudgetIncomeRequest extends FormRequest { diff --git a/app/Http/Requests/ConfigurationRequest.php b/app/Http/Requests/ConfigurationRequest.php index 14b7267ad0..7517fbf878 100644 --- a/app/Http/Requests/ConfigurationRequest.php +++ b/app/Http/Requests/ConfigurationRequest.php @@ -29,7 +29,7 @@ use Illuminate\Foundation\Http\FormRequest; /** * Class ConfigurationRequest. * - * @codeCoverageIgnore + */ class ConfigurationRequest extends FormRequest { diff --git a/app/Http/Requests/DeleteAccountFormRequest.php b/app/Http/Requests/DeleteAccountFormRequest.php index 774e81f493..51d65450ec 100644 --- a/app/Http/Requests/DeleteAccountFormRequest.php +++ b/app/Http/Requests/DeleteAccountFormRequest.php @@ -29,7 +29,7 @@ use Illuminate\Foundation\Http\FormRequest; /** * Class DeleteAccountFormRequest. * - * @codeCoverageIgnore + */ class DeleteAccountFormRequest extends FormRequest { diff --git a/app/Http/Requests/EmailFormRequest.php b/app/Http/Requests/EmailFormRequest.php index 25540c62f5..1c7429e84f 100644 --- a/app/Http/Requests/EmailFormRequest.php +++ b/app/Http/Requests/EmailFormRequest.php @@ -30,7 +30,7 @@ use Illuminate\Foundation\Http\FormRequest; /** * Class EmailFormRequest. * - * @codeCoverageIgnore + */ class EmailFormRequest extends FormRequest { diff --git a/app/Http/Requests/MassDeleteJournalRequest.php b/app/Http/Requests/MassDeleteJournalRequest.php index 5d9e4036c1..ca81fda9ff 100644 --- a/app/Http/Requests/MassDeleteJournalRequest.php +++ b/app/Http/Requests/MassDeleteJournalRequest.php @@ -29,7 +29,7 @@ use Illuminate\Foundation\Http\FormRequest; /** * Class MassDeleteJournalRequest. * - * @codeCoverageIgnore + */ class MassDeleteJournalRequest extends FormRequest { diff --git a/app/Http/Requests/MassEditJournalRequest.php b/app/Http/Requests/MassEditJournalRequest.php index d02bfcd182..d7759af6a1 100644 --- a/app/Http/Requests/MassEditJournalRequest.php +++ b/app/Http/Requests/MassEditJournalRequest.php @@ -29,7 +29,7 @@ use Illuminate\Foundation\Http\FormRequest; /** * Class MassEditJournalRequest. * - * @codeCoverageIgnore + */ class MassEditJournalRequest extends FormRequest { diff --git a/app/Http/Requests/NewUserFormRequest.php b/app/Http/Requests/NewUserFormRequest.php index f523f7ca04..a09ba41480 100644 --- a/app/Http/Requests/NewUserFormRequest.php +++ b/app/Http/Requests/NewUserFormRequest.php @@ -30,7 +30,7 @@ use Illuminate\Foundation\Http\FormRequest; /** * Class NewUserFormRequest. * - * @codeCoverageIgnore + */ class NewUserFormRequest extends FormRequest { diff --git a/app/Http/Requests/ProfileFormRequest.php b/app/Http/Requests/ProfileFormRequest.php index 4bb3b789f4..f643abb3b3 100644 --- a/app/Http/Requests/ProfileFormRequest.php +++ b/app/Http/Requests/ProfileFormRequest.php @@ -29,7 +29,7 @@ use Illuminate\Foundation\Http\FormRequest; /** * Class ProfileFormRequest. * - * @codeCoverageIgnore + */ class ProfileFormRequest extends FormRequest { diff --git a/app/Http/Requests/SelectTransactionsRequest.php b/app/Http/Requests/SelectTransactionsRequest.php index 00a6c6e199..da47ec0d44 100644 --- a/app/Http/Requests/SelectTransactionsRequest.php +++ b/app/Http/Requests/SelectTransactionsRequest.php @@ -30,7 +30,7 @@ use Illuminate\Foundation\Http\FormRequest; /** * Class SelectTransactionsRequest. * - * @codeCoverageIgnore + */ class SelectTransactionsRequest extends FormRequest { diff --git a/app/Http/Requests/TestRuleFormRequest.php b/app/Http/Requests/TestRuleFormRequest.php index 3c6d7bdf37..f2afa826e5 100644 --- a/app/Http/Requests/TestRuleFormRequest.php +++ b/app/Http/Requests/TestRuleFormRequest.php @@ -30,7 +30,7 @@ use Illuminate\Foundation\Http\FormRequest; /** * Class TestRuleFormRequest. * - * @codeCoverageIgnore + */ class TestRuleFormRequest extends FormRequest { diff --git a/app/Http/Requests/TokenFormRequest.php b/app/Http/Requests/TokenFormRequest.php index 8245fafa37..eedf49a616 100644 --- a/app/Http/Requests/TokenFormRequest.php +++ b/app/Http/Requests/TokenFormRequest.php @@ -29,7 +29,7 @@ use Illuminate\Foundation\Http\FormRequest; /** * Class TokenFormRequest. * - * @codeCoverageIgnore + */ class TokenFormRequest extends FormRequest { diff --git a/app/Http/Requests/UserFormRequest.php b/app/Http/Requests/UserFormRequest.php index ceea33a1a9..1305bda1fc 100644 --- a/app/Http/Requests/UserFormRequest.php +++ b/app/Http/Requests/UserFormRequest.php @@ -30,7 +30,7 @@ use Illuminate\Foundation\Http\FormRequest; /** * Class UserFormRequest. * - * @codeCoverageIgnore + */ class UserFormRequest extends FormRequest { diff --git a/app/Http/Requests/UserRegistrationRequest.php b/app/Http/Requests/UserRegistrationRequest.php index 02831d3fb4..c8c68c35a7 100644 --- a/app/Http/Requests/UserRegistrationRequest.php +++ b/app/Http/Requests/UserRegistrationRequest.php @@ -29,7 +29,7 @@ use Illuminate\Foundation\Http\FormRequest; /** * Class UserRegistrationRequest. * - * @codeCoverageIgnore + */ class UserRegistrationRequest extends FormRequest { diff --git a/app/Jobs/CreateAutoBudgetLimits.php b/app/Jobs/CreateAutoBudgetLimits.php index e439113929..0f0ef38ce7 100644 --- a/app/Jobs/CreateAutoBudgetLimits.php +++ b/app/Jobs/CreateAutoBudgetLimits.php @@ -53,7 +53,7 @@ class CreateAutoBudgetLimits implements ShouldQueue /** * Create a new job instance. * - * @codeCoverageIgnore + * * @param Carbon|null $date */ diff --git a/app/Jobs/CreateRecurringTransactions.php b/app/Jobs/CreateRecurringTransactions.php index 8d7baff791..9bc13b0c6d 100644 --- a/app/Jobs/CreateRecurringTransactions.php +++ b/app/Jobs/CreateRecurringTransactions.php @@ -69,7 +69,7 @@ class CreateRecurringTransactions implements ShouldQueue /** * Create a new job instance. * - * @codeCoverageIgnore + * * @param Carbon|null $date */ diff --git a/app/Jobs/DownloadExchangeRates.php b/app/Jobs/DownloadExchangeRates.php index 3e47c4e045..a2eb70c0a4 100644 --- a/app/Jobs/DownloadExchangeRates.php +++ b/app/Jobs/DownloadExchangeRates.php @@ -55,7 +55,7 @@ class DownloadExchangeRates implements ShouldQueue /** * Create a new job instance. * - * @codeCoverageIgnore + * * @param Carbon|null $date */ diff --git a/app/Jobs/MailError.php b/app/Jobs/MailError.php index 7805fb5d22..688a2ba15f 100644 --- a/app/Jobs/MailError.php +++ b/app/Jobs/MailError.php @@ -35,7 +35,7 @@ use Mail; /** * Class MailError. * - * @codeCoverageIgnore + */ class MailError extends Job implements ShouldQueue { diff --git a/app/Jobs/WarnAboutBills.php b/app/Jobs/WarnAboutBills.php index 647e3d0372..f024031760 100644 --- a/app/Jobs/WarnAboutBills.php +++ b/app/Jobs/WarnAboutBills.php @@ -50,7 +50,7 @@ class WarnAboutBills implements ShouldQueue /** * Create a new job instance. * - * @codeCoverageIgnore + * * @param Carbon|null $date */ diff --git a/app/Mail/AccessTokenCreatedMail.php b/app/Mail/AccessTokenCreatedMail.php index 40dbbe2c27..185300fa13 100644 --- a/app/Mail/AccessTokenCreatedMail.php +++ b/app/Mail/AccessTokenCreatedMail.php @@ -30,7 +30,7 @@ use Illuminate\Queue\SerializesModels; /** * Class AccessTokenCreatedMail * - * @codeCoverageIgnore + */ class AccessTokenCreatedMail extends Mailable { diff --git a/app/Mail/AdminTestMail.php b/app/Mail/AdminTestMail.php index bcef6cda6e..502f015361 100644 --- a/app/Mail/AdminTestMail.php +++ b/app/Mail/AdminTestMail.php @@ -32,7 +32,7 @@ use Illuminate\Queue\SerializesModels; * * Sends a test mail to administrators. * - * @codeCoverageIgnore + */ class AdminTestMail extends Mailable { diff --git a/app/Mail/ConfirmEmailChangeMail.php b/app/Mail/ConfirmEmailChangeMail.php index 7ad5fe34ac..cf8bd272c7 100644 --- a/app/Mail/ConfirmEmailChangeMail.php +++ b/app/Mail/ConfirmEmailChangeMail.php @@ -32,7 +32,7 @@ use Illuminate\Queue\SerializesModels; * * Sends message to new address to confirm change. * - * @codeCoverageIgnore + */ class ConfirmEmailChangeMail extends Mailable { diff --git a/app/Mail/OAuthTokenCreatedMail.php b/app/Mail/OAuthTokenCreatedMail.php index 69bc8cf471..5284c8c767 100644 --- a/app/Mail/OAuthTokenCreatedMail.php +++ b/app/Mail/OAuthTokenCreatedMail.php @@ -31,7 +31,7 @@ use Laravel\Passport\Client; /** * Class OAuthTokenCreatedMail * - * @codeCoverageIgnore + */ class OAuthTokenCreatedMail extends Mailable { diff --git a/app/Mail/RegisteredUser.php b/app/Mail/RegisteredUser.php index b68e2449b7..54169051e9 100644 --- a/app/Mail/RegisteredUser.php +++ b/app/Mail/RegisteredUser.php @@ -32,7 +32,7 @@ use Illuminate\Queue\SerializesModels; * * Class RegisteredUser * - * @codeCoverageIgnore + */ class RegisteredUser extends Mailable { diff --git a/app/Mail/ReportNewJournalsMail.php b/app/Mail/ReportNewJournalsMail.php index 2b0154ce8d..28830e07b1 100644 --- a/app/Mail/ReportNewJournalsMail.php +++ b/app/Mail/ReportNewJournalsMail.php @@ -35,7 +35,7 @@ use Illuminate\Support\Collection; * * Sends a list of newly created journals to the user. * - * @codeCoverageIgnore + */ class ReportNewJournalsMail extends Mailable { diff --git a/app/Mail/RequestedNewPassword.php b/app/Mail/RequestedNewPassword.php index 865280d00d..a9cd775dd0 100644 --- a/app/Mail/RequestedNewPassword.php +++ b/app/Mail/RequestedNewPassword.php @@ -31,7 +31,7 @@ use Illuminate\Queue\SerializesModels; * Sends user link for new password. * Class RequestedNewPassword * - * @codeCoverageIgnore + */ class RequestedNewPassword extends Mailable { diff --git a/app/Mail/UndoEmailChangeMail.php b/app/Mail/UndoEmailChangeMail.php index df4a5df620..1f800a5af9 100644 --- a/app/Mail/UndoEmailChangeMail.php +++ b/app/Mail/UndoEmailChangeMail.php @@ -30,7 +30,7 @@ use Illuminate\Queue\SerializesModels; /** * Class UndoEmailChangeMail * - * @codeCoverageIgnore + */ class UndoEmailChangeMail extends Mailable { diff --git a/app/Models/Account.php b/app/Models/Account.php index ba49d190ec..8b013738cb 100644 --- a/app/Models/Account.php +++ b/app/Models/Account.php @@ -154,7 +154,7 @@ class Account extends Model /** * @return BelongsTo - * @codeCoverageIgnore + */ public function user(): BelongsTo { @@ -163,7 +163,7 @@ class Account extends Model /** * @return BelongsTo - * @codeCoverageIgnore + */ public function accountType(): BelongsTo { @@ -171,7 +171,7 @@ class Account extends Model } /** - * @codeCoverageIgnore + * @return MorphMany */ public function attachments(): MorphMany @@ -196,7 +196,7 @@ class Account extends Model /** * @return HasMany - * @codeCoverageIgnore + */ public function accountMeta(): HasMany { @@ -205,7 +205,7 @@ class Account extends Model /** * @return string - * @codeCoverageIgnore + */ public function getEditNameAttribute(): string { @@ -219,7 +219,7 @@ class Account extends Model } /** - * @codeCoverageIgnore + * @return MorphMany */ public function locations(): MorphMany @@ -228,7 +228,7 @@ class Account extends Model } /** - * @codeCoverageIgnore + * Get all of the notes. */ public function notes(): MorphMany @@ -246,7 +246,7 @@ class Account extends Model /** * @return HasMany - * @codeCoverageIgnore + */ public function piggyBanks(): HasMany { @@ -254,7 +254,7 @@ class Account extends Model } /** - * @codeCoverageIgnore + * * @param EloquentBuilder $query * @param array $types @@ -269,11 +269,11 @@ class Account extends Model } /** - * @codeCoverageIgnore + * * @param mixed $value * - * @codeCoverageIgnore + */ public function setVirtualBalanceAttribute($value): void { @@ -286,7 +286,7 @@ class Account extends Model /** * @return HasMany - * @codeCoverageIgnore + */ public function transactions(): HasMany { diff --git a/app/Models/AccountMeta.php b/app/Models/AccountMeta.php index 1047fa1a72..9b0331c209 100644 --- a/app/Models/AccountMeta.php +++ b/app/Models/AccountMeta.php @@ -70,7 +70,7 @@ class AccountMeta extends Model /** * @return BelongsTo - * @codeCoverageIgnore + */ public function account(): BelongsTo { @@ -82,7 +82,7 @@ class AccountMeta extends Model * * @return mixed * @throws JsonException - * @codeCoverageIgnore + */ public function getDataAttribute($value) { @@ -92,7 +92,7 @@ class AccountMeta extends Model /** * @param mixed $value * - * @codeCoverageIgnore + */ public function setDataAttribute($value): void { diff --git a/app/Models/AccountType.php b/app/Models/AccountType.php index a3c53fdca0..1d304f13fb 100644 --- a/app/Models/AccountType.php +++ b/app/Models/AccountType.php @@ -81,7 +81,7 @@ class AccountType extends Model /** * @return HasMany - * @codeCoverageIgnore + */ public function accounts(): HasMany { diff --git a/app/Models/Attachment.php b/app/Models/Attachment.php index 6615788d3a..8171c93168 100644 --- a/app/Models/Attachment.php +++ b/app/Models/Attachment.php @@ -125,7 +125,7 @@ class Attachment extends Model } /** - * @codeCoverageIgnore + * @return BelongsTo */ public function user(): BelongsTo @@ -136,7 +136,7 @@ class Attachment extends Model /** * Get all of the owning attachable models. * - * @codeCoverageIgnore + * * @return MorphTo */ @@ -148,7 +148,7 @@ class Attachment extends Model /** * Returns the expected filename for this attachment. * - * @codeCoverageIgnore + * @return string */ public function fileName(): string @@ -157,7 +157,7 @@ class Attachment extends Model } /** - * @codeCoverageIgnore + * Get all of the notes. */ public function notes(): MorphMany diff --git a/app/Models/AuditLogEntry.php b/app/Models/AuditLogEntry.php index 86f2a94283..52449c821e 100644 --- a/app/Models/AuditLogEntry.php +++ b/app/Models/AuditLogEntry.php @@ -79,7 +79,7 @@ class AuditLogEntry extends Model ]; /** - * @codeCoverageIgnore + */ public function auditable(): MorphTo { @@ -87,7 +87,7 @@ class AuditLogEntry extends Model } /** - * @codeCoverageIgnore + */ public function changer(): MorphTo { diff --git a/app/Models/AutoBudget.php b/app/Models/AutoBudget.php index ef6f4b41fc..2caf50d4ed 100644 --- a/app/Models/AutoBudget.php +++ b/app/Models/AutoBudget.php @@ -71,7 +71,7 @@ class AutoBudget extends Model public const AUTO_BUDGET_ROLLOVER = 2; /** - * @codeCoverageIgnore + * @return BelongsTo */ public function budget(): BelongsTo @@ -80,7 +80,7 @@ class AutoBudget extends Model } /** - * @codeCoverageIgnore + * @return BelongsTo */ public function transactionCurrency(): BelongsTo diff --git a/app/Models/AvailableBudget.php b/app/Models/AvailableBudget.php index 3dbb68df3f..0fad31a1e2 100644 --- a/app/Models/AvailableBudget.php +++ b/app/Models/AvailableBudget.php @@ -111,7 +111,7 @@ class AvailableBudget extends Model } /** - * @codeCoverageIgnore + * @return BelongsTo */ public function user(): BelongsTo @@ -120,7 +120,7 @@ class AvailableBudget extends Model } /** - * @codeCoverageIgnore + * @return BelongsTo */ public function transactionCurrency(): BelongsTo diff --git a/app/Models/Bill.php b/app/Models/Bill.php index 4d5ad3c687..afa848ef39 100644 --- a/app/Models/Bill.php +++ b/app/Models/Bill.php @@ -167,7 +167,7 @@ class Bill extends Model } /** - * @codeCoverageIgnore + * @return BelongsTo */ public function user(): BelongsTo @@ -176,7 +176,7 @@ class Bill extends Model } /** - * @codeCoverageIgnore + * @return MorphMany */ public function attachments(): MorphMany @@ -185,7 +185,7 @@ class Bill extends Model } /** - * @codeCoverageIgnore + * Get all of the notes. */ public function notes(): MorphMany @@ -202,7 +202,7 @@ class Bill extends Model } /** - * @codeCoverageIgnore + * * @param mixed $value */ @@ -214,7 +214,7 @@ class Bill extends Model /** * @param mixed $value * - * @codeCoverageIgnore + */ public function setAmountMinAttribute($value): void { @@ -222,7 +222,7 @@ class Bill extends Model } /** - * @codeCoverageIgnore + * @return BelongsTo */ public function transactionCurrency(): BelongsTo @@ -231,7 +231,7 @@ class Bill extends Model } /** - * @codeCoverageIgnore + * @return HasMany */ public function transactionJournals(): HasMany diff --git a/app/Models/Budget.php b/app/Models/Budget.php index 6b260adb25..11d1cf8c27 100644 --- a/app/Models/Budget.php +++ b/app/Models/Budget.php @@ -127,7 +127,7 @@ class Budget extends Model } /** - * @codeCoverageIgnore + * @return BelongsTo */ public function user(): BelongsTo @@ -136,7 +136,7 @@ class Budget extends Model } /** - * @codeCoverageIgnore + * @return MorphMany */ public function attachments(): MorphMany @@ -145,7 +145,7 @@ class Budget extends Model } /** - * @codeCoverageIgnore + * @return HasMany */ public function autoBudgets(): HasMany @@ -154,7 +154,7 @@ class Budget extends Model } /** - * @codeCoverageIgnore + * @return HasMany */ public function budgetlimits(): HasMany @@ -163,7 +163,7 @@ class Budget extends Model } /** - * @codeCoverageIgnore + * Get all of the notes. */ public function notes(): MorphMany @@ -172,7 +172,7 @@ class Budget extends Model } /** - * @codeCoverageIgnore + * @return BelongsToMany */ public function transactionJournals(): BelongsToMany @@ -181,7 +181,7 @@ class Budget extends Model } /** - * @codeCoverageIgnore + * @return BelongsToMany */ public function transactions(): BelongsToMany diff --git a/app/Models/BudgetLimit.php b/app/Models/BudgetLimit.php index fdb0c43cac..ae5062599d 100644 --- a/app/Models/BudgetLimit.php +++ b/app/Models/BudgetLimit.php @@ -105,7 +105,7 @@ class BudgetLimit extends Model } /** - * @codeCoverageIgnore + * @return BelongsTo */ public function budget(): BelongsTo @@ -114,7 +114,7 @@ class BudgetLimit extends Model } /** - * @codeCoverageIgnore + * @return BelongsTo */ public function transactionCurrency(): BelongsTo diff --git a/app/Models/Category.php b/app/Models/Category.php index 24a9e2038f..8bc5ac8b0c 100644 --- a/app/Models/Category.php +++ b/app/Models/Category.php @@ -117,7 +117,7 @@ class Category extends Model } /** - * @codeCoverageIgnore + * @return BelongsTo */ public function user(): BelongsTo @@ -126,7 +126,7 @@ class Category extends Model } /** - * @codeCoverageIgnore + * @return MorphMany */ public function attachments(): MorphMany @@ -135,7 +135,7 @@ class Category extends Model } /** - * @codeCoverageIgnore + * Get all of the category's notes. */ public function notes(): MorphMany @@ -144,7 +144,7 @@ class Category extends Model } /** - * @codeCoverageIgnore + * @return BelongsToMany */ public function transactionJournals(): BelongsToMany @@ -153,7 +153,7 @@ class Category extends Model } /** - * @codeCoverageIgnore + * @return BelongsToMany */ public function transactions(): BelongsToMany diff --git a/app/Models/Configuration.php b/app/Models/Configuration.php index ec88f81842..bd6155b958 100644 --- a/app/Models/Configuration.php +++ b/app/Models/Configuration.php @@ -73,7 +73,7 @@ class Configuration extends Model /** * TODO can be replaced with native laravel code. * - * @codeCoverageIgnore + * * @param mixed $value * @@ -85,7 +85,7 @@ class Configuration extends Model } /** - * @codeCoverageIgnore + * * @param mixed $value */ diff --git a/app/Models/CurrencyExchangeRate.php b/app/Models/CurrencyExchangeRate.php index f0bf57860e..7be23bd662 100644 --- a/app/Models/CurrencyExchangeRate.php +++ b/app/Models/CurrencyExchangeRate.php @@ -79,7 +79,7 @@ class CurrencyExchangeRate extends Model protected $fillable = ['user_id', 'from_currency_id', 'to_currency_id', 'date', 'rate']; /** - * @codeCoverageIgnore + * @return BelongsTo */ public function fromCurrency(): BelongsTo @@ -88,7 +88,7 @@ class CurrencyExchangeRate extends Model } /** - * @codeCoverageIgnore + * @return BelongsTo */ public function toCurrency(): BelongsTo @@ -97,7 +97,7 @@ class CurrencyExchangeRate extends Model } /** - * @codeCoverageIgnore + * @return BelongsTo */ public function user(): BelongsTo diff --git a/app/Models/InvitedUser.php b/app/Models/InvitedUser.php index 366e93ea2f..39dd9ee44b 100644 --- a/app/Models/InvitedUser.php +++ b/app/Models/InvitedUser.php @@ -66,7 +66,7 @@ class InvitedUser extends Model protected $fillable = ['user_id', 'email', 'invite_code', 'expires', 'redeemed']; /** - * @codeCoverageIgnore + * @return BelongsTo */ public function user(): BelongsTo diff --git a/app/Models/LinkType.php b/app/Models/LinkType.php index e05e7d8263..ab44f2b1f7 100644 --- a/app/Models/LinkType.php +++ b/app/Models/LinkType.php @@ -104,7 +104,7 @@ class LinkType extends Model } /** - * @codeCoverageIgnore + * @return HasMany */ public function transactionJournalLinks(): HasMany diff --git a/app/Models/Location.php b/app/Models/Location.php index 47520351cf..605efcc948 100644 --- a/app/Models/Location.php +++ b/app/Models/Location.php @@ -97,7 +97,7 @@ class Location extends Model } /** - * @codeCoverageIgnore + * Get all of the accounts. */ public function accounts(): MorphMany @@ -108,7 +108,7 @@ class Location extends Model /** * Get all of the owning attachable models. * - * @codeCoverageIgnore + * * @return MorphTo */ diff --git a/app/Models/Note.php b/app/Models/Note.php index 92c83528ec..420f0ccff9 100644 --- a/app/Models/Note.php +++ b/app/Models/Note.php @@ -77,7 +77,7 @@ class Note extends Model protected $fillable = ['title', 'text', 'noteable_id', 'noteable_type']; /** - * @codeCoverageIgnore + * * Get all the owning noteable models. */ diff --git a/app/Models/ObjectGroup.php b/app/Models/ObjectGroup.php index eb20e51e90..de15cd5421 100644 --- a/app/Models/ObjectGroup.php +++ b/app/Models/ObjectGroup.php @@ -103,7 +103,7 @@ class ObjectGroup extends Model /** * @return BelongsTo - * @codeCoverageIgnore + */ public function user(): BelongsTo { diff --git a/app/Models/PiggyBank.php b/app/Models/PiggyBank.php index b497fd1791..2fc9520983 100644 --- a/app/Models/PiggyBank.php +++ b/app/Models/PiggyBank.php @@ -129,7 +129,7 @@ class PiggyBank extends Model } /** - * @codeCoverageIgnore + * @return BelongsTo */ public function account(): BelongsTo @@ -138,7 +138,7 @@ class PiggyBank extends Model } /** - * @codeCoverageIgnore + * @return MorphMany */ public function attachments(): MorphMany @@ -147,7 +147,7 @@ class PiggyBank extends Model } /** - * @codeCoverageIgnore + * Get all of the piggy bank's notes. */ public function notes(): MorphMany @@ -164,7 +164,7 @@ class PiggyBank extends Model } /** - * @codeCoverageIgnore + * @return HasMany */ public function piggyBankEvents(): HasMany @@ -173,7 +173,7 @@ class PiggyBank extends Model } /** - * @codeCoverageIgnore + * @return HasMany */ public function piggyBankRepetitions(): HasMany @@ -182,7 +182,7 @@ class PiggyBank extends Model } /** - * @codeCoverageIgnore + * * @param mixed $value */ diff --git a/app/Models/PiggyBankEvent.php b/app/Models/PiggyBankEvent.php index 592810edcf..e4b0f0891d 100644 --- a/app/Models/PiggyBankEvent.php +++ b/app/Models/PiggyBankEvent.php @@ -73,7 +73,7 @@ class PiggyBankEvent extends Model protected $hidden = ['amount_encrypted']; /** - * @codeCoverageIgnore + * @return BelongsTo */ public function piggyBank(): BelongsTo @@ -82,7 +82,7 @@ class PiggyBankEvent extends Model } /** - * @codeCoverageIgnore + * * @param mixed $value */ @@ -92,7 +92,7 @@ class PiggyBankEvent extends Model } /** - * @codeCoverageIgnore + * @return BelongsTo */ public function transactionJournal(): BelongsTo diff --git a/app/Models/PiggyBankRepetition.php b/app/Models/PiggyBankRepetition.php index f7394bbf90..5cfa4fe4de 100644 --- a/app/Models/PiggyBankRepetition.php +++ b/app/Models/PiggyBankRepetition.php @@ -73,7 +73,7 @@ class PiggyBankRepetition extends Model protected $fillable = ['piggy_bank_id', 'startdate', 'targetdate', 'currentamount']; /** - * @codeCoverageIgnore + * @return BelongsTo */ public function piggyBank(): BelongsTo @@ -82,7 +82,7 @@ class PiggyBankRepetition extends Model } /** - * @codeCoverageIgnore + * * @param EloquentBuilder $query * @param Carbon $start @@ -96,7 +96,7 @@ class PiggyBankRepetition extends Model } /** - * @codeCoverageIgnore + * * @param EloquentBuilder $query * @param Carbon $date @@ -120,7 +120,7 @@ class PiggyBankRepetition extends Model } /** - * @codeCoverageIgnore + * * @param mixed $value */ diff --git a/app/Models/Preference.php b/app/Models/Preference.php index daf12690a7..595b21b9ae 100644 --- a/app/Models/Preference.php +++ b/app/Models/Preference.php @@ -105,7 +105,7 @@ class Preference extends Model } /** - * @codeCoverageIgnore + * @return BelongsTo */ public function user(): BelongsTo diff --git a/app/Models/Recurrence.php b/app/Models/Recurrence.php index b1415f8333..39b9e7ca47 100644 --- a/app/Models/Recurrence.php +++ b/app/Models/Recurrence.php @@ -143,7 +143,7 @@ class Recurrence extends Model } /** - * @codeCoverageIgnore + * @return BelongsTo */ public function user(): BelongsTo @@ -152,7 +152,7 @@ class Recurrence extends Model } /** - * @codeCoverageIgnore + * @return MorphMany */ public function attachments(): MorphMany @@ -161,7 +161,7 @@ class Recurrence extends Model } /** - * @codeCoverageIgnore + * Get all the notes. */ public function notes(): MorphMany @@ -171,7 +171,7 @@ class Recurrence extends Model /** * @return HasMany - * @codeCoverageIgnore + */ public function recurrenceMeta(): HasMany { @@ -180,7 +180,7 @@ class Recurrence extends Model /** * @return HasMany - * @codeCoverageIgnore + */ public function recurrenceRepetitions(): HasMany { @@ -189,7 +189,7 @@ class Recurrence extends Model /** * @return HasMany - * @codeCoverageIgnore + */ public function recurrenceTransactions(): HasMany { @@ -197,7 +197,7 @@ class Recurrence extends Model } /** - * @codeCoverageIgnore + * @return BelongsTo */ public function transactionCurrency(): BelongsTo @@ -206,7 +206,7 @@ class Recurrence extends Model } /** - * @codeCoverageIgnore + * @return BelongsTo */ public function transactionType(): BelongsTo diff --git a/app/Models/RecurrenceMeta.php b/app/Models/RecurrenceMeta.php index 516ff62ed5..00c79e7269 100644 --- a/app/Models/RecurrenceMeta.php +++ b/app/Models/RecurrenceMeta.php @@ -80,7 +80,7 @@ class RecurrenceMeta extends Model /** * @return BelongsTo - * @codeCoverageIgnore + */ public function recurrence(): BelongsTo { diff --git a/app/Models/RecurrenceRepetition.php b/app/Models/RecurrenceRepetition.php index 156dbaf01a..240e2c9d20 100644 --- a/app/Models/RecurrenceRepetition.php +++ b/app/Models/RecurrenceRepetition.php @@ -91,7 +91,7 @@ class RecurrenceRepetition extends Model /** * @return BelongsTo - * @codeCoverageIgnore + */ public function recurrence(): BelongsTo { diff --git a/app/Models/RecurrenceTransaction.php b/app/Models/RecurrenceTransaction.php index ebe4933d01..ba09af0f26 100644 --- a/app/Models/RecurrenceTransaction.php +++ b/app/Models/RecurrenceTransaction.php @@ -112,7 +112,7 @@ class RecurrenceTransaction extends Model protected $table = 'recurrences_transactions'; /** - * @codeCoverageIgnore + * @return BelongsTo */ public function destinationAccount(): BelongsTo @@ -121,7 +121,7 @@ class RecurrenceTransaction extends Model } /** - * @codeCoverageIgnore + * @return BelongsTo */ public function foreignCurrency(): BelongsTo @@ -131,7 +131,7 @@ class RecurrenceTransaction extends Model /** * @return BelongsTo - * @codeCoverageIgnore + */ public function recurrence(): BelongsTo { @@ -140,7 +140,7 @@ class RecurrenceTransaction extends Model /** * @return HasMany - * @codeCoverageIgnore + */ public function recurrenceTransactionMeta(): HasMany { @@ -148,7 +148,7 @@ class RecurrenceTransaction extends Model } /** - * @codeCoverageIgnore + * @return BelongsTo */ public function sourceAccount(): BelongsTo @@ -157,7 +157,7 @@ class RecurrenceTransaction extends Model } /** - * @codeCoverageIgnore + * @return BelongsTo */ public function transactionCurrency(): BelongsTo @@ -166,7 +166,7 @@ class RecurrenceTransaction extends Model } /** - * @codeCoverageIgnore + * @return BelongsTo */ public function transactionType(): BelongsTo diff --git a/app/Models/RecurrenceTransactionMeta.php b/app/Models/RecurrenceTransactionMeta.php index a5e1bd9fc0..43085d48f5 100644 --- a/app/Models/RecurrenceTransactionMeta.php +++ b/app/Models/RecurrenceTransactionMeta.php @@ -80,7 +80,7 @@ class RecurrenceTransactionMeta extends Model /** * @return BelongsTo - * @codeCoverageIgnore + */ public function recurrenceTransaction(): BelongsTo { diff --git a/app/Models/Role.php b/app/Models/Role.php index 75befaabe5..4f5c36c89a 100644 --- a/app/Models/Role.php +++ b/app/Models/Role.php @@ -70,7 +70,7 @@ class Role extends Model protected $fillable = ['name', 'display_name', 'description']; /** - * @codeCoverageIgnore + * @return BelongsToMany */ public function users(): BelongsToMany diff --git a/app/Models/Rule.php b/app/Models/Rule.php index cda09fb731..09bb55f03e 100644 --- a/app/Models/Rule.php +++ b/app/Models/Rule.php @@ -125,7 +125,7 @@ class Rule extends Model } /** - * @codeCoverageIgnore + * @return BelongsTo */ public function user(): BelongsTo @@ -134,7 +134,7 @@ class Rule extends Model } /** - * @codeCoverageIgnore + * @return HasMany */ public function ruleActions(): HasMany @@ -143,7 +143,7 @@ class Rule extends Model } /** - * @codeCoverageIgnore + * @return BelongsTo */ public function ruleGroup(): BelongsTo @@ -152,7 +152,7 @@ class Rule extends Model } /** - * @codeCoverageIgnore + * @return HasMany */ public function ruleTriggers(): HasMany @@ -163,7 +163,7 @@ class Rule extends Model /** * @param mixed $value * - * @codeCoverageIgnore + */ public function setDescriptionAttribute($value): void { diff --git a/app/Models/RuleAction.php b/app/Models/RuleAction.php index a80ccb1523..8044f4facb 100644 --- a/app/Models/RuleAction.php +++ b/app/Models/RuleAction.php @@ -76,7 +76,7 @@ class RuleAction extends Model protected $fillable = ['rule_id', 'action_type', 'action_value', 'order', 'active', 'stop_processing']; /** - * @codeCoverageIgnore + * @return BelongsTo */ public function rule(): BelongsTo diff --git a/app/Models/RuleGroup.php b/app/Models/RuleGroup.php index cd9ea245df..f8dcc4fb1e 100644 --- a/app/Models/RuleGroup.php +++ b/app/Models/RuleGroup.php @@ -116,7 +116,7 @@ class RuleGroup extends Model } /** - * @codeCoverageIgnore + * @return BelongsTo */ public function user(): BelongsTo @@ -125,7 +125,7 @@ class RuleGroup extends Model } /** - * @codeCoverageIgnore + * @return HasMany */ public function rules(): HasMany diff --git a/app/Models/RuleTrigger.php b/app/Models/RuleTrigger.php index 2e0fb6543a..37623e9f85 100644 --- a/app/Models/RuleTrigger.php +++ b/app/Models/RuleTrigger.php @@ -76,7 +76,7 @@ class RuleTrigger extends Model protected $fillable = ['rule_id', 'trigger_type', 'trigger_value', 'order', 'active', 'stop_processing']; /** - * @codeCoverageIgnore + * @return BelongsTo */ public function rule(): BelongsTo diff --git a/app/Models/Tag.php b/app/Models/Tag.php index ce0c944fb4..e39cdd6037 100644 --- a/app/Models/Tag.php +++ b/app/Models/Tag.php @@ -127,7 +127,7 @@ class Tag extends Model } /** - * @codeCoverageIgnore + * @return BelongsTo */ public function user(): BelongsTo @@ -136,7 +136,7 @@ class Tag extends Model } /** - * @codeCoverageIgnore + * @return MorphMany */ public function attachments(): MorphMany @@ -145,7 +145,7 @@ class Tag extends Model } /** - * @codeCoverageIgnore + * @return MorphMany */ public function locations(): MorphMany @@ -154,7 +154,7 @@ class Tag extends Model } /** - * @codeCoverageIgnore + * @return BelongsToMany */ public function transactionJournals(): BelongsToMany diff --git a/app/Models/Transaction.php b/app/Models/Transaction.php index 03e90a0203..a4f57ca72e 100644 --- a/app/Models/Transaction.php +++ b/app/Models/Transaction.php @@ -126,7 +126,7 @@ class Transaction extends Model /** * Get the account this object belongs to. * - * @codeCoverageIgnore + * @return BelongsTo */ public function account(): BelongsTo @@ -137,7 +137,7 @@ class Transaction extends Model /** * Get the budget(s) this object belongs to. * - * @codeCoverageIgnore + * @return BelongsToMany */ public function budgets(): BelongsToMany @@ -148,7 +148,7 @@ class Transaction extends Model /** * Get the category(ies) this object belongs to. * - * @codeCoverageIgnore + * @return BelongsToMany */ public function categories(): BelongsToMany @@ -159,7 +159,7 @@ class Transaction extends Model /** * Get the currency this object belongs to. * - * @codeCoverageIgnore + * @return BelongsTo */ public function foreignCurrency(): BelongsTo @@ -170,7 +170,7 @@ class Transaction extends Model /** * Check for transactions AFTER a specified date. * - * @codeCoverageIgnore + * * @param Builder $query * @param Carbon $date @@ -190,7 +190,7 @@ class Transaction extends Model * @param string $table * * @return bool - * @codeCoverageIgnore + */ public static function isJoined(Builder $query, string $table): bool { @@ -210,7 +210,7 @@ class Transaction extends Model /** * Check for transactions BEFORE the specified date. * - * @codeCoverageIgnore + * * @param Builder $query * @param Carbon $date @@ -224,7 +224,7 @@ class Transaction extends Model } /** - * @codeCoverageIgnore + * * @param Builder $query * @param array $types @@ -242,7 +242,7 @@ class Transaction extends Model } /** - * @codeCoverageIgnore + * * @param mixed $value */ @@ -252,7 +252,7 @@ class Transaction extends Model } /** - * @codeCoverageIgnore + * @return BelongsTo */ public function transactionCurrency(): BelongsTo @@ -261,7 +261,7 @@ class Transaction extends Model } /** - * @codeCoverageIgnore + * @return BelongsTo */ public function transactionJournal(): BelongsTo diff --git a/app/Models/TransactionCurrency.php b/app/Models/TransactionCurrency.php index 1196f7a8e3..8ed812ee65 100644 --- a/app/Models/TransactionCurrency.php +++ b/app/Models/TransactionCurrency.php @@ -108,7 +108,7 @@ class TransactionCurrency extends Model } /** - * @codeCoverageIgnore + * @return HasMany */ public function budgetLimits(): HasMany @@ -117,7 +117,7 @@ class TransactionCurrency extends Model } /** - * @codeCoverageIgnore + * @return HasMany */ public function transactionJournals(): HasMany @@ -126,7 +126,7 @@ class TransactionCurrency extends Model } /** - * @codeCoverageIgnore + * @return HasMany */ public function transactions(): HasMany diff --git a/app/Models/TransactionGroup.php b/app/Models/TransactionGroup.php index 64f8a35792..d07f15f589 100644 --- a/app/Models/TransactionGroup.php +++ b/app/Models/TransactionGroup.php @@ -116,7 +116,7 @@ class TransactionGroup extends Model } /** - * @codeCoverageIgnore + * @return BelongsTo */ public function user(): BelongsTo @@ -125,7 +125,7 @@ class TransactionGroup extends Model } /** - * @codeCoverageIgnore + * @return HasMany */ public function transactionJournals(): HasMany diff --git a/app/Models/TransactionJournal.php b/app/Models/TransactionJournal.php index 03fe540362..7fc8dcd351 100644 --- a/app/Models/TransactionJournal.php +++ b/app/Models/TransactionJournal.php @@ -185,7 +185,7 @@ class TransactionJournal extends Model } /** - * @codeCoverageIgnore + * @return BelongsTo */ public function user(): BelongsTo @@ -194,7 +194,7 @@ class TransactionJournal extends Model } /** - * @codeCoverageIgnore + * @return MorphMany */ public function attachments(): MorphMany @@ -203,7 +203,7 @@ class TransactionJournal extends Model } /** - * @codeCoverageIgnore + * @return BelongsTo */ public function bill(): BelongsTo @@ -212,7 +212,7 @@ class TransactionJournal extends Model } /** - * @codeCoverageIgnore + * @return BelongsToMany */ public function budgets(): BelongsToMany @@ -221,7 +221,7 @@ class TransactionJournal extends Model } /** - * @codeCoverageIgnore + * @return BelongsToMany */ public function categories(): BelongsToMany @@ -230,7 +230,7 @@ class TransactionJournal extends Model } /** - * @codeCoverageIgnore + * @return HasMany */ public function destJournalLinks(): HasMany @@ -239,7 +239,7 @@ class TransactionJournal extends Model } /** - * @codeCoverageIgnore + * @return bool */ public function isTransfer(): bool @@ -252,7 +252,7 @@ class TransactionJournal extends Model } /** - * @codeCoverageIgnore + * @return MorphMany */ public function locations(): MorphMany @@ -261,7 +261,7 @@ class TransactionJournal extends Model } /** - * @codeCoverageIgnore + * Get all of the notes. */ public function notes(): MorphMany @@ -270,7 +270,7 @@ class TransactionJournal extends Model } /** - * @codeCoverageIgnore + * @return HasMany */ public function piggyBankEvents(): HasMany @@ -279,7 +279,7 @@ class TransactionJournal extends Model } /** - * @codeCoverageIgnore + * * @param EloquentBuilder $query * @param Carbon $date @@ -292,7 +292,7 @@ class TransactionJournal extends Model } /** - * @codeCoverageIgnore + * * @param EloquentBuilder $query * @param Carbon $date @@ -305,7 +305,7 @@ class TransactionJournal extends Model } /** - * @codeCoverageIgnore + * * @param EloquentBuilder $query * @param array $types @@ -323,7 +323,7 @@ class TransactionJournal extends Model /** * Checks if tables are joined. * - * @codeCoverageIgnore + * * @param Builder $query * @param string $table @@ -346,7 +346,7 @@ class TransactionJournal extends Model } /** - * @codeCoverageIgnore + * @return HasMany */ public function sourceJournalLinks(): HasMany @@ -355,7 +355,7 @@ class TransactionJournal extends Model } /** - * @codeCoverageIgnore + * @return BelongsToMany */ public function tags(): BelongsToMany @@ -364,7 +364,7 @@ class TransactionJournal extends Model } /** - * @codeCoverageIgnore + * @return BelongsTo */ public function transactionCurrency(): BelongsTo @@ -373,7 +373,7 @@ class TransactionJournal extends Model } /** - * @codeCoverageIgnore + * @return BelongsTo */ public function transactionGroup(): BelongsTo @@ -382,7 +382,7 @@ class TransactionJournal extends Model } /** - * @codeCoverageIgnore + * @return HasMany */ public function transactionJournalMeta(): HasMany @@ -391,7 +391,7 @@ class TransactionJournal extends Model } /** - * @codeCoverageIgnore + * @return BelongsTo */ public function transactionType(): BelongsTo @@ -400,7 +400,7 @@ class TransactionJournal extends Model } /** - * @codeCoverageIgnore + * @return HasMany */ public function transactions(): HasMany diff --git a/app/Models/TransactionJournalLink.php b/app/Models/TransactionJournalLink.php index 937acf1713..4a3046bddc 100644 --- a/app/Models/TransactionJournalLink.php +++ b/app/Models/TransactionJournalLink.php @@ -103,7 +103,7 @@ class TransactionJournalLink extends Model } /** - * @codeCoverageIgnore + * @return BelongsTo */ public function destination(): BelongsTo @@ -112,7 +112,7 @@ class TransactionJournalLink extends Model } /** - * @codeCoverageIgnore + * @return BelongsTo */ public function linkType(): BelongsTo @@ -121,7 +121,7 @@ class TransactionJournalLink extends Model } /** - * @codeCoverageIgnore + * Get all of the notes. */ public function notes(): MorphMany @@ -130,7 +130,7 @@ class TransactionJournalLink extends Model } /** - * @codeCoverageIgnore + * @return BelongsTo */ public function source(): BelongsTo diff --git a/app/Models/TransactionJournalMeta.php b/app/Models/TransactionJournalMeta.php index 823bcb01a6..7ea702a4d8 100644 --- a/app/Models/TransactionJournalMeta.php +++ b/app/Models/TransactionJournalMeta.php @@ -79,7 +79,7 @@ class TransactionJournalMeta extends Model protected $table = 'journal_meta'; /** - * @codeCoverageIgnore + * * @param mixed $value * @@ -91,7 +91,7 @@ class TransactionJournalMeta extends Model } /** - * @codeCoverageIgnore + * * @param mixed $value */ @@ -103,7 +103,7 @@ class TransactionJournalMeta extends Model } /** - * @codeCoverageIgnore + * @return BelongsTo */ public function transactionJournal(): BelongsTo diff --git a/app/Models/TransactionType.php b/app/Models/TransactionType.php index b39832d757..53d3eae91b 100644 --- a/app/Models/TransactionType.php +++ b/app/Models/TransactionType.php @@ -96,7 +96,7 @@ class TransactionType extends Model } /** - * @codeCoverageIgnore + * @return bool */ public function isDeposit(): bool @@ -105,7 +105,7 @@ class TransactionType extends Model } /** - * @codeCoverageIgnore + * @return bool */ public function isOpeningBalance(): bool @@ -114,7 +114,7 @@ class TransactionType extends Model } /** - * @codeCoverageIgnore + * @return bool */ public function isTransfer(): bool @@ -123,7 +123,7 @@ class TransactionType extends Model } /** - * @codeCoverageIgnore + * @return bool */ public function isWithdrawal(): bool @@ -132,7 +132,7 @@ class TransactionType extends Model } /** - * @codeCoverageIgnore + * @return HasMany */ public function transactionJournals(): HasMany diff --git a/app/Models/UserGroup.php b/app/Models/UserGroup.php index f5bbe869f8..e68bd17e32 100644 --- a/app/Models/UserGroup.php +++ b/app/Models/UserGroup.php @@ -56,7 +56,7 @@ class UserGroup extends Model protected $fillable = ['title']; /** - * @codeCoverageIgnore + * * @return HasMany */ diff --git a/app/Models/UserRole.php b/app/Models/UserRole.php index 0247c4ca58..c8b03dc1ae 100644 --- a/app/Models/UserRole.php +++ b/app/Models/UserRole.php @@ -68,7 +68,7 @@ class UserRole extends Model protected $fillable = ['title']; /** - * @codeCoverageIgnore + * * @return HasMany */ diff --git a/app/Models/Webhook.php b/app/Models/Webhook.php index bf38d394b7..66f2463374 100644 --- a/app/Models/Webhook.php +++ b/app/Models/Webhook.php @@ -195,7 +195,7 @@ class Webhook extends Model } /** - * @codeCoverageIgnore + * @return BelongsTo */ public function user(): BelongsTo @@ -204,7 +204,7 @@ class Webhook extends Model } /** - * @codeCoverageIgnore + * @return HasMany */ public function webhookMessages(): HasMany diff --git a/app/Models/WebhookAttempt.php b/app/Models/WebhookAttempt.php index 9d1c296626..a3d3346e89 100644 --- a/app/Models/WebhookAttempt.php +++ b/app/Models/WebhookAttempt.php @@ -88,7 +88,7 @@ class WebhookAttempt extends Model } /** - * @codeCoverageIgnore + * @return BelongsTo */ public function webhookMessage(): BelongsTo diff --git a/app/Models/WebhookMessage.php b/app/Models/WebhookMessage.php index e74dcc1582..b019885d47 100644 --- a/app/Models/WebhookMessage.php +++ b/app/Models/WebhookMessage.php @@ -102,7 +102,7 @@ class WebhookMessage extends Model } /** - * @codeCoverageIgnore + * @return BelongsTo */ public function webhook(): BelongsTo @@ -111,7 +111,7 @@ class WebhookMessage extends Model } /** - * @codeCoverageIgnore + * @return HasMany */ public function webhookAttempts(): HasMany diff --git a/app/Providers/AccountServiceProvider.php b/app/Providers/AccountServiceProvider.php index a58e62ad67..4522c0efd7 100644 --- a/app/Providers/AccountServiceProvider.php +++ b/app/Providers/AccountServiceProvider.php @@ -33,7 +33,7 @@ use Illuminate\Foundation\Application; use Illuminate\Support\ServiceProvider; /** - * @codeCoverageIgnore + * Class AccountServiceProvider. */ class AccountServiceProvider extends ServiceProvider diff --git a/app/Providers/AdminServiceProvider.php b/app/Providers/AdminServiceProvider.php index b68b55657b..c1bd462a93 100644 --- a/app/Providers/AdminServiceProvider.php +++ b/app/Providers/AdminServiceProvider.php @@ -29,7 +29,7 @@ use Illuminate\Foundation\Application; use Illuminate\Support\ServiceProvider; /** - * @codeCoverageIgnore + * Class AdminServiceProvider */ class AdminServiceProvider extends ServiceProvider diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index d622e55553..ade642fb79 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -31,7 +31,7 @@ use Laravel\Sanctum\Sanctum; use URL; /** - * @codeCoverageIgnore + * Class AppServiceProvider */ class AppServiceProvider extends ServiceProvider diff --git a/app/Providers/AttachmentServiceProvider.php b/app/Providers/AttachmentServiceProvider.php index 4d65930e4f..097440f2ba 100644 --- a/app/Providers/AttachmentServiceProvider.php +++ b/app/Providers/AttachmentServiceProvider.php @@ -29,7 +29,7 @@ use Illuminate\Foundation\Application; use Illuminate\Support\ServiceProvider; /** - * @codeCoverageIgnore + * Class AttachmentServiceProvider. */ class AttachmentServiceProvider extends ServiceProvider diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php index 09dddfdcf2..1464c2e37c 100644 --- a/app/Providers/AuthServiceProvider.php +++ b/app/Providers/AuthServiceProvider.php @@ -30,7 +30,7 @@ use Illuminate\Support\Facades\Auth; use Laravel\Passport\Passport; /** - * @codeCoverageIgnore + * Class AuthServiceProvider */ class AuthServiceProvider extends ServiceProvider diff --git a/app/Providers/BillServiceProvider.php b/app/Providers/BillServiceProvider.php index 0b55493126..65f8edb3a2 100644 --- a/app/Providers/BillServiceProvider.php +++ b/app/Providers/BillServiceProvider.php @@ -29,7 +29,7 @@ use Illuminate\Foundation\Application; use Illuminate\Support\ServiceProvider; /** - * @codeCoverageIgnore + * Class BillServiceProvider. */ class BillServiceProvider extends ServiceProvider diff --git a/app/Providers/BroadcastServiceProvider.php b/app/Providers/BroadcastServiceProvider.php index 58e9475c01..f75f7bd99e 100644 --- a/app/Providers/BroadcastServiceProvider.php +++ b/app/Providers/BroadcastServiceProvider.php @@ -27,7 +27,7 @@ use Illuminate\Support\Facades\Broadcast; use Illuminate\Support\ServiceProvider; /** - * @codeCoverageIgnore + * Class BroadcastServiceProvider */ class BroadcastServiceProvider extends ServiceProvider diff --git a/app/Providers/BudgetServiceProvider.php b/app/Providers/BudgetServiceProvider.php index b20a33c548..e6132312a4 100644 --- a/app/Providers/BudgetServiceProvider.php +++ b/app/Providers/BudgetServiceProvider.php @@ -37,7 +37,7 @@ use Illuminate\Foundation\Application; use Illuminate\Support\ServiceProvider; /** - * @codeCoverageIgnore + * Class BudgetServiceProvider. */ class BudgetServiceProvider extends ServiceProvider diff --git a/app/Providers/CategoryServiceProvider.php b/app/Providers/CategoryServiceProvider.php index f84a151241..408348afd0 100644 --- a/app/Providers/CategoryServiceProvider.php +++ b/app/Providers/CategoryServiceProvider.php @@ -33,7 +33,7 @@ use Illuminate\Foundation\Application; use Illuminate\Support\ServiceProvider; /** - * @codeCoverageIgnore + * Class CategoryServiceProvider. */ class CategoryServiceProvider extends ServiceProvider diff --git a/app/Providers/CurrencyServiceProvider.php b/app/Providers/CurrencyServiceProvider.php index 99397399d7..806370066c 100644 --- a/app/Providers/CurrencyServiceProvider.php +++ b/app/Providers/CurrencyServiceProvider.php @@ -29,7 +29,7 @@ use Illuminate\Foundation\Application; use Illuminate\Support\ServiceProvider; /** - * @codeCoverageIgnore + * Class CurrencyServiceProvider. */ class CurrencyServiceProvider extends ServiceProvider diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php index e76b2af4e9..f4f533f7ac 100644 --- a/app/Providers/EventServiceProvider.php +++ b/app/Providers/EventServiceProvider.php @@ -55,7 +55,7 @@ use Log; /** * Class EventServiceProvider. * - * @codeCoverageIgnore + */ class EventServiceProvider extends ServiceProvider { diff --git a/app/Providers/FireflyServiceProvider.php b/app/Providers/FireflyServiceProvider.php index d8f32f46e9..02212f03bc 100644 --- a/app/Providers/FireflyServiceProvider.php +++ b/app/Providers/FireflyServiceProvider.php @@ -76,7 +76,7 @@ use Validator; * * Class FireflyServiceProvider. * - * @codeCoverageIgnore + * */ class FireflyServiceProvider extends ServiceProvider diff --git a/app/Providers/FireflySessionProvider.php b/app/Providers/FireflySessionProvider.php index 2d95dc0181..3e80a02f14 100644 --- a/app/Providers/FireflySessionProvider.php +++ b/app/Providers/FireflySessionProvider.php @@ -28,7 +28,7 @@ use Illuminate\Session\SessionManager; use Illuminate\Support\ServiceProvider; /** - * @codeCoverageIgnore + * Class FireflySessionProvider */ class FireflySessionProvider extends ServiceProvider diff --git a/app/Providers/JournalServiceProvider.php b/app/Providers/JournalServiceProvider.php index df99d30c77..1fb0fd1b32 100644 --- a/app/Providers/JournalServiceProvider.php +++ b/app/Providers/JournalServiceProvider.php @@ -37,7 +37,7 @@ use Illuminate\Foundation\Application; use Illuminate\Support\ServiceProvider; /** - * @codeCoverageIgnore + * Class JournalServiceProvider. */ class JournalServiceProvider extends ServiceProvider diff --git a/app/Providers/PiggyBankServiceProvider.php b/app/Providers/PiggyBankServiceProvider.php index bbf34d26c7..5e810fb3a0 100644 --- a/app/Providers/PiggyBankServiceProvider.php +++ b/app/Providers/PiggyBankServiceProvider.php @@ -29,7 +29,7 @@ use Illuminate\Foundation\Application; use Illuminate\Support\ServiceProvider; /** - * @codeCoverageIgnore + * Class PiggyBankServiceProvider. */ class PiggyBankServiceProvider extends ServiceProvider diff --git a/app/Providers/RecurringServiceProvider.php b/app/Providers/RecurringServiceProvider.php index 137d58e408..bff8c08c66 100644 --- a/app/Providers/RecurringServiceProvider.php +++ b/app/Providers/RecurringServiceProvider.php @@ -29,7 +29,7 @@ use Illuminate\Foundation\Application; use Illuminate\Support\ServiceProvider; /** - * @codeCoverageIgnore + * Class RecurringServiceProvider. */ class RecurringServiceProvider extends ServiceProvider diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php index c281dfb409..6c2f8e6770 100644 --- a/app/Providers/RouteServiceProvider.php +++ b/app/Providers/RouteServiceProvider.php @@ -27,7 +27,7 @@ use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvi use Illuminate\Support\Facades\Route; /** - * @codeCoverageIgnore + * Class RouteServiceProvider */ class RouteServiceProvider extends ServiceProvider diff --git a/app/Providers/RuleGroupServiceProvider.php b/app/Providers/RuleGroupServiceProvider.php index 9145a1faa4..cb7a208f0e 100644 --- a/app/Providers/RuleGroupServiceProvider.php +++ b/app/Providers/RuleGroupServiceProvider.php @@ -29,7 +29,7 @@ use Illuminate\Foundation\Application; use Illuminate\Support\ServiceProvider; /** - * @codeCoverageIgnore + * Class RuleGroupServiceProvider. */ class RuleGroupServiceProvider extends ServiceProvider diff --git a/app/Providers/RuleServiceProvider.php b/app/Providers/RuleServiceProvider.php index ab766531bb..b94ac7d219 100644 --- a/app/Providers/RuleServiceProvider.php +++ b/app/Providers/RuleServiceProvider.php @@ -29,7 +29,7 @@ use Illuminate\Foundation\Application; use Illuminate\Support\ServiceProvider; /** - * @codeCoverageIgnore + * Class RuleServiceProvider. */ class RuleServiceProvider extends ServiceProvider diff --git a/app/Providers/SearchServiceProvider.php b/app/Providers/SearchServiceProvider.php index fed6e8718b..cc03da82ec 100644 --- a/app/Providers/SearchServiceProvider.php +++ b/app/Providers/SearchServiceProvider.php @@ -29,7 +29,7 @@ use Illuminate\Foundation\Application; use Illuminate\Support\ServiceProvider; /** - * @codeCoverageIgnore + * Class SearchServiceProvider. */ class SearchServiceProvider extends ServiceProvider diff --git a/app/Providers/SessionServiceProvider.php b/app/Providers/SessionServiceProvider.php index e02f8eda08..1b64bc034d 100644 --- a/app/Providers/SessionServiceProvider.php +++ b/app/Providers/SessionServiceProvider.php @@ -27,7 +27,7 @@ use FireflyIII\Http\Middleware\StartFireflySession; use Illuminate\Session\SessionServiceProvider as BaseSessionServiceProvider; /** - * @codeCoverageIgnore + * Class SessionServiceProvider. */ class SessionServiceProvider extends BaseSessionServiceProvider diff --git a/app/Providers/TagServiceProvider.php b/app/Providers/TagServiceProvider.php index 1e53acdb20..851fa4a77e 100644 --- a/app/Providers/TagServiceProvider.php +++ b/app/Providers/TagServiceProvider.php @@ -31,7 +31,7 @@ use Illuminate\Foundation\Application; use Illuminate\Support\ServiceProvider; /** - * @codeCoverageIgnore + * Class TagServiceProvider. */ class TagServiceProvider extends ServiceProvider diff --git a/app/Repositories/Account/AccountRepository.php b/app/Repositories/Account/AccountRepository.php index caf53bfffb..197bbbb31b 100644 --- a/app/Repositories/Account/AccountRepository.php +++ b/app/Repositories/Account/AccountRepository.php @@ -38,6 +38,7 @@ use FireflyIII\Models\TransactionType; use FireflyIII\Services\Internal\Destroy\AccountDestroyService; use FireflyIII\Services\Internal\Update\AccountUpdateService; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Database\Eloquent\Builder as EloquentBuilder; use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Support\Collection; @@ -273,11 +274,13 @@ class AccountRepository implements AccountRepositoryInterface } /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user): void + public function setUser(User|Authenticatable|null $user): void { - $this->user = $user; + if (null !== $user) { + $this->user = $user; + } } /** diff --git a/app/Repositories/Account/AccountRepositoryInterface.php b/app/Repositories/Account/AccountRepositoryInterface.php index 85b26128aa..8a843d0257 100644 --- a/app/Repositories/Account/AccountRepositoryInterface.php +++ b/app/Repositories/Account/AccountRepositoryInterface.php @@ -31,6 +31,7 @@ use FireflyIII\Models\TransactionCurrency; use FireflyIII\Models\TransactionGroup; use FireflyIII\Models\TransactionJournal; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; /** @@ -302,9 +303,9 @@ interface AccountRepositoryInterface public function searchAccountNr(string $query, array $types, int $limit): Collection; /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user); + public function setUser(User|Authenticatable|null $user): void; /** * @param array $data diff --git a/app/Repositories/Account/AccountTasker.php b/app/Repositories/Account/AccountTasker.php index 33661f9d6c..a7bbecf9e0 100644 --- a/app/Repositories/Account/AccountTasker.php +++ b/app/Repositories/Account/AccountTasker.php @@ -30,6 +30,7 @@ use FireflyIII\Models\Account; use FireflyIII\Models\TransactionType; use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; use JsonException; use Log; @@ -309,10 +310,12 @@ class AccountTasker implements AccountTaskerInterface } /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user): void + public function setUser(User|Authenticatable|null $user): void { - $this->user = $user; + if (null !== $user) { + $this->user = $user; + } } } diff --git a/app/Repositories/Account/AccountTaskerInterface.php b/app/Repositories/Account/AccountTaskerInterface.php index d7ff2c184d..64d9ea50e4 100644 --- a/app/Repositories/Account/AccountTaskerInterface.php +++ b/app/Repositories/Account/AccountTaskerInterface.php @@ -25,6 +25,7 @@ namespace FireflyIII\Repositories\Account; use Carbon\Carbon; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; /** @@ -60,7 +61,7 @@ interface AccountTaskerInterface public function getIncomeReport(Carbon $start, Carbon $end, Collection $accounts): array; /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user); + public function setUser(User|Authenticatable|null $user): void; } diff --git a/app/Repositories/Account/OperationsRepository.php b/app/Repositories/Account/OperationsRepository.php index c6524f02e5..739b3c2cd7 100644 --- a/app/Repositories/Account/OperationsRepository.php +++ b/app/Repositories/Account/OperationsRepository.php @@ -28,6 +28,7 @@ use FireflyIII\Helpers\Collector\GroupCollectorInterface; use FireflyIII\Models\TransactionCurrency; use FireflyIII\Models\TransactionType; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; /** @@ -78,11 +79,13 @@ class OperationsRepository implements OperationsRepositoryInterface } /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user): void + public function setUser(User|Authenticatable|null $user): void { - $this->user = $user; + if (null !== $user) { + $this->user = $user; + } } /** diff --git a/app/Repositories/Account/OperationsRepositoryInterface.php b/app/Repositories/Account/OperationsRepositoryInterface.php index e70e27f4a4..2741d8b134 100644 --- a/app/Repositories/Account/OperationsRepositoryInterface.php +++ b/app/Repositories/Account/OperationsRepositoryInterface.php @@ -26,6 +26,7 @@ namespace FireflyIII\Repositories\Account; use Carbon\Carbon; use FireflyIII\Models\TransactionCurrency; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; /** @@ -60,9 +61,9 @@ interface OperationsRepositoryInterface public function listIncome(Carbon $start, Carbon $end, ?Collection $accounts = null): array; /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user): void; + public function setUser(User|Authenticatable|null $user): void; /** * Sum of withdrawal journals in period for a set of accounts, grouped per currency. Amounts are always negative. diff --git a/app/Repositories/Attachment/AttachmentRepository.php b/app/Repositories/Attachment/AttachmentRepository.php index 85dd226ae2..6a699a82a1 100644 --- a/app/Repositories/Attachment/AttachmentRepository.php +++ b/app/Repositories/Attachment/AttachmentRepository.php @@ -31,6 +31,7 @@ use FireflyIII\Helpers\Attachments\AttachmentHelperInterface; use FireflyIII\Models\Attachment; use FireflyIII\Models\Note; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Contracts\Encryption\DecryptException; use Illuminate\Support\Collection; use Illuminate\Support\Facades\Storage; @@ -152,11 +153,13 @@ class AttachmentRepository implements AttachmentRepositoryInterface } /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user): void + public function setUser(User|Authenticatable|null $user): void { - $this->user = $user; + if (null !== $user) { + $this->user = $user; + } } /** diff --git a/app/Repositories/Attachment/AttachmentRepositoryInterface.php b/app/Repositories/Attachment/AttachmentRepositoryInterface.php index 50d2d3b8a9..119219a0d1 100644 --- a/app/Repositories/Attachment/AttachmentRepositoryInterface.php +++ b/app/Repositories/Attachment/AttachmentRepositoryInterface.php @@ -26,6 +26,7 @@ namespace FireflyIII\Repositories\Attachment; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Models\Attachment; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; /** @@ -69,9 +70,9 @@ interface AttachmentRepositoryInterface public function getNoteText(Attachment $attachment): ?string; /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user); + public function setUser(User|Authenticatable|null $user): void; /** * @param array $data diff --git a/app/Repositories/Bill/BillRepository.php b/app/Repositories/Bill/BillRepository.php index 0884bdd790..af6557c773 100644 --- a/app/Repositories/Bill/BillRepository.php +++ b/app/Repositories/Bill/BillRepository.php @@ -39,6 +39,7 @@ use FireflyIII\Services\Internal\Destroy\BillDestroyService; use FireflyIII\Services\Internal\Update\BillUpdateService; use FireflyIII\Support\CacheProperties; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Database\Query\JoinClause; use Illuminate\Pagination\LengthAwarePaginator; use Illuminate\Support\Collection; @@ -198,11 +199,13 @@ class BillRepository implements BillRepositoryInterface } /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user): void + public function setUser(User|Authenticatable|null $user): void { - $this->user = $user; + if (null !== $user) { + $this->user = $user; + } } /** diff --git a/app/Repositories/Bill/BillRepositoryInterface.php b/app/Repositories/Bill/BillRepositoryInterface.php index 372d2da8b1..735eae4af5 100644 --- a/app/Repositories/Bill/BillRepositoryInterface.php +++ b/app/Repositories/Bill/BillRepositoryInterface.php @@ -27,6 +27,7 @@ use Carbon\Carbon; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Models\Bill; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Pagination\LengthAwarePaginator; use Illuminate\Support\Collection; @@ -315,9 +316,9 @@ interface BillRepositoryInterface public function setOrder(Bill $bill, int $order): void; /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user); + public function setUser(User|Authenticatable|null $user): void; /** * @param array $data diff --git a/app/Repositories/Budget/AvailableBudgetRepository.php b/app/Repositories/Budget/AvailableBudgetRepository.php index a1a080e987..99f1547ce9 100644 --- a/app/Repositories/Budget/AvailableBudgetRepository.php +++ b/app/Repositories/Budget/AvailableBudgetRepository.php @@ -27,6 +27,7 @@ use Carbon\Carbon; use FireflyIII\Models\AvailableBudget; use FireflyIII\Models\TransactionCurrency; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Database\Eloquent\Builder; use Illuminate\Support\Collection; @@ -220,11 +221,13 @@ class AvailableBudgetRepository implements AvailableBudgetRepositoryInterface } /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user): void + public function setUser(User|Authenticatable|null $user): void { - $this->user = $user; + if (null !== $user) { + $this->user = $user; + } } /** diff --git a/app/Repositories/Budget/AvailableBudgetRepositoryInterface.php b/app/Repositories/Budget/AvailableBudgetRepositoryInterface.php index 7537291f96..a8cd88c105 100644 --- a/app/Repositories/Budget/AvailableBudgetRepositoryInterface.php +++ b/app/Repositories/Budget/AvailableBudgetRepositoryInterface.php @@ -27,6 +27,7 @@ use Carbon\Carbon; use FireflyIII\Models\AvailableBudget; use FireflyIII\Models\TransactionCurrency; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; /** @@ -133,9 +134,9 @@ interface AvailableBudgetRepositoryInterface public function setAvailableBudget(TransactionCurrency $currency, Carbon $start, Carbon $end, string $amount): AvailableBudget; /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user): void; + public function setUser(User|Authenticatable|null $user): void; /** * @param array $data diff --git a/app/Repositories/Budget/BudgetLimitRepository.php b/app/Repositories/Budget/BudgetLimitRepository.php index bdd7d4b73c..2080c21f3e 100644 --- a/app/Repositories/Budget/BudgetLimitRepository.php +++ b/app/Repositories/Budget/BudgetLimitRepository.php @@ -30,6 +30,7 @@ use FireflyIII\Models\Budget; use FireflyIII\Models\BudgetLimit; use FireflyIII\Models\TransactionCurrency; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Database\Eloquent\Builder; use Illuminate\Support\Collection; use JsonException; @@ -271,11 +272,13 @@ class BudgetLimitRepository implements BudgetLimitRepositoryInterface } /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user): void + public function setUser(User|Authenticatable|null $user): void { - $this->user = $user; + if (null !== $user) { + $this->user = $user; + } } /** diff --git a/app/Repositories/Budget/BudgetLimitRepositoryInterface.php b/app/Repositories/Budget/BudgetLimitRepositoryInterface.php index 3c6c914c8a..0c21bbdb09 100644 --- a/app/Repositories/Budget/BudgetLimitRepositoryInterface.php +++ b/app/Repositories/Budget/BudgetLimitRepositoryInterface.php @@ -28,6 +28,7 @@ use FireflyIII\Models\Budget; use FireflyIII\Models\BudgetLimit; use FireflyIII\Models\TransactionCurrency; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; /** @@ -99,9 +100,9 @@ interface BudgetLimitRepositoryInterface public function getBudgetLimits(Budget $budget, Carbon $start = null, Carbon $end = null): Collection; /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user): void; + public function setUser(User|Authenticatable|null $user): void; /** * @param array $data diff --git a/app/Repositories/Budget/BudgetRepository.php b/app/Repositories/Budget/BudgetRepository.php index cef6d344a5..dfd2fe936f 100644 --- a/app/Repositories/Budget/BudgetRepository.php +++ b/app/Repositories/Budget/BudgetRepository.php @@ -25,7 +25,6 @@ namespace FireflyIII\Repositories\Budget; use Carbon\Carbon; use DB; -use Exception; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Helpers\Collector\GroupCollectorInterface; use FireflyIII\Models\Account; @@ -42,6 +41,7 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; use FireflyIII\Services\Internal\Destroy\BudgetDestroyService; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Database\QueryException; use Illuminate\Support\Collection; use JsonException; @@ -145,11 +145,13 @@ class BudgetRepository implements BudgetRepositoryInterface } /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user): void + public function setUser(User|Authenticatable|null $user): void { - $this->user = $user; + if (null !== $user) { + $this->user = $user; + } } /** @@ -752,4 +754,122 @@ class BudgetRepository implements BudgetRepositoryInterface { return (int)$this->user->budgets()->max('order'); } + + /** + * @inheritDoc + */ + public function spentInPeriodForBudget(Budget $budget, Carbon $start, Carbon $end): array + { + Log::debug(sprintf('Now in %s', __METHOD__)); + $start->startOfDay(); + $end->endOfDay(); + + // exclude specific liabilities + $repository = app(AccountRepositoryInterface::class); + $repository->setUser($this->user); + $subset = $repository->getAccountsByType(config('firefly.valid_liabilities')); + $selection = new Collection(); + /** @var Account $account */ + foreach ($subset as $account) { + if ('credit' === $repository->getMetaValue($account, 'liability_direction')) { + $selection->push($account); + } + } + + // start collecting: + /** @var GroupCollectorInterface $collector */ + $collector = app(GroupCollectorInterface::class); + $collector->setUser($this->user) + ->setRange($start, $end) + ->excludeDestinationAccounts($selection) + ->setTypes([TransactionType::WITHDRAWAL]) + ->setBudget($budget); + + $journals = $collector->getExtractedJournals(); + $array = []; + + foreach ($journals as $journal) { + $currencyId = (int)$journal['currency_id']; + $array[$currencyId] = $array[$currencyId] ?? [ + 'id' => (string)$currencyId, + 'name' => $journal['currency_name'], + 'symbol' => $journal['currency_symbol'], + 'code' => $journal['currency_code'], + 'decimal_places' => $journal['currency_decimal_places'], + 'sum' => '0', + ]; + $array[$currencyId]['sum'] = bcadd($array[$currencyId]['sum'], app('steam')->negative($journal['amount'])); + + // also do foreign amount: + $foreignId = (int)$journal['foreign_currency_id']; + if (0 !== $foreignId) { + $array[$foreignId] = $array[$foreignId] ?? [ + 'id' => (string)$foreignId, + 'name' => $journal['foreign_currency_name'], + 'symbol' => $journal['foreign_currency_symbol'], + 'code' => $journal['foreign_currency_code'], + 'decimal_places' => $journal['foreign_currency_decimal_places'], + 'sum' => '0', + ]; + $array[$foreignId]['sum'] = bcadd($array[$foreignId]['sum'], app('steam')->negative($journal['foreign_amount'])); + } + } + + return $array; + } + + /** + * @inheritDoc + */ + public function budgetedInPeriodForBudget(Budget $budget, Carbon $start, Carbon $end): array + { + Log::debug(sprintf('Now in budgetedInPeriod(#%d, "%s", "%s")', $budget->id, $start->format('Y-m-d'), $end->format('Y-m-d'))); + $return = []; + /** @var BudgetLimitRepository $limitRepository */ + $limitRepository = app(BudgetLimitRepository::class); + $limitRepository->setUser($this->user); + + Log::debug(sprintf('Budget #%d: "%s"', $budget->id, $budget->name)); + $limits = $limitRepository->getBudgetLimits($budget, $start, $end); + /** @var BudgetLimit $limit */ + foreach ($limits as $limit) { + Log::debug(sprintf('Budget limit #%d', $limit->id)); + $currency = $limit->transactionCurrency; + $return[$currency->id] = $return[$currency->id] ?? [ + 'id' => (string)$currency->id, + 'name' => $currency->name, + 'symbol' => $currency->symbol, + 'code' => $currency->code, + 'decimal_places' => $currency->decimal_places, + 'sum' => '0', + ]; + // same period + if ($limit->start_date->isSameDay($start) && $limit->end_date->isSameDay($end)) { + $return[$currency->id]['sum'] = bcadd($return[$currency->id]['sum'], (string)$limit->amount); + Log::debug(sprintf('Add full amount [1]: %s', $limit->amount)); + continue; + } + // limit is inside of date range + if ($start->lte($limit->start_date) && $end->gte($limit->end_date)) { + $return[$currency->id]['sum'] = bcadd($return[$currency->id]['sum'], (string)$limit->amount); + Log::debug(sprintf('Add full amount [2]: %s', $limit->amount)); + continue; + } + $total = $limit->start_date->diffInDays($limit->end_date) + 1; // include the day itself. + $days = $this->daysInOverlap($limit, $start, $end); + $amount = bcmul(bcdiv((string)$limit->amount, (string)$total), (string)$days); + $return[$currency->id]['sum'] = bcadd($return[$currency->id]['sum'], $amount); + Log::debug( + sprintf( + 'Amount per day: %s (%s over %d days). Total amount for %d days: %s', + bcdiv((string)$limit->amount, (string)$total), + $limit->amount, + $total, + $days, + $amount + ) + ); + } + return $return; + } } diff --git a/app/Repositories/Budget/BudgetRepositoryInterface.php b/app/Repositories/Budget/BudgetRepositoryInterface.php index 9441b3b76a..34ef2f921a 100644 --- a/app/Repositories/Budget/BudgetRepositoryInterface.php +++ b/app/Repositories/Budget/BudgetRepositoryInterface.php @@ -28,6 +28,7 @@ use FireflyIII\Exceptions\FireflyException; use FireflyIII\Models\AutoBudget; use FireflyIII\Models\Budget; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; /** @@ -60,6 +61,16 @@ interface BudgetRepositoryInterface */ public function budgetedInPeriod(Carbon $start, Carbon $end): array; + /** + * Returns the amount that is budgeted in a period. + * + * @param Budget $budget + * @param Carbon $start + * @param Carbon $end + * @return array + */ + public function budgetedInPeriodForBudget(Budget $budget, Carbon $start, Carbon $end): array; + /** * @return bool */ @@ -181,9 +192,9 @@ interface BudgetRepositoryInterface public function setBudgetOrder(Budget $budget, int $order): void; /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user); + public function setUser(User|Authenticatable|null $user): void; /** * Used in the v2 API to calculate the amount of money spent in all active budgets. @@ -195,6 +206,16 @@ interface BudgetRepositoryInterface */ public function spentInPeriod(Carbon $start, Carbon $end): array; + /** + * Used in the v2 API to calculate the amount of money spent in a single budget.. + * + * @param Carbon $start + * @param Carbon $end + * + * @return array + */ + public function spentInPeriodForBudget(Budget $budget, Carbon $start, Carbon $end): array; + /** * @param array $data * diff --git a/app/Repositories/Budget/NoBudgetRepository.php b/app/Repositories/Budget/NoBudgetRepository.php index 83e099d858..cf80215f58 100644 --- a/app/Repositories/Budget/NoBudgetRepository.php +++ b/app/Repositories/Budget/NoBudgetRepository.php @@ -28,6 +28,7 @@ use FireflyIII\Helpers\Collector\GroupCollectorInterface; use FireflyIII\Models\TransactionCurrency; use FireflyIII\Models\TransactionType; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; /** @@ -138,11 +139,13 @@ class NoBudgetRepository implements NoBudgetRepositoryInterface } /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user): void + public function setUser(User|Authenticatable|null $user): void { - $this->user = $user; + if (null !== $user) { + $this->user = $user; + } } /** diff --git a/app/Repositories/Budget/NoBudgetRepositoryInterface.php b/app/Repositories/Budget/NoBudgetRepositoryInterface.php index f431b59522..0ee20f50ef 100644 --- a/app/Repositories/Budget/NoBudgetRepositoryInterface.php +++ b/app/Repositories/Budget/NoBudgetRepositoryInterface.php @@ -26,6 +26,7 @@ namespace FireflyIII\Repositories\Budget; use Carbon\Carbon; use FireflyIII\Models\TransactionCurrency; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; /** @@ -44,9 +45,9 @@ interface NoBudgetRepositoryInterface public function getNoBudgetPeriodReport(Collection $accounts, Carbon $start, Carbon $end): array; /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user): void; + public function setUser(User|Authenticatable|null $user): void; /** * @param Collection $accounts diff --git a/app/Repositories/Budget/OperationsRepository.php b/app/Repositories/Budget/OperationsRepository.php index 4f983d051e..93d80b6329 100644 --- a/app/Repositories/Budget/OperationsRepository.php +++ b/app/Repositories/Budget/OperationsRepository.php @@ -31,6 +31,7 @@ use FireflyIII\Models\TransactionCurrency; use FireflyIII\Models\TransactionType; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; use Log; @@ -200,11 +201,13 @@ class OperationsRepository implements OperationsRepositoryInterface } /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user): void + public function setUser(User|Authenticatable|null $user): void { - $this->user = $user; + if (null !== $user) { + $this->user = $user; + } } /** diff --git a/app/Repositories/Budget/OperationsRepositoryInterface.php b/app/Repositories/Budget/OperationsRepositoryInterface.php index 6ff33a97c3..2771c548dc 100644 --- a/app/Repositories/Budget/OperationsRepositoryInterface.php +++ b/app/Repositories/Budget/OperationsRepositoryInterface.php @@ -27,6 +27,7 @@ use Carbon\Carbon; use FireflyIII\Models\Budget; use FireflyIII\Models\TransactionCurrency; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; /** @@ -70,9 +71,9 @@ interface OperationsRepositoryInterface public function listExpenses(Carbon $start, Carbon $end, ?Collection $accounts = null, ?Collection $budgets = null): array; /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user): void; + public function setUser(User|Authenticatable|null $user): void; /** diff --git a/app/Repositories/Category/CategoryRepository.php b/app/Repositories/Category/CategoryRepository.php index cbfd18453e..a5d0d41b78 100644 --- a/app/Repositories/Category/CategoryRepository.php +++ b/app/Repositories/Category/CategoryRepository.php @@ -36,6 +36,7 @@ use FireflyIII\Models\RuleAction; use FireflyIII\Services\Internal\Destroy\CategoryDestroyService; use FireflyIII\Services\Internal\Update\CategoryUpdateService; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; use Log; use Storage; @@ -196,13 +197,14 @@ class CategoryRepository implements CategoryRepositoryInterface } /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user): void + public function setUser(User|Authenticatable|null $user): void { - $this->user = $user; + if (null !== $user) { + $this->user = $user; + } } - /** * @param Category $category */ diff --git a/app/Repositories/Category/CategoryRepositoryInterface.php b/app/Repositories/Category/CategoryRepositoryInterface.php index b660fe9332..aefbeeecdd 100644 --- a/app/Repositories/Category/CategoryRepositoryInterface.php +++ b/app/Repositories/Category/CategoryRepositoryInterface.php @@ -27,6 +27,7 @@ use Carbon\Carbon; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Models\Category; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; /** @@ -151,9 +152,9 @@ interface CategoryRepositoryInterface public function searchCategory(string $query, int $limit): Collection; /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user); + public function setUser(User|Authenticatable|null $user): void; /** * @param array $data diff --git a/app/Repositories/Category/NoCategoryRepository.php b/app/Repositories/Category/NoCategoryRepository.php index 0e1845ff67..a8746e3687 100644 --- a/app/Repositories/Category/NoCategoryRepository.php +++ b/app/Repositories/Category/NoCategoryRepository.php @@ -27,6 +27,7 @@ use Carbon\Carbon; use FireflyIII\Helpers\Collector\GroupCollectorInterface; use FireflyIII\Models\TransactionType; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; /** @@ -90,11 +91,13 @@ class NoCategoryRepository implements NoCategoryRepositoryInterface } /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user): void + public function setUser(User|Authenticatable|null $user): void { - $this->user = $user; + if (null !== $user) { + $this->user = $user; + } } /** diff --git a/app/Repositories/Category/NoCategoryRepositoryInterface.php b/app/Repositories/Category/NoCategoryRepositoryInterface.php index 483f3f505d..d01207ebf6 100644 --- a/app/Repositories/Category/NoCategoryRepositoryInterface.php +++ b/app/Repositories/Category/NoCategoryRepositoryInterface.php @@ -25,6 +25,7 @@ namespace FireflyIII\Repositories\Category; use Carbon\Carbon; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; /** @@ -60,9 +61,9 @@ interface NoCategoryRepositoryInterface public function listIncome(Carbon $start, Carbon $end, ?Collection $accounts = null): array; /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user): void; + public function setUser(User|Authenticatable|null $user): void; /** * Sum of withdrawal journals in period without a category, grouped per currency. Amounts are always negative. diff --git a/app/Repositories/Category/OperationsRepository.php b/app/Repositories/Category/OperationsRepository.php index a2dabc2a7d..09aa138ca2 100644 --- a/app/Repositories/Category/OperationsRepository.php +++ b/app/Repositories/Category/OperationsRepository.php @@ -27,6 +27,7 @@ use Carbon\Carbon; use FireflyIII\Helpers\Collector\GroupCollectorInterface; use FireflyIII\Models\TransactionType; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; /** @@ -116,11 +117,13 @@ class OperationsRepository implements OperationsRepositoryInterface } /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user): void + public function setUser(User|Authenticatable|null $user): void { - $this->user = $user; + if (null !== $user) { + $this->user = $user; + } } /** diff --git a/app/Repositories/Category/OperationsRepositoryInterface.php b/app/Repositories/Category/OperationsRepositoryInterface.php index 1a30eee764..45db040c73 100644 --- a/app/Repositories/Category/OperationsRepositoryInterface.php +++ b/app/Repositories/Category/OperationsRepositoryInterface.php @@ -25,6 +25,7 @@ namespace FireflyIII\Repositories\Category; use Carbon\Carbon; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; /** @@ -92,9 +93,9 @@ interface OperationsRepositoryInterface public function listTransferredOut(Carbon $start, Carbon $end, Collection $accounts, ?Collection $categories = null): array; /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user): void; + public function setUser(User|Authenticatable|null $user): void; /** * Sum of withdrawal journals in period for a set of categories, grouped per currency. Amounts are always negative. diff --git a/app/Repositories/Currency/CurrencyRepository.php b/app/Repositories/Currency/CurrencyRepository.php index 96ff6e83a1..82379071a1 100644 --- a/app/Repositories/Currency/CurrencyRepository.php +++ b/app/Repositories/Currency/CurrencyRepository.php @@ -39,6 +39,7 @@ use FireflyIII\Repositories\User\UserRepositoryInterface; use FireflyIII\Services\Internal\Destroy\CurrencyDestroyService; use FireflyIII\Services\Internal\Update\CurrencyUpdateService; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; use JsonException; use Log; @@ -487,11 +488,13 @@ class CurrencyRepository implements CurrencyRepositoryInterface } /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user): void + public function setUser(User|Authenticatable|null $user): void { - $this->user = $user; + if (null !== $user) { + $this->user = $user; + } } /** diff --git a/app/Repositories/Currency/CurrencyRepositoryInterface.php b/app/Repositories/Currency/CurrencyRepositoryInterface.php index 7c45bf9e27..eab7f80549 100644 --- a/app/Repositories/Currency/CurrencyRepositoryInterface.php +++ b/app/Repositories/Currency/CurrencyRepositoryInterface.php @@ -29,6 +29,7 @@ use FireflyIII\Models\CurrencyExchangeRate; use FireflyIII\Models\Preference; use FireflyIII\Models\TransactionCurrency; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; /** @@ -229,9 +230,9 @@ interface CurrencyRepositoryInterface public function setExchangeRate(TransactionCurrency $fromCurrency, TransactionCurrency $toCurrency, Carbon $date, float $rate): CurrencyExchangeRate; /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user); + public function setUser(User|Authenticatable|null $user): void; /** * @param array $data diff --git a/app/Repositories/Journal/JournalAPIRepository.php b/app/Repositories/Journal/JournalAPIRepository.php index 03547080cc..13340f54a3 100644 --- a/app/Repositories/Journal/JournalAPIRepository.php +++ b/app/Repositories/Journal/JournalAPIRepository.php @@ -28,6 +28,7 @@ use FireflyIII\Models\PiggyBankEvent; use FireflyIII\Models\Transaction; use FireflyIII\Models\TransactionJournal; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; use Storage; @@ -110,10 +111,12 @@ class JournalAPIRepository implements JournalAPIRepositoryInterface } /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user): void + public function setUser(User|Authenticatable|null $user): void { - $this->user = $user; + if (null !== $user) { + $this->user = $user; + } } } diff --git a/app/Repositories/Journal/JournalAPIRepositoryInterface.php b/app/Repositories/Journal/JournalAPIRepositoryInterface.php index 16dd484b79..e828aeea33 100644 --- a/app/Repositories/Journal/JournalAPIRepositoryInterface.php +++ b/app/Repositories/Journal/JournalAPIRepositoryInterface.php @@ -26,6 +26,7 @@ namespace FireflyIII\Repositories\Journal; use FireflyIII\Models\Transaction; use FireflyIII\Models\TransactionJournal; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; /** @@ -70,7 +71,7 @@ interface JournalAPIRepositoryInterface public function getPiggyBankEvents(TransactionJournal $journal): Collection; /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user); + public function setUser(User|Authenticatable|null $user): void; } diff --git a/app/Repositories/Journal/JournalCLIRepository.php b/app/Repositories/Journal/JournalCLIRepository.php index c12473dfb8..2ce476df6a 100644 --- a/app/Repositories/Journal/JournalCLIRepository.php +++ b/app/Repositories/Journal/JournalCLIRepository.php @@ -28,6 +28,7 @@ use DB; use FireflyIII\Models\TransactionJournal; use FireflyIII\Support\CacheProperties; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; use stdClass; @@ -36,9 +37,6 @@ use stdClass; */ class JournalCLIRepository implements JournalCLIRepositoryInterface { - /** @var User */ - private $user; - /** * Get all transaction journals with a specific type, regardless of user. * @@ -230,10 +228,10 @@ class JournalCLIRepository implements JournalCLIRepositoryInterface } /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user): void + public function setUser(User|Authenticatable|null $user): void { - $this->user = $user; + // empty } } diff --git a/app/Repositories/Journal/JournalCLIRepositoryInterface.php b/app/Repositories/Journal/JournalCLIRepositoryInterface.php index b226973bda..6b2aa4cb86 100644 --- a/app/Repositories/Journal/JournalCLIRepositoryInterface.php +++ b/app/Repositories/Journal/JournalCLIRepositoryInterface.php @@ -26,6 +26,7 @@ namespace FireflyIII\Repositories\Journal; use Carbon\Carbon; use FireflyIII\Models\TransactionJournal; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; /** @@ -114,7 +115,7 @@ interface JournalCLIRepositoryInterface public function getTags(TransactionJournal $journal): array; /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user); + public function setUser(User|Authenticatable|null $user): void; } diff --git a/app/Repositories/Journal/JournalRepository.php b/app/Repositories/Journal/JournalRepository.php index b48ed7fc75..e5a3ee6985 100644 --- a/app/Repositories/Journal/JournalRepository.php +++ b/app/Repositories/Journal/JournalRepository.php @@ -37,6 +37,7 @@ use FireflyIII\Services\Internal\Destroy\TransactionGroupDestroyService; use FireflyIII\Services\Internal\Update\JournalUpdateService; use FireflyIII\Support\CacheProperties; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; /** @@ -252,11 +253,13 @@ class JournalRepository implements JournalRepositoryInterface } /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user): void + public function setUser(User|Authenticatable|null $user): void { - $this->user = $user; + if (null !== $user) { + $this->user = $user; + } } /** diff --git a/app/Repositories/Journal/JournalRepositoryInterface.php b/app/Repositories/Journal/JournalRepositoryInterface.php index 2dac2b5d3d..de844443f6 100644 --- a/app/Repositories/Journal/JournalRepositoryInterface.php +++ b/app/Repositories/Journal/JournalRepositoryInterface.php @@ -30,6 +30,7 @@ use FireflyIII\Models\TransactionGroup; use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournalLink; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; /** @@ -143,9 +144,9 @@ interface JournalRepositoryInterface public function searchJournalDescriptions(string $search, int $limit): Collection; /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user); + public function setUser(User|Authenticatable|null $user): void; /** * Update budget for a journal. diff --git a/app/Repositories/LinkType/LinkTypeRepository.php b/app/Repositories/LinkType/LinkTypeRepository.php index d1578db0df..a933f2630c 100644 --- a/app/Repositories/LinkType/LinkTypeRepository.php +++ b/app/Repositories/LinkType/LinkTypeRepository.php @@ -30,6 +30,7 @@ use FireflyIII\Models\Note; use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournalLink; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; use Log; @@ -199,11 +200,13 @@ class LinkTypeRepository implements LinkTypeRepositoryInterface } /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user): void + public function setUser(User|Authenticatable|null $user): void { - $this->user = $user; + if (null !== $user) { + $this->user = $user; + } } /** diff --git a/app/Repositories/LinkType/LinkTypeRepositoryInterface.php b/app/Repositories/LinkType/LinkTypeRepositoryInterface.php index 9c3c9f338a..54f984b09a 100644 --- a/app/Repositories/LinkType/LinkTypeRepositoryInterface.php +++ b/app/Repositories/LinkType/LinkTypeRepositoryInterface.php @@ -27,6 +27,7 @@ use FireflyIII\Models\LinkType; use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournalLink; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; /** @@ -124,11 +125,9 @@ interface LinkTypeRepositoryInterface public function getLinks(TransactionJournal $journal): Collection; /** - * Set the user for this instance. - * - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user): void; + public function setUser(User|Authenticatable|null $user): void; /** * @param array $data diff --git a/app/Repositories/ObjectGroup/ObjectGroupRepository.php b/app/Repositories/ObjectGroup/ObjectGroupRepository.php index 35a42991fa..84005207da 100644 --- a/app/Repositories/ObjectGroup/ObjectGroupRepository.php +++ b/app/Repositories/ObjectGroup/ObjectGroupRepository.php @@ -28,6 +28,7 @@ use DB; use FireflyIII\Models\ObjectGroup; use FireflyIII\Models\PiggyBank; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; use Log; @@ -151,11 +152,13 @@ class ObjectGroupRepository implements ObjectGroupRepositoryInterface } /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user): void + public function setUser(User|Authenticatable|null $user): void { - $this->user = $user; + if (null !== $user) { + $this->user = $user; + } } /** diff --git a/app/Repositories/ObjectGroup/ObjectGroupRepositoryInterface.php b/app/Repositories/ObjectGroup/ObjectGroupRepositoryInterface.php index 2a5b2c44e7..0b1de76abb 100644 --- a/app/Repositories/ObjectGroup/ObjectGroupRepositoryInterface.php +++ b/app/Repositories/ObjectGroup/ObjectGroupRepositoryInterface.php @@ -26,6 +26,7 @@ namespace FireflyIII\Repositories\ObjectGroup; use FireflyIII\Models\ObjectGroup; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; /** @@ -89,9 +90,9 @@ interface ObjectGroupRepositoryInterface public function setOrder(ObjectGroup $objectGroup, int $newOrder): ObjectGroup; /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user): void; + public function setUser(User|Authenticatable|null $user): void; /** * @param ObjectGroup $objectGroup diff --git a/app/Repositories/PiggyBank/PiggyBankRepository.php b/app/Repositories/PiggyBank/PiggyBankRepository.php index 88c65e0b16..d8d561a24e 100644 --- a/app/Repositories/PiggyBank/PiggyBankRepository.php +++ b/app/Repositories/PiggyBank/PiggyBankRepository.php @@ -34,6 +34,7 @@ use FireflyIII\Models\TransactionJournal; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; use JsonException; use Log; @@ -274,11 +275,13 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface } /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user): void + public function setUser(User|Authenticatable|null $user): void { - $this->user = $user; + if (null !== $user) { + $this->user = $user; + } } /** diff --git a/app/Repositories/PiggyBank/PiggyBankRepositoryInterface.php b/app/Repositories/PiggyBank/PiggyBankRepositoryInterface.php index d786a77364..c3e4640dcd 100644 --- a/app/Repositories/PiggyBank/PiggyBankRepositoryInterface.php +++ b/app/Repositories/PiggyBank/PiggyBankRepositoryInterface.php @@ -29,6 +29,7 @@ use FireflyIII\Models\PiggyBank; use FireflyIII\Models\PiggyBankRepetition; use FireflyIII\Models\TransactionJournal; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; /** @@ -253,9 +254,9 @@ interface PiggyBankRepositoryInterface public function setOrder(PiggyBank $piggyBank, int $newOrder): bool; /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user); + public function setUser(User|Authenticatable|null $user): void; /** * Store new piggy bank. diff --git a/app/Repositories/Recurring/RecurringRepository.php b/app/Repositories/Recurring/RecurringRepository.php index 1d3dff571e..6b2c473046 100644 --- a/app/Repositories/Recurring/RecurringRepository.php +++ b/app/Repositories/Recurring/RecurringRepository.php @@ -43,6 +43,7 @@ use FireflyIII\Support\Repositories\Recurring\CalculateXOccurrences; use FireflyIII\Support\Repositories\Recurring\CalculateXOccurrencesSince; use FireflyIII\Support\Repositories\Recurring\FiltersWeekends; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Database\Eloquent\Builder; use Illuminate\Pagination\LengthAwarePaginator; use Illuminate\Support\Collection; @@ -345,13 +346,13 @@ class RecurringRepository implements RecurringRepositoryInterface } /** - * Set user for in repository. - * - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user): void + public function setUser(User|Authenticatable|null $user): void { - $this->user = $user; + if (null !== $user) { + $this->user = $user; + } } /** diff --git a/app/Repositories/Recurring/RecurringRepositoryInterface.php b/app/Repositories/Recurring/RecurringRepositoryInterface.php index c4fca83361..14e483c05c 100644 --- a/app/Repositories/Recurring/RecurringRepositoryInterface.php +++ b/app/Repositories/Recurring/RecurringRepositoryInterface.php @@ -29,6 +29,7 @@ use FireflyIII\Models\Recurrence; use FireflyIII\Models\RecurrenceRepetition; use FireflyIII\Models\RecurrenceTransaction; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Pagination\LengthAwarePaginator; use Illuminate\Support\Collection; @@ -226,11 +227,9 @@ interface RecurringRepositoryInterface public function searchRecurrence(string $query, int $limit): Collection; /** - * Set user for in repository. - * - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user): void; + public function setUser(User|Authenticatable|null $user): void; /** * Store a new recurring transaction. diff --git a/app/Repositories/Rule/RuleRepository.php b/app/Repositories/Rule/RuleRepository.php index 77c3ddd85b..0fffd52bec 100644 --- a/app/Repositories/Rule/RuleRepository.php +++ b/app/Repositories/Rule/RuleRepository.php @@ -32,6 +32,7 @@ use FireflyIII\Models\RuleTrigger; use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface; use FireflyIII\Support\Search\OperatorQuerySearch; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; use Log; @@ -361,11 +362,13 @@ class RuleRepository implements RuleRepositoryInterface } /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user): void + public function setUser(User|Authenticatable|null $user): void { - $this->user = $user; + if (null !== $user) { + $this->user = $user; + } } /** diff --git a/app/Repositories/Rule/RuleRepositoryInterface.php b/app/Repositories/Rule/RuleRepositoryInterface.php index 5f2577737e..9c70180933 100644 --- a/app/Repositories/Rule/RuleRepositoryInterface.php +++ b/app/Repositories/Rule/RuleRepositoryInterface.php @@ -28,6 +28,7 @@ use FireflyIII\Models\RuleAction; use FireflyIII\Models\RuleGroup; use FireflyIII\Models\RuleTrigger; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; /** @@ -162,9 +163,9 @@ interface RuleRepositoryInterface public function setOrder(Rule $rule, int $newOrder): void; /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user); + public function setUser(User|Authenticatable|null $user): void; /** * @param array $data diff --git a/app/Repositories/RuleGroup/RuleGroupRepository.php b/app/Repositories/RuleGroup/RuleGroupRepository.php index e71c6f6f51..377130f719 100644 --- a/app/Repositories/RuleGroup/RuleGroupRepository.php +++ b/app/Repositories/RuleGroup/RuleGroupRepository.php @@ -29,6 +29,7 @@ use FireflyIII\Models\RuleAction; use FireflyIII\Models\RuleGroup; use FireflyIII\Models\RuleTrigger; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Support\Collection; use Log; @@ -443,11 +444,13 @@ class RuleGroupRepository implements RuleGroupRepositoryInterface } /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user): void + public function setUser(User|Authenticatable|null $user): void { - $this->user = $user; + if (null !== $user) { + $this->user = $user; + } } /** diff --git a/app/Repositories/RuleGroup/RuleGroupRepositoryInterface.php b/app/Repositories/RuleGroup/RuleGroupRepositoryInterface.php index f2fa871fde..9ab7eeabcd 100644 --- a/app/Repositories/RuleGroup/RuleGroupRepositoryInterface.php +++ b/app/Repositories/RuleGroup/RuleGroupRepositoryInterface.php @@ -25,6 +25,7 @@ namespace FireflyIII\Repositories\RuleGroup; use FireflyIII\Models\RuleGroup; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; /** @@ -164,9 +165,9 @@ interface RuleGroupRepositoryInterface public function setOrder(RuleGroup $ruleGroup, int $newOrder): void; /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user); + public function setUser(User|Authenticatable|null $user): void; /** * @param array $data diff --git a/app/Repositories/Tag/OperationsRepository.php b/app/Repositories/Tag/OperationsRepository.php index fc06b62718..5100258fc1 100644 --- a/app/Repositories/Tag/OperationsRepository.php +++ b/app/Repositories/Tag/OperationsRepository.php @@ -28,6 +28,7 @@ use FireflyIII\Exceptions\FireflyException; use FireflyIII\Helpers\Collector\GroupCollectorInterface; use FireflyIII\Models\TransactionType; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; use Psr\Container\ContainerExceptionInterface; use Psr\Container\NotFoundExceptionInterface; @@ -117,11 +118,13 @@ class OperationsRepository implements OperationsRepositoryInterface } /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user): void + public function setUser(User|Authenticatable|null $user): void { - $this->user = $user; + if (null !== $user) { + $this->user = $user; + } } /** diff --git a/app/Repositories/Tag/OperationsRepositoryInterface.php b/app/Repositories/Tag/OperationsRepositoryInterface.php index f5f6dd09b1..6e1b6cba24 100644 --- a/app/Repositories/Tag/OperationsRepositoryInterface.php +++ b/app/Repositories/Tag/OperationsRepositoryInterface.php @@ -25,6 +25,7 @@ namespace FireflyIII\Repositories\Tag; use Carbon\Carbon; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; /** @@ -63,9 +64,9 @@ interface OperationsRepositoryInterface public function listIncome(Carbon $start, Carbon $end, ?Collection $accounts = null, ?Collection $tags = null): array; /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user): void; + public function setUser(User|Authenticatable|null $user): void; /** * Sum of withdrawal journals in period for a set of tags, grouped per currency. Amounts are always negative. diff --git a/app/Repositories/Tag/TagRepository.php b/app/Repositories/Tag/TagRepository.php index 8e37750467..c44bf69cd5 100644 --- a/app/Repositories/Tag/TagRepository.php +++ b/app/Repositories/Tag/TagRepository.php @@ -34,6 +34,7 @@ use FireflyIII\Models\Note; use FireflyIII\Models\Tag; use FireflyIII\Models\TransactionType; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; use Log; use Storage; @@ -109,11 +110,13 @@ class TagRepository implements TagRepositoryInterface } /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user): void + public function setUser(User|Authenticatable|null $user): void { - $this->user = $user; + if (null !== $user) { + $this->user = $user; + } } /** diff --git a/app/Repositories/Tag/TagRepositoryInterface.php b/app/Repositories/Tag/TagRepositoryInterface.php index 0a5bbd76cc..1f5a0b3804 100644 --- a/app/Repositories/Tag/TagRepositoryInterface.php +++ b/app/Repositories/Tag/TagRepositoryInterface.php @@ -27,6 +27,7 @@ use Carbon\Carbon; use FireflyIII\Models\Location; use FireflyIII\Models\Tag; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; /** @@ -163,9 +164,9 @@ interface TagRepositoryInterface public function searchTags(string $query, int $limit): Collection; /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user); + public function setUser(User|Authenticatable|null $user): void; /** * This method stores a tag. diff --git a/app/Repositories/TransactionGroup/TransactionGroupRepository.php b/app/Repositories/TransactionGroup/TransactionGroupRepository.php index c88f1fca85..824601f25e 100644 --- a/app/Repositories/TransactionGroup/TransactionGroupRepository.php +++ b/app/Repositories/TransactionGroup/TransactionGroupRepository.php @@ -45,6 +45,7 @@ use FireflyIII\Services\Internal\Destroy\TransactionGroupDestroyService; use FireflyIII\Services\Internal\Update\GroupUpdateService; use FireflyIII\Support\NullArrayObject; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Database\Eloquent\Builder; use Illuminate\Support\Collection; use JsonException; @@ -189,11 +190,13 @@ class TransactionGroupRepository implements TransactionGroupRepositoryInterface } /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user): void + public function setUser(User|Authenticatable|null $user): void { - $this->user = $user; + if (null !== $user) { + $this->user = $user; + } } /** diff --git a/app/Repositories/TransactionGroup/TransactionGroupRepositoryInterface.php b/app/Repositories/TransactionGroup/TransactionGroupRepositoryInterface.php index 36a1186d4c..e1e6ee8ca4 100644 --- a/app/Repositories/TransactionGroup/TransactionGroupRepositoryInterface.php +++ b/app/Repositories/TransactionGroup/TransactionGroupRepositoryInterface.php @@ -29,6 +29,7 @@ use FireflyIII\Models\Location; use FireflyIII\Models\TransactionGroup; use FireflyIII\Support\NullArrayObject; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; /** @@ -150,11 +151,9 @@ interface TransactionGroupRepositoryInterface public function getTags(int $journalId): array; /** - * Set the user. - * - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user): void; + public function setUser(User|Authenticatable|null $user): void; /** * Create a new transaction group. diff --git a/app/Repositories/Webhook/WebhookRepository.php b/app/Repositories/Webhook/WebhookRepository.php index f9ee12bb74..8cb8ad83ff 100644 --- a/app/Repositories/Webhook/WebhookRepository.php +++ b/app/Repositories/Webhook/WebhookRepository.php @@ -27,6 +27,7 @@ use FireflyIII\Models\Webhook; use FireflyIII\Models\WebhookAttempt; use FireflyIII\Models\WebhookMessage; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; use Str; @@ -104,11 +105,13 @@ class WebhookRepository implements WebhookRepositoryInterface } /** - * @inheritDoc + * @param User|Authenticatable|null $user */ - public function setUser(User $user): void + public function setUser(User|Authenticatable|null $user): void { - $this->user = $user; + if (null !== $user) { + $this->user = $user; + } } /** diff --git a/app/Repositories/Webhook/WebhookRepositoryInterface.php b/app/Repositories/Webhook/WebhookRepositoryInterface.php index 04201667b2..9b2c21e3ba 100644 --- a/app/Repositories/Webhook/WebhookRepositoryInterface.php +++ b/app/Repositories/Webhook/WebhookRepositoryInterface.php @@ -27,6 +27,7 @@ use FireflyIII\Models\Webhook; use FireflyIII\Models\WebhookAttempt; use FireflyIII\Models\WebhookMessage; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; /** @@ -78,11 +79,9 @@ interface WebhookRepositoryInterface public function getReadyMessages(Webhook $webhook): Collection; /** - * Set user. - * - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user): void; + public function setUser(User|Authenticatable|null $user): void; /** * @param array $data diff --git a/app/Rules/BelongsUser.php b/app/Rules/BelongsUser.php index 0c6ce5acb6..11b0b28a3e 100644 --- a/app/Rules/BelongsUser.php +++ b/app/Rules/BelongsUser.php @@ -43,7 +43,7 @@ class BelongsUser implements Rule * Create a new rule instance. * * @return void - * @codeCoverageIgnore + */ public function __construct() { @@ -54,7 +54,7 @@ class BelongsUser implements Rule * Get the validation error message. * * @return string - * @codeCoverageIgnore + */ public function message(): string { diff --git a/app/Rules/IsAssetAccountId.php b/app/Rules/IsAssetAccountId.php index 7eb32b0d9d..ef7b5bb41d 100644 --- a/app/Rules/IsAssetAccountId.php +++ b/app/Rules/IsAssetAccountId.php @@ -37,7 +37,7 @@ class IsAssetAccountId implements Rule * Get the validation error message. This is not translated because only the API uses it. * * @return string - * @codeCoverageIgnore + */ public function message(): string { diff --git a/app/Rules/IsBoolean.php b/app/Rules/IsBoolean.php index 5ccea1498b..0a68b4854e 100644 --- a/app/Rules/IsBoolean.php +++ b/app/Rules/IsBoolean.php @@ -34,7 +34,7 @@ class IsBoolean implements Rule /** * Get the validation error message. * - * @codeCoverageIgnore + * @return string */ public function message(): string diff --git a/app/Rules/IsDateOrTime.php b/app/Rules/IsDateOrTime.php index 0fb9fff6b6..de5c2c7f22 100644 --- a/app/Rules/IsDateOrTime.php +++ b/app/Rules/IsDateOrTime.php @@ -39,7 +39,7 @@ class IsDateOrTime implements Rule * Get the validation error message. * * @return string - * @codeCoverageIgnore + */ public function message() { diff --git a/app/Rules/IsValidAttachmentModel.php b/app/Rules/IsValidAttachmentModel.php index 455c7cb339..1170b6f95a 100644 --- a/app/Rules/IsValidAttachmentModel.php +++ b/app/Rules/IsValidAttachmentModel.php @@ -53,7 +53,7 @@ class IsValidAttachmentModel implements Rule /** * IsValidAttachmentModel constructor. * - * @codeCoverageIgnore + * * @param string $model */ @@ -80,7 +80,7 @@ class IsValidAttachmentModel implements Rule /** * Get the validation error message. * - * @codeCoverageIgnore + * @return string */ public function message(): string diff --git a/app/Rules/UniqueAccountNumber.php b/app/Rules/UniqueAccountNumber.php index 4bc92a4c44..39cc1a787b 100644 --- a/app/Rules/UniqueAccountNumber.php +++ b/app/Rules/UniqueAccountNumber.php @@ -40,7 +40,7 @@ class UniqueAccountNumber implements Rule /** * Create a new rule instance. * - * @codeCoverageIgnore + * * @param Account|null $account * @param string|null $expectedType @@ -66,7 +66,7 @@ class UniqueAccountNumber implements Rule /** * Get the validation error message. * - * @codeCoverageIgnore + * * @return string */ diff --git a/app/Rules/UniqueIban.php b/app/Rules/UniqueIban.php index 5edebb1199..90d67aabe8 100644 --- a/app/Rules/UniqueIban.php +++ b/app/Rules/UniqueIban.php @@ -39,7 +39,7 @@ class UniqueIban implements Rule /** * Create a new rule instance. * - * @codeCoverageIgnore + * * @param Account|null $account * @param string|null $expectedType @@ -63,7 +63,7 @@ class UniqueIban implements Rule /** * Get the validation error message. * - * @codeCoverageIgnore + * * @return string */ diff --git a/app/Rules/ValidJournals.php b/app/Rules/ValidJournals.php index 5618fbfe98..b7f387d7c7 100644 --- a/app/Rules/ValidJournals.php +++ b/app/Rules/ValidJournals.php @@ -31,7 +31,7 @@ use Log; /** * Class ValidJournals * - * @codeCoverageIgnore + */ class ValidJournals implements Rule { diff --git a/app/Rules/ValidRecurrenceRepetitionType.php b/app/Rules/ValidRecurrenceRepetitionType.php index 74af36d979..afac72c46b 100644 --- a/app/Rules/ValidRecurrenceRepetitionType.php +++ b/app/Rules/ValidRecurrenceRepetitionType.php @@ -28,7 +28,7 @@ use Illuminate\Contracts\Validation\Rule; /** * Class ValidRecurrenceRepetitionType * - * @codeCoverageIgnore + */ class ValidRecurrenceRepetitionType implements Rule { diff --git a/app/Rules/ValidRecurrenceRepetitionValue.php b/app/Rules/ValidRecurrenceRepetitionValue.php index 8860d5a6d8..19087da65e 100644 --- a/app/Rules/ValidRecurrenceRepetitionValue.php +++ b/app/Rules/ValidRecurrenceRepetitionValue.php @@ -31,7 +31,7 @@ use Log; /** * Class ValidRecurrenceRepetitionValue * - * @codeCoverageIgnore + */ class ValidRecurrenceRepetitionValue implements Rule { diff --git a/app/Services/Internal/Destroy/BillDestroyService.php b/app/Services/Internal/Destroy/BillDestroyService.php index d2b2522584..d779510fbc 100644 --- a/app/Services/Internal/Destroy/BillDestroyService.php +++ b/app/Services/Internal/Destroy/BillDestroyService.php @@ -27,7 +27,7 @@ use Exception; use FireflyIII\Models\Bill; /** - * @codeCoverageIgnore + * Class BillDestroyService */ class BillDestroyService diff --git a/app/Services/Internal/Destroy/BudgetDestroyService.php b/app/Services/Internal/Destroy/BudgetDestroyService.php index cea4e6fd3e..b7db3a7e16 100644 --- a/app/Services/Internal/Destroy/BudgetDestroyService.php +++ b/app/Services/Internal/Destroy/BudgetDestroyService.php @@ -30,7 +30,7 @@ use FireflyIII\Models\Budget; /** * Class BudgetDestroyService * - * @codeCoverageIgnore + */ class BudgetDestroyService { diff --git a/app/Services/Internal/Destroy/CategoryDestroyService.php b/app/Services/Internal/Destroy/CategoryDestroyService.php index 9c7f91e377..428f1a0e1c 100644 --- a/app/Services/Internal/Destroy/CategoryDestroyService.php +++ b/app/Services/Internal/Destroy/CategoryDestroyService.php @@ -30,7 +30,7 @@ use FireflyIII\Models\Category; /** * Class CategoryDestroyService * - * @codeCoverageIgnore + */ class CategoryDestroyService { diff --git a/app/Services/Internal/Destroy/CurrencyDestroyService.php b/app/Services/Internal/Destroy/CurrencyDestroyService.php index 70ecf99d43..343e85b7ac 100644 --- a/app/Services/Internal/Destroy/CurrencyDestroyService.php +++ b/app/Services/Internal/Destroy/CurrencyDestroyService.php @@ -29,7 +29,7 @@ use FireflyIII\Models\TransactionCurrency; /** * Class CurrencyDestroyService * - * @codeCoverageIgnore + */ class CurrencyDestroyService { diff --git a/app/Services/Internal/Destroy/JournalDestroyService.php b/app/Services/Internal/Destroy/JournalDestroyService.php index 994f066a5b..33d7feaf82 100644 --- a/app/Services/Internal/Destroy/JournalDestroyService.php +++ b/app/Services/Internal/Destroy/JournalDestroyService.php @@ -32,7 +32,7 @@ use FireflyIII\Models\TransactionJournalMeta; use Log; /** - * @codeCoverageIgnore + * Class JournalDestroyService */ class JournalDestroyService diff --git a/app/Services/Internal/Destroy/RecurrenceDestroyService.php b/app/Services/Internal/Destroy/RecurrenceDestroyService.php index 88fbb27376..d68c51f59a 100644 --- a/app/Services/Internal/Destroy/RecurrenceDestroyService.php +++ b/app/Services/Internal/Destroy/RecurrenceDestroyService.php @@ -27,7 +27,7 @@ use FireflyIII\Models\Recurrence; use FireflyIII\Models\RecurrenceTransaction; /** - * @codeCoverageIgnore + * Class RecurrenceDestroyService */ class RecurrenceDestroyService diff --git a/app/Services/Internal/Destroy/TransactionGroupDestroyService.php b/app/Services/Internal/Destroy/TransactionGroupDestroyService.php index d18cb35c29..82174ce567 100644 --- a/app/Services/Internal/Destroy/TransactionGroupDestroyService.php +++ b/app/Services/Internal/Destroy/TransactionGroupDestroyService.php @@ -30,7 +30,7 @@ use Illuminate\Support\Facades\Log; /** * Class TransactionGroupDestroyService * - * @codeCoverageIgnore + */ class TransactionGroupDestroyService { diff --git a/app/Services/Internal/Support/AccountServiceTrait.php b/app/Services/Internal/Support/AccountServiceTrait.php index 3f9507ee46..3f103dd549 100644 --- a/app/Services/Internal/Support/AccountServiceTrait.php +++ b/app/Services/Internal/Support/AccountServiceTrait.php @@ -125,7 +125,7 @@ trait AccountServiceTrait } } - // the account role may not be set in the data but we may have it already: + // the account role may not be set in the data, but we may have it already: if (!array_key_exists('account_role', $data)) { $data['account_role'] = null; } @@ -164,7 +164,7 @@ trait AccountServiceTrait * @param Account $account * @param string $note * - * @codeCoverageIgnore + * @return bool */ public function updateNote(Account $account, string $note): bool diff --git a/app/Services/Internal/Support/BillServiceTrait.php b/app/Services/Internal/Support/BillServiceTrait.php index b790330ff4..5e0f17ec35 100644 --- a/app/Services/Internal/Support/BillServiceTrait.php +++ b/app/Services/Internal/Support/BillServiceTrait.php @@ -31,7 +31,7 @@ use Log; /** * Trait BillServiceTrait * - * @codeCoverageIgnore + */ trait BillServiceTrait { diff --git a/app/Services/Internal/Support/JournalServiceTrait.php b/app/Services/Internal/Support/JournalServiceTrait.php index e57c9dc4ee..5f2c0bd247 100644 --- a/app/Services/Internal/Support/JournalServiceTrait.php +++ b/app/Services/Internal/Support/JournalServiceTrait.php @@ -54,7 +54,6 @@ trait JournalServiceTrait * @param array $data * * @return Account|null - * @codeCoverageIgnore * @throws FireflyException */ protected function getAccount(string $transactionType, string $direction, array $data): ?Account @@ -78,10 +77,11 @@ trait JournalServiceTrait $result = $this->findAccountByNumber($result, $data, $expectedTypes[$transactionType]); $numberResult = $result; $result = $this->findAccountByName($result, $data, $expectedTypes[$transactionType]); + $nameResult =$result; - // if result is NULL but IBAN is set, any result of the search by NAME can't overrule + // if $result (find by name) is NULL, but IBAN is set, any result of the search by NAME can't overrule // this account. In such a case, the name search must be retried with a new name. - if (null !== $result && null === $numberResult && null === $ibanResult && '' !== (string) $data['iban']) { + if (null !== $nameResult && null === $numberResult && null === $ibanResult && '' !== (string)$data['iban'] && '' !== (string) $nameResult->iban) { $data['name'] = sprintf('%s (%s)', $data['name'], $data['iban']); Log::debug(sprintf('Search again using the new name, "%s".', $data['name'])); $result = $this->findAccountByName(null, $data, $expectedTypes[$transactionType]); @@ -101,11 +101,15 @@ trait JournalServiceTrait $result = $this->createAccount(null, $tempData, $expectedTypes[$transactionType][0]); } } - - Log::debug('If nothing is found, create it.'); - $result = $this->createAccount($result, $data, $expectedTypes[$transactionType][0]); - Log::debug('If cant be created, return cash account.'); - return $this->getCashAccount($result, $data, $expectedTypes[$transactionType]); + if (null === $result) { + Log::debug('If nothing is found, create it.'); + $result = $this->createAccount($result, $data, $expectedTypes[$transactionType][0]); + } + if (null === $result) { + Log::debug('If cant be created, return cash account.'); + $result = $this->getCashAccount($result, $data, $expectedTypes[$transactionType]); + } + return $result; } /** @@ -329,7 +333,6 @@ trait JournalServiceTrait * * @return string * @throws FireflyException - * @codeCoverageIgnore */ protected function getAmount(string $amount): string { @@ -348,7 +351,6 @@ trait JournalServiceTrait * @param string|null $amount * * @return string|null - * @codeCoverageIgnore */ protected function getForeignAmount(?string $amount): ?string { @@ -376,7 +378,7 @@ trait JournalServiceTrait * @param TransactionJournal $journal * @param NullArrayObject $data * - * @codeCoverageIgnore + */ protected function storeBudget(TransactionJournal $journal, NullArrayObject $data): void { @@ -400,7 +402,7 @@ trait JournalServiceTrait * @param TransactionJournal $journal * @param NullArrayObject $data * - * @codeCoverageIgnore + */ protected function storeCategory(TransactionJournal $journal, NullArrayObject $data): void { @@ -419,7 +421,7 @@ trait JournalServiceTrait * @param TransactionJournal $journal * @param string|null $notes * - * @codeCoverageIgnore + */ protected function storeNotes(TransactionJournal $journal, ?string $notes): void { @@ -448,7 +450,7 @@ trait JournalServiceTrait * @param TransactionJournal $journal * @param array|null $tags * - * @codeCoverageIgnore + */ protected function storeTags(TransactionJournal $journal, ?array $tags): void { diff --git a/app/Services/Internal/Support/RecurringTransactionTrait.php b/app/Services/Internal/Support/RecurringTransactionTrait.php index 815f13a7f5..c4000a3b46 100644 --- a/app/Services/Internal/Support/RecurringTransactionTrait.php +++ b/app/Services/Internal/Support/RecurringTransactionTrait.php @@ -354,7 +354,7 @@ trait RecurringTransactionTrait /** * @param Recurrence $recurrence * - * @codeCoverageIgnore + */ protected function deleteRepetitions(Recurrence $recurrence): void { @@ -364,7 +364,7 @@ trait RecurringTransactionTrait /** * @param Recurrence $recurrence * - * @codeCoverageIgnore + */ protected function deleteTransactions(Recurrence $recurrence): void { diff --git a/app/Services/Internal/Update/BillUpdateService.php b/app/Services/Internal/Update/BillUpdateService.php index af0b98644c..63e494a785 100644 --- a/app/Services/Internal/Update/BillUpdateService.php +++ b/app/Services/Internal/Update/BillUpdateService.php @@ -37,7 +37,7 @@ use JsonException; use Log; /** - * @codeCoverageIgnore + * Class BillUpdateService */ class BillUpdateService diff --git a/app/Services/Internal/Update/CategoryUpdateService.php b/app/Services/Internal/Update/CategoryUpdateService.php index e8bc406803..16eea5e01c 100644 --- a/app/Services/Internal/Update/CategoryUpdateService.php +++ b/app/Services/Internal/Update/CategoryUpdateService.php @@ -34,7 +34,7 @@ use Log; /** * Class CategoryUpdateService * - * @codeCoverageIgnore + */ class CategoryUpdateService { diff --git a/app/Services/Internal/Update/CurrencyUpdateService.php b/app/Services/Internal/Update/CurrencyUpdateService.php index bc8372a744..f7e16acb01 100644 --- a/app/Services/Internal/Update/CurrencyUpdateService.php +++ b/app/Services/Internal/Update/CurrencyUpdateService.php @@ -28,7 +28,7 @@ use FireflyIII\Models\TransactionCurrency; /** * Class CurrencyUpdateService * - * @codeCoverageIgnore + */ class CurrencyUpdateService { @@ -41,23 +41,23 @@ class CurrencyUpdateService public function update(TransactionCurrency $currency, array $data): TransactionCurrency { if (array_key_exists('code', $data) && '' !== (string)$data['code']) { - $currency->code = $data['code']; + $currency->code = e($data['code']); } if (array_key_exists('symbol', $data) && '' !== (string)$data['symbol']) { - $currency->symbol = $data['symbol']; + $currency->symbol = e($data['symbol']); } if (array_key_exists('name', $data) && '' !== (string)$data['name']) { - $currency->name = $data['name']; + $currency->name = e($data['name']); } if (array_key_exists('enabled', $data) && is_bool($data['enabled'])) { - $currency->enabled = $data['enabled']; + $currency->enabled = (bool) $data['enabled']; } if (array_key_exists('decimal_places', $data) && is_int($data['decimal_places'])) { - $currency->decimal_places = $data['decimal_places']; + $currency->decimal_places = (int) $data['decimal_places']; } $currency->save(); diff --git a/app/Services/Internal/Update/RecurrenceUpdateService.php b/app/Services/Internal/Update/RecurrenceUpdateService.php index 950a1c4e3f..ea6b8ce601 100644 --- a/app/Services/Internal/Update/RecurrenceUpdateService.php +++ b/app/Services/Internal/Update/RecurrenceUpdateService.php @@ -38,7 +38,7 @@ use Log; /** * Class RecurrenceUpdateService * - * @codeCoverageIgnore + */ class RecurrenceUpdateService { @@ -193,8 +193,9 @@ class RecurrenceUpdateService $originalCount = $recurrence->recurrenceRepetitions()->count(); if (1 === $originalCount) { Log::debug('Return the first one'); - - return $recurrence->recurrenceRepetitions()->first(); + /** @var RecurrenceRepetition $result */ + $result = $recurrence->recurrenceRepetitions()->first(); + return $result; } // find it: $fields = [ diff --git a/app/Services/Password/PwndVerifierV2.php b/app/Services/Password/PwndVerifierV2.php index c4396f4cae..14853e1d1c 100644 --- a/app/Services/Password/PwndVerifierV2.php +++ b/app/Services/Password/PwndVerifierV2.php @@ -31,7 +31,7 @@ use Log; /** * Class PwndVerifierV2. * - * @codeCoverageIgnore + */ class PwndVerifierV2 implements Verifier { diff --git a/app/Support/Amount.php b/app/Support/Amount.php index 22afd97785..bc03801de9 100644 --- a/app/Support/Amount.php +++ b/app/Support/Amount.php @@ -36,7 +36,7 @@ use Psr\Container\NotFoundExceptionInterface; /** * Class Amount. * - * @codeCoverageIgnore + */ class Amount { diff --git a/app/Support/CacheProperties.php b/app/Support/CacheProperties.php index df7adf5809..b588b2bbb7 100644 --- a/app/Support/CacheProperties.php +++ b/app/Support/CacheProperties.php @@ -30,7 +30,7 @@ use JsonException; /** * Class CacheProperties. * - * @codeCoverageIgnore + */ class CacheProperties { diff --git a/app/Support/Chart/Budget/FrontpageChartGenerator.php b/app/Support/Chart/Budget/FrontpageChartGenerator.php index 633b339ddf..92f5fff561 100644 --- a/app/Support/Chart/Budget/FrontpageChartGenerator.php +++ b/app/Support/Chart/Budget/FrontpageChartGenerator.php @@ -44,7 +44,6 @@ class FrontpageChartGenerator private Carbon $end; private string $monthAndDayFormat; private Carbon $start; - private User $user; /** * FrontpageChartGenerator constructor. @@ -226,7 +225,6 @@ class FrontpageChartGenerator */ public function setUser(User $user): void { - $this->user = $user; $this->budgetRepository->setUser($user); $this->blRepository->setUser($user); $this->opsRepository->setUser($user); diff --git a/app/Support/ChartColour.php b/app/Support/ChartColour.php index 82dbb2d238..ed59ce82bc 100644 --- a/app/Support/ChartColour.php +++ b/app/Support/ChartColour.php @@ -26,7 +26,7 @@ namespace FireflyIII\Support; /** * Class ChartColour. * - * @codeCoverageIgnore + */ class ChartColour { diff --git a/app/Support/Cronjobs/AbstractCronjob.php b/app/Support/Cronjobs/AbstractCronjob.php index 0fd2974ac1..e66bbe006f 100644 --- a/app/Support/Cronjobs/AbstractCronjob.php +++ b/app/Support/Cronjobs/AbstractCronjob.php @@ -28,7 +28,7 @@ use Carbon\Carbon; /** * Class AbstractCronjob * - * @codeCoverageIgnore + */ abstract class AbstractCronjob { diff --git a/app/Support/Domain.php b/app/Support/Domain.php index 6422919533..42def30123 100644 --- a/app/Support/Domain.php +++ b/app/Support/Domain.php @@ -26,7 +26,7 @@ namespace FireflyIII\Support; /** * Class Domain. * - * @codeCoverageIgnore + */ class Domain { diff --git a/app/Support/ExpandedForm.php b/app/Support/ExpandedForm.php index e0141c4589..b7cc425beb 100644 --- a/app/Support/ExpandedForm.php +++ b/app/Support/ExpandedForm.php @@ -36,7 +36,7 @@ use Throwable; * * @SuppressWarnings(PHPMD.TooManyMethods) * - * @codeCoverageIgnore + */ class ExpandedForm { diff --git a/app/Support/Facades/AccountForm.php b/app/Support/Facades/AccountForm.php index 86c7046c07..d6c69236ec 100644 --- a/app/Support/Facades/AccountForm.php +++ b/app/Support/Facades/AccountForm.php @@ -26,7 +26,7 @@ namespace FireflyIII\Support\Facades; use Illuminate\Support\Facades\Facade; /** - * @codeCoverageIgnore + * Class AccountForm. * */ diff --git a/app/Support/Facades/Amount.php b/app/Support/Facades/Amount.php index 0c1bb53dd2..c1918596c5 100644 --- a/app/Support/Facades/Amount.php +++ b/app/Support/Facades/Amount.php @@ -29,7 +29,7 @@ use Illuminate\Support\Collection; use Illuminate\Support\Facades\Facade; /** - * @codeCoverageIgnore + * Class Amount. * * @method string formatAnything(TransactionCurrency $format, string $amount, bool $coloured = true) diff --git a/app/Support/Facades/CurrencyForm.php b/app/Support/Facades/CurrencyForm.php index 92f5bedfdf..a272f1590d 100644 --- a/app/Support/Facades/CurrencyForm.php +++ b/app/Support/Facades/CurrencyForm.php @@ -26,7 +26,7 @@ namespace FireflyIII\Support\Facades; use Illuminate\Support\Facades\Facade; /** - * @codeCoverageIgnore + * Class CurrencyForm. * */ diff --git a/app/Support/Facades/ExpandedForm.php b/app/Support/Facades/ExpandedForm.php index d55363e739..7e8f16a254 100644 --- a/app/Support/Facades/ExpandedForm.php +++ b/app/Support/Facades/ExpandedForm.php @@ -26,7 +26,7 @@ namespace FireflyIII\Support\Facades; use Illuminate\Support\Facades\Facade; /** - * @codeCoverageIgnore + * Class ExpandedForm. */ class ExpandedForm extends Facade diff --git a/app/Support/Facades/FireflyConfig.php b/app/Support/Facades/FireflyConfig.php index 09f13e512c..8f1c8fc1f4 100644 --- a/app/Support/Facades/FireflyConfig.php +++ b/app/Support/Facades/FireflyConfig.php @@ -27,7 +27,7 @@ use FireflyIII\Models\Configuration; use Illuminate\Support\Facades\Facade; /** - * @codeCoverageIgnore + * Class FireflyConfig. * @method null|Configuration get($name, $default = null) * @method Configuration set(string $name, $value) diff --git a/app/Support/Facades/Navigation.php b/app/Support/Facades/Navigation.php index 45d8007f02..33aee79fb5 100644 --- a/app/Support/Facades/Navigation.php +++ b/app/Support/Facades/Navigation.php @@ -27,7 +27,7 @@ use Carbon\Carbon; use Illuminate\Support\Facades\Facade; /** - * @codeCoverageIgnore + * Class Navigation. * * @method Carbon addPeriod(Carbon $theDate, string $repeatFreq, int $skip) diff --git a/app/Support/Facades/PiggyBankForm.php b/app/Support/Facades/PiggyBankForm.php index ebf07351bb..0f38c5869b 100644 --- a/app/Support/Facades/PiggyBankForm.php +++ b/app/Support/Facades/PiggyBankForm.php @@ -26,7 +26,7 @@ namespace FireflyIII\Support\Facades; use Illuminate\Support\Facades\Facade; /** - * @codeCoverageIgnore + * Class PiggyBankForm. * */ diff --git a/app/Support/Facades/Preferences.php b/app/Support/Facades/Preferences.php index d18a46a10d..bcbd53bb1d 100644 --- a/app/Support/Facades/Preferences.php +++ b/app/Support/Facades/Preferences.php @@ -29,7 +29,7 @@ use Illuminate\Support\Collection; use Illuminate\Support\Facades\Facade; /** - * @codeCoverageIgnore + * Class Preferences. * * @method Collection beginsWith(User $user, string $search) diff --git a/app/Support/Facades/RuleForm.php b/app/Support/Facades/RuleForm.php index fe103723ed..1455471b9d 100644 --- a/app/Support/Facades/RuleForm.php +++ b/app/Support/Facades/RuleForm.php @@ -26,7 +26,7 @@ namespace FireflyIII\Support\Facades; use Illuminate\Support\Facades\Facade; /** - * @codeCoverageIgnore + * Class RuleForm. * */ diff --git a/app/Support/Facades/Steam.php b/app/Support/Facades/Steam.php index e9c5a4890e..89ac24b108 100644 --- a/app/Support/Facades/Steam.php +++ b/app/Support/Facades/Steam.php @@ -43,7 +43,7 @@ use Illuminate\Support\Facades\Facade; * @method string positive(string $amount) * @method array balancesPerCurrencyByAccounts(Collection $accounts, Carbon $date) * - * @codeCoverageIgnore + */ class Steam extends Facade { diff --git a/app/Support/FireflyConfig.php b/app/Support/FireflyConfig.php index ec559a59c9..57abb7e45b 100644 --- a/app/Support/FireflyConfig.php +++ b/app/Support/FireflyConfig.php @@ -33,7 +33,7 @@ use Log; /** * Class FireflyConfig. * - * @codeCoverageIgnore + */ class FireflyConfig { diff --git a/app/Support/Http/Api/AccountFilter.php b/app/Support/Http/Api/AccountFilter.php index 1204164501..14d6ac3da2 100644 --- a/app/Support/Http/Api/AccountFilter.php +++ b/app/Support/Http/Api/AccountFilter.php @@ -28,7 +28,7 @@ use FireflyIII\Models\AccountType; /** * Trait AccountFilter * - * @codeCoverageIgnore + */ trait AccountFilter { diff --git a/app/Support/Http/Api/ApiSupport.php b/app/Support/Http/Api/ApiSupport.php index 342c8eb51d..86ce524680 100644 --- a/app/Support/Http/Api/ApiSupport.php +++ b/app/Support/Http/Api/ApiSupport.php @@ -29,7 +29,7 @@ use Illuminate\Support\Collection; /** * Trait ApiSupport * - * @codeCoverageIgnore + */ trait ApiSupport { diff --git a/app/Support/Http/Api/TransactionFilter.php b/app/Support/Http/Api/TransactionFilter.php index b5b4376df0..ce91b6dedf 100644 --- a/app/Support/Http/Api/TransactionFilter.php +++ b/app/Support/Http/Api/TransactionFilter.php @@ -28,7 +28,7 @@ use FireflyIII\Models\TransactionType; /** * Trait TransactionFilter * - * @codeCoverageIgnore + */ trait TransactionFilter { diff --git a/app/Support/Http/Controllers/ModelInformation.php b/app/Support/Http/Controllers/ModelInformation.php index 957549e1cd..745180da4e 100644 --- a/app/Support/Http/Controllers/ModelInformation.php +++ b/app/Support/Http/Controllers/ModelInformation.php @@ -69,7 +69,7 @@ trait ModelInformation } /** - * @codeCoverageIgnore + * * @return string[] * @@ -94,7 +94,7 @@ trait ModelInformation } /** - * @codeCoverageIgnore + * @return array */ protected function getRoles(): array diff --git a/app/Support/Http/Controllers/PeriodOverview.php b/app/Support/Http/Controllers/PeriodOverview.php index caed398aea..7f17a513b8 100644 --- a/app/Support/Http/Controllers/PeriodOverview.php +++ b/app/Support/Http/Controllers/PeriodOverview.php @@ -200,7 +200,7 @@ trait PeriodOverview * @param array $journals * * @return array - * @codeCoverageIgnore + */ private function filterTransferredIn(Account $account, array $journals): array { @@ -219,7 +219,7 @@ trait PeriodOverview * @param array $journals * * @return array - * @codeCoverageIgnore + */ private function groupByCurrency(array $journals): array { diff --git a/app/Support/Http/Controllers/RequestInformation.php b/app/Support/Http/Controllers/RequestInformation.php index 01bab6eeec..ecab47278b 100644 --- a/app/Support/Http/Controllers/RequestInformation.php +++ b/app/Support/Http/Controllers/RequestInformation.php @@ -220,7 +220,7 @@ trait RequestInformation * @param array $data * * @return ValidatorContract - * @codeCoverageIgnore + */ final protected function validator(array $data): ValidatorContract { diff --git a/app/Support/Http/Controllers/RuleManagement.php b/app/Support/Http/Controllers/RuleManagement.php index a839b01018..77dacdaab7 100644 --- a/app/Support/Http/Controllers/RuleManagement.php +++ b/app/Support/Http/Controllers/RuleManagement.php @@ -40,7 +40,7 @@ trait RuleManagement * @param Request $request * * @return array - * @codeCoverageIgnore + */ protected function getPreviousActions(Request $request): array { @@ -75,7 +75,7 @@ trait RuleManagement * @param Request $request * * @return array - * @codeCoverageIgnore + */ protected function getPreviousTriggers(Request $request): array { diff --git a/app/Support/Logging/AuditLogger.php b/app/Support/Logging/AuditLogger.php index d08542122d..3e19e38f20 100644 --- a/app/Support/Logging/AuditLogger.php +++ b/app/Support/Logging/AuditLogger.php @@ -31,7 +31,7 @@ use Monolog\Handler\AbstractProcessingHandler; /** * Class AuditLogger * - * @codeCoverageIgnore + */ class AuditLogger { diff --git a/app/Support/Logging/AuditProcessor.php b/app/Support/Logging/AuditProcessor.php index acc4cc1e33..9e450f722b 100644 --- a/app/Support/Logging/AuditProcessor.php +++ b/app/Support/Logging/AuditProcessor.php @@ -27,7 +27,7 @@ namespace FireflyIII\Support\Logging; /** * Class AuditProcessor * - * @codeCoverageIgnore + */ class AuditProcessor { diff --git a/app/Support/NullArrayObject.php b/app/Support/NullArrayObject.php index 144bc1bb7d..0c18f43e47 100644 --- a/app/Support/NullArrayObject.php +++ b/app/Support/NullArrayObject.php @@ -28,7 +28,7 @@ use ArrayObject; /** * Class NullArrayObject * - * @codeCoverageIgnore + */ class NullArrayObject extends ArrayObject { diff --git a/app/Support/Preferences.php b/app/Support/Preferences.php index 10390fe799..3014b1fc76 100644 --- a/app/Support/Preferences.php +++ b/app/Support/Preferences.php @@ -35,7 +35,7 @@ use Session; /** * Class Preferences. * - * @codeCoverageIgnore + */ class Preferences { diff --git a/app/Support/Search/OperatorQuerySearch.php b/app/Support/Search/OperatorQuerySearch.php index 01bbbd9a9e..b28c09f2f6 100644 --- a/app/Support/Search/OperatorQuerySearch.php +++ b/app/Support/Search/OperatorQuerySearch.php @@ -69,21 +69,23 @@ class OperatorQuerySearch implements SearchInterface private CategoryRepositoryInterface $categoryRepository; private GroupCollectorInterface $collector; private CurrencyRepositoryInterface $currencyRepository; - private Carbon $date; private array $invalidOperators; private int $limit; private Collection $operators; private int $page; - private array $prohibitedWords; - private float $startTime; - private TagRepositoryInterface $tagRepository; - private array $validOperators; - private array $words; + protected Carbon $date; + + + private array $prohibitedWords; + private float $startTime; + private TagRepositoryInterface $tagRepository; + private array $validOperators; + private array $words; /** * OperatorQuerySearch constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -94,7 +96,6 @@ class OperatorQuerySearch implements SearchInterface $this->prohibitedWords = []; $this->invalidOperators = []; $this->limit = 25; - $this->date = today(config('app.timezone')); $this->validOperators = array_keys(config('search.operators')); $this->startTime = microtime(true); $this->accountRepository = app(AccountRepositoryInterface::class); @@ -115,7 +116,6 @@ class OperatorQuerySearch implements SearchInterface /** * @inheritDoc - * @codeCoverageIgnore */ public function getModifiers(): Collection { @@ -124,7 +124,6 @@ class OperatorQuerySearch implements SearchInterface /** * @inheritDoc - * @codeCoverageIgnore */ public function getOperators(): Collection { @@ -133,7 +132,6 @@ class OperatorQuerySearch implements SearchInterface /** * @inheritDoc - * @codeCoverageIgnore */ public function getWordsAsString(): string { @@ -142,7 +140,6 @@ class OperatorQuerySearch implements SearchInterface /** * @inheritDoc - * @codeCoverageIgnore */ public function hasModifiers(): bool { @@ -1992,7 +1989,6 @@ class OperatorQuerySearch implements SearchInterface /** * @inheritDoc - * @codeCoverageIgnore */ public function searchTime(): float { @@ -2019,17 +2015,8 @@ class OperatorQuerySearch implements SearchInterface return $this->words; } - /** - * @param Carbon $date - */ - public function setDate(Carbon $date): void - { - $this->date = $date; - } - /** * @inheritDoc - * @codeCoverageIgnore */ public function setPage(int $page): void { @@ -2039,7 +2026,6 @@ class OperatorQuerySearch implements SearchInterface /** * @inheritDoc - * @codeCoverageIgnore */ public function setUser(User $user): void { @@ -2063,4 +2049,12 @@ class OperatorQuerySearch implements SearchInterface $this->limit = $limit; $this->collector->setLimit($this->limit); } + + /** + * @param Carbon $date + */ + public function setDate(Carbon $date): void + { + $this->date = $date; + } } diff --git a/app/Support/Steam.php b/app/Support/Steam.php index 280070cd73..18f9897f1c 100644 --- a/app/Support/Steam.php +++ b/app/Support/Steam.php @@ -43,7 +43,7 @@ use ValueError; /** * Class Steam. * - * @codeCoverageIgnore + */ class Steam { diff --git a/app/TransactionRules/Actions/LinkToBill.php b/app/TransactionRules/Actions/LinkToBill.php index d4c7ed522c..7384d227fb 100644 --- a/app/TransactionRules/Actions/LinkToBill.php +++ b/app/TransactionRules/Actions/LinkToBill.php @@ -42,7 +42,7 @@ class LinkToBill implements ActionInterface /** * TriggerInterface constructor. * - * @codeCoverageIgnore + * * @param RuleAction $action */ diff --git a/app/TransactionRules/Actions/MoveDescriptionToNotes.php b/app/TransactionRules/Actions/MoveDescriptionToNotes.php index fcab74d39b..e0fd1485e2 100644 --- a/app/TransactionRules/Actions/MoveDescriptionToNotes.php +++ b/app/TransactionRules/Actions/MoveDescriptionToNotes.php @@ -40,7 +40,7 @@ class MoveDescriptionToNotes implements ActionInterface /** * TriggerInterface constructor. * - * @codeCoverageIgnore + * * @param RuleAction $action */ diff --git a/app/TransactionRules/Actions/MoveNotesToDescription.php b/app/TransactionRules/Actions/MoveNotesToDescription.php index 0410b9998b..92a59264b4 100644 --- a/app/TransactionRules/Actions/MoveNotesToDescription.php +++ b/app/TransactionRules/Actions/MoveNotesToDescription.php @@ -39,7 +39,7 @@ class MoveNotesToDescription implements ActionInterface /** * TriggerInterface constructor. * - * @codeCoverageIgnore + * * @param RuleAction $action */ diff --git a/app/TransactionRules/Factory/ActionFactory.php b/app/TransactionRules/Factory/ActionFactory.php index 5627727ea6..ebcb35dd1c 100644 --- a/app/TransactionRules/Factory/ActionFactory.php +++ b/app/TransactionRules/Factory/ActionFactory.php @@ -32,7 +32,7 @@ use Log; /** * Class ActionFactory can create actions. * - * @codeCoverageIgnore + */ class ActionFactory { diff --git a/app/Transformers/AccountTransformer.php b/app/Transformers/AccountTransformer.php index d3e42102bd..31b507ef13 100644 --- a/app/Transformers/AccountTransformer.php +++ b/app/Transformers/AccountTransformer.php @@ -41,7 +41,7 @@ class AccountTransformer extends AbstractTransformer * * AccountTransformer constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Transformers/AttachmentTransformer.php b/app/Transformers/AttachmentTransformer.php index e816a8ba3f..d71117f501 100644 --- a/app/Transformers/AttachmentTransformer.php +++ b/app/Transformers/AttachmentTransformer.php @@ -36,7 +36,7 @@ class AttachmentTransformer extends AbstractTransformer /** * BillTransformer constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Transformers/AvailableBudgetTransformer.php b/app/Transformers/AvailableBudgetTransformer.php index ec7cdd1b23..2c50aedc5a 100644 --- a/app/Transformers/AvailableBudgetTransformer.php +++ b/app/Transformers/AvailableBudgetTransformer.php @@ -40,7 +40,7 @@ class AvailableBudgetTransformer extends AbstractTransformer /** * CurrencyTransformer constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Transformers/BillTransformer.php b/app/Transformers/BillTransformer.php index e88ddc7786..09129156db 100644 --- a/app/Transformers/BillTransformer.php +++ b/app/Transformers/BillTransformer.php @@ -42,7 +42,7 @@ class BillTransformer extends AbstractTransformer /** * BillTransformer constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Transformers/BudgetTransformer.php b/app/Transformers/BudgetTransformer.php index 2450415f83..2ea099c621 100644 --- a/app/Transformers/BudgetTransformer.php +++ b/app/Transformers/BudgetTransformer.php @@ -41,7 +41,7 @@ class BudgetTransformer extends AbstractTransformer /** * BudgetTransformer constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Transformers/CategoryTransformer.php b/app/Transformers/CategoryTransformer.php index 739a025726..9f1b9836e1 100644 --- a/app/Transformers/CategoryTransformer.php +++ b/app/Transformers/CategoryTransformer.php @@ -39,7 +39,7 @@ class CategoryTransformer extends AbstractTransformer /** * CategoryTransformer constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Transformers/ObjectGroupTransformer.php b/app/Transformers/ObjectGroupTransformer.php index 86f7d1e37a..7fa38b9f52 100644 --- a/app/Transformers/ObjectGroupTransformer.php +++ b/app/Transformers/ObjectGroupTransformer.php @@ -37,7 +37,7 @@ class ObjectGroupTransformer extends AbstractTransformer * * AccountTransformer constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Transformers/PiggyBankEventTransformer.php b/app/Transformers/PiggyBankEventTransformer.php index 78dc72f53b..e000cc2de0 100644 --- a/app/Transformers/PiggyBankEventTransformer.php +++ b/app/Transformers/PiggyBankEventTransformer.php @@ -42,7 +42,7 @@ class PiggyBankEventTransformer extends AbstractTransformer /** * PiggyBankEventTransformer constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Transformers/PiggyBankTransformer.php b/app/Transformers/PiggyBankTransformer.php index 4b97997ce6..1ddb5412bc 100644 --- a/app/Transformers/PiggyBankTransformer.php +++ b/app/Transformers/PiggyBankTransformer.php @@ -43,7 +43,7 @@ class PiggyBankTransformer extends AbstractTransformer /** * PiggyBankTransformer constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Transformers/RecurrenceTransformer.php b/app/Transformers/RecurrenceTransformer.php index c6571aba99..e4b205ac0c 100644 --- a/app/Transformers/RecurrenceTransformer.php +++ b/app/Transformers/RecurrenceTransformer.php @@ -51,7 +51,7 @@ class RecurrenceTransformer extends AbstractTransformer /** * RecurrenceTransformer constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Transformers/RuleTransformer.php b/app/Transformers/RuleTransformer.php index 459dce79fe..d95c1ba4dc 100644 --- a/app/Transformers/RuleTransformer.php +++ b/app/Transformers/RuleTransformer.php @@ -40,7 +40,7 @@ class RuleTransformer extends AbstractTransformer /** * CurrencyTransformer constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Transformers/TransactionGroupTransformer.php b/app/Transformers/TransactionGroupTransformer.php index 89e8038022..98ace4a7fd 100644 --- a/app/Transformers/TransactionGroupTransformer.php +++ b/app/Transformers/TransactionGroupTransformer.php @@ -50,7 +50,7 @@ class TransactionGroupTransformer extends AbstractTransformer /** * Constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Transformers/TransactionLinkTransformer.php b/app/Transformers/TransactionLinkTransformer.php index 47185d812d..5b558fa857 100644 --- a/app/Transformers/TransactionLinkTransformer.php +++ b/app/Transformers/TransactionLinkTransformer.php @@ -38,7 +38,7 @@ class TransactionLinkTransformer extends AbstractTransformer /** * Constructor. * - * @codeCoverageIgnore + */ public function __construct() { diff --git a/app/Transformers/V2/BudgetTransformer.php b/app/Transformers/V2/BudgetTransformer.php index 80793dd5d0..e7f0331e93 100644 --- a/app/Transformers/V2/BudgetTransformer.php +++ b/app/Transformers/V2/BudgetTransformer.php @@ -38,7 +38,7 @@ class BudgetTransformer extends AbstractTransformer /** * BudgetTransformer constructor. * - * @codeCoverageIgnore + */ public function __construct() { @@ -97,8 +97,8 @@ class BudgetTransformer extends AbstractTransformer 'id' => (string)$budget->id, 'created_at' => $budget->created_at->toAtomString(), 'updated_at' => $budget->updated_at->toAtomString(), - 'active' => $budget->active, 'name' => $budget->name, + 'active' => $budget->active, 'order' => $budget->order, // 'notes' => $notes, // 'auto_budget_type' => $abType, diff --git a/app/User.php b/app/User.php index 8cb0958299..cc8878c38f 100644 --- a/app/User.php +++ b/app/User.php @@ -218,7 +218,7 @@ class User extends Authenticatable } /** - * @codeCoverageIgnore + * Link to accounts. * * @return HasMany @@ -229,7 +229,7 @@ class User extends Authenticatable } /** - * @codeCoverageIgnore + * Link to attachments * * @return HasMany @@ -240,7 +240,7 @@ class User extends Authenticatable } /** - * @codeCoverageIgnore + * Link to available budgets * * @return HasMany @@ -251,7 +251,7 @@ class User extends Authenticatable } /** - * @codeCoverageIgnore + * Link to bills. * * @return HasMany @@ -262,7 +262,7 @@ class User extends Authenticatable } /** - * @codeCoverageIgnore + * Link to budgets. * * @return HasMany @@ -273,7 +273,7 @@ class User extends Authenticatable } /** - * @codeCoverageIgnore + * Link to categories * * @return HasMany @@ -284,7 +284,7 @@ class User extends Authenticatable } /** - * @codeCoverageIgnore + * Link to currency exchange rates * * @return HasMany @@ -295,7 +295,7 @@ class User extends Authenticatable } /** - * @codeCoverageIgnore + * Generates access token. * * @return string @@ -353,7 +353,7 @@ class User extends Authenticatable } /** - * @codeCoverageIgnore + * * @return HasMany */ @@ -378,7 +378,7 @@ class User extends Authenticatable } /** - * @codeCoverageIgnore + * Link to object groups. * * @return HasMany @@ -389,7 +389,7 @@ class User extends Authenticatable } /** - * @codeCoverageIgnore + * Link to piggy banks. * * @return HasManyThrough @@ -400,7 +400,7 @@ class User extends Authenticatable } /** - * @codeCoverageIgnore + * Link to preferences. * * @return HasMany @@ -411,7 +411,7 @@ class User extends Authenticatable } /** - * @codeCoverageIgnore + * Link to recurring transactions. * * @return HasMany @@ -462,7 +462,7 @@ class User extends Authenticatable } /** - * @codeCoverageIgnore + * Link to roles. * * @return BelongsToMany @@ -497,7 +497,7 @@ class User extends Authenticatable } /** - * @codeCoverageIgnore + * Link to rule groups. * * @return HasMany @@ -508,7 +508,7 @@ class User extends Authenticatable } /** - * @codeCoverageIgnore + * Link to rules. * * @return HasMany @@ -519,7 +519,7 @@ class User extends Authenticatable } /** - * @codeCoverageIgnore + * Send the password reset notification. * * @param string $token @@ -559,7 +559,7 @@ class User extends Authenticatable } /** - * @codeCoverageIgnore + * Link to tags. * * @return HasMany @@ -570,7 +570,7 @@ class User extends Authenticatable } /** - * @codeCoverageIgnore + * Link to transaction groups. * * @return HasMany @@ -581,7 +581,7 @@ class User extends Authenticatable } /** - * @codeCoverageIgnore + * Link to transaction journals. * * @return HasMany @@ -592,7 +592,7 @@ class User extends Authenticatable } /** - * @codeCoverageIgnore + * Link to transactions. * * @return HasManyThrough @@ -603,7 +603,7 @@ class User extends Authenticatable } /** - * @codeCoverageIgnore + * @return BelongsTo */ public function userGroup(): BelongsTo @@ -612,7 +612,7 @@ class User extends Authenticatable } /** - * @codeCoverageIgnore + * * Link to webhooks * diff --git a/changelog.md b/changelog.md index 650be75a1e..ee97bce5d7 100644 --- a/changelog.md +++ b/changelog.md @@ -2,6 +2,103 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). +## 6.0.0 - 2023-03-xx + +This is release **6.0.0** of Firefly III. + +### Warnings + +- The upgrade is not backwards compatible for people who manage outgoing loans (money borrowed to other people). Transactions will be removed or changed. See [this Gist](https://gist.github.com/JC5/909385c5086f9e07ba2c32e047446d68) for more information. +- You will need to make a backup of your database. +- You must use PHP 8.2 or use the Docker container. + +### Notes + +- The new **v3** layout is not yet finished, and it should **not** be used to edit or add data. + +### Added +- Introduce Jetbrains Qodana code scanning for code quality. +- Reintroduced PHPUnit tests +- Added a warning for people using the "remote user guard" in combination with Personal Access Tokens. +- Improved validation across the board. +- First code to validate a user's financial administration +- Dark mode CSS +- New language: Catalan +- "Working" beta of the new layout under `/v3/` +- There is a page for webhooks. +- [Issue 4975](https://github.com/firefly-iii/firefly-iii/issues/4975) Rules can copy/move description to notes and vice versa +- [Issue 5031](https://github.com/firefly-iii/firefly-iii/issues/5031) You can invite users to your installation when registration is off +- [Issue 5213](https://github.com/firefly-iii/firefly-iii/issues/5213) You can trigger recurring transactions beforehand +- [Issue 5592](https://github.com/firefly-iii/firefly-iii/issues/5592) Transactions have a little history box to show how rules changed them +- [Issue 5752](https://github.com/firefly-iii/firefly-iii/issues/5752) Firefly III can send Slack notifications instead of emails +- [Issue 5862](https://github.com/firefly-iii/firefly-iii/issues/5862) Search can filter on reconciled transactions +- [Issue 6086](https://github.com/firefly-iii/firefly-iii/issues/6086) All search filters can be negative by putting `-` in front of them +- [Issue 6441](https://github.com/firefly-iii/firefly-iii/issues/6441) Buttons to purge deleted data, which is easy for data imports +- [Issue 6457](https://github.com/firefly-iii/firefly-iii/issues/6457) Rule trigger 'transaction exists', that will always trigger +- [Issue 6526](https://github.com/firefly-iii/firefly-iii/issues/6526) Option to disable rules and/or webhooks when saving transactions +- [Issue 6605](https://github.com/firefly-iii/firefly-iii/issues/6605) You can search for external ID values + +### Changed +- Completely rewritten documentation at https://docs.firefly-iii.org +- Bad escape in JS code has been fixed. +- Added date validation in routes for better script kiddie protection +- Shorter titles in object groups +- Piggy bank actions are created correctly +- Some bad spelling in a header check +- Various errors no longer throw a 500 but a 422 (validation failed) +- The translations now have a warning in the comments so people don't submit translations. +- [Issue 6824](https://github.com/firefly-iii/firefly-iii/issues/6824) Fix issue with bills. +- [Issue 6828](https://github.com/firefly-iii/firefly-iii/issues/6828) Catch bad number in API +- [Issue 6829](https://github.com/firefly-iii/firefly-iii/issues/6829) Better error catching in API +- [Issue 6831](https://github.com/firefly-iii/firefly-iii/issues/6831) TypeError when using remote authentication +- [Issue 6834](https://github.com/firefly-iii/firefly-iii/issues/6834) Will use IBAN in account names if account exists already with a different IBAN +- [Issue 6842](https://github.com/firefly-iii/firefly-iii/issues/6842) Switch from expense to revenue when importing data. +- [Issue 6855](https://github.com/firefly-iii/firefly-iii/issues/6855) Do not validate currency if currency is NULL, thanks @eps90! +- [Issue 6869](https://github.com/firefly-iii/firefly-iii/issues/6869) Liability created via API is not applying opening balance. +- [Issue 6870](https://github.com/firefly-iii/firefly-iii/issues/6870) Old inactive recurring transactions do not lose categories when the categories are deleted +- [Issue 6974](https://github.com/firefly-iii/firefly-iii/issues/6974) Auto budget amount fix. +- [Issue 6876](https://github.com/firefly-iii/firefly-iii/issues/6876) Date field is validated in recurring transactions +- [Issue 6581](https://github.com/firefly-iii/firefly-iii/issues/6581) Fields were not cleared in the transaction screen in some cases + +### Removed +- [Issue 4198](https://github.com/firefly-iii/firefly-iii/issues/4198) The total available budget amount bar on the `/budgets` page is no longer manageable but will be auto-calculated +- Cryptocurrencies in default currency set +- Unused environment variables + +### API +- URLs with underscores in them have been updated to use dashes instead (`piggy_banks` -> `piggy-banks`). +- [Issue 6130](https://github.com/firefly-iii/firefly-iii/issues/6130) You can now create a reconciliation transaction +- New `v2` endpoints, see new documentation at https://api-docs.firefly-iii.org +- Various API fixes + +### Security +- [Issue 6826](https://github.com/firefly-iii/firefly-iii/issues/6826) Hide 2FA information when printing, thanks @jstebenne! +- Blocked users can access API, and users can unblock themselves using the API. This was reported in CVE-2023-0298. + +## 6.0.0-beta.2 - 2023-02-20 + +### Warnings + +- ⚠️ Make a backup of your database first! +- ⚠️ This version requires **PHP 8.2**. + +You can access the new V3 layout under `/v3/`. If you decide to use or test it: + +- ⚠️ Read the instructions under the ☠️ icon FIRST. +- ⚠️ The new layout is not yet finished. Use it to change your data at your own risk. + +### Added +- Add max upload to debug page. + +### Fixed +- Missing indexes in bill overview. +- Various dark mode fixes + +### Security +- Bad escape in transaction currencies could cause XSS attacks. + +### API +- All v1 and v2 routes checked and documented properly. ## 6.0.0-beta.1 - 2023-02-12 diff --git a/composer.json b/composer.json index 14ef8bed66..9b0f461d43 100644 --- a/composer.json +++ b/composer.json @@ -97,7 +97,7 @@ "league/commonmark": "2.*", "league/csv": "^9.7", "league/fractal": "0.*", - "nunomaduro/collision": "^6.3", + "nunomaduro/collision": "^7.0", "pragmarx/google2fa": "^8.0", "predis/predis": "^2.1", "psr/log": "<4", diff --git a/composer.lock b/composer.lock index 8db1e89f83..e854171b3c 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "052f139e8202508ed3608b6447bec7dd", + "content-hash": "b88b46f4acccd4b40e0ce98015c29585", "packages": [ { "name": "bacon/bacon-qr-code", @@ -306,30 +306,30 @@ }, { "name": "diglactic/laravel-breadcrumbs", - "version": "v8.0.1", + "version": "v8.1.0", "source": { "type": "git", "url": "https://github.com/diglactic/laravel-breadcrumbs.git", - "reference": "b2c594e56fd15ef3112436e2067dca13131dd990" + "reference": "ce3dfb760743c63a287dab4b8090d7bf68b321ee" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/diglactic/laravel-breadcrumbs/zipball/b2c594e56fd15ef3112436e2067dca13131dd990", - "reference": "b2c594e56fd15ef3112436e2067dca13131dd990", + "url": "https://api.github.com/repos/diglactic/laravel-breadcrumbs/zipball/ce3dfb760743c63a287dab4b8090d7bf68b321ee", + "reference": "ce3dfb760743c63a287dab4b8090d7bf68b321ee", "shasum": "" }, "require": { "facade/ignition-contracts": "^1.0", - "laravel/framework": "^6.0 || ^7.0 || ^8.0 || ^9.0", + "laravel/framework": "^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0", "php": "^7.2 || ^8.0" }, "conflict": { "davejamesmiller/laravel-breadcrumbs": "*" }, "require-dev": { - "orchestra/testbench": "^4.10 || ^5.9 || ^6.4 || ^7.0", + "orchestra/testbench": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0", "php-coveralls/php-coveralls": "^2.4", - "phpunit/phpunit": "^8.5 || ^9.4", + "phpunit/phpunit": "^8.5 || ^9.5", "spatie/phpunit-snapshot-assertions": "^2.2 || ^4.2" }, "type": "library", @@ -371,9 +371,9 @@ ], "support": { "issues": "https://github.com/diglactic/laravel-breadcrumbs/issues", - "source": "https://github.com/diglactic/laravel-breadcrumbs/tree/v8.0.1" + "source": "https://github.com/diglactic/laravel-breadcrumbs/tree/v8.1.0" }, - "time": "2022-09-02T16:18:17+00:00" + "time": "2023-02-06T22:46:35+00:00" }, { "name": "doctrine/cache", @@ -470,16 +470,16 @@ }, { "name": "doctrine/dbal", - "version": "3.5.3", + "version": "3.6.0", "source": { "type": "git", "url": "https://github.com/doctrine/dbal.git", - "reference": "88fa7e5189fd5ec6682477044264dc0ed4e3aa1e" + "reference": "85b98cb23c8af471a67abfe14485da696bcabc2e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/dbal/zipball/88fa7e5189fd5ec6682477044264dc0ed4e3aa1e", - "reference": "88fa7e5189fd5ec6682477044264dc0ed4e3aa1e", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/85b98cb23c8af471a67abfe14485da696bcabc2e", + "reference": "85b98cb23c8af471a67abfe14485da696bcabc2e", "shasum": "" }, "require": { @@ -492,11 +492,12 @@ "psr/log": "^1|^2|^3" }, "require-dev": { - "doctrine/coding-standard": "11.0.0", + "doctrine/coding-standard": "11.1.0", + "fig/log-test": "^1", "jetbrains/phpstorm-stubs": "2022.3", - "phpstan/phpstan": "1.9.4", + "phpstan/phpstan": "1.9.14", "phpstan/phpstan-strict-rules": "^1.4", - "phpunit/phpunit": "9.5.27", + "phpunit/phpunit": "9.6.3", "psalm/plugin-phpunit": "0.18.4", "squizlabs/php_codesniffer": "3.7.1", "symfony/cache": "^5.4|^6.0", @@ -561,7 +562,7 @@ ], "support": { "issues": "https://github.com/doctrine/dbal/issues", - "source": "https://github.com/doctrine/dbal/tree/3.5.3" + "source": "https://github.com/doctrine/dbal/tree/3.6.0" }, "funding": [ { @@ -577,7 +578,7 @@ "type": "tidelift" } ], - "time": "2023-01-12T10:21:44+00:00" + "time": "2023-02-07T22:52:03+00:00" }, { "name": "doctrine/deprecations", @@ -1135,16 +1136,16 @@ }, { "name": "firebase/php-jwt", - "version": "v6.3.2", + "version": "v6.4.0", "source": { "type": "git", "url": "https://github.com/firebase/php-jwt.git", - "reference": "ea7dda77098b96e666c5ef382452f94841e439cd" + "reference": "4dd1e007f22a927ac77da5a3fbb067b42d3bc224" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/firebase/php-jwt/zipball/ea7dda77098b96e666c5ef382452f94841e439cd", - "reference": "ea7dda77098b96e666c5ef382452f94841e439cd", + "url": "https://api.github.com/repos/firebase/php-jwt/zipball/4dd1e007f22a927ac77da5a3fbb067b42d3bc224", + "reference": "4dd1e007f22a927ac77da5a3fbb067b42d3bc224", "shasum": "" }, "require": { @@ -1159,6 +1160,7 @@ "psr/http-factory": "^1.0" }, "suggest": { + "ext-sodium": "Support EdDSA (Ed25519) signatures", "paragonie/sodium_compat": "Support EdDSA (Ed25519) signatures when libsodium is not present" }, "type": "library", @@ -1191,9 +1193,9 @@ ], "support": { "issues": "https://github.com/firebase/php-jwt/issues", - "source": "https://github.com/firebase/php-jwt/tree/v6.3.2" + "source": "https://github.com/firebase/php-jwt/tree/v6.4.0" }, - "time": "2022-12-19T17:10:46+00:00" + "time": "2023-02-09T21:01:23+00:00" }, { "name": "fruitcake/php-cors", @@ -1698,6 +1700,90 @@ ], "time": "2022-10-26T14:07:24+00:00" }, + { + "name": "guzzlehttp/uri-template", + "version": "v1.0.1", + "source": { + "type": "git", + "url": "https://github.com/guzzle/uri-template.git", + "reference": "b945d74a55a25a949158444f09ec0d3c120d69e2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/guzzle/uri-template/zipball/b945d74a55a25a949158444f09ec0d3c120d69e2", + "reference": "b945d74a55a25a949158444f09ec0d3c120d69e2", + "shasum": "" + }, + "require": { + "php": "^7.2.5 || ^8.0", + "symfony/polyfill-php80": "^1.17" + }, + "require-dev": { + "phpunit/phpunit": "^8.5.19 || ^9.5.8", + "uri-template/tests": "1.0.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "psr-4": { + "GuzzleHttp\\UriTemplate\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Graham Campbell", + "email": "hello@gjcampbell.co.uk", + "homepage": "https://github.com/GrahamCampbell" + }, + { + "name": "Michael Dowling", + "email": "mtdowling@gmail.com", + "homepage": "https://github.com/mtdowling" + }, + { + "name": "George Mponos", + "email": "gmponos@gmail.com", + "homepage": "https://github.com/gmponos" + }, + { + "name": "Tobias Nyholm", + "email": "tobias.nyholm@gmail.com", + "homepage": "https://github.com/Nyholm" + } + ], + "description": "A polyfill class for uri_template of PHP", + "keywords": [ + "guzzlehttp", + "uri-template" + ], + "support": { + "issues": "https://github.com/guzzle/uri-template/issues", + "source": "https://github.com/guzzle/uri-template/tree/v1.0.1" + }, + "funding": [ + { + "url": "https://github.com/GrahamCampbell", + "type": "github" + }, + { + "url": "https://github.com/Nyholm", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/uri-template", + "type": "tidelift" + } + ], + "time": "2021-10-07T12:57:01+00:00" + }, { "name": "jc5/google2fa-laravel", "version": "v2.0.8", @@ -1855,16 +1941,16 @@ }, { "name": "laravel/framework", - "version": "v9.50.2", + "version": "v9.52.0", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "39932773c09658ddea9045958f305e67f9304995" + "reference": "eb85cd9d72e5bfa54b4d0d9040786f26d6184a9e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/39932773c09658ddea9045958f305e67f9304995", - "reference": "39932773c09658ddea9045958f305e67f9304995", + "url": "https://api.github.com/repos/laravel/framework/zipball/eb85cd9d72e5bfa54b4d0d9040786f26d6184a9e", + "reference": "eb85cd9d72e5bfa54b4d0d9040786f26d6184a9e", "shasum": "" }, "require": { @@ -1872,9 +1958,15 @@ "doctrine/inflector": "^2.0.5", "dragonmantank/cron-expression": "^3.3.2", "egulias/email-validator": "^3.2.1|^4.0", + "ext-ctype": "*", + "ext-filter": "*", + "ext-hash": "*", "ext-mbstring": "*", "ext-openssl": "*", + "ext-session": "*", + "ext-tokenizer": "*", "fruitcake/php-cors": "^1.2", + "guzzlehttp/uri-template": "^1.0", "laravel/serializable-closure": "^1.2.2", "league/commonmark": "^2.2.1", "league/flysystem": "^3.8.0", @@ -1946,6 +2038,7 @@ "ably/ably-php": "^1.0", "aws/aws-sdk-php": "^3.235.5", "doctrine/dbal": "^2.13.3|^3.1.4", + "ext-gmp": "*", "fakerphp/faker": "^1.21", "guzzlehttp/guzzle": "^7.5", "league/flysystem-aws-s3-v3": "^3.0", @@ -1968,10 +2061,13 @@ "aws/aws-sdk-php": "Required to use the SQS queue driver, DynamoDb failed job storage, and SES mail driver (^3.235.5).", "brianium/paratest": "Required to run tests in parallel (^6.0).", "doctrine/dbal": "Required to rename columns and drop SQLite columns (^2.13.3|^3.1.4).", + "ext-apcu": "Required to use the APC cache driver.", + "ext-fileinfo": "Required to use the Filesystem class.", "ext-ftp": "Required to use the Flysystem FTP driver.", "ext-gd": "Required to use Illuminate\\Http\\Testing\\FileFactory::image().", "ext-memcached": "Required to use the memcache cache driver.", - "ext-pcntl": "Required to use all features of the queue worker.", + "ext-pcntl": "Required to use all features of the queue worker and console signal trapping.", + "ext-pdo": "Required to use all database features.", "ext-posix": "Required to use all features of the queue worker.", "ext-redis": "Required to use the Redis cache and queue drivers (^4.0|^5.0).", "fakerphp/faker": "Required to use the eloquent factory builder (^1.9.1).", @@ -2039,20 +2135,20 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2023-02-02T20:52:46+00:00" + "time": "2023-02-14T14:51:14+00:00" }, { "name": "laravel/passport", - "version": "v11.6.0", + "version": "v11.8.0", "source": { "type": "git", "url": "https://github.com/laravel/passport.git", - "reference": "1d8204e40c63bb6cbb981907fdbeb5c69a4fbae9" + "reference": "2008d86244297a9fa291faf63f59d0949bddf91e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/passport/zipball/1d8204e40c63bb6cbb981907fdbeb5c69a4fbae9", - "reference": "1d8204e40c63bb6cbb981907fdbeb5c69a4fbae9", + "url": "https://api.github.com/repos/laravel/passport/zipball/2008d86244297a9fa291faf63f59d0949bddf91e", + "reference": "2008d86244297a9fa291faf63f59d0949bddf91e", "shasum": "" }, "require": { @@ -2116,7 +2212,7 @@ "issues": "https://github.com/laravel/passport/issues", "source": "https://github.com/laravel/passport" }, - "time": "2023-01-31T13:41:55+00:00" + "time": "2023-02-17T09:08:51+00:00" }, { "name": "laravel/sanctum", @@ -2306,16 +2402,16 @@ }, { "name": "laravel/ui", - "version": "v4.2.0", + "version": "v4.2.1", "source": { "type": "git", "url": "https://github.com/laravel/ui.git", - "reference": "810adddcf4e2538b0d1ed470c3a5220ffe761370" + "reference": "05ff7ac1eb55e2dfd10edcfb18c953684d693907" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/ui/zipball/810adddcf4e2538b0d1ed470c3a5220ffe761370", - "reference": "810adddcf4e2538b0d1ed470c3a5220ffe761370", + "url": "https://api.github.com/repos/laravel/ui/zipball/05ff7ac1eb55e2dfd10edcfb18c953684d693907", + "reference": "05ff7ac1eb55e2dfd10edcfb18c953684d693907", "shasum": "" }, "require": { @@ -2326,7 +2422,8 @@ "php": "^8.0" }, "require-dev": { - "orchestra/testbench": "^7.0|^8.0" + "orchestra/testbench": "^7.0|^8.0", + "phpunit/phpunit": "^9.3" }, "type": "library", "extra": { @@ -2361,34 +2458,34 @@ "ui" ], "support": { - "source": "https://github.com/laravel/ui/tree/v4.2.0" + "source": "https://github.com/laravel/ui/tree/v4.2.1" }, - "time": "2023-01-10T12:13:29+00:00" + "time": "2023-02-17T09:17:24+00:00" }, { "name": "laravelcollective/html", - "version": "v6.3.0", + "version": "v6.4.0", "source": { "type": "git", "url": "https://github.com/LaravelCollective/html.git", - "reference": "78c3cb516ac9e6d3d76cad9191f81d217302dea6" + "reference": "ac74f580459a5120079b8def0404e5d312a09504" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/LaravelCollective/html/zipball/78c3cb516ac9e6d3d76cad9191f81d217302dea6", - "reference": "78c3cb516ac9e6d3d76cad9191f81d217302dea6", + "url": "https://api.github.com/repos/LaravelCollective/html/zipball/ac74f580459a5120079b8def0404e5d312a09504", + "reference": "ac74f580459a5120079b8def0404e5d312a09504", "shasum": "" }, "require": { - "illuminate/http": "^6.0|^7.0|^8.0|^9.0", - "illuminate/routing": "^6.0|^7.0|^8.0|^9.0", - "illuminate/session": "^6.0|^7.0|^8.0|^9.0", - "illuminate/support": "^6.0|^7.0|^8.0|^9.0", - "illuminate/view": "^6.0|^7.0|^8.0|^9.0", + "illuminate/http": "^6.0|^7.0|^8.0|^9.0|^10.0", + "illuminate/routing": "^6.0|^7.0|^8.0|^9.0|^10.0", + "illuminate/session": "^6.0|^7.0|^8.0|^9.0|^10.0", + "illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0", + "illuminate/view": "^6.0|^7.0|^8.0|^9.0|^10.0", "php": ">=7.2.5" }, "require-dev": { - "illuminate/database": "^6.0|^7.0|^8.0|^9.0", + "illuminate/database": "^6.0|^7.0|^8.0|^9.0|^10.0", "mockery/mockery": "~1.0", "phpunit/phpunit": "~8.5|^9.5.10" }, @@ -2435,7 +2532,7 @@ "issues": "https://github.com/LaravelCollective/html/issues", "source": "https://github.com/LaravelCollective/html" }, - "time": "2022-02-08T21:02:54+00:00" + "time": "2023-02-13T18:15:35+00:00" }, { "name": "lcobucci/clock", @@ -2577,16 +2674,16 @@ }, { "name": "league/commonmark", - "version": "2.3.8", + "version": "2.3.9", "source": { "type": "git", "url": "https://github.com/thephpleague/commonmark.git", - "reference": "c493585c130544c4e91d2e0e131e6d35cb0cbc47" + "reference": "c1e114f74e518daca2729ea8c4bf1167038fa4b5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/c493585c130544c4e91d2e0e131e6d35cb0cbc47", - "reference": "c493585c130544c4e91d2e0e131e6d35cb0cbc47", + "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/c1e114f74e518daca2729ea8c4bf1167038fa4b5", + "reference": "c1e114f74e518daca2729ea8c4bf1167038fa4b5", "shasum": "" }, "require": { @@ -2679,7 +2776,7 @@ "type": "tidelift" } ], - "time": "2022-12-10T16:02:17+00:00" + "time": "2023-02-15T14:07:24+00:00" }, { "name": "league/config", @@ -2903,16 +3000,16 @@ }, { "name": "league/flysystem", - "version": "3.12.2", + "version": "3.12.3", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem.git", - "reference": "f6377c709d2275ed6feaf63e44be7a7162b0e77f" + "reference": "81e87e74dd5213795c7846d65089712d2dda90ce" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/f6377c709d2275ed6feaf63e44be7a7162b0e77f", - "reference": "f6377c709d2275ed6feaf63e44be7a7162b0e77f", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/81e87e74dd5213795c7846d65089712d2dda90ce", + "reference": "81e87e74dd5213795c7846d65089712d2dda90ce", "shasum": "" }, "require": { @@ -2974,7 +3071,7 @@ ], "support": { "issues": "https://github.com/thephpleague/flysystem/issues", - "source": "https://github.com/thephpleague/flysystem/tree/3.12.2" + "source": "https://github.com/thephpleague/flysystem/tree/3.12.3" }, "funding": [ { @@ -2990,7 +3087,7 @@ "type": "tidelift" } ], - "time": "2023-01-19T12:02:19+00:00" + "time": "2023-02-18T15:32:41+00:00" }, { "name": "league/fractal", @@ -3120,16 +3217,16 @@ }, { "name": "league/oauth2-server", - "version": "8.3.6", + "version": "8.4.0", "source": { "type": "git", "url": "https://github.com/thephpleague/oauth2-server.git", - "reference": "28c5441716c10d0c936bd731860dc385d0f6d1a8" + "reference": "539f4340c14eca8d44578fd118f6bdc0ad16d1ce" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/oauth2-server/zipball/28c5441716c10d0c936bd731860dc385d0f6d1a8", - "reference": "28c5441716c10d0c936bd731860dc385d0f6d1a8", + "url": "https://api.github.com/repos/thephpleague/oauth2-server/zipball/539f4340c14eca8d44578fd118f6bdc0ad16d1ce", + "reference": "539f4340c14eca8d44578fd118f6bdc0ad16d1ce", "shasum": "" }, "require": { @@ -3196,7 +3293,7 @@ ], "support": { "issues": "https://github.com/thephpleague/oauth2-server/issues", - "source": "https://github.com/thephpleague/oauth2-server/tree/8.3.6" + "source": "https://github.com/thephpleague/oauth2-server/tree/8.4.0" }, "funding": [ { @@ -3204,7 +3301,7 @@ "type": "github" } ], - "time": "2022-11-14T19:42:00+00:00" + "time": "2023-02-15T16:08:35+00:00" }, { "name": "league/uri", @@ -3379,16 +3476,16 @@ }, { "name": "monolog/monolog", - "version": "2.9.0", + "version": "2.9.1", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "e1c0ae1528ce313a450e5e1ad782765c4a8dd3cb" + "reference": "f259e2b15fb95494c83f52d3caad003bbf5ffaa1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/e1c0ae1528ce313a450e5e1ad782765c4a8dd3cb", - "reference": "e1c0ae1528ce313a450e5e1ad782765c4a8dd3cb", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/f259e2b15fb95494c83f52d3caad003bbf5ffaa1", + "reference": "f259e2b15fb95494c83f52d3caad003bbf5ffaa1", "shasum": "" }, "require": { @@ -3465,7 +3562,7 @@ ], "support": { "issues": "https://github.com/Seldaek/monolog/issues", - "source": "https://github.com/Seldaek/monolog/tree/2.9.0" + "source": "https://github.com/Seldaek/monolog/tree/2.9.1" }, "funding": [ { @@ -3477,7 +3574,7 @@ "type": "tidelift" } ], - "time": "2023-02-05T13:07:32+00:00" + "time": "2023-02-06T13:44:46+00:00" }, { "name": "nesbot/carbon", @@ -3732,38 +3829,38 @@ }, { "name": "nunomaduro/collision", - "version": "v6.4.0", + "version": "v7.0.3", "source": { "type": "git", "url": "https://github.com/nunomaduro/collision.git", - "reference": "f05978827b9343cba381ca05b8c7deee346b6015" + "reference": "fbf3c8a8ee08068bee7d81ee0cee5ddf032aaa84" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nunomaduro/collision/zipball/f05978827b9343cba381ca05b8c7deee346b6015", - "reference": "f05978827b9343cba381ca05b8c7deee346b6015", + "url": "https://api.github.com/repos/nunomaduro/collision/zipball/fbf3c8a8ee08068bee7d81ee0cee5ddf032aaa84", + "reference": "fbf3c8a8ee08068bee7d81ee0cee5ddf032aaa84", "shasum": "" }, "require": { - "filp/whoops": "^2.14.5", - "php": "^8.0.0", - "symfony/console": "^6.0.2" + "filp/whoops": "^2.14.6", + "nunomaduro/termwind": "^1.15.1", + "php": "^8.1.0", + "symfony/console": "^6.2.5" }, "require-dev": { - "brianium/paratest": "^6.4.1", - "laravel/framework": "^9.26.1", - "laravel/pint": "^1.1.1", - "nunomaduro/larastan": "^1.0.3", - "nunomaduro/mock-final-classes": "^1.1.0", - "orchestra/testbench": "^7.7", - "phpunit/phpunit": "^9.5.23", - "spatie/ignition": "^1.4.1" + "laravel/framework": "^10.0.0", + "laravel/pint": "^1.5.0", + "laravel/sail": "^1.20.2", + "laravel/sanctum": "^3.2.1", + "laravel/tinker": "^2.8.0", + "nunomaduro/larastan": "^2.4.0", + "orchestra/testbench-core": "^8.0.0", + "pestphp/pest": "^2.0.0", + "phpunit/phpunit": "^10.0.7", + "spatie/laravel-ignition": "^2.0.0" }, "type": "library", "extra": { - "branch-alias": { - "dev-develop": "6.x-dev" - }, "laravel": { "providers": [ "NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider" @@ -3771,6 +3868,9 @@ } }, "autoload": { + "files": [ + "./src/Adapters/Phpunit/Autoload.php" + ], "psr-4": { "NunoMaduro\\Collision\\": "src/" } @@ -3816,20 +3916,20 @@ "type": "patreon" } ], - "time": "2023-01-03T12:54:54+00:00" + "time": "2023-02-16T14:34:30+00:00" }, { "name": "nunomaduro/termwind", - "version": "v1.15.0", + "version": "v1.15.1", "source": { "type": "git", "url": "https://github.com/nunomaduro/termwind.git", - "reference": "594ab862396c16ead000de0c3c38f4a5cbe1938d" + "reference": "8ab0b32c8caa4a2e09700ea32925441385e4a5dc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nunomaduro/termwind/zipball/594ab862396c16ead000de0c3c38f4a5cbe1938d", - "reference": "594ab862396c16ead000de0c3c38f4a5cbe1938d", + "url": "https://api.github.com/repos/nunomaduro/termwind/zipball/8ab0b32c8caa4a2e09700ea32925441385e4a5dc", + "reference": "8ab0b32c8caa4a2e09700ea32925441385e4a5dc", "shasum": "" }, "require": { @@ -3886,7 +3986,7 @@ ], "support": { "issues": "https://github.com/nunomaduro/termwind/issues", - "source": "https://github.com/nunomaduro/termwind/tree/v1.15.0" + "source": "https://github.com/nunomaduro/termwind/tree/v1.15.1" }, "funding": [ { @@ -3902,7 +4002,7 @@ "type": "github" } ], - "time": "2022-12-20T19:00:15+00:00" + "time": "2023-02-08T01:06:31+00:00" }, { "name": "nyholm/psr7", @@ -8278,16 +8378,16 @@ }, { "name": "twig/twig", - "version": "v3.5.0", + "version": "v3.5.1", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "3ffcf4b7d890770466da3b2666f82ac054e7ec72" + "reference": "a6e0510cc793912b451fd40ab983a1d28f611c15" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/3ffcf4b7d890770466da3b2666f82ac054e7ec72", - "reference": "3ffcf4b7d890770466da3b2666f82ac054e7ec72", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/a6e0510cc793912b451fd40ab983a1d28f611c15", + "reference": "a6e0510cc793912b451fd40ab983a1d28f611c15", "shasum": "" }, "require": { @@ -8338,7 +8438,7 @@ ], "support": { "issues": "https://github.com/twigphp/Twig/issues", - "source": "https://github.com/twigphp/Twig/tree/v3.5.0" + "source": "https://github.com/twigphp/Twig/tree/v3.5.1" }, "funding": [ { @@ -8350,7 +8450,7 @@ "type": "tidelift" } ], - "time": "2022-12-27T12:28:18+00:00" + "time": "2023-02-08T07:49:20+00:00" }, { "name": "vlucas/phpdotenv", @@ -9316,16 +9416,16 @@ }, { "name": "nunomaduro/larastan", - "version": "2.4.0", + "version": "2.4.1", "source": { "type": "git", "url": "https://github.com/nunomaduro/larastan.git", - "reference": "14f631348ead3e245651606931863b4f218d1f78" + "reference": "238fdbfba3aae133cdec73e99826c9b0232141f7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nunomaduro/larastan/zipball/14f631348ead3e245651606931863b4f218d1f78", - "reference": "14f631348ead3e245651606931863b4f218d1f78", + "url": "https://api.github.com/repos/nunomaduro/larastan/zipball/238fdbfba3aae133cdec73e99826c9b0232141f7", + "reference": "238fdbfba3aae133cdec73e99826c9b0232141f7", "shasum": "" }, "require": { @@ -9388,7 +9488,7 @@ ], "support": { "issues": "https://github.com/nunomaduro/larastan/issues", - "source": "https://github.com/nunomaduro/larastan/tree/2.4.0" + "source": "https://github.com/nunomaduro/larastan/tree/2.4.1" }, "funding": [ { @@ -9408,7 +9508,7 @@ "type": "patreon" } ], - "time": "2023-01-11T11:57:44+00:00" + "time": "2023-02-05T12:19:17+00:00" }, { "name": "phar-io/manifest", @@ -9718,16 +9818,16 @@ }, { "name": "phpstan/phpstan", - "version": "1.9.14", + "version": "1.9.18", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "e5fcc96289cf737304286a9b505fbed091f02e58" + "reference": "f2d5cf71be91172a57c649770b73c20ebcffb0bf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/e5fcc96289cf737304286a9b505fbed091f02e58", - "reference": "e5fcc96289cf737304286a9b505fbed091f02e58", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/f2d5cf71be91172a57c649770b73c20ebcffb0bf", + "reference": "f2d5cf71be91172a57c649770b73c20ebcffb0bf", "shasum": "" }, "require": { @@ -9757,7 +9857,7 @@ ], "support": { "issues": "https://github.com/phpstan/phpstan/issues", - "source": "https://github.com/phpstan/phpstan/tree/1.9.14" + "source": "https://github.com/phpstan/phpstan/tree/1.9.18" }, "funding": [ { @@ -9773,7 +9873,7 @@ "type": "tidelift" } ], - "time": "2023-01-19T10:47:09+00:00" + "time": "2023-02-17T15:01:27+00:00" }, { "name": "phpstan/phpstan-deprecation-rules", diff --git a/config/firefly.php b/config/firefly.php index b6b521c6e4..8d6ee58355 100644 --- a/config/firefly.php +++ b/config/firefly.php @@ -106,8 +106,8 @@ return [ 'webhooks' => true, 'handle_debts' => true, ], - 'version' => '6.0.0-beta.1', - 'api_version' => '2.0.0-beta.1', + 'version' => '6.0.0-beta.2', + 'api_version' => '2.0.0-beta.2', 'db_version' => 19, // generic settings diff --git a/frontend/package.json b/frontend/package.json index 800dd97e42..4057475e29 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -11,14 +11,14 @@ }, "dependencies": { "@popperjs/core": "^2.11.2", - "@quasar/extras": "^1.15.10", + "@quasar/extras": "^1.15.11", "apexcharts": "^3.32.1", "axios": "^0.21.1", "axios-cache-adapter": "^2.7.3", "core-js": "^3.6.5", "date-fns": "^2.28.0", "pinia": "^2.0.14", - "quasar": "^2.11.5", + "quasar": "^2.11.6", "vue": "3", "vue-i18n": "^9.0.0", "vue-router": "^4.0.0", diff --git a/frontend/src/api/v2/budgets/get.js b/frontend/src/api/v2/budgets/get.js new file mode 100644 index 0000000000..2f5d1c2aed --- /dev/null +++ b/frontend/src/api/v2/budgets/get.js @@ -0,0 +1,32 @@ +/* + * list.js + * Copyright (c) 2022 james@firefly-iii.org + * + * This file is part of Firefly III (https://github.com/firefly-iii). + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +import {api} from "boot/axios"; +import {format} from "date-fns"; + +export default class Get { + spent(identifier, start, end) { + let url = '/api/v2/budgets/' + identifier + '/spent'; + let startStr = format(start, 'y-MM-dd'); + let endStr = format(end, 'y-MM-dd'); + return api.get(url, {params: {start: startStr, end: endStr}}); + } + +} diff --git a/frontend/src/components/dashboard/BudgetBox.vue b/frontend/src/components/dashboard/BudgetBox.vue index 9be3af1705..beae4361c0 100644 --- a/frontend/src/components/dashboard/BudgetBox.vue +++ b/frontend/src/components/dashboard/BudgetBox.vue @@ -18,6 +18,11 @@ - along with this program. If not, see . --> + +