From 6ab6fda3f684a694d57f9238f225b6f79e7bb092 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Tue, 11 May 2021 21:26:55 +1000 Subject: [PATCH] Updated lock file --- app/Jobs/Util/Import.php | 4 +++ composer.lock | 57 ++++++++++++++++++++++------------------ 2 files changed, 35 insertions(+), 26 deletions(-) diff --git a/app/Jobs/Util/Import.php b/app/Jobs/Util/Import.php index fe1e5cb3e4..7fc8ec6ea4 100644 --- a/app/Jobs/Util/Import.php +++ b/app/Jobs/Util/Import.php @@ -438,6 +438,10 @@ class Import implements ShouldQueue $user = $user_repository->save($modified, $this->fetchUser($resource['email']), true, true); $user->email_verified_at = now(); $user->confirmation_code = ''; + + if($modified['deleted_at']) + $user->deleted_at = now(); + $user->save(); $user_agent = array_key_exists('token_name', $resource) ?: request()->server('HTTP_USER_AGENT'); diff --git a/composer.lock b/composer.lock index b139c2f113..82b196abc8 100644 --- a/composer.lock +++ b/composer.lock @@ -103,16 +103,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.180.5", + "version": "3.180.6", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "948a4defbe2a571cc4460725015b8e98b7060f2d" + "reference": "1a836be14ba664ea11eb965dec77715e9e607013" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/948a4defbe2a571cc4460725015b8e98b7060f2d", - "reference": "948a4defbe2a571cc4460725015b8e98b7060f2d", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/1a836be14ba664ea11eb965dec77715e9e607013", + "reference": "1a836be14ba664ea11eb965dec77715e9e607013", "shasum": "" }, "require": { @@ -187,9 +187,9 @@ "support": { "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80", "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", @@ -3933,27 +3933,28 @@ }, { "name": "league/omnipay", - "version": "v3.1.0", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/thephpleague/omnipay.git", - "reference": "1ba7c8a3312cf2342458b99c9e5b86eaae44aed2" + "reference": "d090c000030fc759e32f6f747873b5d630103030" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/omnipay/zipball/1ba7c8a3312cf2342458b99c9e5b86eaae44aed2", - "reference": "1ba7c8a3312cf2342458b99c9e5b86eaae44aed2", + "url": "https://api.github.com/repos/thephpleague/omnipay/zipball/d090c000030fc759e32f6f747873b5d630103030", + "reference": "d090c000030fc759e32f6f747873b5d630103030", "shasum": "" }, "require": { "omnipay/common": "^3", - "php": "^7.2", + "php": "^7.2|^8.0", "php-http/discovery": "^1.12", "php-http/guzzle7-adapter": "^0.1" }, "require-dev": { "omnipay/tests": "^3" }, + "default-branch": true, "type": "metapackage", "extra": { "branch-alias": { @@ -3984,9 +3985,9 @@ ], "support": { "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", @@ -4737,21 +4738,21 @@ }, { "name": "omnipay/common", - "version": "v3.0.5", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/thephpleague/omnipay-common.git", - "reference": "0d1f4486c1c873537ac030d37c7ce2986c4de1d2" + "reference": "e1ebc22615f14219d31cefdf62d7036feb228b1c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/omnipay-common/zipball/0d1f4486c1c873537ac030d37c7ce2986c4de1d2", - "reference": "0d1f4486c1c873537ac030d37c7ce2986c4de1d2", + "url": "https://api.github.com/repos/thephpleague/omnipay-common/zipball/e1ebc22615f14219d31cefdf62d7036feb228b1c", + "reference": "e1ebc22615f14219d31cefdf62d7036feb228b1c", "shasum": "" }, "require": { "moneyphp/money": "^3.1", - "php": "^5.6|^7", + "php": "^5.6|^7|^8", "php-http/client-implementation": "^1", "php-http/discovery": "^1.2.1", "php-http/message": "^1.5", @@ -4766,6 +4767,7 @@ "suggest": { "league/omnipay": "The default Omnipay package provides a default HTTP Adapter." }, + "default-branch": true, "type": "library", "extra": { "branch-alias": { @@ -4817,9 +4819,9 @@ ], "support": { "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", @@ -6962,16 +6964,16 @@ }, { "name": "sentry/sentry-laravel", - "version": "2.5.2", + "version": "2.5.3", "source": { "type": "git", "url": "https://github.com/getsentry/sentry-laravel.git", - "reference": "368a2701b3bd370a2892f1f67bfbf0cbecbaca17" + "reference": "23ea0d80cb2eb7d0d056879726f7800549fc7c01" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/getsentry/sentry-laravel/zipball/368a2701b3bd370a2892f1f67bfbf0cbecbaca17", - "reference": "368a2701b3bd370a2892f1f67bfbf0cbecbaca17", + "url": "https://api.github.com/repos/getsentry/sentry-laravel/zipball/23ea0d80cb2eb7d0d056879726f7800549fc7c01", + "reference": "23ea0d80cb2eb7d0d056879726f7800549fc7c01", "shasum": "" }, "require": { @@ -6989,6 +6991,9 @@ "orchestra/testbench": "3.1 - 3.8 | ^4.7 | ^5.1 | ^6.0", "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", "extra": { "branch-alias": { @@ -7034,7 +7039,7 @@ ], "support": { "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": [ { @@ -7046,7 +7051,7 @@ "type": "custom" } ], - "time": "2021-05-06T07:49:08+00:00" + "time": "2021-05-10T13:41:30+00:00" }, { "name": "stripe/stripe-php",