Merge branch 'main' into PHP8.4Take2

Author: phpfui

CHANGES.md

@@ -1,6 +1,40 @@
 twilio-php Changelog
 ====================
 
+[2025-01-13] Version 8.3.12
+---------------------------
+**Library - Chore**
+- [PR #841](https://github.com/twilio/twilio-php/pull/841): update changelog for 8.3.11. Thanks to [@tiwarishubham635](https://github.com/tiwarishubham635)!
+- [PR #840](https://github.com/twilio/twilio-php/pull/840): fix model names in json serialize and payload. Thanks to [@tiwarishubham635](https://github.com/tiwarishubham635)!
+
+**Library - Fix**
+- [PR #839](https://github.com/twilio/twilio-php/pull/839): Php8.4 take 2. Thanks to [@phpfui](https://github.com/phpfui)!
+
+**Messaging**
+- Adds validity period Default value in service resource documentation
+
+
+[2025-01-10] Version 8.3.11
+---------------------------
+**Library - Fix**
+- [PR #839](https://github.com/twilio/twilio-php/pull/839): Php8.4 take 2. Thanks to [@phpfui](https://github.com/phpfui)!
+
+**Library - Chore**
+- [PR #840](https://github.com/twilio/twilio-php/pull/840): fix model names in json serialize and payload. Thanks to [@tiwarishubham635](https://github.com/tiwarishubham635)!
+
+
+[2025-01-09] Version 8.3.10
+---------------------------
+**Library - Fix**
+- [PR #834](https://github.com/twilio/twilio-php/pull/834): avoid deprecation messages for PHP 8.4. Thanks to [@phpfui](https://github.com/phpfui)!
+
+**Library - Chore**
+- [PR #837](https://github.com/twilio/twilio-php/pull/837): revert 'fix: avoid deprecation messages for PHP 8.4'. Thanks to [@tiwarishubham635](https://github.com/tiwarishubham635)!
+
+**Numbers**
+- Change beta feature flag to use v2/BulkHostedNumberOrders
+
+
 [2024-12-05] Version 8.3.9
 --------------------------
 **Api**

example/message.php

@@ -28,4 +28,4 @@
 $messageList = $client->messages->read([],10);
 foreach ($messageList as $msg) {
     print("ID:: ". $msg->sid . " | " . "From:: " . $msg->from . " | " . "TO:: " . $msg->to . " | "  .  " Status:: " . $msg->status . " | " . " Body:: ". $msg->body ."\n");
-}
+}

src/Twilio/Base/BaseClient.php

@@ -49,13 +49,13 @@ class BaseClient
      * @throws ConfigurationException If valid authentication is not present
      */
     public function __construct(
-        string $username = null,
-        string $password = null,
-        string $accountSid = null,
-        string $region = null,
-        HttpClient $httpClient = null,
-        array $environment = null,
-        array $userAgentExtensions = null
+        ?string $username = null,
+        ?string $password = null,
+        ?string $accountSid = null,
+        ?string $region = null,
+        ?HttpClient $httpClient = null,
+        ?array $environment = null,
+        ?array $userAgentExtensions = null
     ) {
         $this->environment = $environment ?: \getenv();
 
@@ -119,9 +119,9 @@ public function request(
         array $params = [],
         array $data = [],
         array $headers = [],
-        string $username = null,
-        string $password = null,
-        int $timeout = null
+        ?string $username = null,
+        ?string $password = null,
+        ?int $timeout = null
     ): \Twilio\Http\Response{
         $username = $username ?: $this->username;
         $password = $password ?: $this->password;
@@ -341,7 +341,7 @@ public function getEdge(): string
      *
      * @param string $uri Edge to use, unsets the Edge when called with no arguments
      */
-    public function setEdge(string $edge = null): void
+    public function setEdge(?string $edge = null): void
     {
         $this->edge = $this->getArg($edge, self::ENV_EDGE);
     }
@@ -381,7 +381,7 @@ public function getLogLevel(): ?string
      *
      * @param string $logLevel log level to use
      */
-    public function setLogLevel(string $logLevel = null): void
+    public function setLogLevel(?string $logLevel = null): void
     {
         $this->logLevel = $this->getArg($logLevel, self::ENV_LOG);
     }

src/Twilio/Domain.php

@@ -57,8 +57,8 @@ public function absoluteUrl(string $uri): string {
      */
     public function request(string $method, string $uri,
                             array $params = [], array $data = [], array $headers = [],
-                            string $user = null, string $password = null,
-                            int $timeout = null): Response {
+                            ?string $user = null, ?string $password = null,
+                            ?int $timeout = null): Response {
         $url = $this->absoluteUrl($uri);
         return $this->client->request(
             $method,

src/Twilio/Http/Client.php

@@ -7,6 +7,6 @@
 interface Client {
     public function request(string $method, string $url,
                             array $params = [], array $data = [], array $headers = [],
-                            string $user = null, string $password = null,
-                            int $timeout = null): Response;
+                            ?string $user = null, ?string $password = null,
+                            ?int $timeout = null): Response;
 }

src/Twilio/Http/CurlClient.php

@@ -20,8 +20,8 @@ public function __construct(array $options = []) {
 
     public function request(string $method, string $url,
                             array $params = [], array $data = [], array $headers = [],
-                            string $user = null, string $password = null,
-                            int $timeout = null): Response {
+                            ?string $user = null, ?string $password = null,
+                            ?int $timeout = null): Response {
         $options = $this->options($method, $url, $params, $data, $headers,
                                   $user, $password, $timeout);
 
@@ -85,8 +85,8 @@ public function request(string $method, string $url,
 
     public function options(string $method, string $url,
                             array $params = [], array $data = [], array $headers = [],
-                            string $user = null, string $password = null,
-                            int $timeout = null): array {
+                            ?string $user = null, ?string $password = null,
+                            ?int $timeout = null): array {
         $timeout = $timeout ?? self::DEFAULT_TIMEOUT;
         $options = $this->curlOptions + [
             CURLOPT_URL => $url,

src/Twilio/Http/File.php

@@ -24,7 +24,7 @@ final class File {
      * @param string|resource|mixed|null $contents
      * @param string $contentType
      */
-    public function __construct(string $fileName, $contents = null, string $contentType = null) {
+    public function __construct(string $fileName, $contents = null, ?string $contentType = null) {
         $this->fileName = $fileName;
         $this->contents = $contents;
         $this->contentType = $contentType;

src/Twilio/Http/GuzzleClient.php

@@ -22,8 +22,8 @@ public function __construct(ClientInterface $client) {
 
     public function request(string $method, string $url,
                             array $params = [], array $data = [], array $headers = [],
-                            string $user = null, string $password = null,
-                            int $timeout = null): Response {
+                            ?string $user = null, ?string $password = null,
+                            ?int $timeout = null): Response {
         try {
             $options = [
                 'timeout' => $timeout,

src/Twilio/Jwt/AccessToken.php

@@ -18,7 +18,7 @@ class AccessToken {
     /** @var string[] $customClaims */
     private $customClaims;
 
-    public function __construct(string $accountSid, string $signingKeySid, string $secret, int $ttl = 3600, string $identity = null, string $region = null) {
+    public function __construct(string $accountSid, string $signingKeySid, string $secret, int $ttl = 3600, ?string $identity = null, ?string $region = null) {
         $this->signingKeySid = $signingKeySid;
         $this->accountSid = $accountSid;
         $this->secret = $secret;

src/Twilio/Jwt/JWT.php

@@ -19,7 +19,7 @@ class JWT {
      * @throws \DomainException
      * @throws \UnexpectedValueException
      */
-    public static function decode(string $jwt, string $key = null, bool $verify = true) {
+    public static function decode(string $jwt, ?string $key = null, bool $verify = true) {
         $tks = \explode('.', $jwt);
         if (\count($tks) !== 3) {
             throw new \UnexpectedValueException('Wrong number of segments');