fix special phone number format before the request to be able to perform external checks with valid content

Tests/ClientTest.php

@@ -18,12 +18,13 @@ namespace D3\LinkmobilityClient\Tests;
 use Assert\InvalidArgumentException;
 use D3\LinkmobilityClient\Client;
 use D3\LinkmobilityClient\Exceptions\ApiException;
+use D3\LinkmobilityClient\LoggerHandler;
 use D3\LinkmobilityClient\Request\RequestInterface;
 use D3\LinkmobilityClient\Response\Response;
 use D3\LinkmobilityClient\Response\ResponseInterface;
 use D3\LinkmobilityClient\SMS\TextRequest;
-use D3\LinkmobilityClient\Url;
+use D3\LinkmobilityClient\Url\Url;
-use D3\LinkmobilityClient\UrlInterface;
+use D3\LinkmobilityClient\Url\UrlInterface;
 use GuzzleHttp\Client as GuzzleClient;
 use GuzzleHttp\ClientInterface;
 use PHPUnit\Framework\MockObject\MockObject;
@@ -170,13 +171,12 @@ class ClientTest extends ApiTestCase
 
     /**
      * @test
-     * @param $useLogger
      * @param $okStatus
      * @return void
      * @throws ReflectionException
      * @dataProvider rawRequestDataProvider
      */
