Merge fixes
This commit is contained in:
parent
5c6caf5603
commit
2fbc40e966
2
.env
2
.env
|
@ -56,7 +56,7 @@ _APP_SMTP_PORT=1025
|
||||||
_APP_SMTP_SECURE=
|
_APP_SMTP_SECURE=
|
||||||
_APP_SMTP_USERNAME=
|
_APP_SMTP_USERNAME=
|
||||||
_APP_SMTP_PASSWORD=
|
_APP_SMTP_PASSWORD=
|
||||||
_APP_SMS_PROVIDER=sms://mock
|
_APP_SMS_PROVIDER=sms://username:password@mock
|
||||||
_APP_SMS_FROM=+123456789
|
_APP_SMS_FROM=+123456789
|
||||||
_APP_STORAGE_LIMIT=30000000
|
_APP_STORAGE_LIMIT=30000000
|
||||||
_APP_STORAGE_PREVIEW_LIMIT=20000000
|
_APP_STORAGE_PREVIEW_LIMIT=20000000
|
||||||
|
|
|
@ -1029,7 +1029,7 @@ App::setResource('sms', function () {
|
||||||
$secret = $dsn->getPassword();
|
$secret = $dsn->getPassword();
|
||||||
|
|
||||||
return match ($dsn->getHost()) {
|
return match ($dsn->getHost()) {
|
||||||
'mock' => new Mock('', ''), // used for tests
|
'mock' => new Mock($user, $secret), // used for tests
|
||||||
'twilio' => new Twilio($user, $secret),
|
'twilio' => new Twilio($user, $secret),
|
||||||
'text-magic' => new TextMagic($user, $secret),
|
'text-magic' => new TextMagic($user, $secret),
|
||||||
'telesign' => new Telesign($user, $secret),
|
'telesign' => new Telesign($user, $secret),
|
||||||
|
|
|
@ -35,7 +35,7 @@ class MessagingV1 extends Worker
|
||||||
$secret = $dsn->getPassword();
|
$secret = $dsn->getPassword();
|
||||||
|
|
||||||
$this->sms = match ($dsn->getHost()) {
|
$this->sms = match ($dsn->getHost()) {
|
||||||
'mock' => new Mock('', ''), // used for tests
|
'mock' => new Mock($user, $secret), // used for tests
|
||||||
'twilio' => new Twilio($user, $secret),
|
'twilio' => new Twilio($user, $secret),
|
||||||
'text-magic' => new TextMagic($user, $secret),
|
'text-magic' => new TextMagic($user, $secret),
|
||||||
'telesign' => new Telesign($user, $secret),
|
'telesign' => new Telesign($user, $secret),
|
||||||
|
|
1
composer.lock
generated
1
composer.lock
generated
|
@ -2409,6 +2409,7 @@
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
"ext-curl": "*",
|
||||||
"php": ">=8.0.0"
|
"php": ">=8.0.0"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
|
|
Loading…
Reference in a new issue