From 3120e29940a182a9fed4f7d9bb4c277642333252 Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 30 Mar 2022 20:09:19 +0200 Subject: [PATCH] Update packages. --- .../Autocomplete/AccountController.php | 2 + .../Controllers/Chart/AccountController.php | 9 ++- app/Api/V1/Controllers/Controller.php | 8 ++- .../TransactionCurrency/ShowController.php | 7 ++- .../TransactionCurrency/StoreController.php | 3 +- .../Controllers/Summary/BasicController.php | 2 +- .../System/ConfigurationController.php | 6 +- .../V1/Controllers/System/UserController.php | 2 +- .../V1/Requests/Insight/GenericRequest.php | 8 +-- app/Helpers/Collector/GroupCollector.php | 7 +-- changelog.md | 4 +- composer.json | 3 +- composer.lock | 62 +++++++++---------- config/google2fa.php | 4 ++ 14 files changed, 68 insertions(+), 59 deletions(-) diff --git a/app/Api/V1/Controllers/Autocomplete/AccountController.php b/app/Api/V1/Controllers/Autocomplete/AccountController.php index 7e3e19a8be..7fe5b418cf 100644 --- a/app/Api/V1/Controllers/Autocomplete/AccountController.php +++ b/app/Api/V1/Controllers/Autocomplete/AccountController.php @@ -71,6 +71,8 @@ class AccountController extends Controller * * @return JsonResponse * @throws JsonException + * @throws FireflyException + * @throws FireflyException */ public function accounts(AutocompleteRequest $request): JsonResponse { diff --git a/app/Api/V1/Controllers/Chart/AccountController.php b/app/Api/V1/Controllers/Chart/AccountController.php index 87a8a32127..264c1a97a0 100644 --- a/app/Api/V1/Controllers/Chart/AccountController.php +++ b/app/Api/V1/Controllers/Chart/AccountController.php @@ -35,6 +35,9 @@ use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; use FireflyIII\Support\Http\Api\ApiSupport; use FireflyIII\User; use Illuminate\Http\JsonResponse; +use JsonException; +use Psr\Container\ContainerExceptionInterface; +use Psr\Container\NotFoundExceptionInterface; /** * Class AccountController @@ -77,9 +80,9 @@ class AccountController extends Controller * * @return JsonResponse * @throws FireflyException - * @throws \JsonException - * @throws \Psr\Container\ContainerExceptionInterface - * @throws \Psr\Container\NotFoundExceptionInterface + * @throws JsonException + * @throws ContainerExceptionInterface + * @throws NotFoundExceptionInterface */ public function overview(DateRequest $request): JsonResponse { diff --git a/app/Api/V1/Controllers/Controller.php b/app/Api/V1/Controllers/Controller.php index ea8e4fcb02..55b1058762 100644 --- a/app/Api/V1/Controllers/Controller.php +++ b/app/Api/V1/Controllers/Controller.php @@ -34,6 +34,8 @@ use Illuminate\Routing\Controller as BaseController; use League\Fractal\Manager; use League\Fractal\Serializer\JsonApiSerializer; use Log; +use Psr\Container\ContainerExceptionInterface; +use Psr\Container\NotFoundExceptionInterface; use Symfony\Component\HttpFoundation\ParameterBag; /** @@ -74,8 +76,8 @@ abstract class Controller extends BaseController * Method to grab all parameters from the URI. * * @return ParameterBag - * @throws \Psr\Container\ContainerExceptionInterface - * @throws \Psr\Container\NotFoundExceptionInterface + * @throws ContainerExceptionInterface + * @throws NotFoundExceptionInterface */ private function getParameters(): ParameterBag { @@ -96,7 +98,7 @@ abstract class Controller extends BaseController $obj = Carbon::parse($date); } catch (InvalidDateException | InvalidFormatException $e) { // don't care - Log::warning(sprintf('Ignored invalid date "%s" in API controller parameter check: %s', (string) $date, $e->getMessage())); + Log::warning(sprintf('Ignored invalid date "%s" in API controller parameter check: %s', $date, $e->getMessage())); } } $bag->set($field, $obj); diff --git a/app/Api/V1/Controllers/Models/TransactionCurrency/ShowController.php b/app/Api/V1/Controllers/Models/TransactionCurrency/ShowController.php index 6145954662..2cc7c99838 100644 --- a/app/Api/V1/Controllers/Models/TransactionCurrency/ShowController.php +++ b/app/Api/V1/Controllers/Models/TransactionCurrency/ShowController.php @@ -33,6 +33,7 @@ use FireflyIII\Support\Http\Api\TransactionFilter; use FireflyIII\Transformers\CurrencyTransformer; use Illuminate\Http\JsonResponse; use Illuminate\Pagination\LengthAwarePaginator; +use JsonException; use League\Fractal\Pagination\IlluminatePaginatorAdapter; use League\Fractal\Resource\Collection as FractalCollection; use League\Fractal\Resource\Item; @@ -72,7 +73,7 @@ class ShowController extends Controller * * @return JsonResponse * @throws FireflyException - * @throws \JsonException + * @throws JsonException * @codeCoverageIgnore */ public function index(): JsonResponse @@ -108,7 +109,7 @@ class ShowController extends Controller * * @return JsonResponse * @throws FireflyException - * @throws \JsonException + * @throws JsonException * @codeCoverageIgnore */ public function show(TransactionCurrency $currency): JsonResponse @@ -134,7 +135,7 @@ class ShowController extends Controller * * @return JsonResponse * @throws FireflyException - * @throws \JsonException + * @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 40f8b60467..e85ed2ab05 100644 --- a/app/Api/V1/Controllers/Models/TransactionCurrency/StoreController.php +++ b/app/Api/V1/Controllers/Models/TransactionCurrency/StoreController.php @@ -33,6 +33,7 @@ use FireflyIII\Support\Http\Api\AccountFilter; use FireflyIII\Support\Http\Api\TransactionFilter; use FireflyIII\Transformers\CurrencyTransformer; use Illuminate\Http\JsonResponse; +use JsonException; use League\Fractal\Resource\Item; /** @@ -74,7 +75,7 @@ class StoreController extends Controller * * @return JsonResponse * @throws FireflyException - * @throws \JsonException + * @throws JsonException */ public function store(StoreRequest $request): JsonResponse { diff --git a/app/Api/V1/Controllers/Summary/BasicController.php b/app/Api/V1/Controllers/Summary/BasicController.php index 725a17ab9c..af1ad594f2 100644 --- a/app/Api/V1/Controllers/Summary/BasicController.php +++ b/app/Api/V1/Controllers/Summary/BasicController.php @@ -364,7 +364,7 @@ class BasicController extends Controller function (Account $account) { $includeNetWorth = $this->accountRepository->getMetaValue($account, 'include_net_worth'); - return null === $includeNetWorth ? true : '1' === $includeNetWorth; + return null === $includeNetWorth || '1' === $includeNetWorth; } ); diff --git a/app/Api/V1/Controllers/System/ConfigurationController.php b/app/Api/V1/Controllers/System/ConfigurationController.php index 7238ed9a49..552a901336 100644 --- a/app/Api/V1/Controllers/System/ConfigurationController.php +++ b/app/Api/V1/Controllers/System/ConfigurationController.php @@ -30,6 +30,8 @@ use FireflyIII\Repositories\User\UserRepositoryInterface; use FireflyIII\Support\Binder\EitherConfigKey; use Illuminate\Http\JsonResponse; use Log; +use Psr\Container\ContainerExceptionInterface; +use Psr\Container\NotFoundExceptionInterface; /** * Class ConfigurationController @@ -94,8 +96,8 @@ class ConfigurationController extends Controller * * @return array * @throws FireflyException - * @throws \Psr\Container\ContainerExceptionInterface - * @throws \Psr\Container\NotFoundExceptionInterface + * @throws ContainerExceptionInterface + * @throws NotFoundExceptionInterface */ private function getDynamicConfiguration(): array { diff --git a/app/Api/V1/Controllers/System/UserController.php b/app/Api/V1/Controllers/System/UserController.php index fadac9cdee..c36eeb03c2 100644 --- a/app/Api/V1/Controllers/System/UserController.php +++ b/app/Api/V1/Controllers/System/UserController.php @@ -81,7 +81,7 @@ class UserController extends Controller return response()->json([], 500); } - if ($admin->id !== $user->id && $this->repository->hasRole($admin, 'owner')) { + if ($this->repository->hasRole($admin, 'owner')) { $this->repository->destroy($user); return response()->json([], 204); diff --git a/app/Api/V1/Requests/Insight/GenericRequest.php b/app/Api/V1/Requests/Insight/GenericRequest.php index 3eb5757ee1..5a10d23e7d 100644 --- a/app/Api/V1/Requests/Insight/GenericRequest.php +++ b/app/Api/V1/Requests/Insight/GenericRequest.php @@ -128,7 +128,7 @@ class GenericRequest extends FormRequest foreach ($array as $billId) { $billId = (int) $billId; $bill = $repository->find($billId); - if (null !== $billId) { + if (null !== $bill) { $this->bills->push($bill); } } @@ -160,7 +160,7 @@ class GenericRequest extends FormRequest foreach ($array as $budgetId) { $budgetId = (int) $budgetId; $budget = $repository->find($budgetId); - if (null !== $budgetId) { + if (null !== $budget) { $this->budgets->push($budget); } } @@ -192,7 +192,7 @@ class GenericRequest extends FormRequest foreach ($array as $categoryId) { $categoryId = (int) $categoryId; $category = $repository->find($categoryId); - if (null !== $categoryId) { + if (null !== $category) { $this->categories->push($category); } } @@ -282,7 +282,7 @@ class GenericRequest extends FormRequest foreach ($array as $tagId) { $tagId = (int) $tagId; $tag = $repository->find($tagId); - if (null !== $tagId) { + if (null !== $tag) { $this->tags->push($tag); } } diff --git a/app/Helpers/Collector/GroupCollector.php b/app/Helpers/Collector/GroupCollector.php index 41d43bc62e..060da5eee1 100644 --- a/app/Helpers/Collector/GroupCollector.php +++ b/app/Helpers/Collector/GroupCollector.php @@ -536,15 +536,12 @@ class GroupCollector implements GroupCollectorInterface */ private function postFilterCollection(Collection $collection): Collection { - Log::debug('Now in postFilterCollection()'); $currentCollection = $collection; - $total = count($this->postFilters); /** * @var int $i * @var Closure $function */ - foreach ($this->postFilters as $i => $function) { - Log::debug(sprintf('Now working on filter #%d/%d', $i + 1, $total)); + foreach ($this->postFilters as $function) { $nextCollection = new Collection; // loop everything in the current collection @@ -558,10 +555,8 @@ class GroupCollector implements GroupCollectorInterface $result = $function($ii, $item); if (false === $result) { // skip other filters, continue to next item. - Log::debug('Filter returns false, jump to next item.'); continue; } - Log::debug('Filter returns true'); $nextCollection->push($item); } $currentCollection = $nextCollection; diff --git a/changelog.md b/changelog.md index 998810933a..79887b1fd8 100644 --- a/changelog.md +++ b/changelog.md @@ -18,7 +18,7 @@ Please refer to the [documentation](https://docs.firefly-iii.org/firefly-iii/) a - Error email message now includes HTTP headers. - [Issue 5373](https://github.com/firefly-iii/firefly-iii/issues/5373) You can give budgets notes, although they're not visible yet. - [Issue 5648](https://github.com/firefly-iii/firefly-iii/issues/5648) The Docker image supports custom locales, see `.env.example` for instructions. -- [Issue 3984](https://github.com/firefly-iii/firefly-iii/issues/3984) [issue 5636](https://github.com/firefly-iii/firefly-iii/issues/5636) [issue 4903](https://github.com/firefly-iii/firefly-iii/issues/4903) [issue 5326](https://github.com/firefly-iii/firefly-iii/issues/5326) Lots of new search and rule operators. +- [Issue 3984](https://github.com/firefly-iii/firefly-iii/issues/3984) [issue 5636](https://github.com/firefly-iii/firefly-iii/issues/5636) [issue 4903](https://github.com/firefly-iii/firefly-iii/issues/4903) [issue 5326](https://github.com/firefly-iii/firefly-iii/issues/5326) Lots of new search and rule operators. For the full list, see [search.php](https://github.com/firefly-iii/firefly-iii/blob/main/config/search.php) (a bit technical). - [Issue 5269](https://github.com/firefly-iii/firefly-iii/issues/5269) It's possible to add piggy banks that have no explicit target amount goal. - [Issue 4893](https://github.com/firefly-iii/firefly-iii/issues/4893) Bills can be given an end date and an extension date and will warn you about those dates. @@ -26,7 +26,7 @@ Please refer to the [documentation](https://docs.firefly-iii.org/firefly-iii/) a - [Issue 5757](https://github.com/firefly-iii/firefly-iii/issues/5757) Upgrade to Laravel 9. ### Deprecated -- [Issue 5911](https://github.com/firefly-iii/firefly-iii/issues/5911) Removed support for LDAP +- [Issue 5911](https://github.com/firefly-iii/firefly-iii/issues/5911) Removed support for LDAP. ### Fixed - [Issue 5810](https://github.com/firefly-iii/firefly-iii/issues/5810) Could not search for `no_notes:true` in some cases. diff --git a/composer.json b/composer.json index 80ca761322..f66df744d2 100644 --- a/composer.json +++ b/composer.json @@ -69,7 +69,6 @@ "ext-bcmath": "*", "ext-curl": "*", "ext-fileinfo": "*", - "ext-gd": "*", "ext-iconv": "*", "ext-intl": "*", "ext-json": "*", @@ -87,7 +86,7 @@ "doctrine/dbal": "3.*", "gdbots/query-parser": "^2.0", "guzzlehttp/guzzle": "^7.4", - "jc5/google2fa-laravel": "2.0.6", + "jc5/google2fa-laravel": "^2.0", "jc5/recovery": "^2", "laravel/framework": "^9", "laravel/passport": "10.*", diff --git a/composer.lock b/composer.lock index fee1d5f583..d39833ab06 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": "1b4ee41614d7675cbab4855b783ae73b", + "content-hash": "1c676a0a4c48460c6fcd9800be95736b", "packages": [ { "name": "bacon/bacon-qr-code", @@ -1700,21 +1700,21 @@ }, { "name": "jc5/google2fa-laravel", - "version": "2.0.6", + "version": "v2.0.8", "source": { "type": "git", "url": "https://github.com/JC5/google2fa-laravel.git", - "reference": "271957317a84d36276c698e85db3ea33551e321d" + "reference": "0205b0e58b90ee41e6d108d4c26ad9d0f7997baa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/JC5/google2fa-laravel/zipball/271957317a84d36276c698e85db3ea33551e321d", - "reference": "271957317a84d36276c698e85db3ea33551e321d", + "url": "https://api.github.com/repos/JC5/google2fa-laravel/zipball/0205b0e58b90ee41e6d108d4c26ad9d0f7997baa", + "reference": "0205b0e58b90ee41e6d108d4c26ad9d0f7997baa", "shasum": "" }, "require": { "laravel/framework": ">=5.4.36", - "php": ">=7.3", + "php": ">=8", "pragmarx/google2fa-qrcode": "^1.0" }, "require-dev": { @@ -1752,7 +1752,7 @@ }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "MIT" ], "authors": [ { @@ -1775,9 +1775,9 @@ ], "support": { "issues": "https://github.com/JC5/google2fa-laravel/issues", - "source": "https://github.com/JC5/google2fa-laravel/tree/2.0.6" + "source": "https://github.com/JC5/google2fa-laravel/tree/v2.0.8" }, - "time": "2021-07-10T05:21:50+00:00" + "time": "2022-03-30T16:00:00+00:00" }, { "name": "jc5/recovery", @@ -1855,16 +1855,16 @@ }, { "name": "laravel/framework", - "version": "v9.5.1", + "version": "v9.6.0", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "35be2599c9ac3d58bf1578895c2e85ea4848a0d7" + "reference": "47940a1a8774b96696ed57e6736ccea4a880c057" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/35be2599c9ac3d58bf1578895c2e85ea4848a0d7", - "reference": "35be2599c9ac3d58bf1578895c2e85ea4848a0d7", + "url": "https://api.github.com/repos/laravel/framework/zipball/47940a1a8774b96696ed57e6736ccea4a880c057", + "reference": "47940a1a8774b96696ed57e6736ccea4a880c057", "shasum": "" }, "require": { @@ -2030,7 +2030,7 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2022-03-15T14:41:19+00:00" + "time": "2022-03-29T14:41:26+00:00" }, { "name": "laravel/passport", @@ -2111,20 +2111,21 @@ }, { "name": "laravel/sanctum", - "version": "v2.14.2", + "version": "v2.15.0", "source": { "type": "git", "url": "https://github.com/laravel/sanctum.git", - "reference": "dc5d749ba9bfcfd68d8f5c272238f88bea223e66" + "reference": "5be160413b6f37dcf8758663edeab12d0e806f56" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/sanctum/zipball/dc5d749ba9bfcfd68d8f5c272238f88bea223e66", - "reference": "dc5d749ba9bfcfd68d8f5c272238f88bea223e66", + "url": "https://api.github.com/repos/laravel/sanctum/zipball/5be160413b6f37dcf8758663edeab12d0e806f56", + "reference": "5be160413b6f37dcf8758663edeab12d0e806f56", "shasum": "" }, "require": { "ext-json": "*", + "illuminate/console": "^6.9|^7.0|^8.0|^9.0", "illuminate/contracts": "^6.9|^7.0|^8.0|^9.0", "illuminate/database": "^6.9|^7.0|^8.0|^9.0", "illuminate/support": "^6.9|^7.0|^8.0|^9.0", @@ -2171,7 +2172,7 @@ "issues": "https://github.com/laravel/sanctum/issues", "source": "https://github.com/laravel/sanctum" }, - "time": "2022-02-16T14:40:23+00:00" + "time": "2022-03-28T13:53:05+00:00" }, { "name": "laravel/serializable-closure", @@ -5127,16 +5128,16 @@ }, { "name": "spatie/ignition", - "version": "1.2.6", + "version": "1.2.7", "source": { "type": "git", "url": "https://github.com/spatie/ignition.git", - "reference": "be24d33a9de271638314924b5da85e168e4148e4" + "reference": "2f059cf42b48f7c522efbba1c05ad59fc2c1a3f2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/ignition/zipball/be24d33a9de271638314924b5da85e168e4148e4", - "reference": "be24d33a9de271638314924b5da85e168e4148e4", + "url": "https://api.github.com/repos/spatie/ignition/zipball/2f059cf42b48f7c522efbba1c05ad59fc2c1a3f2", + "reference": "2f059cf42b48f7c522efbba1c05ad59fc2c1a3f2", "shasum": "" }, "require": { @@ -5193,7 +5194,7 @@ "type": "github" } ], - "time": "2022-03-23T11:02:14+00:00" + "time": "2022-03-29T08:48:34+00:00" }, { "name": "spatie/laravel-ignition", @@ -8995,16 +8996,16 @@ }, { "name": "phpdocumentor/type-resolver", - "version": "1.6.0", + "version": "1.6.1", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "93ebd0014cab80c4ea9f5e297ea48672f1b87706" + "reference": "77a32518733312af16a44300404e945338981de3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/93ebd0014cab80c4ea9f5e297ea48672f1b87706", - "reference": "93ebd0014cab80c4ea9f5e297ea48672f1b87706", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/77a32518733312af16a44300404e945338981de3", + "reference": "77a32518733312af16a44300404e945338981de3", "shasum": "" }, "require": { @@ -9039,9 +9040,9 @@ "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", "support": { "issues": "https://github.com/phpDocumentor/TypeResolver/issues", - "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.6.0" + "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.6.1" }, - "time": "2022-01-04T19:58:01+00:00" + "time": "2022-03-15T21:29:03+00:00" }, { "name": "phpspec/prophecy", @@ -10624,7 +10625,6 @@ "ext-bcmath": "*", "ext-curl": "*", "ext-fileinfo": "*", - "ext-gd": "*", "ext-iconv": "*", "ext-intl": "*", "ext-json": "*", diff --git a/config/google2fa.php b/config/google2fa.php index 34e719a2e1..553c4a6014 100644 --- a/config/google2fa.php +++ b/config/google2fa.php @@ -21,6 +21,8 @@ declare(strict_types=1); +use PragmaRX\Google2FALaravel\Support\Constants; + return [ /* * Auth container binding @@ -92,4 +94,6 @@ return [ 'store_in_cookie' => true, + 'qrcode_image_backend' => Constants::QRCODE_IMAGE_BACKEND_SVG, + ];