Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-23 20:00:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5666 from turbo124/v5-develop

Browse Source 
Updated lock file
This commit is contained in:
David Bomba 2021-05-11 21:27:14 +10:00 committed by GitHub
commit 1c4272002d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 35 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Jobs/Util/Import.php
View File

@ -438,6 +438,10 @@ class Import implements ShouldQueue
$user = $user_repository->save($modified, $this->fetchUser($resource['email']), true, true); $user = $user_repository->save($modified, $this->fetchUser($resource['email']), true, true);
$user->email_verified_at = now(); $user->email_verified_at = now();
$user->confirmation_code = ''; $user->confirmation_code = '';
if($modified['deleted_at'])
$user->deleted_at = now();
$user->save(); $user->save();
$user_agent = array_key_exists('token_name', $resource) ?: request()->server('HTTP_USER_AGENT'); $user_agent = array_key_exists('token_name', $resource) ?: request()->server('HTTP_USER_AGENT');

57
composer.lock generated
View File

@ -103,16 +103,16 @@
}, },
{ {
"name": "aws/aws-sdk-php", "name": "aws/aws-sdk-php",
"version": "3.180.5", "version": "3.180.6",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/aws/aws-sdk-php.git", "url": "https://github.com/aws/aws-sdk-php.git",
"reference": "948a4defbe2a571cc4460725015b8e98b7060f2d" "reference": "1a836be14ba664ea11eb965dec77715e9e607013"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/948a4defbe2a571cc4460725015b8e98b7060f2d", "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/1a836be14ba664ea11eb965dec77715e9e607013",
"reference": "948a4defbe2a571cc4460725015b8e98b7060f2d", "reference": "1a836be14ba664ea11eb965dec77715e9e607013",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -187,9 +187,9 @@
"support": { "support": {
"forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80", "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
"issues": "https://github.com/aws/aws-sdk-php/issues", "issues": "https://github.com/aws/aws-sdk-php/issues",
"source": "https://github.com/aws/aws-sdk-php/tree/3.180.5" "source": "https://github.com/aws/aws-sdk-php/tree/3.180.6"
}, },
"time": "2021-05-07T18:12:43+00:00" "time": "2021-05-10T18:17:07+00:00"
}, },
{ {
"name": "bacon/bacon-qr-code", "name": "bacon/bacon-qr-code",
@ -3933,27 +3933,28 @@
}, },
{ {
"name": "league/omnipay", "name": "league/omnipay",
"version": "v3.1.0", "version": "dev-master",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/thephpleague/omnipay.git", "url": "https://github.com/thephpleague/omnipay.git",
"reference": "1ba7c8a3312cf2342458b99c9e5b86eaae44aed2" "reference": "d090c000030fc759e32f6f747873b5d630103030"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/thephpleague/omnipay/zipball/1ba7c8a3312cf2342458b99c9e5b86eaae44aed2", "url": "https://api.github.com/repos/thephpleague/omnipay/zipball/d090c000030fc759e32f6f747873b5d630103030",
"reference": "1ba7c8a3312cf2342458b99c9e5b86eaae44aed2", "reference": "d090c000030fc759e32f6f747873b5d630103030",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"omnipay/common": "^3", "omnipay/common": "^3",
"php": "^7.2", "php": "^7.2|^8.0",
"php-http/discovery": "^1.12", "php-http/discovery": "^1.12",
"php-http/guzzle7-adapter": "^0.1" "php-http/guzzle7-adapter": "^0.1"
}, },
"require-dev": { "require-dev": {
"omnipay/tests": "^3" "omnipay/tests": "^3"
}, },
"default-branch": true,
"type": "metapackage", "type": "metapackage",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
@ -3984,9 +3985,9 @@
], ],
"support": { "support": {
"issues": "https://github.com/thephpleague/omnipay/issues", "issues": "https://github.com/thephpleague/omnipay/issues",
"source": "https://github.com/thephpleague/omnipay/tree/v3.1.0" "source": "https://github.com/thephpleague/omnipay/tree/master"
}, },
"time": "2020-09-22T14:02:17+00:00" "time": "2021-05-02T15:02:18+00:00"
}, },
{ {
"name": "livewire/livewire", "name": "livewire/livewire",
@ -4737,21 +4738,21 @@
}, },
{ {
"name": "omnipay/common", "name": "omnipay/common",
"version": "v3.0.5", "version": "dev-master",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/thephpleague/omnipay-common.git", "url": "https://github.com/thephpleague/omnipay-common.git",
"reference": "0d1f4486c1c873537ac030d37c7ce2986c4de1d2" "reference": "e1ebc22615f14219d31cefdf62d7036feb228b1c"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/thephpleague/omnipay-common/zipball/0d1f4486c1c873537ac030d37c7ce2986c4de1d2", "url": "https://api.github.com/repos/thephpleague/omnipay-common/zipball/e1ebc22615f14219d31cefdf62d7036feb228b1c",
"reference": "0d1f4486c1c873537ac030d37c7ce2986c4de1d2", "reference": "e1ebc22615f14219d31cefdf62d7036feb228b1c",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"moneyphp/money": "^3.1", "moneyphp/money": "^3.1",
"php": "^5.6|^7", "php": "^5.6|^7|^8",
"php-http/client-implementation": "^1", "php-http/client-implementation": "^1",
"php-http/discovery": "^1.2.1", "php-http/discovery": "^1.2.1",
"php-http/message": "^1.5", "php-http/message": "^1.5",
@ -4766,6 +4767,7 @@
"suggest": { "suggest": {
"league/omnipay": "The default Omnipay package provides a default HTTP Adapter." "league/omnipay": "The default Omnipay package provides a default HTTP Adapter."
}, },
"default-branch": true,
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
@ -4817,9 +4819,9 @@
], ],
"support": { "support": {
"issues": "https://github.com/thephpleague/omnipay-common/issues", "issues": "https://github.com/thephpleague/omnipay-common/issues",
"source": "https://github.com/thephpleague/omnipay-common/tree/v3.0.5" "source": "https://github.com/thephpleague/omnipay-common/tree/master"
}, },
"time": "2020-08-20T18:22:12+00:00" "time": "2020-12-13T12:53:48+00:00"
}, },
{ {
"name": "omnipay/paypal", "name": "omnipay/paypal",
@ -6962,16 +6964,16 @@
}, },
{ {
"name": "sentry/sentry-laravel", "name": "sentry/sentry-laravel",
"version": "2.5.2", "version": "2.5.3",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/getsentry/sentry-laravel.git", "url": "https://github.com/getsentry/sentry-laravel.git",
"reference": "368a2701b3bd370a2892f1f67bfbf0cbecbaca17" "reference": "23ea0d80cb2eb7d0d056879726f7800549fc7c01"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/getsentry/sentry-laravel/zipball/368a2701b3bd370a2892f1f67bfbf0cbecbaca17", "url": "https://api.github.com/repos/getsentry/sentry-laravel/zipball/23ea0d80cb2eb7d0d056879726f7800549fc7c01",
"reference": "368a2701b3bd370a2892f1f67bfbf0cbecbaca17", "reference": "23ea0d80cb2eb7d0d056879726f7800549fc7c01",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -6989,6 +6991,9 @@
"orchestra/testbench": "3.1 - 3.8 | ^4.7 | ^5.1 | ^6.0", "orchestra/testbench": "3.1 - 3.8 | ^4.7 | ^5.1 | ^6.0",
"phpunit/phpunit": "^5.7 | ^6.5 | ^7.5 | ^8.4 | ^9.3" "phpunit/phpunit": "^5.7 | ^6.5 | ^7.5 | ^8.4 | ^9.3"
}, },
"suggest": {
"zendframework/zend-diactoros": "When using Laravel >=5.1 - <=6.9 this package can help get more accurate request info, not used on Laravel >=6.10 anymore (https://laravel.com/docs/5.8/requests#psr7-requests)"
},
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
@ -7034,7 +7039,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/getsentry/sentry-laravel/issues", "issues": "https://github.com/getsentry/sentry-laravel/issues",
"source": "https://github.com/getsentry/sentry-laravel/tree/2.5.2" "source": "https://github.com/getsentry/sentry-laravel/tree/2.5.3"
}, },
"funding": [ "funding": [
{ {
@ -7046,7 +7051,7 @@
"type": "custom" "type": "custom"
} }
], ],
"time": "2021-05-06T07:49:08+00:00" "time": "2021-05-10T13:41:30+00:00"
}, },
{ {
"name": "stripe/stripe-php", "name": "stripe/stripe-php",