-    public function testRawRequest($useLogger, $okStatus)
+    public function testRawRequest($okStatus)
     {
         $statusCode = $okStatus ? '200' : '301';
 
@@ -205,7 +205,7 @@ class ClientTest extends ApiTestCase
             ->disableOriginalConstructor()
             ->getMock();
         $responseMock->expects($this->atLeastOnce())->method('getStatusCode')->willReturn($statusCode);
-        $responseMock->expects($useLogger && $okStatus ? $this->atLeastOnce() : $this->never())
+        $responseMock->expects($this->atLeastOnce())
             ->method('getBody')->willReturn($streamMock);
 
         /** @var GuzzleClient|MockObject $requestClientMock */
@@ -219,17 +219,21 @@ class ClientTest extends ApiTestCase
             ->onlyMethods(['debug', 'error', 'log'])
             ->getMock();
 
+        /** @var LoggerHandler|MockObject $loggerHandlerMock */
+        $loggerHandlerMock = $this->getMockBuilder(LoggerHandler::class)
+            ->onlyMethods(['getLogger'])
+            ->getMock();
+        $loggerHandlerMock->method('getLogger')->willReturn($loggerMock);
+
         /** @var Client|MockObject $clientMock */
         $clientMock = $this->getMockBuilder(Client::class)
             ->disableOriginalConstructor()
             ->onlyMethods([
-                'hasLogger',
+                'getLoggerHandler'
-                'getLogger'
             ])
             ->getMock();
-        $clientMock->method('hasLogger')->willReturn($useLogger);
+        $clientMock->expects($this->atLeastOnce())
-        $clientMock->expects($useLogger ? $this->atLeastOnce() : $this->never())
+            ->method('getLoggerHandler')->willReturn($loggerHandlerMock);
-            ->method('getLogger')->willReturn($loggerMock);
         $this->setValue($clientMock, 'requestClient', $requestClientMock);
 
         if (false === $okStatus) {
@@ -247,37 +251,8 @@ class ClientTest extends ApiTestCase
     public function rawRequestDataProvider(): array
     {
         return [
-            'has logger, OK status' => [true, true],
+            'OK status' => [true],
-            'has no logger, OK status' => [false, true],
+            'NOK status' => [false],
-            'has logger, NOK status' => [true, false],
-            'has no logger, NOK status' => [false, false],
         ];
     }
-
-    /**
-     * @test
-     * @return void
-     * @throws ReflectionException
-     */
-    public function testLogger()
-    {
-        $this->assertFalse($this->callMethod($this->api, 'hasLogger'));
-        $this->assertNull($this->callMethod($this->api, 'getLogger'));
-
-        /** @var LoggerInterface|MockObject $loggerMock */
-        $loggerMock = $this->getMockBuilder(AbstractLogger::class)
-            ->onlyMethods(['debug', 'error', 'log'])
-            ->getMock();
-
-        $this->assertSame(
-            $this->api,
-            $this->callMethod($this->api, 'setLogger', [$loggerMock])
-        );
-
-        $this->assertTrue($this->callMethod($this->api, 'hasLogger'));
-        $this->assertSame(
-            $loggerMock,
-            $this->callMethod($this->api, 'getLogger')
-        );
-    }
 }

Tests/LoggerHandlerTest.php

@@ -0,0 +1,79 @@
+<?php
+
+/**
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * https://www.d3data.de
+ *
+ * @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
+ * @author    D3 Data Development - Daniel Seifert <support@shopmodule.com>
+ * @link      https://www.oxidmodule.com
+ */
+
+declare(strict_types=1);
+
+namespace D3\LinkmobilityClient\Tests;
+
+use D3\LinkmobilityClient\LoggerHandler;
+use PHPUnit\Framework\MockObject\MockObject;
+use Psr\Log\AbstractLogger;
+use Psr\Log\LoggerInterface;
+use ReflectionException;
+
+class LoggerHandlerTest extends ApiTestCase
+{
+    /** @var LoggerHandler */
+    public $loggerHandler;
+
+    /**
+     * @return void
+     */
+    public function setUp(): void
+    {
+        parent::setUp();
+
+        $this->loggerHandler = new LoggerHandler();
+    }
+
+    /**
+     * @return void
+     */
+    public function tearDown(): void
+    {
+        parent::tearDown();
+
+        unset($this->loggerHandler);
+    }
+
+    /**
+     * @test
+     * @throws ReflectionException
+     */
+    public function testConstruct()
+    {
+        $this->assertInstanceOf(
+            LoggerInterface::class,
+            $this->callMethod($this->loggerHandler, 'getLogger')
+        );
+    }
+
+    /**
+     * @test
+     * @return void
+     * @throws ReflectionException
+     */
+    public function testLogger()
+    {
+        /** @var LoggerInterface|MockObject $loggerMock */
+        $loggerMock = $this->getMockBuilder(AbstractLogger::class)
+            ->onlyMethods(['debug', 'error', 'log'])
+            ->getMock();
+
+        $this->callMethod($this->loggerHandler, 'setLogger', [ $loggerMock]);
+        $this->assertSame(
+            $loggerMock,
+            $this->callMethod($this->loggerHandler, 'getLogger')
+        );
+    }
+}

Tests/RecipientsList/RecipientsListTest.php

@@ -16,6 +16,7 @@ declare(strict_types=1);
 namespace D3\LinkmobilityClient\Tests\RecipientsList;
 
 use D3\LinkmobilityClient\Client;
+use D3\LinkmobilityClient\LoggerHandler;
 use D3\LinkmobilityClient\RecipientsList\RecipientsList;
 use D3\LinkmobilityClient\Tests\ApiTestCase;
 use D3\LinkmobilityClient\ValueObject\Recipient;
@@ -183,13 +184,18 @@ class RecipientsListTest extends ApiTestCase
                            ->getMock();
         $loggerMock->expects($this->atLeastOnce())->method('info')->willReturn(true);
 
+        /** @var LoggerHandler|MockObject $loggerHandlerMock */
+        $loggerHandlerMock = $this->getMockBuilder(LoggerHandler::class)
+            ->onlyMethods(['getLogger'])
+            ->getMock();
+        $loggerHandlerMock->method('getLogger')->willReturn($loggerMock);
+
         /** @var Client|MockObject $clientMock */
         $clientMock = $this->getMockBuilder(Client::class)
             ->disableOriginalConstructor()
-            ->onlyMethods(['hasLogger', 'getLogger'])
+            ->onlyMethods(['getLoggerHandler'])
             ->getMock();
-        $clientMock->method('hasLogger')->willReturn(true);
+        $clientMock->method('getLoggerHandler')->willReturn($loggerHandlerMock);
-        $clientMock->method('getLogger')->willReturn($loggerMock);
 
         /** @var RecipientsList|MockObject $recListMock */
         $recListMock = $this->getMockBuilder(RecipientsList::class)

Tests/Request/AbstractRequest.php

@@ -92,6 +92,20 @@ abstract class AbstractRequest extends ApiTestCase
         );
     }
 
+    /**
+     * @test
+     * @throws ReflectionException
+     */
+    public function testGetUri()
+    {
+        $this->assertIsString(
+            $this->callMethod(
+                $this->request,
+                'getUri'
+            )
+        );
+    }
+
     /**
      * @test
      * @throws ReflectionException
@@ -228,8 +242,6 @@ abstract class AbstractRequest extends ApiTestCase
         ];
     }
 
-
-
     /**
      * @test
      * @throws ReflectionException
@@ -453,10 +465,55 @@ abstract class AbstractRequest extends ApiTestCase
     /**
      * @test
      * @throws ReflectionException
+     * @dataProvider setGetSenderAddressTypeDataProvider
      */
