From 81b20fc9791d38e1fa311cda51e0dc9964ac59a3 Mon Sep 17 00:00:00 2001
From: Daniel Seifert <ds@shopmodule.com>
Date: Tue, 12 Jul 2022 10:04:04 +0200
Subject: [PATCH] format sender address as integer

---
 src/Request/Request.php               |  2 +-
 src/ValueObject/Sender.php            | 10 +++++++++-
 src/ValueObject/StringValueObject.php |  5 +++++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/Request/Request.php b/src/Request/Request.php
index 0681c4c..4244136 100644
--- a/src/Request/Request.php
+++ b/src/Request/Request.php
@@ -162,7 +162,7 @@ abstract class Request implements RequestInterface
             'priority'          => $this->getPriority(),
             'recipientAddressList'  => $this->getRecipientsList()->getRecipients(),
             'sendAsFlashSms'    => $this->doSendAsFlashSms(),
-            'senderAddress'     => $this->getSenderAddress() ? $this->getSenderAddress()->get() : null,
+            'senderAddress'     => $this->getSenderAddress() ? $this->getSenderAddress()->getFormatted() : null,
             'senderAddressType' => $this->getSenderAddressType(),
             'test'              => $this->getTestMode(),
             'validityPeriode'   => $this->getValidityPeriode()
diff --git a/src/ValueObject/Sender.php b/src/ValueObject/Sender.php
index 949f08f..fd27022 100644
--- a/src/ValueObject/Sender.php
+++ b/src/ValueObject/Sender.php
@@ -27,7 +27,7 @@ class Sender extends StringValueObject
         $phoneUtil = $this->getPhoneNumberUtil();
 
         $phoneNumber = $phoneUtil->parse( $number, strtoupper($iso2CountryCode) );
-        $number      = $phoneUtil->format( $phoneNumber, PhoneNumberFormat::E164 );
+        $number = ltrim($phoneUtil->format($phoneNumber, PhoneNumberFormat::E164), '+');
 
         if (false === $phoneUtil->isValidNumber($phoneNumber)) {
             throw new RecipientException( ExceptionMessages::INVALID_SENDER );
@@ -43,4 +43,12 @@ class Sender extends StringValueObject
     {
         return PhoneNumberUtil::getInstance();
     }
+
+    /**
+     * @return int
+     */
+    public function getFormatted()
+    {
+        return (int) parent::getFormatted();
+    }
 }
diff --git a/src/ValueObject/StringValueObject.php b/src/ValueObject/StringValueObject.php
index b0e703f..307e981 100644
--- a/src/ValueObject/StringValueObject.php
+++ b/src/ValueObject/StringValueObject.php
@@ -24,4 +24,9 @@ abstract class StringValueObject extends ValueObject
     {
         return $this->value;
     }
+
+    public function getFormatted()
+    {
+        return $this->get();
+    }
 }