From cc7bdf15fec8192ad062cf38c17d93f89739fbfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Tue, 20 Apr 2021 13:31:21 +0200 Subject: [PATCH 1/9] wip --- app/Utils/TemplateEngine.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Utils/TemplateEngine.php b/app/Utils/TemplateEngine.php index 49b77217b1..33ee07c3c2 100644 --- a/app/Utils/TemplateEngine.php +++ b/app/Utils/TemplateEngine.php @@ -127,7 +127,7 @@ class TemplateEngine $this->body = EmailTemplateDefaults::getDefaultTemplate($this->template, $this->settings_entity->locale()); } } - + return $this; } @@ -276,7 +276,7 @@ class TemplateEngine $documents['wrapper']->saveHTML(); $documents['body'] = new \DOMDocument(); - $documents['body']->loadHTML(empty($body) ? '
' : (new CssToInlineStyles())->convert($body, $styles)); + $documents['body']->loadHTML(empty($body) ? '
' : mb_convert_encoding((new CssToInlineStyles())->convert($body, $styles), 'HTML-ENTITIES', 'UTF-8')); $table_html =' From 15fa60d780ba5e84fd120d11ec9c2c76944282cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Tue, 20 Apr 2021 13:32:25 +0200 Subject: [PATCH 2/9] wip --- app/Mail/Engine/PaymentEmailEngine.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Mail/Engine/PaymentEmailEngine.php b/app/Mail/Engine/PaymentEmailEngine.php index cac9576518..25a8ae6cb4 100644 --- a/app/Mail/Engine/PaymentEmailEngine.php +++ b/app/Mail/Engine/PaymentEmailEngine.php @@ -33,7 +33,7 @@ class PaymentEmailEngine extends BaseEmailEngine public $contact; private $helpers; - + public function __construct($payment, $contact, $template_data = null) { $this->payment = $payment; @@ -169,7 +169,7 @@ class PaymentEmailEngine extends BaseEmailEngine $data['$company3'] = ['value' => $this->helpers->formatCustomFieldValue($this->company->custom_fields, 'company3', $this->settings->custom_value3, $this->client) ?: ' ', 'label' => $this->helpers->makeCustomField($this->company->custom_fields, 'company3')]; $data['$company4'] = ['value' => $this->helpers->formatCustomFieldValue($this->company->custom_fields, 'company4', $this->settings->custom_value4, $this->client) ?: ' ', 'label' => $this->helpers->makeCustomField($this->company->custom_fields, 'company4')]; - $data['$view_link'] = ['value' => ''.ctrans('texts.view_payment').'', 'label' => ctrans('texts.view_payment')]; + $data['$view_link'] = ['value' => ''.ctrans('texts.view_payment').'', 'label' => ctrans('texts.view_payment')]; $data['$view_url'] = ['value' => $this->payment->getLink(), 'label' => ctrans('texts.view_payment')]; $data['$invoices'] = ['value' => $this->formatInvoices(), 'label' => ctrans('texts.invoices')]; From 033e221d2f4da57eba5c3f1b2dbebd91677a378b Mon Sep 17 00:00:00 2001 From: David Bomba Date: Wed, 21 Apr 2021 13:54:10 +1000 Subject: [PATCH 3/9] Adjustments for recurring invoice cron --- .../Controllers/Traits/VerifiesUserEmail.php | 9 ++++++ app/Jobs/RecurringInvoice/SendRecurring.php | 18 +++++------ config/database.php | 30 ++++++++++--------- 3 files changed, 34 insertions(+), 23 deletions(-) diff --git a/app/Http/Controllers/Traits/VerifiesUserEmail.php b/app/Http/Controllers/Traits/VerifiesUserEmail.php index 74232e3fc7..cf5cc73a7d 100644 --- a/app/Http/Controllers/Traits/VerifiesUserEmail.php +++ b/app/Http/Controllers/Traits/VerifiesUserEmail.php @@ -43,6 +43,15 @@ trait VerifiesUserEmail $user->confirmation_code = null; $user->save(); + if(isset($user->oauth_user_id)){ + + return $this->render('auth.confirmed', [ + 'root' => 'themes', + 'message' => ctrans('texts.security_confirmation'), + ]); + + } + if (is_null($user->password) || empty($user->password) || Hash::check('', $user->password)) { return $this->render('auth.confirmation_with_password', ['root' => 'themes', 'user_id' => $user->hashed_id]); } diff --git a/app/Jobs/RecurringInvoice/SendRecurring.php b/app/Jobs/RecurringInvoice/SendRecurring.php index e0dec9726c..8a70e621be 100644 --- a/app/Jobs/RecurringInvoice/SendRecurring.php +++ b/app/Jobs/RecurringInvoice/SendRecurring.php @@ -68,15 +68,6 @@ class SendRecurring implements ShouldQueue ->fillDefaults() ->save(); - nlog("Invoice {$invoice->number} created"); - - $invoice->invitations->each(function ($invitation) use ($invoice) { - if ($invitation->contact && strlen($invitation->contact->email) >=1) { - EmailEntity::dispatch($invitation, $invoice->company); - nlog("Firing email for invoice {$invoice->number}"); - } - }); - nlog("updating recurring invoice dates"); /* Set next date here to prevent a recurring loop forming */ $this->recurring_invoice->next_send_date = $this->recurring_invoice->nextSendDate()->format('Y-m-d'); @@ -99,6 +90,15 @@ class SendRecurring implements ShouldQueue $invoice->entityEmailEvent($invoice->invitations->first(), 'invoice', 'email_template_invoice'); } + nlog("Invoice {$invoice->number} created"); + + $invoice->invitations->each(function ($invitation) use ($invoice) { + if ($invitation->contact && strlen($invitation->contact->email) >=1) { + EmailEntity::dispatch($invitation, $invoice->company); + nlog("Firing email for invoice {$invoice->number}"); + } + }); + if ($invoice->client->getSetting('auto_bill_date') == 'on_send_date' && $this->recurring_invoice->auto_bill_enabled) { nlog("attempting to autobill {$invoice->number}"); $invoice->service()->autoBill()->save(); diff --git a/config/database.php b/config/database.php index a59440a08e..dbccc25c3c 100644 --- a/config/database.php +++ b/config/database.php @@ -154,13 +154,14 @@ return [ ], 'sentinel-default' => array_merge( - array_map( - function ($a, $b) { - return ["host" => $a,"port" => $b]; - }, - explode(',', env('REDIS_HOST', 'localhost')), - explode(',', env('REDIS_PORT', 26379)) - ), + [ + "host" => "v5db1", + "port" => "26379", + ], + [ + "host" => "v5db2", + "port" => "26379", + ], ['options' => [ 'replication' => 'sentinel', 'service' => env('REDIS_SENTINEL_SERVICE', 'mymaster'), @@ -172,13 +173,14 @@ return [ ), 'sentinel-cache' => array_merge( - array_map( - function ($a, $b) { - return ["host" => $a,"port" => $b]; - }, - explode(',', env('REDIS_HOST', 'localhost')), - explode(',', env('REDIS_PORT', 26379)) - ), + [ + "host" => "v5db1", + "port" => "26379", + ], + [ + "host" => "v5db2", + "port" => "26379", + ], ['options' => [ 'replication' => 'sentinel', 'service' => env('REDIS_SENTINEL_SERVICE', 'mymaster'), From 6021f31ab4ab88b6ec27eba3ade6735073a34114 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Wed, 21 Apr 2021 14:18:03 +1000 Subject: [PATCH 4/9] Redis Sentinel configuration --- composer.json | 1 + composer.lock | 165 +++++++++++++++++++++++++++++++++++++++++++- config/cache.php | 4 ++ config/database.php | 23 ++++++ config/queue.php | 7 ++ config/session.php | 2 +- 6 files changed, 200 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 12254fd486..fff14da8ad 100644 --- a/composer.json +++ b/composer.json @@ -58,6 +58,7 @@ "league/omnipay": "^3.1", "livewire/livewire": "^2.0", "maennchen/zipstream-php": "^1.2", + "monospice/laravel-redis-sentinel-drivers": "^2.7", "nwidart/laravel-modules": "^8.0", "omnipay/paypal": "^3.0", "pragmarx/google2fa": "^8.0", diff --git a/composer.lock b/composer.lock index 25bd1c789e..3c218742df 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": "f01381d3d00f0bd84acbda078ad1b99e", + "content-hash": "131c90cf17cbf87d1fc25b96c052a8e3", "packages": [ { "name": "authorizenet/authorizenet", @@ -4175,6 +4175,169 @@ ], "time": "2020-12-14T13:15:25+00:00" }, + { + "name": "monospice/laravel-redis-sentinel-drivers", + "version": "2.x-dev", + "source": { + "type": "git", + "url": "https://github.com/monospice/laravel-redis-sentinel-drivers.git", + "reference": "5b1c107d2fc511c26829c5c5b57957e31dc32807" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/monospice/laravel-redis-sentinel-drivers/zipball/5b1c107d2fc511c26829c5c5b57957e31dc32807", + "reference": "5b1c107d2fc511c26829c5c5b57957e31dc32807", + "shasum": "" + }, + "require": { + "illuminate/cache": "^5.4 || ^6.0 || ^7.0 || ^8.0", + "illuminate/contracts": "^5.4 || ^6.0 || ^7.0 || ^8.0", + "illuminate/queue": "^5.4 || ^6.0 || ^7.0 || ^8.0", + "illuminate/redis": "^5.4 || ^6.0 || ^7.0 || ^8.0", + "illuminate/session": "^5.4 || ^6.0 || ^7.0 || ^8.0", + "illuminate/support": "^5.4 || ^6.0 || ^7.0 || ^8.0", + "monospice/spicy-identifiers": "^0.1", + "php": ">=5.6.4", + "predis/predis": "^1.1" + }, + "require-dev": { + "laravel/framework": "^5.4 || ^6.0 || ^7.0 || ^8.0", + "laravel/horizon": "^1.0 || ^2.0 || ^3.0 || ^4.0", + "laravel/lumen-framework": "^5.4 || ^6.0 || ^7.0 || ^8.0", + "mockery/mockery": "^1.3", + "phpunit/phpunit": "^5.0" + }, + "default-branch": true, + "type": "library", + "extra": { + "laravel": { + "providers": [ + "Monospice\\LaravelRedisSentinel\\RedisSentinelServiceProvider" + ] + } + }, + "autoload": { + "psr-4": { + "Monospice\\LaravelRedisSentinel\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Cy Rossignol", + "email": "cy@rossignols.me" + } + ], + "description": "Redis Sentinel integration for Laravel and Lumen.", + "keywords": [ + "laravel", + "lumen", + "redis", + "sentinel" + ], + "support": { + "issues": "https://github.com/monospice/laravel-redis-sentinel-drivers/issues", + "source": "https://github.com/monospice/laravel-redis-sentinel-drivers/tree/integration-tests" + }, + "time": "2020-09-08T06:14:57+00:00" + }, + { + "name": "monospice/spicy-identifier-tools", + "version": "1.0.3", + "source": { + "type": "git", + "url": "https://github.com/monospice/spicy-identifier-tools.git", + "reference": "8659493c64d3023c38bf4f325bff86fbb53c085a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/monospice/spicy-identifier-tools/zipball/8659493c64d3023c38bf4f325bff86fbb53c085a", + "reference": "8659493c64d3023c38bf4f325bff86fbb53c085a", + "shasum": "" + }, + "require": { + "php": ">=5.4.0" + }, + "require-dev": { + "phpspec/phpspec": "~2.2", + "phpunit/phpunit": "~4.7" + }, + "type": "library", + "autoload": { + "psr-4": { + "Monospice\\SpicyIdentifiers\\Tools\\": "src/Tools" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Cy Rossignol", + "email": "cy.rossignol@yahoo.com" + } + ], + "description": "An easy way to parse, convert, and format identifier names.", + "support": { + "issues": "https://github.com/monospice/spicy-identifier-tools/issues", + "source": "https://github.com/monospice/spicy-identifier-tools/tree/1.0.3" + }, + "time": "2015-11-04T19:00:37+00:00" + }, + { + "name": "monospice/spicy-identifiers", + "version": "0.1.0", + "source": { + "type": "git", + "url": "https://github.com/monospice/spicy-identifiers.git", + "reference": "ecd04ca84907f2f0d58bf3b2bb9a36d7d29d86bd" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/monospice/spicy-identifiers/zipball/ecd04ca84907f2f0d58bf3b2bb9a36d7d29d86bd", + "reference": "ecd04ca84907f2f0d58bf3b2bb9a36d7d29d86bd", + "shasum": "" + }, + "require": { + "monospice/spicy-identifier-tools": "~1.0", + "php": ">=5.4.0" + }, + "require-dev": { + "phpspec/phpspec": "~2.2" + }, + "type": "library", + "autoload": { + "psr-4": { + "Monospice\\SpicyIdentifiers\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Cy Rossignol", + "email": "cy@rossignols.me" + } + ], + "description": "An easy way to parse and manipulate identifier names, such as dynamic method names.", + "keywords": [ + "dynamic", + "method", + "parser", + "variable" + ], + "support": { + "issues": "https://github.com/monospice/spicy-identifiers/issues", + "source": "https://github.com/monospice/spicy-identifiers/tree/1.0.x" + }, + "time": "2017-01-29T09:00:23+00:00" + }, { "name": "mtdowling/jmespath.php", "version": "2.6.0", diff --git a/config/cache.php b/config/cache.php index b054ca87d6..a18a947d0e 100644 --- a/config/cache.php +++ b/config/cache.php @@ -86,6 +86,10 @@ return [ 'endpoint' => env('DYNAMODB_ENDPOINT'), ], + 'redis-sentinel' => [ + 'driver' => 'redis-sentinel', + 'connection' => 'default', + ], ], /* diff --git a/config/database.php b/config/database.php index dbccc25c3c..9609cb8464 100644 --- a/config/database.php +++ b/config/database.php @@ -193,4 +193,27 @@ return [ ], + 'redis-sentinel' => [ + + 'default' => [ + [ + 'host' => 'v5db1', + 'port' => 26379, + ], + [ + 'host' => 'v5db2', + 'port' => 26379, + ], + ], + + 'options' => [ + 'service' => env('REDIS_SENTINEL_SERVICE', 'mymaster'), + 'parameters' => [ + 'password' => env('REDIS_PASSWORD', null), + 'database' => 0, + ], + ], + + ], + ]; diff --git a/config/queue.php b/config/queue.php index 8f826c982b..7a42ca0b0a 100644 --- a/config/queue.php +++ b/config/queue.php @@ -67,6 +67,13 @@ return [ 'block_for' => null, ], + 'redis-sentinel' => [ + 'driver' => 'redis-sentinel', + 'connection' => 'default', + 'queue' => 'default', + 'retry_after' => 90, // Laravel >= 5.4.30 + 'expire' => 90, // Laravel < 5.4.30 + ], ], /* diff --git a/config/session.php b/config/session.php index 4e0f66cda6..1122a33a17 100644 --- a/config/session.php +++ b/config/session.php @@ -72,7 +72,7 @@ return [ | */ - 'connection' => env('SESSION_CONNECTION', null), + 'connection' => env('SESSION_CONNECTION', 'default'), /* |-------------------------------------------------------------------------- From 2fb342c5cb865a40175d593c18fac8db2a50fff1 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Wed, 21 Apr 2021 15:11:19 +1000 Subject: [PATCH 5/9] Redis Sentinel configuration --- composer.json | 1 - composer.lock | 518 +++++++++++++++----------------------------- config/cache.php | 6 +- config/database.php | 53 ++--- config/queue.php | 9 +- config/session.php | 2 +- 6 files changed, 193 insertions(+), 396 deletions(-) diff --git a/composer.json b/composer.json index fff14da8ad..12254fd486 100644 --- a/composer.json +++ b/composer.json @@ -58,7 +58,6 @@ "league/omnipay": "^3.1", "livewire/livewire": "^2.0", "maennchen/zipstream-php": "^1.2", - "monospice/laravel-redis-sentinel-drivers": "^2.7", "nwidart/laravel-modules": "^8.0", "omnipay/paypal": "^3.0", "pragmarx/google2fa": "^8.0", diff --git a/composer.lock b/composer.lock index 3c218742df..48383dee41 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": "131c90cf17cbf87d1fc25b96c052a8e3", + "content-hash": "f01381d3d00f0bd84acbda078ad1b99e", "packages": [ { "name": "authorizenet/authorizenet", @@ -51,16 +51,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.178.0", + "version": "3.178.6", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "214e3d98c54277cd8965f1cf307dce39631407bf" + "reference": "0aa83b522d5ffa794c02e7411af87a0e241a3082" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/214e3d98c54277cd8965f1cf307dce39631407bf", - "reference": "214e3d98c54277cd8965f1cf307dce39631407bf", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/0aa83b522d5ffa794c02e7411af87a0e241a3082", + "reference": "0aa83b522d5ffa794c02e7411af87a0e241a3082", "shasum": "" }, "require": { @@ -135,9 +135,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.178.0" + "source": "https://github.com/aws/aws-sdk-php/tree/3.178.6" }, - "time": "2021-04-08T18:13:16+00:00" + "time": "2021-04-19T18:13:17+00:00" }, { "name": "bacon/bacon-qr-code", @@ -1089,43 +1089,6 @@ }, "time": "2020-10-02T16:03:48+00:00" }, - { - "name": "dnoegel/php-xdg-base-dir", - "version": "v0.1.1", - "source": { - "type": "git", - "url": "https://github.com/dnoegel/php-xdg-base-dir.git", - "reference": "8f8a6e48c5ecb0f991c2fdcf5f154a47d85f9ffd" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/dnoegel/php-xdg-base-dir/zipball/8f8a6e48c5ecb0f991c2fdcf5f154a47d85f9ffd", - "reference": "8f8a6e48c5ecb0f991c2fdcf5f154a47d85f9ffd", - "shasum": "" - }, - "require": { - "php": ">=5.3.2" - }, - "require-dev": { - "phpunit/phpunit": "~7.0|~6.0|~5.0|~4.8.35" - }, - "type": "library", - "autoload": { - "psr-4": { - "XdgBaseDir\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "description": "implementation of xdg base directory specification for php", - "support": { - "issues": "https://github.com/dnoegel/php-xdg-base-dir/issues", - "source": "https://github.com/dnoegel/php-xdg-base-dir/tree/v0.1.1" - }, - "time": "2019-12-04T15:06:13+00:00" - }, { "name": "doctrine/cache", "version": "1.10.2", @@ -1228,16 +1191,16 @@ }, { "name": "doctrine/dbal", - "version": "2.13.0", + "version": "2.13.1", "source": { "type": "git", "url": "https://github.com/doctrine/dbal.git", - "reference": "67d56d3203b33db29834e6b2fcdbfdc50535d796" + "reference": "c800380457948e65bbd30ba92cc17cda108bf8c9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/dbal/zipball/67d56d3203b33db29834e6b2fcdbfdc50535d796", - "reference": "67d56d3203b33db29834e6b2fcdbfdc50535d796", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/c800380457948e65bbd30ba92cc17cda108bf8c9", + "reference": "c800380457948e65bbd30ba92cc17cda108bf8c9", "shasum": "" }, "require": { @@ -1252,6 +1215,7 @@ "jetbrains/phpstorm-stubs": "2020.2", "phpstan/phpstan": "0.12.81", "phpunit/phpunit": "^7.5.20|^8.5|9.5.0", + "squizlabs/php_codesniffer": "3.6.0", "symfony/console": "^2.0.5|^3.0|^4.0|^5.0", "vimeo/psalm": "4.6.4" }, @@ -1314,7 +1278,7 @@ ], "support": { "issues": "https://github.com/doctrine/dbal/issues", - "source": "https://github.com/doctrine/dbal/tree/2.13.0" + "source": "https://github.com/doctrine/dbal/tree/2.13.1" }, "funding": [ { @@ -1330,7 +1294,7 @@ "type": "tidelift" } ], - "time": "2021-03-28T18:10:53+00:00" + "time": "2021-04-17T17:30:19+00:00" }, { "name": "doctrine/deprecations", @@ -2021,16 +1985,16 @@ }, { "name": "google/apiclient-services", - "version": "v0.167.0", + "version": "v0.170.0", "source": { "type": "git", "url": "https://github.com/googleapis/google-api-php-client-services.git", - "reference": "46b71684a100f3d976e0321cf24f487b314add68" + "reference": "b45ddc3d82b2c8f328d869d55db88c1885d898ee" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/googleapis/google-api-php-client-services/zipball/46b71684a100f3d976e0321cf24f487b314add68", - "reference": "46b71684a100f3d976e0321cf24f487b314add68", + "url": "https://api.github.com/repos/googleapis/google-api-php-client-services/zipball/b45ddc3d82b2c8f328d869d55db88c1885d898ee", + "reference": "b45ddc3d82b2c8f328d869d55db88c1885d898ee", "shasum": "" }, "require": { @@ -2056,9 +2020,9 @@ ], "support": { "issues": "https://github.com/googleapis/google-api-php-client-services/issues", - "source": "https://github.com/googleapis/google-api-php-client-services/tree/v0.167.0" + "source": "https://github.com/googleapis/google-api-php-client-services/tree/v0.170.0" }, - "time": "2021-03-22T11:26:04+00:00" + "time": "2021-04-20T20:34:12+00:00" }, { "name": "google/auth", @@ -2795,16 +2759,16 @@ }, { "name": "laravel/framework", - "version": "v8.36.2", + "version": "v8.38.0", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "0debd8ad6b5aa1f61ccc73910adf049af4ca0444" + "reference": "26a73532c54d2c090692bf2e3e64e449669053ba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/0debd8ad6b5aa1f61ccc73910adf049af4ca0444", - "reference": "0debd8ad6b5aa1f61ccc73910adf049af4ca0444", + "url": "https://api.github.com/repos/laravel/framework/zipball/26a73532c54d2c090692bf2e3e64e449669053ba", + "reference": "26a73532c54d2c090692bf2e3e64e449669053ba", "shasum": "" }, "require": { @@ -2959,7 +2923,7 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2021-04-07T12:37:22+00:00" + "time": "2021-04-20T13:50:21+00:00" }, { "name": "laravel/slack-notification-channel", @@ -3320,16 +3284,16 @@ }, { "name": "league/csv", - "version": "9.7.0", + "version": "9.7.1", "source": { "type": "git", "url": "https://github.com/thephpleague/csv.git", - "reference": "4cacd9c72c4aa8bdbef43315b2ca25c46a0f833f" + "reference": "0ec57e8264ec92565974ead0d1724cf1026e10c1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/csv/zipball/4cacd9c72c4aa8bdbef43315b2ca25c46a0f833f", - "reference": "4cacd9c72c4aa8bdbef43315b2ca25c46a0f833f", + "url": "https://api.github.com/repos/thephpleague/csv/zipball/0ec57e8264ec92565974ead0d1724cf1026e10c1", + "reference": "0ec57e8264ec92565974ead0d1724cf1026e10c1", "shasum": "" }, "require": { @@ -3400,7 +3364,7 @@ "type": "github" } ], - "time": "2021-03-26T22:08:10+00:00" + "time": "2021-04-17T16:32:08+00:00" }, { "name": "league/flysystem", @@ -3800,28 +3764,27 @@ }, { "name": "league/omnipay", - "version": "dev-master", + "version": "v3.1.0", "source": { "type": "git", "url": "https://github.com/thephpleague/omnipay.git", - "reference": "e9439db0633ba988e6f6cdd029fad38aad73f9f6" + "reference": "1ba7c8a3312cf2342458b99c9e5b86eaae44aed2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/omnipay/zipball/e9439db0633ba988e6f6cdd029fad38aad73f9f6", - "reference": "e9439db0633ba988e6f6cdd029fad38aad73f9f6", + "url": "https://api.github.com/repos/thephpleague/omnipay/zipball/1ba7c8a3312cf2342458b99c9e5b86eaae44aed2", + "reference": "1ba7c8a3312cf2342458b99c9e5b86eaae44aed2", "shasum": "" }, "require": { "omnipay/common": "^3", - "php": "^7.2|^8.0", + "php": "^7.2", "php-http/discovery": "^1.12", "php-http/guzzle7-adapter": "^0.1" }, "require-dev": { "omnipay/tests": "^3" }, - "default-branch": true, "type": "metapackage", "extra": { "branch-alias": { @@ -3852,22 +3815,22 @@ ], "support": { "issues": "https://github.com/thephpleague/omnipay/issues", - "source": "https://github.com/thephpleague/omnipay/tree/master" + "source": "https://github.com/thephpleague/omnipay/tree/v3.1.0" }, - "time": "2021-03-12T09:17:59+00:00" + "time": "2020-09-22T14:02:17+00:00" }, { "name": "livewire/livewire", - "version": "v2.4.2", + "version": "v2.4.3", "source": { "type": "git", "url": "https://github.com/livewire/livewire.git", - "reference": "2495387841a3eb03ac62b2c984ccd2574303285b" + "reference": "69575f50bb7f8a49a41f9bd6bd16c73a6ef4fda3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/livewire/livewire/zipball/2495387841a3eb03ac62b2c984ccd2574303285b", - "reference": "2495387841a3eb03ac62b2c984ccd2574303285b", + "url": "https://api.github.com/repos/livewire/livewire/zipball/69575f50bb7f8a49a41f9bd6bd16c73a6ef4fda3", + "reference": "69575f50bb7f8a49a41f9bd6bd16c73a6ef4fda3", "shasum": "" }, "require": { @@ -3918,7 +3881,7 @@ "description": "A front-end framework for Laravel.", "support": { "issues": "https://github.com/livewire/livewire/issues", - "source": "https://github.com/livewire/livewire/tree/v2.4.2" + "source": "https://github.com/livewire/livewire/tree/v2.4.3" }, "funding": [ { @@ -3926,7 +3889,7 @@ "type": "github" } ], - "time": "2021-04-04T15:46:50+00:00" + "time": "2021-04-16T14:27:45+00:00" }, { "name": "maennchen/zipstream-php", @@ -4175,169 +4138,6 @@ ], "time": "2020-12-14T13:15:25+00:00" }, - { - "name": "monospice/laravel-redis-sentinel-drivers", - "version": "2.x-dev", - "source": { - "type": "git", - "url": "https://github.com/monospice/laravel-redis-sentinel-drivers.git", - "reference": "5b1c107d2fc511c26829c5c5b57957e31dc32807" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/monospice/laravel-redis-sentinel-drivers/zipball/5b1c107d2fc511c26829c5c5b57957e31dc32807", - "reference": "5b1c107d2fc511c26829c5c5b57957e31dc32807", - "shasum": "" - }, - "require": { - "illuminate/cache": "^5.4 || ^6.0 || ^7.0 || ^8.0", - "illuminate/contracts": "^5.4 || ^6.0 || ^7.0 || ^8.0", - "illuminate/queue": "^5.4 || ^6.0 || ^7.0 || ^8.0", - "illuminate/redis": "^5.4 || ^6.0 || ^7.0 || ^8.0", - "illuminate/session": "^5.4 || ^6.0 || ^7.0 || ^8.0", - "illuminate/support": "^5.4 || ^6.0 || ^7.0 || ^8.0", - "monospice/spicy-identifiers": "^0.1", - "php": ">=5.6.4", - "predis/predis": "^1.1" - }, - "require-dev": { - "laravel/framework": "^5.4 || ^6.0 || ^7.0 || ^8.0", - "laravel/horizon": "^1.0 || ^2.0 || ^3.0 || ^4.0", - "laravel/lumen-framework": "^5.4 || ^6.0 || ^7.0 || ^8.0", - "mockery/mockery": "^1.3", - "phpunit/phpunit": "^5.0" - }, - "default-branch": true, - "type": "library", - "extra": { - "laravel": { - "providers": [ - "Monospice\\LaravelRedisSentinel\\RedisSentinelServiceProvider" - ] - } - }, - "autoload": { - "psr-4": { - "Monospice\\LaravelRedisSentinel\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Cy Rossignol", - "email": "cy@rossignols.me" - } - ], - "description": "Redis Sentinel integration for Laravel and Lumen.", - "keywords": [ - "laravel", - "lumen", - "redis", - "sentinel" - ], - "support": { - "issues": "https://github.com/monospice/laravel-redis-sentinel-drivers/issues", - "source": "https://github.com/monospice/laravel-redis-sentinel-drivers/tree/integration-tests" - }, - "time": "2020-09-08T06:14:57+00:00" - }, - { - "name": "monospice/spicy-identifier-tools", - "version": "1.0.3", - "source": { - "type": "git", - "url": "https://github.com/monospice/spicy-identifier-tools.git", - "reference": "8659493c64d3023c38bf4f325bff86fbb53c085a" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/monospice/spicy-identifier-tools/zipball/8659493c64d3023c38bf4f325bff86fbb53c085a", - "reference": "8659493c64d3023c38bf4f325bff86fbb53c085a", - "shasum": "" - }, - "require": { - "php": ">=5.4.0" - }, - "require-dev": { - "phpspec/phpspec": "~2.2", - "phpunit/phpunit": "~4.7" - }, - "type": "library", - "autoload": { - "psr-4": { - "Monospice\\SpicyIdentifiers\\Tools\\": "src/Tools" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Cy Rossignol", - "email": "cy.rossignol@yahoo.com" - } - ], - "description": "An easy way to parse, convert, and format identifier names.", - "support": { - "issues": "https://github.com/monospice/spicy-identifier-tools/issues", - "source": "https://github.com/monospice/spicy-identifier-tools/tree/1.0.3" - }, - "time": "2015-11-04T19:00:37+00:00" - }, - { - "name": "monospice/spicy-identifiers", - "version": "0.1.0", - "source": { - "type": "git", - "url": "https://github.com/monospice/spicy-identifiers.git", - "reference": "ecd04ca84907f2f0d58bf3b2bb9a36d7d29d86bd" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/monospice/spicy-identifiers/zipball/ecd04ca84907f2f0d58bf3b2bb9a36d7d29d86bd", - "reference": "ecd04ca84907f2f0d58bf3b2bb9a36d7d29d86bd", - "shasum": "" - }, - "require": { - "monospice/spicy-identifier-tools": "~1.0", - "php": ">=5.4.0" - }, - "require-dev": { - "phpspec/phpspec": "~2.2" - }, - "type": "library", - "autoload": { - "psr-4": { - "Monospice\\SpicyIdentifiers\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Cy Rossignol", - "email": "cy@rossignols.me" - } - ], - "description": "An easy way to parse and manipulate identifier names, such as dynamic method names.", - "keywords": [ - "dynamic", - "method", - "parser", - "variable" - ], - "support": { - "issues": "https://github.com/monospice/spicy-identifiers/issues", - "source": "https://github.com/monospice/spicy-identifiers/tree/1.0.x" - }, - "time": "2017-01-29T09:00:23+00:00" - }, { "name": "mtdowling/jmespath.php", "version": "2.6.0", @@ -4768,21 +4568,21 @@ }, { "name": "omnipay/common", - "version": "dev-master", + "version": "v3.0.5", "source": { "type": "git", "url": "https://github.com/thephpleague/omnipay-common.git", - "reference": "e1ebc22615f14219d31cefdf62d7036feb228b1c" + "reference": "0d1f4486c1c873537ac030d37c7ce2986c4de1d2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/omnipay-common/zipball/e1ebc22615f14219d31cefdf62d7036feb228b1c", - "reference": "e1ebc22615f14219d31cefdf62d7036feb228b1c", + "url": "https://api.github.com/repos/thephpleague/omnipay-common/zipball/0d1f4486c1c873537ac030d37c7ce2986c4de1d2", + "reference": "0d1f4486c1c873537ac030d37c7ce2986c4de1d2", "shasum": "" }, "require": { "moneyphp/money": "^3.1", - "php": "^5.6|^7|^8", + "php": "^5.6|^7", "php-http/client-implementation": "^1", "php-http/discovery": "^1.2.1", "php-http/message": "^1.5", @@ -4797,7 +4597,6 @@ "suggest": { "league/omnipay": "The default Omnipay package provides a default HTTP Adapter." }, - "default-branch": true, "type": "library", "extra": { "branch-alias": { @@ -4849,9 +4648,9 @@ ], "support": { "issues": "https://github.com/thephpleague/omnipay-common/issues", - "source": "https://github.com/thephpleague/omnipay-common/tree/master" + "source": "https://github.com/thephpleague/omnipay-common/tree/v3.0.5" }, - "time": "2020-12-13T12:53:48+00:00" + "time": "2020-08-20T18:22:12+00:00" }, { "name": "omnipay/paypal", @@ -4919,16 +4718,16 @@ }, { "name": "opis/closure", - "version": "3.6.1", + "version": "3.6.2", "source": { "type": "git", "url": "https://github.com/opis/closure.git", - "reference": "943b5d70cc5ae7483f6aff6ff43d7e34592ca0f5" + "reference": "06e2ebd25f2869e54a306dda991f7db58066f7f6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/opis/closure/zipball/943b5d70cc5ae7483f6aff6ff43d7e34592ca0f5", - "reference": "943b5d70cc5ae7483f6aff6ff43d7e34592ca0f5", + "url": "https://api.github.com/repos/opis/closure/zipball/06e2ebd25f2869e54a306dda991f7db58066f7f6", + "reference": "06e2ebd25f2869e54a306dda991f7db58066f7f6", "shasum": "" }, "require": { @@ -4978,9 +4777,9 @@ ], "support": { "issues": "https://github.com/opis/closure/issues", - "source": "https://github.com/opis/closure/tree/3.6.1" + "source": "https://github.com/opis/closure/tree/3.6.2" }, - "time": "2020-11-07T02:01:34+00:00" + "time": "2021-04-09T13:42:10+00:00" }, { "name": "paragonie/constant_time_encoding", @@ -5623,16 +5422,16 @@ }, { "name": "phpseclib/phpseclib", - "version": "3.0.7", + "version": "3.0.8", "source": { "type": "git", "url": "https://github.com/phpseclib/phpseclib.git", - "reference": "d369510df0ebd5e1a5d0fe3d4d23c55fa87a403d" + "reference": "d9615a6fb970d9933866ca8b4036ec3407b020b6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/d369510df0ebd5e1a5d0fe3d4d23c55fa87a403d", - "reference": "d369510df0ebd5e1a5d0fe3d4d23c55fa87a403d", + "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/d9615a6fb970d9933866ca8b4036ec3407b020b6", + "reference": "d9615a6fb970d9933866ca8b4036ec3407b020b6", "shasum": "" }, "require": { @@ -5714,7 +5513,7 @@ ], "support": { "issues": "https://github.com/phpseclib/phpseclib/issues", - "source": "https://github.com/phpseclib/phpseclib/tree/3.0.7" + "source": "https://github.com/phpseclib/phpseclib/tree/3.0.8" }, "funding": [ { @@ -5730,7 +5529,7 @@ "type": "tidelift" } ], - "time": "2021-04-06T14:00:11+00:00" + "time": "2021-04-19T03:20:48+00:00" }, { "name": "pragmarx/google2fa", @@ -6260,20 +6059,19 @@ }, { "name": "psy/psysh", - "version": "v0.10.7", + "version": "v0.10.8", "source": { "type": "git", "url": "https://github.com/bobthecow/psysh.git", - "reference": "a395af46999a12006213c0c8346c9445eb31640c" + "reference": "e4573f47750dd6c92dca5aee543fa77513cbd8d3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bobthecow/psysh/zipball/a395af46999a12006213c0c8346c9445eb31640c", - "reference": "a395af46999a12006213c0c8346c9445eb31640c", + "url": "https://api.github.com/repos/bobthecow/psysh/zipball/e4573f47750dd6c92dca5aee543fa77513cbd8d3", + "reference": "e4573f47750dd6c92dca5aee543fa77513cbd8d3", "shasum": "" }, "require": { - "dnoegel/php-xdg-base-dir": "0.1.*", "ext-json": "*", "ext-tokenizer": "*", "nikic/php-parser": "~4.0|~3.0|~2.0|~1.3", @@ -6330,9 +6128,9 @@ ], "support": { "issues": "https://github.com/bobthecow/psysh/issues", - "source": "https://github.com/bobthecow/psysh/tree/v0.10.7" + "source": "https://github.com/bobthecow/psysh/tree/v0.10.8" }, - "time": "2021-03-14T02:14:56+00:00" + "time": "2021-04-10T16:23:39+00:00" }, { "name": "ralouphie/getallheaders", @@ -7083,16 +6881,16 @@ }, { "name": "stripe/stripe-php", - "version": "v7.76.0", + "version": "v7.77.0", "source": { "type": "git", "url": "https://github.com/stripe/stripe-php.git", - "reference": "47e66d4186712be33c593fe820dccf270a04d5d6" + "reference": "f6724447481f6fb8c2e714165e092adad9ca470a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/stripe/stripe-php/zipball/47e66d4186712be33c593fe820dccf270a04d5d6", - "reference": "47e66d4186712be33c593fe820dccf270a04d5d6", + "url": "https://api.github.com/repos/stripe/stripe-php/zipball/f6724447481f6fb8c2e714165e092adad9ca470a", + "reference": "f6724447481f6fb8c2e714165e092adad9ca470a", "shasum": "" }, "require": { @@ -7138,9 +6936,9 @@ ], "support": { "issues": "https://github.com/stripe/stripe-php/issues", - "source": "https://github.com/stripe/stripe-php/tree/v7.76.0" + "source": "https://github.com/stripe/stripe-php/tree/v7.77.0" }, - "time": "2021-03-22T16:50:21+00:00" + "time": "2021-04-12T17:19:16+00:00" }, { "name": "swiftmailer/swiftmailer", @@ -7381,16 +7179,16 @@ }, { "name": "symfony/deprecation-contracts", - "version": "v2.2.0", + "version": "v2.4.0", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "5fa56b4074d1ae755beb55617ddafe6f5d78f665" + "reference": "5f38c8804a9e97d23e0c8d63341088cd8a22d627" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/5fa56b4074d1ae755beb55617ddafe6f5d78f665", - "reference": "5fa56b4074d1ae755beb55617ddafe6f5d78f665", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/5f38c8804a9e97d23e0c8d63341088cd8a22d627", + "reference": "5f38c8804a9e97d23e0c8d63341088cd8a22d627", "shasum": "" }, "require": { @@ -7399,7 +7197,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.2-dev" + "dev-main": "2.4-dev" }, "thanks": { "name": "symfony/contracts", @@ -7428,7 +7226,7 @@ "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/master" + "source": "https://github.com/symfony/deprecation-contracts/tree/v2.4.0" }, "funding": [ { @@ -7444,7 +7242,7 @@ "type": "tidelift" } ], - "time": "2020-09-07T11:33:47+00:00" + "time": "2021-03-23T23:28:01+00:00" }, { "name": "symfony/error-handler", @@ -7602,16 +7400,16 @@ }, { "name": "symfony/event-dispatcher-contracts", - "version": "v2.2.0", + "version": "v2.4.0", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher-contracts.git", - "reference": "0ba7d54483095a198fa51781bc608d17e84dffa2" + "reference": "69fee1ad2332a7cbab3aca13591953da9cdb7a11" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/0ba7d54483095a198fa51781bc608d17e84dffa2", - "reference": "0ba7d54483095a198fa51781bc608d17e84dffa2", + "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/69fee1ad2332a7cbab3aca13591953da9cdb7a11", + "reference": "69fee1ad2332a7cbab3aca13591953da9cdb7a11", "shasum": "" }, "require": { @@ -7624,7 +7422,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.2-dev" + "dev-main": "2.4-dev" }, "thanks": { "name": "symfony/contracts", @@ -7661,7 +7459,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v2.2.0" + "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v2.4.0" }, "funding": [ { @@ -7677,7 +7475,7 @@ "type": "tidelift" } ], - "time": "2020-09-07T11:33:47+00:00" + "time": "2021-03-23T23:28:01+00:00" }, { "name": "symfony/filesystem", @@ -7890,16 +7688,16 @@ }, { "name": "symfony/http-client-contracts", - "version": "v2.3.1", + "version": "v2.4.0", "source": { "type": "git", "url": "https://github.com/symfony/http-client-contracts.git", - "reference": "41db680a15018f9c1d4b23516059633ce280ca33" + "reference": "7e82f6084d7cae521a75ef2cb5c9457bbda785f4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/41db680a15018f9c1d4b23516059633ce280ca33", - "reference": "41db680a15018f9c1d4b23516059633ce280ca33", + "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/7e82f6084d7cae521a75ef2cb5c9457bbda785f4", + "reference": "7e82f6084d7cae521a75ef2cb5c9457bbda785f4", "shasum": "" }, "require": { @@ -7910,9 +7708,8 @@ }, "type": "library", "extra": { - "branch-version": "2.3", "branch-alias": { - "dev-main": "2.3-dev" + "dev-main": "2.4-dev" }, "thanks": { "name": "symfony/contracts", @@ -7949,7 +7746,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/http-client-contracts/tree/v2.3.1" + "source": "https://github.com/symfony/http-client-contracts/tree/v2.4.0" }, "funding": [ { @@ -7965,7 +7762,7 @@ "type": "tidelift" } ], - "time": "2020-10-14T17:08:19+00:00" + "time": "2021-04-11T23:07:08+00:00" }, { "name": "symfony/http-foundation", @@ -9354,21 +9151,21 @@ }, { "name": "symfony/service-contracts", - "version": "v2.2.0", + "version": "v2.4.0", "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "d15da7ba4957ffb8f1747218be9e1a121fd298a1" + "reference": "f040a30e04b57fbcc9c6cbcf4dbaa96bd318b9bb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/d15da7ba4957ffb8f1747218be9e1a121fd298a1", - "reference": "d15da7ba4957ffb8f1747218be9e1a121fd298a1", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/f040a30e04b57fbcc9c6cbcf4dbaa96bd318b9bb", + "reference": "f040a30e04b57fbcc9c6cbcf4dbaa96bd318b9bb", "shasum": "" }, "require": { "php": ">=7.2.5", - "psr/container": "^1.0" + "psr/container": "^1.1" }, "suggest": { "symfony/service-implementation": "" @@ -9376,7 +9173,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.2-dev" + "dev-main": "2.4-dev" }, "thanks": { "name": "symfony/contracts", @@ -9413,7 +9210,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/service-contracts/tree/master" + "source": "https://github.com/symfony/service-contracts/tree/v2.4.0" }, "funding": [ { @@ -9429,7 +9226,7 @@ "type": "tidelift" } ], - "time": "2020-09-07T11:33:47+00:00" + "time": "2021-04-01T10:43:52+00:00" }, { "name": "symfony/string", @@ -9609,16 +9406,16 @@ }, { "name": "symfony/translation-contracts", - "version": "v2.3.0", + "version": "v2.4.0", "source": { "type": "git", "url": "https://github.com/symfony/translation-contracts.git", - "reference": "e2eaa60b558f26a4b0354e1bbb25636efaaad105" + "reference": "95c812666f3e91db75385749fe219c5e494c7f95" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/e2eaa60b558f26a4b0354e1bbb25636efaaad105", - "reference": "e2eaa60b558f26a4b0354e1bbb25636efaaad105", + "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/95c812666f3e91db75385749fe219c5e494c7f95", + "reference": "95c812666f3e91db75385749fe219c5e494c7f95", "shasum": "" }, "require": { @@ -9630,7 +9427,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.3-dev" + "dev-main": "2.4-dev" }, "thanks": { "name": "symfony/contracts", @@ -9667,7 +9464,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/translation-contracts/tree/v2.3.0" + "source": "https://github.com/symfony/translation-contracts/tree/v2.4.0" }, "funding": [ { @@ -9683,7 +9480,7 @@ "type": "tidelift" } ], - "time": "2020-09-28T13:05:58+00:00" + "time": "2021-03-23T23:28:01+00:00" }, { "name": "symfony/var-dumper", @@ -10886,6 +10683,43 @@ ], "time": "2020-12-08T13:29:20+00:00" }, + { + "name": "dnoegel/php-xdg-base-dir", + "version": "v0.1.1", + "source": { + "type": "git", + "url": "https://github.com/dnoegel/php-xdg-base-dir.git", + "reference": "8f8a6e48c5ecb0f991c2fdcf5f154a47d85f9ffd" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/dnoegel/php-xdg-base-dir/zipball/8f8a6e48c5ecb0f991c2fdcf5f154a47d85f9ffd", + "reference": "8f8a6e48c5ecb0f991c2fdcf5f154a47d85f9ffd", + "shasum": "" + }, + "require": { + "php": ">=5.3.2" + }, + "require-dev": { + "phpunit/phpunit": "~7.0|~6.0|~5.0|~4.8.35" + }, + "type": "library", + "autoload": { + "psr-4": { + "XdgBaseDir\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "implementation of xdg base directory specification for php", + "support": { + "issues": "https://github.com/dnoegel/php-xdg-base-dir/issues", + "source": "https://github.com/dnoegel/php-xdg-base-dir/tree/v0.1.1" + }, + "time": "2019-12-04T15:06:13+00:00" + }, { "name": "doctrine/annotations", "version": "1.12.1", @@ -11027,16 +10861,16 @@ }, { "name": "facade/flare-client-php", - "version": "1.6.1", + "version": "1.7.0", "source": { "type": "git", "url": "https://github.com/facade/flare-client-php.git", - "reference": "f2b0969f2d9594704be74dbeb25b201570a98098" + "reference": "6bf380035890cb0a09b9628c491ae3866b858522" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/facade/flare-client-php/zipball/f2b0969f2d9594704be74dbeb25b201570a98098", - "reference": "f2b0969f2d9594704be74dbeb25b201570a98098", + "url": "https://api.github.com/repos/facade/flare-client-php/zipball/6bf380035890cb0a09b9628c491ae3866b858522", + "reference": "6bf380035890cb0a09b9628c491ae3866b858522", "shasum": "" }, "require": { @@ -11080,7 +10914,7 @@ ], "support": { "issues": "https://github.com/facade/flare-client-php/issues", - "source": "https://github.com/facade/flare-client-php/tree/1.6.1" + "source": "https://github.com/facade/flare-client-php/tree/1.7.0" }, "funding": [ { @@ -11088,20 +10922,20 @@ "type": "github" } ], - "time": "2021-04-08T08:50:01+00:00" + "time": "2021-04-12T09:30:36+00:00" }, { "name": "facade/ignition", - "version": "2.8.2", + "version": "2.8.3", "source": { "type": "git", "url": "https://github.com/facade/ignition.git", - "reference": "cb7f790e6306caeb4a9ffe21e59942b7128cc630" + "reference": "a8201d51aae83addceaef9344592a3b068b5d64d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/facade/ignition/zipball/cb7f790e6306caeb4a9ffe21e59942b7128cc630", - "reference": "cb7f790e6306caeb4a9ffe21e59942b7128cc630", + "url": "https://api.github.com/repos/facade/ignition/zipball/a8201d51aae83addceaef9344592a3b068b5d64d", + "reference": "a8201d51aae83addceaef9344592a3b068b5d64d", "shasum": "" }, "require": { @@ -11165,7 +10999,7 @@ "issues": "https://github.com/facade/ignition/issues", "source": "https://github.com/facade/ignition" }, - "time": "2021-04-08T10:42:53+00:00" + "time": "2021-04-09T20:45:59+00:00" }, { "name": "facade/ignition-contracts", @@ -11394,21 +11228,21 @@ }, { "name": "friendsofphp/php-cs-fixer", - "version": "v2.18.5", + "version": "v2.18.6", "source": { "type": "git", "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git", - "reference": "e0f6d05c8b157f50029ca6c65c19ed2694f475bf" + "reference": "5fed214993e7863cef88a08f214344891299b9e4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/e0f6d05c8b157f50029ca6c65c19ed2694f475bf", - "reference": "e0f6d05c8b157f50029ca6c65c19ed2694f475bf", + "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/5fed214993e7863cef88a08f214344891299b9e4", + "reference": "5fed214993e7863cef88a08f214344891299b9e4", "shasum": "" }, "require": { "composer/semver": "^1.4 || ^2.0 || ^3.0", - "composer/xdebug-handler": "^1.2", + "composer/xdebug-handler": "^1.2 || ^2.0", "doctrine/annotations": "^1.2", "ext-json": "*", "ext-tokenizer": "*", @@ -11486,7 +11320,7 @@ "description": "A tool to automatically fix PHP code style", "support": { "issues": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/issues", - "source": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/tree/v2.18.5" + "source": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/tree/v2.18.6" }, "funding": [ { @@ -11494,7 +11328,7 @@ "type": "github" } ], - "time": "2021-04-06T18:37:33+00:00" + "time": "2021-04-19T19:45:11+00:00" }, { "name": "hamcrest/hamcrest-php", @@ -11795,16 +11629,16 @@ }, { "name": "nunomaduro/collision", - "version": "v5.3.0", + "version": "v5.4.0", "source": { "type": "git", "url": "https://github.com/nunomaduro/collision.git", - "reference": "aca63581f380f63a492b1e3114604e411e39133a" + "reference": "41b7e9999133d5082700d31a1d0977161df8322a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nunomaduro/collision/zipball/aca63581f380f63a492b1e3114604e411e39133a", - "reference": "aca63581f380f63a492b1e3114604e411e39133a", + "url": "https://api.github.com/repos/nunomaduro/collision/zipball/41b7e9999133d5082700d31a1d0977161df8322a", + "reference": "41b7e9999133d5082700d31a1d0977161df8322a", "shasum": "" }, "require": { @@ -11879,7 +11713,7 @@ "type": "patreon" } ], - "time": "2021-01-25T15:34:13+00:00" + "time": "2021-04-09T13:38:32+00:00" }, { "name": "openlss/lib-array2xml", @@ -13712,16 +13546,16 @@ }, { "name": "swagger-api/swagger-ui", - "version": "v3.46.0", + "version": "v3.47.1", "source": { "type": "git", "url": "https://github.com/swagger-api/swagger-ui.git", - "reference": "cc408812fc927e265da158bf68239530740ab4cc" + "reference": "0f8548c0d443fa37f10a45948d5f2babf685c657" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/swagger-api/swagger-ui/zipball/cc408812fc927e265da158bf68239530740ab4cc", - "reference": "cc408812fc927e265da158bf68239530740ab4cc", + "url": "https://api.github.com/repos/swagger-api/swagger-ui/zipball/0f8548c0d443fa37f10a45948d5f2babf685c657", + "reference": "0f8548c0d443fa37f10a45948d5f2babf685c657", "shasum": "" }, "type": "library", @@ -13767,9 +13601,9 @@ ], "support": { "issues": "https://github.com/swagger-api/swagger-ui/issues", - "source": "https://github.com/swagger-api/swagger-ui/tree/v3.46.0" + "source": "https://github.com/swagger-api/swagger-ui/tree/v3.47.1" }, - "time": "2021-03-31T18:50:40+00:00" + "time": "2021-04-15T21:56:21+00:00" }, { "name": "symfony/debug", diff --git a/config/cache.php b/config/cache.php index a18a947d0e..58ecd82e65 100644 --- a/config/cache.php +++ b/config/cache.php @@ -86,10 +86,6 @@ return [ 'endpoint' => env('DYNAMODB_ENDPOINT'), ], - 'redis-sentinel' => [ - 'driver' => 'redis-sentinel', - 'connection' => 'default', - ], ], /* @@ -105,4 +101,4 @@ return [ 'prefix' => env('CACHE_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_').'_cache'), -]; +]; \ No newline at end of file diff --git a/config/database.php b/config/database.php index 9609cb8464..a59440a08e 100644 --- a/config/database.php +++ b/config/database.php @@ -154,14 +154,13 @@ return [ ], 'sentinel-default' => array_merge( - [ - "host" => "v5db1", - "port" => "26379", - ], - [ - "host" => "v5db2", - "port" => "26379", - ], + array_map( + function ($a, $b) { + return ["host" => $a,"port" => $b]; + }, + explode(',', env('REDIS_HOST', 'localhost')), + explode(',', env('REDIS_PORT', 26379)) + ), ['options' => [ 'replication' => 'sentinel', 'service' => env('REDIS_SENTINEL_SERVICE', 'mymaster'), @@ -173,14 +172,13 @@ return [ ), 'sentinel-cache' => array_merge( - [ - "host" => "v5db1", - "port" => "26379", - ], - [ - "host" => "v5db2", - "port" => "26379", - ], + array_map( + function ($a, $b) { + return ["host" => $a,"port" => $b]; + }, + explode(',', env('REDIS_HOST', 'localhost')), + explode(',', env('REDIS_PORT', 26379)) + ), ['options' => [ 'replication' => 'sentinel', 'service' => env('REDIS_SENTINEL_SERVICE', 'mymaster'), @@ -193,27 +191,4 @@ return [ ], - 'redis-sentinel' => [ - - 'default' => [ - [ - 'host' => 'v5db1', - 'port' => 26379, - ], - [ - 'host' => 'v5db2', - 'port' => 26379, - ], - ], - - 'options' => [ - 'service' => env('REDIS_SENTINEL_SERVICE', 'mymaster'), - 'parameters' => [ - 'password' => env('REDIS_PASSWORD', null), - 'database' => 0, - ], - ], - - ], - ]; diff --git a/config/queue.php b/config/queue.php index 7a42ca0b0a..35ff52ffca 100644 --- a/config/queue.php +++ b/config/queue.php @@ -67,13 +67,6 @@ return [ 'block_for' => null, ], - 'redis-sentinel' => [ - 'driver' => 'redis-sentinel', - 'connection' => 'default', - 'queue' => 'default', - 'retry_after' => 90, // Laravel >= 5.4.30 - 'expire' => 90, // Laravel < 5.4.30 - ], ], /* @@ -93,4 +86,4 @@ return [ 'table' => 'failed_jobs', ], -]; +]; \ No newline at end of file diff --git a/config/session.php b/config/session.php index 1122a33a17..4e0f66cda6 100644 --- a/config/session.php +++ b/config/session.php @@ -72,7 +72,7 @@ return [ | */ - 'connection' => env('SESSION_CONNECTION', 'default'), + 'connection' => env('SESSION_CONNECTION', null), /* |-------------------------------------------------------------------------- From 731ac736e13daa5af4d7f2ae5add53bc167d55a7 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Wed, 21 Apr 2021 15:22:10 +1000 Subject: [PATCH 6/9] Composer update with php 8 --- composer.lock | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/composer.lock b/composer.lock index 48383dee41..e031074892 100644 --- a/composer.lock +++ b/composer.lock @@ -3764,27 +3764,28 @@ }, { "name": "league/omnipay", - "version": "v3.1.0", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/thephpleague/omnipay.git", - "reference": "1ba7c8a3312cf2342458b99c9e5b86eaae44aed2" + "reference": "e9439db0633ba988e6f6cdd029fad38aad73f9f6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/omnipay/zipball/1ba7c8a3312cf2342458b99c9e5b86eaae44aed2", - "reference": "1ba7c8a3312cf2342458b99c9e5b86eaae44aed2", + "url": "https://api.github.com/repos/thephpleague/omnipay/zipball/e9439db0633ba988e6f6cdd029fad38aad73f9f6", + "reference": "e9439db0633ba988e6f6cdd029fad38aad73f9f6", "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": { @@ -3815,9 +3816,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-03-12T09:17:59+00:00" }, { "name": "livewire/livewire", @@ -4568,21 +4569,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", @@ -4597,6 +4598,7 @@ "suggest": { "league/omnipay": "The default Omnipay package provides a default HTTP Adapter." }, + "default-branch": true, "type": "library", "extra": { "branch-alias": { @@ -4648,9 +4650,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", From 23b5686c28f4a2f4fb881676dc3a46462e3b4a71 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Wed, 21 Apr 2021 16:06:34 +1000 Subject: [PATCH 7/9] Fixes for migrations --- .../2020_09_22_205113_id_number_fields_for_missing_entities.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/migrations/2020_09_22_205113_id_number_fields_for_missing_entities.php b/database/migrations/2020_09_22_205113_id_number_fields_for_missing_entities.php index 302ecba4b8..b7f7de23ae 100644 --- a/database/migrations/2020_09_22_205113_id_number_fields_for_missing_entities.php +++ b/database/migrations/2020_09_22_205113_id_number_fields_for_missing_entities.php @@ -36,7 +36,7 @@ class IdNumberFieldsForMissingEntities extends Migration Schema::table('vendors', function (Blueprint $table) { $table->text('vendor_hash')->nullable(); $table->text('public_notes')->nullable(); - $table->unique(['company_id', 'number']); + // $table->unique(['company_id', 'number']); }); Schema::table('vendor_contacts', function (Blueprint $table) { From d892e0b6ed4f10dcb14a7d32a7cc3d9c913830d9 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Wed, 21 Apr 2021 19:57:59 +1000 Subject: [PATCH 8/9] Fixes for counter --- app/Http/Controllers/OneTimeTokenController.php | 4 ++-- app/Utils/Traits/GeneratesCounter.php | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/OneTimeTokenController.php b/app/Http/Controllers/OneTimeTokenController.php index 34b6ca8fb9..d5079ce055 100644 --- a/app/Http/Controllers/OneTimeTokenController.php +++ b/app/Http/Controllers/OneTimeTokenController.php @@ -72,8 +72,8 @@ class OneTimeTokenController extends BaseController $data = [ 'user_id' => auth()->user()->id, - 'company_key'=> auth()->company()->company_key, - 'context' => $requst->input('context'), + 'company_key'=> auth()->user()->company()->company_key, + 'context' => $request->input('context'), ]; Cache::put( $hash, $data, 3600 ); diff --git a/app/Utils/Traits/GeneratesCounter.php b/app/Utils/Traits/GeneratesCounter.php index 37ecd9887a..3e7ce126f4 100644 --- a/app/Utils/Traits/GeneratesCounter.php +++ b/app/Utils/Traits/GeneratesCounter.php @@ -422,6 +422,11 @@ trait GeneratesCounter */ private function resetCounters(Client $client) { + $reset_counter_frequency = (int)$client->getSetting('reset_counter_frequency_id'); + + if($reset_counter_frequency == 0) + return; + $timezone = Timezone::find($client->getSetting('timezone_id')); $reset_date = Carbon::parse($client->getSetting('reset_counter_date'), $timezone->name); @@ -430,7 +435,7 @@ trait GeneratesCounter return false; } - switch ($client->company->reset_counter_frequency_id) { + switch ($reset_counter_frequency) { case RecurringInvoice::FREQUENCY_DAILY: $reset_date->addDay(); break; From 94c246f8df4da0a4dedecf38a6b808e9eb7639dc Mon Sep 17 00:00:00 2001 From: David Bomba Date: Wed, 21 Apr 2021 20:16:22 +1000 Subject: [PATCH 9/9] v5.1.50 --- config/ninja.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/ninja.php b/config/ninja.php index 533fa49001..1e416435f3 100644 --- a/config/ninja.php +++ b/config/ninja.php @@ -14,8 +14,8 @@ return [ 'require_https' => env('REQUIRE_HTTPS', true), 'app_url' => rtrim(env('APP_URL', ''), '/'), 'app_domain' => env('APP_DOMAIN', ''), - 'app_version' => '5.1.49', - 'app_tag' => '5.1.49-release', + 'app_version' => '5.1.50', + 'app_tag' => '5.1.50-release', 'minimum_client_version' => '5.0.16', 'terms_version' => '1.0.1', 'api_secret' => env('API_SECRET', false),