-    public function setGetSenderAddressTypeTest()
+    public function testSetGetSenderAddressType($hasSender, $addressType, $expected)
     {
-        $this->checkGetterSetter('fixture', 'setSenderAddressType', 'getSenderAddressType');
+        /** @var Request|MockObject $request */
+        $request = $this->getMockBuilder($this->testClassName)
+            ->setConstructorArgs([$this->request->getMessage(), $this->request->getClient()])
+            ->onlyMethods(['getSenderAddress'])
+            ->getMock();
+
+        if ($hasSender) {
+            /** @var Sender|MockObject $senderMock */
+            $senderMock = $this->getMockBuilder(Sender::class)
+                ->disableOriginalConstructor()
+                ->onlyMethods(['get'])
+                ->getMock();
+            $senderMock->method('get')->willReturn('fixture');
+            $request->method('getSenderAddress')->willReturn($senderMock);
+        } else {
+            $request->method('getSenderAddress')->willReturn(null);
+        }
+
+        $this->assertInstanceOf(
+            Request::class,
+            $this->callMethod(
+                $request,
+                'setSenderAddressType',
+                [$addressType]
+            )
+        );
+
+        $this->assertSame(
+            $expected,
+            $this->callMethod(
+                $request,
+                'getSenderAddressType'
+            )
+        );
+    }
+
+    /**
+     * @return array[]
+     */
+    public function setGetSenderAddressTypeDataProvider(): array
+    {
+        return [
+            'has no sender'                 => [false, 'fixture', null],
+            'has sender and address type'   => [true, 'fixture', 'fixture'],
+        ];
     }
 
     /**

Tests/Url/UrlTest.php

@@ -13,9 +13,10 @@
 
 declare(strict_types=1);
 
-namespace D3\LinkmobilityClient\Tests;
+namespace D3\LinkmobilityClient\Tests\Url;
 
-use D3\LinkmobilityClient\Url;
+use D3\LinkmobilityClient\Tests\ApiTestCase;
+use D3\LinkmobilityClient\Url\Url;
 use ReflectionException;
 
 class UrlTest extends ApiTestCase
@@ -58,4 +59,34 @@ class UrlTest extends ApiTestCase
             )
         );
     }
+
+    /**
+     * @test
+     * @throws ReflectionException
+     */
+    public function testGetTextSmsUri()
+    {
+        $uri = $this->callMethod(
+            $this->url,
+            'getTextSmsUri'
+        );
+
+        $this->assertIsString($uri);
+        $this->assertStringStartsWith('/', $uri);
+    }
+
+    /**
+     * @test
+     * @throws ReflectionException
+     */
+    public function testGetBinarySmsUri()
+    {
+        $uri = $this->callMethod(
+            $this->url,
+            'getBinarySmsUri'
+        );
+
+        $this->assertIsString($uri);
+        $this->assertStringStartsWith('/', $uri);
+    }
 }

Tests/ValueObject/RecipientTest.php

