feat(message): remove the unused message class

craftsys · Sep 29, 2020 · 4446f5a · 4446f5a
1 parent 4ce6280
commit 4446f5a
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 21 deletions.
diff --git a/src/Msg91Message.php b/src/Msg91Message.php
diff --git a/src/OTP/OTPService.php b/src/OTP/OTPService.php
@@ -16,7 +16,7 @@ class OTPService extends Service
     /**
      * Create a new service instance
      * @param \Craftsys\Msg91\Client $client
-     * @param int|string|\Craftsys\Msg91\OTP\Options|\Craftsys\Msg91\Msg91Message $payload
+     * @param int|string|\Craftsys\Msg91\Contracts\Options $payload
      * @return void
      */
     public function __construct(Client $client, $payload = null)

diff --git a/src/Options.php b/src/Options.php
@@ -4,8 +4,9 @@
 
 use Closure;
 use Craftsys\Msg91\Contracts\Options as ContractsOptions;
+use JsonSerializable;
 
-abstract class Options implements ContractsOptions
+abstract class Options implements ContractsOptions, JsonSerializable
 {
     /**
      * Payload for the message
@@ -181,7 +182,6 @@ public function mergeWith($options = null)
         $current_payload = $this->getPayload();
         switch (true) {
             case $options instanceof self:
-            case $options instanceof Msg91Message:
                 $this->payload = array_merge($current_payload, $options->getPayload());
                 break;
             case is_array($options):
@@ -207,4 +207,13 @@ public function resolveConfig(Config $config)
     {
         $this->mergeWith($config->all());
     }
+
+    /**
+     * Convert options to json
+     * @return array
+     */
+    public function jsonSerialize()
+    {
+        return $this->toArray();
+    }
 }
diff --git a/src/SMS/SMSService.php b/src/SMS/SMSService.php
@@ -16,7 +16,7 @@ class SMSService extends Service
     /**
      * Create a new service instance
      * @param \Craftsys\Msg91\Client $client
-     * @param int|string|\Craftsys\Msg91\SMS\Options|\Craftsys\Msg91\Msg91Message $payload
+     * @param int|string|\Craftsys\Msg91\Contracts\Options $payload
      * @return void
      */
     public function __construct(Client $client, $payload = null)