feat(options): enhance the options for better testing

src/OTP/OTPService.php

@@ -23,12 +23,8 @@ public function __construct(Client $client, $payload = null)
     {
         $this->client = $client;
         $this->options = (new Options())
-            ->resolveConfig($this->client->getConfig());
-        if (is_int($payload)) {
-            $this->options->otp($payload);
-        } else {
-            $this->options->mergeWith($payload);
-        }
+            ->resolveConfig($this->client->getConfig())
+            ->mergeWith($payload);
     }
 
     /**

src/OTP/Options.php

@@ -7,6 +7,19 @@
 
 class Options extends Msg91Options
 {
+    /**
+     * Construct a new options
+     * @param mixed $options - initial payload of the message
+     * @return void
+     */
+    public function __construct($options = null)
+    {
+        if (is_int($options)) {
+            $this->otp($options);
+        } else {
+            $this->mergeWith($options);
+        }
+    }
     /**
      * Set the otp for the message
      * @param int|null $otp
@@ -74,6 +87,16 @@ public function method($via = null)
         return $this;
     }
 
+    public function mergeWith($options = null)
+    {
+        if (is_int($options)) {
+            $this->otp($options);
+        } else {
+            parent::mergeWith($options);
+        }
+        return $this;
+    }
+
     /**
      * Resolve the configuration options
      */

src/Options.php

@@ -15,7 +15,7 @@ abstract class Options implements ContractsOptions, JsonSerializable
     protected $payload = [];
 
     /**
-     * Construct a new Msg91Message
+     * Construct a new Options
      * @param mixed $options - initial payload of the message
      * @return void
      */
@@ -181,8 +181,8 @@ public function mergeWith($options = null)
         // do which ever results in true
         $current_payload = $this->getPayload();
         switch (true) {
-            case $options instanceof self:
-                $this->payload = array_merge($current_payload, $options->getPayload());
+            case $options instanceof ContractsOptions:
+                $this->payload = array_merge($current_payload, $options->toArray());
                 break;
             case is_array($options):
                 // if it is an array

tests/OTP/OptionsTest.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace Craftsys\Tests\Msg91\OTP;
+
+use Craftsys\Msg91\OTP\Options;
+use Craftsys\Tests\Msg91\TestCase;
+
+class OptionsTest extends TestCase
+{
+    public function test_init_with_int_will_set_otp()
+    {
+        $options = (new Options(1234));
+        $this->assertEquals(1234, $options->getPayloadForKey('otp'));
+    }
+
+    public function test_can_merge_with_another_options()
+    {
+        $options = (new Options())->mergeWith(new Options(1234));
+        $this->assertEquals(1234, $options->getPayloadForKey('otp'));
+    }
+}

tests/OptionsTest.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace Craftsys\Tests\Msg91;
+
+use Craftsys\Msg91\Options as AbstractOptions;
+
+class OptionsTest extends TestCase
+{
+    public function test_can_merge_with_a_string()
+    {
+        $options = (new Options)->mergeWith('string');
+        $this->assertEquals('string', $options->getPayloadForKey('message'));
+    }
+
+    public function test_can_merge_with_another_options()
+    {
+        $options = (new Options)->mergeWith((new Options())->from('this'));
+        $this->assertEquals('this', $options->getPayloadForKey('sender'));
+    }
+
+    public function test_be_merged_with_a_closure()
+    {
+        $options = (new Options)->mergeWith(function ($options) {
+            $options->from('this');
+        });
+        $this->assertEquals('this', $options->getPayloadForKey('sender'));
+    }
+
+    public function test_can_merge_an_array()
+    {
+        $options = (new Options)->mergeWith(['template_id' => 'this']);
+        $this->assertEquals('this', $options->getPayloadForKey('template_id'));
+    }
+}
+
+class Options extends AbstractOptions
+{
+}