PHP Version #51
Open
PHP Version #51
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
SamuelMwangiW
commented
Aug 28, 2025
Contributor
Author
SamuelMwangiW
left a comment
SamuelMwangiW
left a comment
There was a problem hiding this comment.
self review
Contributor
Author
There was a problem hiding this comment.
This is not necessary for a library
Contributor
Author
There was a problem hiding this comment.
Use phpunit.xml.dist instead. This allows maintainers to override phpunit.xml locally during development. This is especially important as I intend to push a PR that adds tests and the test credentials are expected to be in phpunit.xml.
This is also why phpunit.xml is now added to .gitignore
| } | ||
|
|
||
| $this->baseUrl = 'https://api.' . $this->baseDomain . '/version1/'; | ||
| $this->voiceUrl = 'https://voice.africastalking.com/'; |
Contributor
Author
There was a problem hiding this comment.
Voice is disabled on sandbox.
Comment on lines
-98
to
+110
| $sms = new SMS($this->client, $this->username, $this->apiKey, $content); | ||
| return $sms; | ||
| } | ||
|
|
||
| public function content() | ||
| { | ||
| $content = new Content($this->contentClient, $this->username, $this->apiKey); | ||
| return $content; | ||
| } | ||
|
|
||
| public function airtime() | ||
| { | ||
| $airtime = new Airtime($this->client, $this->username, $this->apiKey); | ||
| return $airtime; | ||
| } | ||
|
|
||
| public function voice() | ||
| { | ||
| $voice = new Voice($this->voiceClient, $this->username, $this->apiKey); | ||
| return $voice; | ||
| } | ||
|
|
||
| public function application() | ||
| { | ||
| $application = new Application($this->client, $this->username, $this->apiKey); | ||
| return $application; | ||
| } | ||
|
|
||
| public function mobileData() | ||
| { | ||
| $mobileData = new MobileData($this->mobileDataClient, $this->username, $this->apiKey); | ||
| return $mobileData; | ||
| } | ||
|
|
||
| public function token() | ||
| { | ||
| $token = new Token($this->tokenClient, $this->username, $this->apiKey); | ||
| return $token; | ||
| } | ||
| public const BASE_DOMAIN = 'africastalking.com'; | ||
|
|
||
| public const BASE_SANDBOX_DOMAIN = 'sandbox.' . self::BASE_DOMAIN; | ||
|
|
||
| protected string $username; | ||
|
|
||
| protected string $apiKey; | ||
|
|
||
| protected Client $client; | ||
|
|
||
| protected Client $contentClient; | ||
|
|
||
| protected Client $voiceClient; | ||
|
|
||
| protected Client $tokenClient; | ||
|
|
||
| protected Client $mobileDataClient; | ||
|
|
||
| protected string $baseDomain; | ||
|
|
||
| public string $baseUrl; | ||
|
|
||
| protected string $voiceUrl; | ||
|
|
||
| protected string $checkoutTokenUrl; | ||
|
|
||
| protected string $contentUrl; | ||
|
|
||
| protected string $mobileDataUrl; | ||
|
|
||
| public function __construct(string $username, string $apiKey) | ||
| { | ||
| if ($username === 'sandbox') { | ||
| $this->baseDomain = self::BASE_SANDBOX_DOMAIN; | ||
| } else { | ||
| $this->baseDomain = self::BASE_DOMAIN; | ||
| } | ||
|
|
||
| $this->baseUrl = 'https://api.' . $this->baseDomain . '/version1/'; | ||
| $this->voiceUrl = 'https://voice.africastalking.com/'; | ||
| $this->mobileDataUrl = 'https://bundles.' . $this->baseDomain . '/'; | ||
| $this->contentUrl = ($username === 'sandbox') ? ($this->baseUrl) : ('https://content.' . $this->baseDomain . '/version1/'); | ||
| $this->checkoutTokenUrl = 'https://api.' . $this->baseDomain . '/'; | ||
|
|
||
| if ($username === 'sandbox') { | ||
| $this->contentUrl = $this->baseUrl; | ||
| } | ||
|
|
||
| $this->username = $username; | ||
| $this->apiKey = $apiKey; | ||
|
|
||
| $this->client = new Client([ | ||
| 'base_uri' => $this->baseUrl, | ||
| 'headers' => [ | ||
| 'apikey' => $this->apiKey, | ||
| 'Content-Type' => 'application/x-www-form-urlencoded', | ||
| 'Accept' => 'application/json', | ||
| ], | ||
| ]); | ||
|
|
||
| $this->contentClient = new Client([ | ||
| 'base_uri' => $this->contentUrl, | ||
| 'headers' => [ | ||
| 'apikey' => $this->apiKey, | ||
| 'Content-Type' => 'application/x-www-form-urlencoded', | ||
| 'Accept' => 'application/json', | ||
| ], | ||
| ]); | ||
|
|
||
| $this->voiceClient = new Client([ | ||
| 'base_uri' => $this->voiceUrl, | ||
| 'headers' => [ | ||
| 'apikey' => $this->apiKey, | ||
| 'Content-Type' => 'application/x-www-form-urlencoded', | ||
| 'Accept' => 'application/json', | ||
| ], | ||
| ]); | ||
|
|
||
| $this->mobileDataClient = new Client([ | ||
| 'base_uri' => $this->mobileDataUrl, | ||
| 'headers' => [ | ||
| 'apikey' => $this->apiKey, | ||
| 'Content-Type' => 'application/json', | ||
| 'Accept' => 'application/json', | ||
| ], | ||
| ]); | ||
|
|
||
| $this->tokenClient = new Client([ | ||
| 'base_uri' => $this->checkoutTokenUrl, | ||
| 'headers' => [ | ||
| 'apikey' => $this->apiKey, | ||
| 'Content-Type' => 'application/json', | ||
| 'Accept' => 'application/json', | ||
| ], | ||
| ]); | ||
| } | ||
|
|
||
| public function sms(): SMS | ||
| { | ||
| $content = new Content($this->contentClient, $this->username, $this->apiKey); | ||
|
|
||
| return new SMS($this->client, $this->username, $this->apiKey, $content); |
Contributor
Author
There was a problem hiding this comment.
The variable is unnecessary here
Comment on lines
-104
to
+115
| $content = new Content($this->contentClient, $this->username, $this->apiKey); | ||
| return $content; | ||
| } | ||
|
|
||
| public function airtime() | ||
| { | ||
| $airtime = new Airtime($this->client, $this->username, $this->apiKey); | ||
| return $airtime; | ||
| } | ||
|
|
||
| public function voice() | ||
| { | ||
| $voice = new Voice($this->voiceClient, $this->username, $this->apiKey); | ||
| return $voice; | ||
| } | ||
|
|
||
| public function application() | ||
| { | ||
| $application = new Application($this->client, $this->username, $this->apiKey); | ||
| return $application; | ||
| } | ||
|
|
||
| public function mobileData() | ||
| { | ||
| $mobileData = new MobileData($this->mobileDataClient, $this->username, $this->apiKey); | ||
| return $mobileData; | ||
| } | ||
|
|
||
| public function token() | ||
| { | ||
| $token = new Token($this->tokenClient, $this->username, $this->apiKey); | ||
| return $token; | ||
| } | ||
| public const BASE_DOMAIN = 'africastalking.com'; | ||
|
|
||
| public const BASE_SANDBOX_DOMAIN = 'sandbox.' . self::BASE_DOMAIN; | ||
|
|
||
| protected string $username; | ||
|
|
||
| protected string $apiKey; | ||
|
|
||
| protected Client $client; | ||
|
|
||
| protected Client $contentClient; | ||
|
|
||
| protected Client $voiceClient; | ||
|
|
||
| protected Client $tokenClient; | ||
|
|
||
| protected Client $mobileDataClient; | ||
|
|
||
| protected string $baseDomain; | ||
|
|
||
| public string $baseUrl; | ||
|
|
||
| protected string $voiceUrl; | ||
|
|
||
| protected string $checkoutTokenUrl; | ||
|
|
||
| protected string $contentUrl; | ||
|
|
||
| protected string $mobileDataUrl; | ||
|
|
||
| public function __construct(string $username, string $apiKey) | ||
| { | ||
| if ($username === 'sandbox') { | ||
| $this->baseDomain = self::BASE_SANDBOX_DOMAIN; | ||
| } else { | ||
| $this->baseDomain = self::BASE_DOMAIN; | ||
| } | ||
|
|
||
| $this->baseUrl = 'https://api.' . $this->baseDomain . '/version1/'; | ||
| $this->voiceUrl = 'https://voice.africastalking.com/'; | ||
| $this->mobileDataUrl = 'https://bundles.' . $this->baseDomain . '/'; | ||
| $this->contentUrl = ($username === 'sandbox') ? ($this->baseUrl) : ('https://content.' . $this->baseDomain . '/version1/'); | ||
| $this->checkoutTokenUrl = 'https://api.' . $this->baseDomain . '/'; | ||
|
|
||
| if ($username === 'sandbox') { | ||
| $this->contentUrl = $this->baseUrl; | ||
| } | ||
|
|
||
| $this->username = $username; | ||
| $this->apiKey = $apiKey; | ||
|
|
||
| $this->client = new Client([ | ||
| 'base_uri' => $this->baseUrl, | ||
| 'headers' => [ | ||
| 'apikey' => $this->apiKey, | ||
| 'Content-Type' => 'application/x-www-form-urlencoded', | ||
| 'Accept' => 'application/json', | ||
| ], | ||
| ]); | ||
|
|
||
| $this->contentClient = new Client([ | ||
| 'base_uri' => $this->contentUrl, | ||
| 'headers' => [ | ||
| 'apikey' => $this->apiKey, | ||
| 'Content-Type' => 'application/x-www-form-urlencoded', | ||
| 'Accept' => 'application/json', | ||
| ], | ||
| ]); | ||
|
|
||
| $this->voiceClient = new Client([ | ||
| 'base_uri' => $this->voiceUrl, | ||
| 'headers' => [ | ||
| 'apikey' => $this->apiKey, | ||
| 'Content-Type' => 'application/x-www-form-urlencoded', | ||
| 'Accept' => 'application/json', | ||
| ], | ||
| ]); | ||
|
|
||
| $this->mobileDataClient = new Client([ | ||
| 'base_uri' => $this->mobileDataUrl, | ||
| 'headers' => [ | ||
| 'apikey' => $this->apiKey, | ||
| 'Content-Type' => 'application/json', | ||
| 'Accept' => 'application/json', | ||
| ], | ||
| ]); | ||
|
|
||
| $this->tokenClient = new Client([ | ||
| 'base_uri' => $this->checkoutTokenUrl, | ||
| 'headers' => [ | ||
| 'apikey' => $this->apiKey, | ||
| 'Content-Type' => 'application/json', | ||
| 'Accept' => 'application/json', | ||
| ], | ||
| ]); | ||
| } | ||
|
|
||
| public function sms(): SMS | ||
| { | ||
| $content = new Content($this->contentClient, $this->username, $this->apiKey); | ||
|
|
||
| return new SMS($this->client, $this->username, $this->apiKey, $content); | ||
| } | ||
|
|
||
| public function content(): Content | ||
| { | ||
| return new Content($this->contentClient, $this->username, $this->apiKey); |
Contributor
Author
There was a problem hiding this comment.
The variable is unnecessary here
| } | ||
|
|
||
| protected function buildSay($options) | ||
| protected function buildSay(string|array $options): array|string |
Contributor
Author
There was a problem hiding this comment.
The tests were failing that $options received is an array or string.
| // change trimSilence to true or false string | ||
| $trimSilence ? $trimSilence = "true" : $trimSilence ="false"; | ||
| $trimSilence ? $trimSilence = 'true' : $trimSilence = 'false'; |
Contributor
Author
There was a problem hiding this comment.
This does not look right but can't update without tests
Contributor
Author
There was a problem hiding this comment.
No changes to tests besides formatting.
Contributor
Author
There was a problem hiding this comment.
No changes to tests besides formatting.
Contributor
Author
There was a problem hiding this comment.
No changes to tests.
Contributor
Author
|
Please squash commits while merging |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The SDK is overdue for a major review.
This is a first of (hopefully multiple) PRs aimed at bringing the SDK to the AI age.
This PR is restricted to the following:
composer.lockfile - This being a library, the lock file is only required for local development and ignored in user-space