Updated code and fixed tests to support php 8.4 (#59)

* Updated code and fixed tests to support php 8.4

* Updated version for release

.github/workflows/main.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        version: ['7.0', '7.4', '8.0', '8.3']
+        version: ['7.1', '7.4', '8.0', '8.4']
       max-parallel: 2
 
     steps:
@@ -41,7 +41,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        version: ['7.0', '7.4', '8.0', '8.3']
+        version: ['7.1', '7.4', '8.0', '8.4']
       max-parallel: 1
 
     steps:

README.md

@@ -9,7 +9,7 @@ A software development kit to provide ways to interact with CM.com's Text servic
 
 ### Requirements
 
-- php 7.* or 8.0 or 8.1 or 8.2 or 8.3
+- php 7.1 through 8.4 (inclusive)
 
 
 ## Usage

composer.json

@@ -2,7 +2,7 @@
     "name": "cmdotcom/text-sdk-php",
     "description": "PHP SDK to send messages with CM.com",
     "type": "library",
-    "version": "2.3.1",
+    "version": "3.0.0",
     "keywords": ["sms","cm.com","rcs","whatsapp","viber","line","wechat","imessage","twitter","instagram"],
     "homepage": "https://www.cm.com/products/text/",
     "license": "MIT",
@@ -16,10 +16,10 @@
     "require": {
         "ext-curl": "*",
         "ext-json": "*",
-        "php": "^7.0||^8.0"
+        "php": "^7.1||^8.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "~6.0||~9.0"
+        "phpunit/phpunit": "~7.0||~9.0"
     },
     "autoload": {
         "psr-0": {

src/CMText/ITextClient.php

@@ -22,15 +22,15 @@ public function __construct(
      * @param string $message - Message body to send
      * @param string $from - Sender name
      * @param array $to - Recipient phonenumbers
-     * @param string $reference optional
+     * @param string|null $reference optional
      *
      * @return TextClientResult
      */
     public function SendMessage(
         string $message,
         string $from,
         array $to,
-        string $reference = null
+        ?string $reference = null
     );
 
     /**

src/CMText/Message.php

@@ -106,11 +106,16 @@ class Message implements JsonSerializable
      *
      * @param string|MessageBody $body
      * @param string|null $from
-     * @param array $to
+     * @param array|null $to
      * @param string|null $reference
      * @throws \CMText\Exceptions\RecipientLimitException
      */
-    public function __construct($body = '', string $from = null, array $to = [], string $reference = null)
+    public function __construct(
+        $body = '',
+        ?string $from = null,
+        ?array $to = [],
+        ?string $reference = null
+    )
     {
         $this->__set('body', $body);
         $this->__set('from', $from);

src/CMText/RichContent/Messages/WhatsApp/WhatsAppInteractiveContent.php

@@ -25,10 +25,10 @@ class WhatsAppInteractiveContent implements \JsonSerializable
      */
     public function __construct(
         string $type,
-        WhatsAppInteractiveHeader $header = null,
-        WhatsAppInteractiveBody $body = null,
-        IWhatsAppInteractiveAction $action = null,
-        WhatsAppInteractiveFooter $footer = null
+        ?WhatsAppInteractiveHeader $header = null,
+        ?WhatsAppInteractiveBody $body = null,
+        ?IWhatsAppInteractiveAction $action = null,
+        ?WhatsAppInteractiveFooter $footer = null
     )
     {
         if( !in_array(

src/CMText/RichContent/Messages/WhatsApp/WhatsAppInteractiveHeader.php

@@ -14,14 +14,14 @@ class WhatsAppInteractiveHeader
 
     /**
      * @param string $type
-     * @param string $text
+     * @param string|null $text
      * @param MediaContent|null $media
      * @throws \Exception
      */
     public function __construct(
         string $type,
-        string $text = null,
-        MediaContent $media = null)
+        ?string $text = null,
+        ?MediaContent $media = null)
     {
         if( !in_array($type, (new \ReflectionClass(WhatsAppInteractiveHeaderTypes::class))->getConstants()) ){
             throw new \Exception("Unsupported WhatsApp-InteractiveHeader-type $type");

src/CMText/RichContent/Messages/WhatsApp/WhatsAppInteractiveSectionRow.php

@@ -19,7 +19,7 @@ class WhatsAppInteractiveSectionRow
     public function __construct(
         string $title,
         string $id,
-        string $description = null
+        ?string $description = null
     )
     {
         $this->title = $title;

src/CMText/RichContent/Suggestions/ReplySuggestion.php

@@ -22,7 +22,7 @@ class ReplySuggestion extends SuggestionBase
 
     public function __construct(
         string $Label,
-        string $Text = null
+        ?string $Text = null
     )
     {
         $this->label = $Label;

src/CMText/TextClient.php

@@ -32,7 +32,7 @@ class TextClient implements ITextClient
     /**
      * SDK Version constant
      */
-    const VERSION = '2.3.1';
+    const VERSION = '3.0.0';
 
 
     /**
@@ -70,7 +70,7 @@ public function SendMessage(
         string $message,
         string $from,
         array $to,
-        string $reference = null
+        ?string $reference = null
     )
     {
         // send it out instantly

src/CMText/TextClientResult.php

@@ -26,9 +26,9 @@ class TextClientResult
      * TextClientResult constructor.
      *
      * @param int    $httpStatusCode
-     * @param string $responseBody
+     * @param string|null $responseBody
      */
-    public function __construct(int $httpStatusCode, $responseBody = '')
+    public function __construct(int $httpStatusCode, ?string $responseBody = '')
     {
         $this->httpStatusCode = $httpStatusCode;
         $this->response = $responseBody;

tests/CMText/RichContent/Common/ContactTest.php

@@ -30,31 +30,37 @@ public function testJsonSerialize()
 
     public function testAddUrl()
     {
-        $this->assertObjectHasAttribute(
-            'urls',
-            (new Contact(
-                $this->contactProperties['url']
-            ))->jsonSerialize()
+        $this->assertTrue(
+            property_exists(
+                (new Contact(
+                    $this->contactProperties['url']
+                ))->jsonSerialize(),
+                'urls'
+            )
         );
     }
 
     public function testAddPhonenumber()
     {
-        $this->assertObjectHasAttribute(
-            'phones',
-            (new Contact(
-                $this->contactProperties['phonenumber']
-            ))->jsonSerialize()
+        $this->assertTrue(
+            property_exists(
+                (new Contact(
+                    $this->contactProperties['phonenumber']
+                ))->jsonSerialize(),
+                'phones'
+            )
         );
     }
 
     public function testSetOrganization()
     {
-        $this->assertObjectHasAttribute(
-            'org',
-            (new Contact(
-                $this->contactProperties['organization']
-            ))->jsonSerialize()
+        $this->assertTrue(
+            property_exists(
+                (new Contact(
+                    $this->contactProperties['organization']
+                ))->jsonSerialize(),
+                'org'
+            )
         );
     }
 
@@ -95,41 +101,49 @@ public function test__construct()
 
     public function testSetBirthday()
     {
-        $this->assertObjectHasAttribute(
-            'birthday',
-            (new Contact(
-                $this->contactProperties['birthday']
-            ))->jsonSerialize()
+        $this->assertTrue(
+            property_exists(
+                (new Contact(
+                    $this->contactProperties['birthday']
+                ))->jsonSerialize(),
+                'birthday'
+            )
         );
     }
 
     public function testSetName()
     {
-        $this->assertObjectHasAttribute(
-            'name',
-            (new Contact(
-                $this->contactProperties['name']
-            ))->jsonSerialize()
+        $this->assertTrue(
+            property_exists(
+                (new Contact(
+                    $this->contactProperties['name']
+                ))->jsonSerialize(),
+                'name'
+            )
         );
     }
 
     public function testAddEmail()
     {
-        $this->assertObjectHasAttribute(
-            'emails',
-            (new Contact(
-                $this->contactProperties['email']
-            ))->jsonSerialize()
+        $this->assertTrue(
+            property_exists(
+                (new Contact(
+                    $this->contactProperties['email']
+                ))->jsonSerialize(),
+                'emails'
+            )
         );
     }
 
     public function testAddAddress()
     {
-        $this->assertObjectHasAttribute(
-            'addresses',
-            (new Contact(
-                $this->contactProperties['address']
-            ))->jsonSerialize()
+        $this->assertTrue(
+            property_exists(
+                (new Contact(
+                    $this->contactProperties['address']
+                ))->jsonSerialize(),
+                'addresses'
+            )
         );
     }
 

tests/CMText/RichContent/Common/LineItemTest.php

@@ -17,19 +17,16 @@ public function test__construct()
 
         $json = json_decode(json_encode($lineitem));
 
-        $this->assertObjectHasAttribute(
-            'label',
-            $json
+        $this->assertTrue(
+            property_exists($json, 'label')
         );
 
-        $this->assertObjectHasAttribute(
-            'type',
-            $json
+        $this->assertTrue(
+            property_exists($json, 'type')
         );
 
-        $this->assertObjectHasAttribute(
-            'amount',
-            $json
+        $this->assertTrue(
+            property_exists($json, 'amount')
         );
     }
 }

tests/CMText/RichContent/Messages/PaymentMessageTest.php

@@ -34,9 +34,8 @@ public function test__construct()
 
         $json = json_decode(json_encode($message));
 
-        $this->assertObjectHasAttribute(
-            'payment',
-            $json
+        $this->assertTrue(
+            property_exists($json, 'payment')
         );
     }
 }