Move 'tariff' in XML to messages child

Author: mbardelmeijer

src/CmsmsClient.php

@@ -58,13 +58,17 @@ public function send(CmsmsMessage $message, $recipient)
      * @param string $recipient
      * @return string
      */
-    protected function buildMessageXml(CmsmsMessage $message, $recipient)
+    public function buildMessageXml(CmsmsMessage $message, $recipient)
     {
         $xml = new SimpleXMLElement('<MESSAGES/>');
 
         $xml->addChild('AUTHENTICATION')
             ->addChild('PRODUCTTOKEN', $this->productToken);
 
+        if ($tariff = $message->getTariff()) {
+            $xml->addChild('TARIFF', $tariff);
+        }
+
         $msg = $xml->addChild('MSG');
         foreach ($message->toXmlArray() as $name => $value) {
             $msg->addChild($name, $value);

src/CmsmsMessage.php

@@ -16,7 +16,7 @@ class CmsmsMessage
     protected $reference;
 
     /** @var int */
-    protected $tariff;
+    protected $tariff = 0;
 
     /** @var int */
     protected $minimumNumberOfMessageParts;
@@ -91,6 +91,14 @@ public function tariff($tariff)
         return $this;
     }
 
+    /**
+     * @return int
+     */
+    public function getTariff()
+    {
+        return $this->tariff;
+    }
+
     /**
      * @param int $minimum
      * @param int $maximum
@@ -118,7 +126,6 @@ public function toXmlArray()
             'BODY' => $this->body,
             'FROM' => $this->originator,
             'REFERENCE' => $this->reference,
-            'TARIFF' => $this->tariff,
             'MINIMUMNUMBEROFMESSAGEPARTS' => $this->minimumNumberOfMessageParts,
             'MAXIMUMNUMBEROFMESSAGEPARTS' => $this->maximumNumberOfMessageParts,
         ]);

tests/CmsmsClientTest.php

@@ -73,4 +73,17 @@ public function it_throws_exception_on_error_response()
 
         $this->client->send($this->message, '00301234');
     }
+
+    /** @test */
+    public function it_includes_tariff_in_xml()
+    {
+        $message = clone $this->message;
+        $message->tariff(20);
+
+        $messageXml = $this->client->buildMessageXml($message, '00301234');
+        $parsedXml = simplexml_load_string($messageXml);
+
+        $this->assertFalse(empty($parsedXml->TARIFF));
+        $this->assertEquals(20, (int) $parsedXml->TARIFF);
+    }
 }

tests/CmsmsMessageTest.php

@@ -102,7 +102,7 @@ public function it_can_set_tariff()
     {
         $message = (new CmsmsMessage)->tariff(12);
 
-        $this->assertEquals(12, Arr::get($message->toXmlArray(), 'TARIFF'));
+        $this->assertEquals(12, $message->getTariff());
     }
 
     /** @test */