IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Update packages.

Browse Source
This commit is contained in:
James Cole 2022-03-30 20:09:19 +02:00
parent 1211a5c878
commit 3120e29940
No known key found for this signature in database
GPG Key ID: B49A324B7EAD6D80
14 changed files with 68 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Api/V1/Controllers/Autocomplete/AccountController.php
View File

@ -71,6 +71,8 @@ class AccountController extends Controller
* *
* @return JsonResponse * @return JsonResponse
* @throws JsonException * @throws JsonException
* @throws FireflyException
* @throws FireflyException
*/ */
public function accounts(AutocompleteRequest $request): JsonResponse public function accounts(AutocompleteRequest $request): JsonResponse
{ {

9
app/Api/V1/Controllers/Chart/AccountController.php
View File

@ -35,6 +35,9 @@ use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
use FireflyIII\Support\Http\Api\ApiSupport; use FireflyIII\Support\Http\Api\ApiSupport;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Http\JsonResponse; use Illuminate\Http\JsonResponse;
use JsonException;
use Psr\Container\ContainerExceptionInterface;
use Psr\Container\NotFoundExceptionInterface;
/** /**
* Class AccountController * Class AccountController
@ -77,9 +80,9 @@ class AccountController extends Controller
* *
* @return JsonResponse * @return JsonResponse
* @throws FireflyException * @throws FireflyException
* @throws \JsonException * @throws JsonException
* @throws \Psr\Container\ContainerExceptionInterface * @throws ContainerExceptionInterface
* @throws \Psr\Container\NotFoundExceptionInterface * @throws NotFoundExceptionInterface
*/ */
public function overview(DateRequest $request): JsonResponse public function overview(DateRequest $request): JsonResponse
{ {

8
app/Api/V1/Controllers/Controller.php
View File

@ -34,6 +34,8 @@ use Illuminate\Routing\Controller as BaseController;
use League\Fractal\Manager; use League\Fractal\Manager;
use League\Fractal\Serializer\JsonApiSerializer; use League\Fractal\Serializer\JsonApiSerializer;
use Log; use Log;
use Psr\Container\ContainerExceptionInterface;
use Psr\Container\NotFoundExceptionInterface;
use Symfony\Component\HttpFoundation\ParameterBag; use Symfony\Component\HttpFoundation\ParameterBag;
/** /**
@ -74,8 +76,8 @@ abstract class Controller extends BaseController
* Method to grab all parameters from the URI. * Method to grab all parameters from the URI.
* *
* @return ParameterBag * @return ParameterBag
* @throws \Psr\Container\ContainerExceptionInterface * @throws ContainerExceptionInterface
* @throws \Psr\Container\NotFoundExceptionInterface * @throws NotFoundExceptionInterface
*/ */
private function getParameters(): ParameterBag private function getParameters(): ParameterBag
{ {
@ -96,7 +98,7 @@ abstract class Controller extends BaseController
$obj = Carbon::parse($date); $obj = Carbon::parse($date);
} catch (InvalidDateException | InvalidFormatException $e) { } catch (InvalidDateException | InvalidFormatException $e) {
// don't care // 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); $bag->set($field, $obj);

7
app/Api/V1/Controllers/Models/TransactionCurrency/ShowController.php
View File

@ -33,6 +33,7 @@ use FireflyIII\Support\Http\Api\TransactionFilter;
use FireflyIII\Transformers\CurrencyTransformer; use FireflyIII\Transformers\CurrencyTransformer;
use Illuminate\Http\JsonResponse; use Illuminate\Http\JsonResponse;
use Illuminate\Pagination\LengthAwarePaginator; use Illuminate\Pagination\LengthAwarePaginator;
use JsonException;
use League\Fractal\Pagination\IlluminatePaginatorAdapter; use League\Fractal\Pagination\IlluminatePaginatorAdapter;
use League\Fractal\Resource\Collection as FractalCollection; use League\Fractal\Resource\Collection as FractalCollection;
use League\Fractal\Resource\Item; use League\Fractal\Resource\Item;
@ -72,7 +73,7 @@ class ShowController extends Controller
* *
* @return JsonResponse * @return JsonResponse
* @throws FireflyException * @throws FireflyException
* @throws \JsonException * @throws JsonException
* @codeCoverageIgnore * @codeCoverageIgnore
*/ */
public function index(): JsonResponse public function index(): JsonResponse
@ -108,7 +109,7 @@ class ShowController extends Controller
* *
* @return JsonResponse * @return JsonResponse
* @throws FireflyException * @throws FireflyException
* @throws \JsonException * @throws JsonException
* @codeCoverageIgnore * @codeCoverageIgnore
*/ */
public function show(TransactionCurrency $currency): JsonResponse public function show(TransactionCurrency $currency): JsonResponse
@ -134,7 +135,7 @@ class ShowController extends Controller
* *
* @return JsonResponse * @return JsonResponse
* @throws FireflyException * @throws FireflyException
* @throws \JsonException * @throws JsonException
* @codeCoverageIgnore * @codeCoverageIgnore
*/ */
public function showDefault(): JsonResponse public function showDefault(): JsonResponse

3
app/Api/V1/Controllers/Models/TransactionCurrency/StoreController.php
View File

@ -33,6 +33,7 @@ use FireflyIII\Support\Http\Api\AccountFilter;
use FireflyIII\Support\Http\Api\TransactionFilter; use FireflyIII\Support\Http\Api\TransactionFilter;
use FireflyIII\Transformers\CurrencyTransformer; use FireflyIII\Transformers\CurrencyTransformer;
use Illuminate\Http\JsonResponse; use Illuminate\Http\JsonResponse;
use JsonException;
use League\Fractal\Resource\Item; use League\Fractal\Resource\Item;
/** /**
@ -74,7 +75,7 @@ class StoreController extends Controller
* *
* @return JsonResponse * @return JsonResponse
* @throws FireflyException * @throws FireflyException
* @throws \JsonException * @throws JsonException
*/ */
public function store(StoreRequest $request): JsonResponse public function store(StoreRequest $request): JsonResponse
{ {

2
app/Api/V1/Controllers/Summary/BasicController.php
View File

@ -364,7 +364,7 @@ class BasicController extends Controller
function (Account $account) { function (Account $account) {
$includeNetWorth = $this->accountRepository->getMetaValue($account, 'include_net_worth'); $includeNetWorth = $this->accountRepository->getMetaValue($account, 'include_net_worth');
return null === $includeNetWorth ? true : '1' === $includeNetWorth; return null === $includeNetWorth || '1' === $includeNetWorth;
} }
); );

6
app/Api/V1/Controllers/System/ConfigurationController.php
View File

@ -30,6 +30,8 @@ use FireflyIII\Repositories\User\UserRepositoryInterface;
use FireflyIII\Support\Binder\EitherConfigKey; use FireflyIII\Support\Binder\EitherConfigKey;
use Illuminate\Http\JsonResponse; use Illuminate\Http\JsonResponse;
use Log; use Log;
use Psr\Container\ContainerExceptionInterface;
use Psr\Container\NotFoundExceptionInterface;
/** /**
* Class ConfigurationController * Class ConfigurationController
@ -94,8 +96,8 @@ class ConfigurationController extends Controller
* *
* @return array * @return array
* @throws FireflyException * @throws FireflyException
* @throws \Psr\Container\ContainerExceptionInterface * @throws ContainerExceptionInterface
* @throws \Psr\Container\NotFoundExceptionInterface * @throws NotFoundExceptionInterface
*/ */
private function getDynamicConfiguration(): array private function getDynamicConfiguration(): array
{ {

2
app/Api/V1/Controllers/System/UserController.php
View File

@ -81,7 +81,7 @@ class UserController extends Controller
return response()->json([], 500); return response()->json([], 500);
} }
if ($admin->id !== $user->id && $this->repository->hasRole($admin, 'owner')) { if ($this->repository->hasRole($admin, 'owner')) {
$this->repository->destroy($user); $this->repository->destroy($user);
return response()->json([], 204); return response()->json([], 204);

8
app/Api/V1/Requests/Insight/GenericRequest.php
View File

@ -128,7 +128,7 @@ class GenericRequest extends FormRequest
foreach ($array as $billId) { foreach ($array as $billId) {
$billId = (int) $billId; $billId = (int) $billId;
$bill = $repository->find($billId); $bill = $repository->find($billId);
if (null !== $billId) { if (null !== $bill) {
$this->bills->push($bill); $this->bills->push($bill);
} }
} }
@ -160,7 +160,7 @@ class GenericRequest extends FormRequest
foreach ($array as $budgetId) { foreach ($array as $budgetId) {
$budgetId = (int) $budgetId; $budgetId = (int) $budgetId;
$budget = $repository->find($budgetId); $budget = $repository->find($budgetId);
if (null !== $budgetId) { if (null !== $budget) {
$this->budgets->push($budget); $this->budgets->push($budget);
} }
} }
@ -192,7 +192,7 @@ class GenericRequest extends FormRequest
foreach ($array as $categoryId) { foreach ($array as $categoryId) {
$categoryId = (int) $categoryId; $categoryId = (int) $categoryId;
$category = $repository->find($categoryId); $category = $repository->find($categoryId);
if (null !== $categoryId) { if (null !== $category) {
$this->categories->push($category); $this->categories->push($category);
} }
} }
@ -282,7 +282,7 @@ class GenericRequest extends FormRequest
foreach ($array as $tagId) { foreach ($array as $tagId) {
$tagId = (int) $tagId; $tagId = (int) $tagId;
$tag = $repository->find($tagId); $tag = $repository->find($tagId);
if (null !== $tagId) { if (null !== $tag) {
$this->tags->push($tag); $this->tags->push($tag);
} }
} }

7
app/Helpers/Collector/GroupCollector.php
View File

@ -536,15 +536,12 @@ class GroupCollector implements GroupCollectorInterface
*/ */
private function postFilterCollection(Collection $collection): Collection private function postFilterCollection(Collection $collection): Collection
{ {
Log::debug('Now in postFilterCollection()');
$currentCollection = $collection; $currentCollection = $collection;
$total = count($this->postFilters);
/** /**
* @var int $i * @var int $i
* @var Closure $function * @var Closure $function
*/ */
foreach ($this->postFilters as $i => $function) { foreach ($this->postFilters as $function) {
Log::debug(sprintf('Now working on filter #%d/%d', $i + 1, $total));
$nextCollection = new Collection; $nextCollection = new Collection;
// loop everything in the current collection // loop everything in the current collection
@ -558,10 +555,8 @@ class GroupCollector implements GroupCollectorInterface
$result = $function($ii, $item); $result = $function($ii, $item);
if (false === $result) { if (false === $result) {
// skip other filters, continue to next item. // skip other filters, continue to next item.
Log::debug('Filter returns false, jump to next item.');
continue; continue;
} }
Log::debug('Filter returns true');
$nextCollection->push($item); $nextCollection->push($item);
} }
$currentCollection = $nextCollection; $currentCollection = $nextCollection;

4
changelog.md
View File

@ -18,7 +18,7 @@ Please refer to the [documentation](https://docs.firefly-iii.org/firefly-iii/) a
- Error email message now includes HTTP headers. - 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 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 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 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. - [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. - [Issue 5757](https://github.com/firefly-iii/firefly-iii/issues/5757) Upgrade to Laravel 9.
### Deprecated ### 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 ### Fixed
- [Issue 5810](https://github.com/firefly-iii/firefly-iii/issues/5810) Could not search for `no_notes:true` in some cases. - [Issue 5810](https://github.com/firefly-iii/firefly-iii/issues/5810) Could not search for `no_notes:true` in some cases.

3
composer.json
View File

@ -69,7 +69,6 @@
"ext-bcmath": "*", "ext-bcmath": "*",
"ext-curl": "*", "ext-curl": "*",
"ext-fileinfo": "*", "ext-fileinfo": "*",
"ext-gd": "*",
"ext-iconv": "*", "ext-iconv": "*",
"ext-intl": "*", "ext-intl": "*",
"ext-json": "*", "ext-json": "*",
@ -87,7 +86,7 @@
"doctrine/dbal": "3.*", "doctrine/dbal": "3.*",
"gdbots/query-parser": "^2.0", "gdbots/query-parser": "^2.0",
"guzzlehttp/guzzle": "^7.4", "guzzlehttp/guzzle": "^7.4",
"jc5/google2fa-laravel": "2.0.6", "jc5/google2fa-laravel": "^2.0",
"jc5/recovery": "^2", "jc5/recovery": "^2",
"laravel/framework": "^9", "laravel/framework": "^9",
"laravel/passport": "10.*", "laravel/passport": "10.*",

62
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "1b4ee41614d7675cbab4855b783ae73b", "content-hash": "1c676a0a4c48460c6fcd9800be95736b",
"packages": [ "packages": [
{ {
"name": "bacon/bacon-qr-code", "name": "bacon/bacon-qr-code",
@ -1700,21 +1700,21 @@
}, },
{ {
"name": "jc5/google2fa-laravel", "name": "jc5/google2fa-laravel",
"version": "2.0.6", "version": "v2.0.8",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/JC5/google2fa-laravel.git", "url": "https://github.com/JC5/google2fa-laravel.git",
"reference": "271957317a84d36276c698e85db3ea33551e321d" "reference": "0205b0e58b90ee41e6d108d4c26ad9d0f7997baa"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/JC5/google2fa-laravel/zipball/271957317a84d36276c698e85db3ea33551e321d", "url": "https://api.github.com/repos/JC5/google2fa-laravel/zipball/0205b0e58b90ee41e6d108d4c26ad9d0f7997baa",
"reference": "271957317a84d36276c698e85db3ea33551e321d", "reference": "0205b0e58b90ee41e6d108d4c26ad9d0f7997baa",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"laravel/framework": ">=5.4.36", "laravel/framework": ">=5.4.36",
"php": ">=7.3", "php": ">=8",
"pragmarx/google2fa-qrcode": "^1.0" "pragmarx/google2fa-qrcode": "^1.0"
}, },
"require-dev": { "require-dev": {
@ -1752,7 +1752,7 @@
}, },
"notification-url": "https://packagist.org/downloads/", "notification-url": "https://packagist.org/downloads/",
"license": [ "license": [
"BSD-3-Clause" "MIT"
], ],
"authors": [ "authors": [
{ {
@ -1775,9 +1775,9 @@
], ],
"support": { "support": {
"issues": "https://github.com/JC5/google2fa-laravel/issues", "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", "name": "jc5/recovery",
@ -1855,16 +1855,16 @@
}, },
{ {
"name": "laravel/framework", "name": "laravel/framework",
"version": "v9.5.1", "version": "v9.6.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/laravel/framework.git", "url": "https://github.com/laravel/framework.git",
"reference": "35be2599c9ac3d58bf1578895c2e85ea4848a0d7" "reference": "47940a1a8774b96696ed57e6736ccea4a880c057"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/35be2599c9ac3d58bf1578895c2e85ea4848a0d7", "url": "https://api.github.com/repos/laravel/framework/zipball/47940a1a8774b96696ed57e6736ccea4a880c057",
"reference": "35be2599c9ac3d58bf1578895c2e85ea4848a0d7", "reference": "47940a1a8774b96696ed57e6736ccea4a880c057",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2030,7 +2030,7 @@
"issues": "https://github.com/laravel/framework/issues", "issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework" "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", "name": "laravel/passport",
@ -2111,20 +2111,21 @@
}, },
{ {
"name": "laravel/sanctum", "name": "laravel/sanctum",
"version": "v2.14.2", "version": "v2.15.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/laravel/sanctum.git", "url": "https://github.com/laravel/sanctum.git",
"reference": "dc5d749ba9bfcfd68d8f5c272238f88bea223e66" "reference": "5be160413b6f37dcf8758663edeab12d0e806f56"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/laravel/sanctum/zipball/dc5d749ba9bfcfd68d8f5c272238f88bea223e66", "url": "https://api.github.com/repos/laravel/sanctum/zipball/5be160413b6f37dcf8758663edeab12d0e806f56",
"reference": "dc5d749ba9bfcfd68d8f5c272238f88bea223e66", "reference": "5be160413b6f37dcf8758663edeab12d0e806f56",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"ext-json": "*", "ext-json": "*",
"illuminate/console": "^6.9|^7.0|^8.0|^9.0",
"illuminate/contracts": "^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/database": "^6.9|^7.0|^8.0|^9.0",
"illuminate/support": "^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", "issues": "https://github.com/laravel/sanctum/issues",
"source": "https://github.com/laravel/sanctum" "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", "name": "laravel/serializable-closure",
@ -5127,16 +5128,16 @@
}, },
{ {
"name": "spatie/ignition", "name": "spatie/ignition",
"version": "1.2.6", "version": "1.2.7",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/spatie/ignition.git", "url": "https://github.com/spatie/ignition.git",
"reference": "be24d33a9de271638314924b5da85e168e4148e4" "reference": "2f059cf42b48f7c522efbba1c05ad59fc2c1a3f2"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/spatie/ignition/zipball/be24d33a9de271638314924b5da85e168e4148e4", "url": "https://api.github.com/repos/spatie/ignition/zipball/2f059cf42b48f7c522efbba1c05ad59fc2c1a3f2",
"reference": "be24d33a9de271638314924b5da85e168e4148e4", "reference": "2f059cf42b48f7c522efbba1c05ad59fc2c1a3f2",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -5193,7 +5194,7 @@
"type": "github" "type": "github"
} }
], ],
"time": "2022-03-23T11:02:14+00:00" "time": "2022-03-29T08:48:34+00:00"
}, },
{ {
"name": "spatie/laravel-ignition", "name": "spatie/laravel-ignition",
@ -8995,16 +8996,16 @@
}, },
{ {
"name": "phpdocumentor/type-resolver", "name": "phpdocumentor/type-resolver",
"version": "1.6.0", "version": "1.6.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpDocumentor/TypeResolver.git", "url": "https://github.com/phpDocumentor/TypeResolver.git",
"reference": "93ebd0014cab80c4ea9f5e297ea48672f1b87706" "reference": "77a32518733312af16a44300404e945338981de3"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/93ebd0014cab80c4ea9f5e297ea48672f1b87706", "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/77a32518733312af16a44300404e945338981de3",
"reference": "93ebd0014cab80c4ea9f5e297ea48672f1b87706", "reference": "77a32518733312af16a44300404e945338981de3",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -9039,9 +9040,9 @@
"description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
"support": { "support": {
"issues": "https://github.com/phpDocumentor/TypeResolver/issues", "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", "name": "phpspec/prophecy",
@ -10624,7 +10625,6 @@
"ext-bcmath": "*", "ext-bcmath": "*",
"ext-curl": "*", "ext-curl": "*",
"ext-fileinfo": "*", "ext-fileinfo": "*",
"ext-gd": "*",
"ext-iconv": "*", "ext-iconv": "*",
"ext-intl": "*", "ext-intl": "*",
"ext-json": "*", "ext-json": "*",

4
config/google2fa.php
View File

@ -21,6 +21,8 @@
declare(strict_types=1); declare(strict_types=1);
use PragmaRX\Google2FALaravel\Support\Constants;
return [ return [
/* /*
* Auth container binding * Auth container binding
@ -92,4 +94,6 @@ return [
'store_in_cookie' => true, 'store_in_cookie' => true,
'qrcode_image_backend' => Constants::QRCODE_IMAGE_BACKEND_SVG,
]; ];