From 3035065249fd70226f1d632635af317ae78767ab Mon Sep 17 00:00:00 2001 From: Ed Grosvenor Date: Mon, 2 May 2022 10:06:07 -0500 Subject: [PATCH 1/7] WIP --- config/twilio-notification-channel.php | 1 + src/TwilioConfig.php | 5 +++++ src/TwilioProvider.php | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/config/twilio-notification-channel.php b/config/twilio-notification-channel.php index 04e69c6..77a5e78 100644 --- a/config/twilio-notification-channel.php +++ b/config/twilio-notification-channel.php @@ -5,6 +5,7 @@ 'password' => env('TWILIO_PASSWORD'), // optional when using auth token 'auth_token' => env('TWILIO_AUTH_TOKEN'), // optional when using username and password 'account_sid' => env('TWILIO_ACCOUNT_SID'), + 'sid' => env('TWILIO_SID', env('TWILIO_ACCOUNT_SID')), 'from' => env('TWILIO_FROM'), // optional 'alphanumeric_sender' => env('TWILIO_ALPHA_SENDER'), diff --git a/src/TwilioConfig.php b/src/TwilioConfig.php index 5334258..ead51e2 100644 --- a/src/TwilioConfig.php +++ b/src/TwilioConfig.php @@ -45,6 +45,11 @@ public function getAccountSid(): ?string return $this->config['account_sid'] ?? null; } + public function getSid(): ?string + { + return $this->config['sid'] ?? null; + } + public function getFrom(): ?string { return $this->config['from'] ?? null; diff --git a/src/TwilioProvider.php b/src/TwilioProvider.php index 19020ef..69e6d64 100755 --- a/src/TwilioProvider.php +++ b/src/TwilioProvider.php @@ -42,7 +42,7 @@ public function register() } if ($config->usingTokenAuth()) { - return new TwilioService($config->getAccountSid(), $config->getAuthToken()); + return new TwilioService($config->getAccountSid(), $config->getAuthToken(), $config->getAccountSid()); } throw InvalidConfigException::missingConfig(); From 01c9fae769ef6af6fa8159b53cc9aefc5953318d Mon Sep 17 00:00:00 2001 From: Ed Grosvenor Date: Mon, 2 May 2022 10:08:18 -0500 Subject: [PATCH 2/7] Fix order of arguments --- src/TwilioProvider.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/TwilioProvider.php b/src/TwilioProvider.php index 69e6d64..10ec91d 100755 --- a/src/TwilioProvider.php +++ b/src/TwilioProvider.php @@ -42,7 +42,7 @@ public function register() } if ($config->usingTokenAuth()) { - return new TwilioService($config->getAccountSid(), $config->getAuthToken(), $config->getAccountSid()); + return new TwilioService($config->getSid(), $config->getAuthToken(), $config->getAccountSid()); } throw InvalidConfigException::missingConfig(); From 393e11357b9c908285e4297834569df0520477a7 Mon Sep 17 00:00:00 2001 From: Ed Grosvenor Date: Fri, 10 Feb 2023 22:21:45 +0100 Subject: [PATCH 3/7] Laravel 10 --- composer.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index 5cc0fae..0beefe6 100644 --- a/composer.json +++ b/composer.json @@ -24,15 +24,15 @@ "require": { "php": ">=7.2|^8.0", "twilio/sdk": "~6.0", - "illuminate/notifications": "^5.8 || ^6.0 || ^7.0 || ^8.0 || ^9.0", - "illuminate/support": "^5.8 || ^6.0 || ^7.0 || ^8.0 || ^9.0", - "illuminate/events": "^5.8 || ^6.0 || ^7.0 || ^8.0 || ^9.0", - "illuminate/queue": "^5.8 || ^6.0 || ^7.0 || ^8.0 || ^9.0" + "illuminate/notifications": "^5.8 || ^6.0 || ^7.0 || ^8.0 || ^9.0||^10,0", + "illuminate/support": "^5.8 || ^6.0 || ^7.0 || ^8.0 || ^9.0||^10,0", + "illuminate/events": "^5.8 || ^6.0 || ^7.0 || ^8.0 || ^9.0||^10,0", + "illuminate/queue": "^5.8 || ^6.0 || ^7.0 || ^8.0 || ^9.0||^10,0" }, "require-dev": { "mockery/mockery": "^1.3", "phpunit/phpunit": "^8.5|^9.5", - "orchestra/testbench": "^3|^4|^5|^6|^7" + "orchestra/testbench": "^3|^4|^5|^6|^7|^8" }, "autoload": { "psr-4": { From 165c4129bc1bf05ebc9f5b5839ae96b1904bb01d Mon Sep 17 00:00:00 2001 From: Ed Grosvenor Date: Fri, 10 Feb 2023 22:22:41 +0100 Subject: [PATCH 4/7] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 0beefe6..d1033ed 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,7 @@ } ], "require": { - "php": ">=7.2|^8.0", + "php": ">=7.2|^8.0|^8.1", "twilio/sdk": "~6.0", "illuminate/notifications": "^5.8 || ^6.0 || ^7.0 || ^8.0 || ^9.0||^10,0", "illuminate/support": "^5.8 || ^6.0 || ^7.0 || ^8.0 || ^9.0||^10,0", From a34e14d5de96f06b59e6cfd464b93796c47c74bf Mon Sep 17 00:00:00 2001 From: Ed Grosvenor Date: Thu, 16 Feb 2023 09:55:05 +0100 Subject: [PATCH 5/7] Update composer.json --- composer.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index d1033ed..34c4f1c 100644 --- a/composer.json +++ b/composer.json @@ -24,10 +24,10 @@ "require": { "php": ">=7.2|^8.0|^8.1", "twilio/sdk": "~6.0", - "illuminate/notifications": "^5.8 || ^6.0 || ^7.0 || ^8.0 || ^9.0||^10,0", - "illuminate/support": "^5.8 || ^6.0 || ^7.0 || ^8.0 || ^9.0||^10,0", - "illuminate/events": "^5.8 || ^6.0 || ^7.0 || ^8.0 || ^9.0||^10,0", - "illuminate/queue": "^5.8 || ^6.0 || ^7.0 || ^8.0 || ^9.0||^10,0" + "illuminate/notifications": "^5.8 || ^6.0 || ^7.0 || ^8.0 || ^9.0||^10.0", + "illuminate/support": "^5.8 || ^6.0 || ^7.0 || ^8.0 || ^9.0||^10.0", + "illuminate/events": "^5.8 || ^6.0 || ^7.0 || ^8.0 || ^9.0||^10.0", + "illuminate/queue": "^5.8 || ^6.0 || ^7.0 || ^8.0 || ^9.0||^10.0" }, "require-dev": { "mockery/mockery": "^1.3", From 02f7e5f2b0c9e9d7f73679badeb7d6ddb0e49727 Mon Sep 17 00:00:00 2001 From: Ed Grosvenor Date: Tue, 19 Mar 2024 14:34:15 +0100 Subject: [PATCH 6/7] Update composer.json --- composer.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index 34c4f1c..29ecc4b 100644 --- a/composer.json +++ b/composer.json @@ -24,15 +24,15 @@ "require": { "php": ">=7.2|^8.0|^8.1", "twilio/sdk": "~6.0", - "illuminate/notifications": "^5.8 || ^6.0 || ^7.0 || ^8.0 || ^9.0||^10.0", - "illuminate/support": "^5.8 || ^6.0 || ^7.0 || ^8.0 || ^9.0||^10.0", - "illuminate/events": "^5.8 || ^6.0 || ^7.0 || ^8.0 || ^9.0||^10.0", - "illuminate/queue": "^5.8 || ^6.0 || ^7.0 || ^8.0 || ^9.0||^10.0" + "illuminate/notifications": "^5.8 || ^6.0 || ^7.0 || ^8.0 || ^9.0||^10.0|^11.0", + "illuminate/support": "^5.8 || ^6.0 || ^7.0 || ^8.0 || ^9.0||^10.0|^11.0", + "illuminate/events": "^5.8 || ^6.0 || ^7.0 || ^8.0 || ^9.0||^10.0|^11.0", + "illuminate/queue": "^5.8 || ^6.0 || ^7.0 || ^8.0 || ^9.0||^10.0|^11.0" }, "require-dev": { "mockery/mockery": "^1.3", "phpunit/phpunit": "^8.5|^9.5", - "orchestra/testbench": "^3|^4|^5|^6|^7|^8" + "orchestra/testbench": "^3|^4|^5|^6|^7|^8|^9" }, "autoload": { "psr-4": { From 9d5fe8a7366e2dae710509015acd95c84806f06f Mon Sep 17 00:00:00 2001 From: Ed Grosvenor Date: Tue, 30 Sep 2025 21:06:21 +0200 Subject: [PATCH 7/7] Update composer.json --- composer.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index 29ecc4b..1eed18f 100644 --- a/composer.json +++ b/composer.json @@ -24,15 +24,15 @@ "require": { "php": ">=7.2|^8.0|^8.1", "twilio/sdk": "~6.0", - "illuminate/notifications": "^5.8 || ^6.0 || ^7.0 || ^8.0 || ^9.0||^10.0|^11.0", - "illuminate/support": "^5.8 || ^6.0 || ^7.0 || ^8.0 || ^9.0||^10.0|^11.0", - "illuminate/events": "^5.8 || ^6.0 || ^7.0 || ^8.0 || ^9.0||^10.0|^11.0", - "illuminate/queue": "^5.8 || ^6.0 || ^7.0 || ^8.0 || ^9.0||^10.0|^11.0" + "illuminate/notifications": "^5.8 || ^6.0 || ^7.0 || ^8.0 || ^9.0||^10.0|^11.0|^12.0", + "illuminate/support": "^5.8 || ^6.0 || ^7.0 || ^8.0 || ^9.0||^10.0|^11.0|^12.0", + "illuminate/events": "^5.8 || ^6.0 || ^7.0 || ^8.0 || ^9.0||^10.0|^11.0|^12.0", + "illuminate/queue": "^5.8 || ^6.0 || ^7.0 || ^8.0 || ^9.0||^10.0|^11.0|^12.0" }, "require-dev": { "mockery/mockery": "^1.3", "phpunit/phpunit": "^8.5|^9.5", - "orchestra/testbench": "^3|^4|^5|^6|^7|^8|^9" + "orchestra/testbench": "^3|^4|^5|^6|^7|^8|^9|^10" }, "autoload": { "psr-4": {