@@ -78,7 +78,7 @@ class RecipientTest extends ApiTestCase
         $recipientMock->__construct($this->phoneNumberFixture, $this->phoneCountryFixture);
 
         $this->assertSame(
-            '491527565839',
+            '+491527565839',
             $this->callMethod(
                 $recipientMock,
                 'get'

src/Client.php

@@ -18,11 +18,12 @@ namespace D3\LinkmobilityClient;
 use D3\LinkmobilityClient\Exceptions\ApiException;
 use D3\LinkmobilityClient\Exceptions\ExceptionMessages;
 use D3\LinkmobilityClient\Request\RequestInterface;
+use D3\LinkmobilityClient\Url\Url;
+use D3\LinkmobilityClient\Url\UrlInterface;
 use GuzzleHttp\ClientInterface;
 use GuzzleHttp\Exception\GuzzleException;
 use InvalidArgumentException;
 use Psr\Http\Message\ResponseInterface;
-use Psr\Log\LoggerInterface;
 
 class Client
 {
@@ -30,8 +31,6 @@ class Client
     public $apiUrl;
     public $requestClient;
 
-    private $logger;
-
     public function __construct(string $accessToken, UrlInterface $apiUrl = null, ClientInterface $client = null)
     {
         $this->accessToken = $accessToken;
@@ -69,9 +68,7 @@ class Client
     {
         $options['headers']['Authorization'] = 'Bearer '.$this->accessToken;
 
-        if ($this->hasLogger()) {
+        $this->getLoggerHandler()->getLogger()->debug('linkmobility request: '.$url, $options);
-            $this->getLogger()->debug('request '.$url, $options);
-        }
 
         $response = $this->requestClient->request(
             $method,
@@ -81,45 +78,22 @@ class Client
 
         if ($response->getStatusCode() != 200) {
             $message = sprintf(ExceptionMessages::NOK_REQUEST_RETURN, $url, $response->getStatusCode());
-            if ($this->hasLogger()) {
+            $response->getBody()->rewind();
-                $this->getLogger()->error($message);
+            $this->getLoggerHandler()->getLogger()->error($message, [$response->getBody()->getContents()]);
-            }
             throw new ApiException($message);
         }
 
-        if ($this->hasLogger()) {
         $response->getBody()->rewind();
-            $this->getLogger()->debug('response', [$response->getBody()->getContents()]);
+        $this->getLoggerHandler()->getLogger()->debug('response', [$response->getBody()->getContents()]);
-        }
 
         return $response;
     }
 
     /**
-     * @param mixed $logger
+     * @return LoggerHandler
-     *
-     * @return Client
      */
-    public function setLogger(LoggerInterface $logger): Client
+    public function getLoggerHandler(): LoggerHandler
     {
-        $this->logger = $logger;
+        return LoggerHandler::getInstance();
-
-        return $this;
-    }
-
-    /**
-     * @return bool
-     */
-    public function hasLogger(): bool
-    {
-        return $this->logger instanceof LoggerInterface;
-    }
-
-    /**
-     * @return LoggerInterface|null
-     */
-    public function getLogger()
-    {
-        return $this->hasLogger() ? $this->logger : null;
     }
 }

src/Exceptions/ExceptionMessages.php

@@ -24,4 +24,8 @@ class ExceptionMessages
     public const INVALID_RECIPIENT_PHONE    = 'invalid recipient phone number';
 
     public const NOT_A_MOBILE_NUMBER        = 'not a mobile number';
+
+    public const EMPTY_RECIPIENT_LIST       = 'request must contain a valid recipient';
+
+    public const DEBUG_NOSENDERORCOUNTRYCODE= 'no sender number or sender country code defined, use fallback to account default';
 }

src/Exceptions/NoSenderDefinedException.php

@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * https://www.d3data.de
+ *
+ * @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
+ * @author    D3 Data Development - Daniel Seifert <support@shopmodule.com>
+ * @link      https://www.oxidmodule.com
+ */
+
+declare(strict_types=1);
+
+namespace D3\LinkmobilityClient\Exceptions;
+
+class NoSenderDefinedException extends LinkmobilityException
+{
+}

src/LoggerHandler.php

@@ -0,0 +1,55 @@
+<?php
+
+/**
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * https://www.d3data.de
+ *
+ * @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
+ * @author    D3 Data Development - Daniel Seifert <support@shopmodule.com>
+ * @link      https://www.oxidmodule.com
+ */
+
+declare(strict_types=1);
+
+namespace D3\LinkmobilityClient;
+
+use Psr\Log\LoggerInterface;
+use Psr\Log\NullLogger;
+
+class LoggerHandler
+{
+    private static $instance = null;
+    private $logger;
+
+    public static function getInstance()
+    {
+        if (self::$instance === null) {
+            self::$instance = new self();
+        }
+
+        return self::$instance;
+    }
+
+    public function __construct()
+    {
+        $this->setLogger(new NullLogger());
+    }
+
+    /**
+     * @param mixed $logger
+     */
+    public function setLogger(LoggerInterface $logger)
+    {
+        $this->logger = $logger;
+    }
+
+    /**
+     * @return LoggerInterface
+     */
+    public function getLogger(): LoggerInterface
+    {
+        return $this->logger;
+    }
+}

src/RecipientsList/RecipientsList.php

@@ -76,13 +76,9 @@ class RecipientsList implements RecipientsListInterface, Iterator
 
             $this->recipients[ md5(serialize($recipient)) ] = $recipient;
         } catch (NumberParseException $e) {
-            if ($this->getClient()->hasLogger()) {
+            $this->client->getLoggerHandler()->getLogger()->info($e->getMessage(), [$recipient]);
-                $this->getClient()->getLogger()->info($e->getMessage());
-            }
         } catch (RecipientException $e) {
-            if ($this->getClient()->hasLogger()) {
+            $this->client->getLoggerHandler()->getLogger()->info($e->getMessage(), [$recipient]);
-                $this->getClient()->getLogger()->info($e->getMessage());
-            }
         }
 
         return $this;
@@ -98,12 +94,15 @@ class RecipientsList implements RecipientsListInterface, Iterator
         return $this;
     }
 
+    /**
+     * @return array
+     */
     public function getRecipients(): array
     {
         return array_values(
             array_map(
                 function (Recipient $recipient) {
-                    return $recipient->get();
+                    return $recipient->getFormatted();
                 },
                 $this->recipients
             )

src/Request/Request.php

@@ -17,6 +17,7 @@ namespace D3\LinkmobilityClient\Request;
 
 use Assert\Assert;
 use D3\LinkmobilityClient\Client;
+use D3\LinkmobilityClient\Exceptions\ExceptionMessages;
 use D3\LinkmobilityClient\RecipientsList\RecipientsList;
 use D3\LinkmobilityClient\RecipientsList\RecipientsListInterface;
 use D3\LinkmobilityClient\Response\ResponseInterface;
@@ -122,6 +123,11 @@ abstract class Request implements RequestInterface
         return $this;
     }
 
+    /**
+     * @return string
+     */
+    abstract public function getUri(): string;
+
     /**
      * @throws InvalidArgumentException
      */
@@ -135,7 +141,7 @@ abstract class Request implements RequestInterface
         Assert::that($this->getOptions())->isArray();
 
         Assert::that($this->getRecipientsList())->isInstanceOf(RecipientsList::class)->notEmpty();
-        Assert::that($this->getRecipientsList()->getRecipients())->notEmpty('request must contain a valid recipient');
+        Assert::that($this->getRecipientsList()->getRecipients())->notEmpty(ExceptionMessages::EMPTY_RECIPIENT_LIST);
         Assert::thatAll($this->getRecipientsList())->isInstanceOf(Recipient::class)->notEmpty();
 
         // optional properties
@@ -460,7 +466,7 @@ abstract class Request implements RequestInterface
      */
     public function getSenderAddressType()
     {
-        return $this->senderAddressType;
+        return $this->getSenderAddress() && $this->getSenderAddress()->get() ? $this->senderAddressType : null;
     }
 
     /**

src/SMS/BinaryRequest.php

@@ -17,6 +17,7 @@ namespace D3\LinkmobilityClient\SMS;
 
 use Assert\Assert;
 use D3\LinkmobilityClient\Request\Request;
+use D3\LinkmobilityClient\Url\Url;
 use D3\LinkmobilityClient\ValueObject\SmsBinaryMessage;
 use InvalidArgumentException;
 
@@ -27,7 +28,7 @@ class BinaryRequest extends Request implements SmsRequestInterface
      */
     public function getUri(): string
     {
-        return '/rest/smsmessaging/binary';
+        return (new Url())->getBinarySmsUri();
     }
 
     public function getRawBody(): array

src/SMS/TextRequest.php

@@ -17,6 +17,7 @@ namespace D3\LinkmobilityClient\SMS;
 
 use Assert\Assert;
 use D3\LinkmobilityClient\Request\Request;
+use D3\LinkmobilityClient\Url\Url;
 use D3\LinkmobilityClient\ValueObject\SmsTextMessage;
 use InvalidArgumentException;
 
@@ -27,7 +28,7 @@ class TextRequest extends Request implements SmsRequestInterface
      */
     public function getUri(): string
     {
-        return '/rest/smsmessaging/text';
+        return (new Url())->getTextSmsUri();
     }
 
     /**

src/Url/Url.php

@@ -13,7 +13,7 @@
 
 declare(strict_types=1);
 
-namespace D3\LinkmobilityClient;
+namespace D3\LinkmobilityClient\Url;
 
 class Url implements UrlInterface
 {
@@ -26,4 +26,20 @@ class Url implements UrlInterface
     {
         return $this->baseUri;
     }
+
+    /**
+     * @return string
+     */
+    public function getTextSmsUri()
+    {
+        return '/rest/smsmessaging/text';
+    }
+
+    /**
+     * @return string
+     */
+    public function getBinarySmsUri()
+    {
+        return '/rest/smsmessaging/binary';
+    }
 }

src/Url/UrlInterface.php

@@ -13,7 +13,7 @@
 
 declare(strict_types=1);
 
-namespace D3\LinkmobilityClient;
+namespace D3\LinkmobilityClient\Url;
 
 interface UrlInterface
 {

src/ValueObject/Recipient.php

@@ -40,7 +40,7 @@ class Recipient extends StringValueObject
         $phoneUtil = $this->getPhoneNumberUtil();
 
         $phoneNumber = $phoneUtil->parse($number, strtoupper($iso2CountryCode));
-        $number = ltrim($phoneUtil->format($phoneNumber, PhoneNumberFormat::E164), '+');
+        $number = $phoneUtil->format($phoneNumber, PhoneNumberFormat::E164);
 
         parent::__construct($number);
         $this->countryCode = $iso2CountryCode;
@@ -61,4 +61,9 @@ class Recipient extends StringValueObject
     {
         return $this->countryCode;
     }
+
+    public function getFormatted()
+    {
+        return ltrim(parent::getFormatted(), '+');
+    }
 }

src/ValueObject/Sender.php

@@ -17,12 +17,14 @@ namespace D3\LinkmobilityClient\ValueObject;
 
 use Assert\Assert;
 use D3\LinkmobilityClient\Exceptions\ExceptionMessages;
+use D3\LinkmobilityClient\Exceptions\NoSenderDefinedException;
 use D3\LinkmobilityClient\Exceptions\RecipientException;
+use D3\LinkmobilityClient\LoggerHandler;
 use libphonenumber\NumberParseException;
 use libphonenumber\PhoneNumberFormat;
 use libphonenumber\PhoneNumberUtil;
 
-class Sender extends StringValueObject
+class Sender extends ValueObject
 {
     /**
      * @param string $number
@@ -31,20 +33,30 @@ class Sender extends StringValueObject
      * @throws RecipientException
      * @throws NumberParseException
      */
-    public function __construct(string $number, string $iso2CountryCode)
+    public function __construct(string $number = null, string $iso2CountryCode = null)
     {
+        try {
+            if (is_null($number) || is_null($iso2CountryCode)) {
+                throw new NoSenderDefinedException();
+            }
+
             Assert::that($iso2CountryCode)->string()->length(2);
 
             $phoneUtil = $this->getPhoneNumberUtil();
 
             $phoneNumber = $phoneUtil->parse($number, strtoupper($iso2CountryCode));
-        $number = ltrim($phoneUtil->format($phoneNumber, PhoneNumberFormat::E164), '+');
+            $number      = $phoneUtil->format($phoneNumber, PhoneNumberFormat::E164);
 
             if (false === $phoneUtil->isValidNumber($phoneNumber)) {
                 throw new RecipientException(ExceptionMessages::INVALID_SENDER);
             }
 
             parent::__construct($number);
+        } catch (NoSenderDefinedException $e) {
+            LoggerHandler::getInstance()->getLogger()->debug(
+                ExceptionMessages::DEBUG_NOSENDERORCOUNTRYCODE
+            );
+        }
     }
 
     /**
@@ -55,11 +67,8 @@ class Sender extends StringValueObject
         return PhoneNumberUtil::getInstance();
     }
 
-    /**
-     * @return int
-     */
     public function getFormatted()
     {
-        return parent::getFormatted();
+        return ltrim(parent::getFormatted(), '+');
     }
 }

src/ValueObject/StringValueObject.php

@@ -19,13 +19,6 @@ use Assert\Assert;
 
 abstract class StringValueObject extends ValueObject
 {
-    public function __construct(string $number)
-    {
-        Assert::that($number)->notEmpty();
-
-        $this->value = $number;
-    }
-
     public function __toString()
     {
         return $this->get();
@@ -35,9 +28,4 @@ abstract class StringValueObject extends ValueObject
     {
         return $this->value;
     }
-
-    public function getFormatted()
-    {
-        return $this->get();
-    }
 }

src/ValueObject/ValueObject.php

@@ -15,7 +15,26 @@ declare(strict_types=1);
 
 namespace D3\LinkmobilityClient\ValueObject;
 
+use Assert\Assert;
+
 abstract class ValueObject
 {
     protected $value;
+
+    public function __construct(string $number)
+    {
+        Assert::that($number)->notEmpty();
+
+        $this->value = $number;
+    }
+
+    public function get()
+    {
+        return $this->value;
+    }
+
+    public function getFormatted()
+    {
+        return $this->get();
+    }
 }