adjust changelog

# Conflicts:
#	CHANGELOG.md

.php-cs-fixer.php

@@ -6,7 +6,7 @@ $finder = PhpCsFixer\Finder::create()
 
 $config = new PhpCsFixer\Config();
 return $config->setRules([
-        '@PHP70Migration' => true,
+        '@PHP73Migration' => true,
         '@PSR12' => true
     ])
     ->setFinder($finder)

CHANGELOG.md

@@ -1,9 +1,96 @@
 # Changelog
+All notable changes to this project will be documented in this file.
 
----
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## 1.0.0.0 (2022-07-13)
+## [Unreleased](https://git.d3data.de/D3Public/linkmobility-php-client/compare/2.2.0...rel_2.x)
 
+## [2.2.0](https://git.d3data.de/D3Public/linkmobility-php-client/compare/2.1.0...2.2.0) - 2023-06-29
+### Added
+- bump psr/http-message dependency to version 2
+
+### Changed
+- use assertion exception
+
+## [2.1.0](https://git.d3data.de/D3Public/linkmobility-php-client/compare/2.0.3...2.1.0) - 2023-01-20
+### Added
+- installable in PHP > 8.0
+- debug logger to log all comunications in debug mode (default Guzzle client only)
+- retry middleware to request again in defined error cases  (default Guzzle client only)
+
+### Fixed
+- missing getRecipientsList() in RecipientsListInterface
+
+### Deprecated
+- unused client argument in recipient list class
+
+### Removed 
+- unused ApiException class
+
+## [2.0.3](https://git.d3data.de/D3Public/linkmobility-php-client/compare/2.0.2...2.0.3) - 2022-12-26
+### Changed
+- allow Guzzle v7.3 for more backward compatibility
+
+## [2.0.2](https://git.d3data.de/D3Public/linkmobility-php-client/compare/2.0.1...2.0.2) - 2022-07-28
+### Changed
+- add support note
+- adjust readme
+
+## [2.0.1](https://git.d3data.de/D3Public/linkmobility-php-client/compare/2.0.0...2.0.1) - 2022-07-28
+### Added
+- phpstan code checks
+
+### Changed
+- improve changelog
+- improve code quality
+
+### Fixed
+- wrong return type of LoggerHandler::getInstance
+
+## [2.0.0](https://git.d3data.de/D3Public/linkmobility-php-client/compare/1.3.0...2.0.0) - 2022-07-19
+### Changed
+- adjust to PHP >= 7.3 and current dependency packages
+
+## [1.3.1](https://git.d3data.de/D3Public/linkmobility-php-client/compare/1.3.0...1.3.1) - 2022-07-28
+### Changed
+- improve code quality
+
+### Fixed
+- wrong return type of LoggerHandler::getInstance
+
+## [1.3.0](https://git.d3data.de/D3Public/linkmobility-php-client/compare/1.2.1...1.3.0) - 2022-07-18
+### Added
+- tests added
+
+### Changed
+- tests use generated example phone numbers
+- move recipient checks from list to recipient itself
+
+## [1.2.1](https://git.d3data.de/D3Public/linkmobility-php-client/compare/1.2.0...1.2.1) - 2022-07-15
+### Changed
+- extend log messages
+- sanitize special phone number format before request
+
+## [1.2.0](https://git.d3data.de/D3Public/linkmobility-php-client/compare/1.1.0...1.2.0) - 2022-07-14
+### Added
+- collect exception messages in a class
+- collect URI parts in a class
+
+### Changed
+- make sender number optional
+- assign sender address type only if sender is set
+- extract logger handler from client
+
+## [1.1.0](https://git.d3data.de/D3Public/linkmobility-php-client/compare/1.0.0...1.1.0) - 2022-07-13
+### Added
+- make installable in PHP 8
+
+### Removed
+- remove unused dependency
+
+## [1.0.0](https://git.d3data.de/D3Public/linkmobility-php-client/releases/tag/1.0.0) - 2022-07-13
+### Added
 - initial implementation
   - SMS requests (text or binary)
   - SMS responses

README.en.md

@@ -1,7 +1,7 @@
 [![deutsche Version](https://logos.oxidmodule.com/de2_xs.svg)](README.md)
 [![english version](https://logos.oxidmodule.com/en2_xs.svg)](README.en.md)
 
-# LINK Mobility Austria PHP API Client
+# LINK Mobility PHP API Client
 
 [LINK Mobility](https://www.linkmobility.de/) provides a service for sending mobile messages (SMS, Whatsapp, RCS, Chatbot, ...).
 
@@ -18,8 +18,8 @@ composer require d3/linkmobility-php-client
 ```
 
 ```
-$client = new Client('personal accesstoken');
+$client = new \D3\LinkmobilityClient\Client('personal accesstoken');
-$client->setLogger($logger);  // optional
+\D3\LinkmobilityClient\LoggerHandler::getInstance()->setLogger($logger);  // optional
 $request = new D3\LinkmobilityClient\SMS\RequestFactory($message, $client)->getSmsRequest())
     ->addRecipient(new D3\LinkmobilityClient\ValueObject\Recipient('recipient number', 'DE'));
 $response = $client->request($request)
@@ -39,6 +39,12 @@ If you have a suggestion that would make this better, please fork the repo and c
 - Push to the Branch (git push origin feature/AmazingFeature)
 - Open a Pull Request
 
+## Support
+
+If you have any questions about the *messaging service* and its *contracts*, please contact the [LINK Mobility Team](https://www.linkmobility.de/kontakt).
+
+For *technical inquiries* you will find the contact options in the [composer.json](composer.json).
+
 ## License
 (status: 2022-07-13)
 

README.md

@@ -1,7 +1,7 @@
 [![deutsche Version](https://logos.oxidmodule.com/de2_xs.svg)](README.md)
 [![english version](https://logos.oxidmodule.com/en2_xs.svg)](README.en.md)
 
-# LINK Mobility Austria PHP API Client
+# LINK Mobility PHP API Client
 
 [LINK Mobility](https://www.linkmobility.de/) stellt einen Service zum Versenden von mobilen Nachrichten (SMS, Whatsapp, RCS, Chatbot, ...) zur Verfügung.
 
@@ -18,8 +18,8 @@ composer require d3/linkmobility-php-client
 ```
 
 ```
-$client = new Client('personal accesstoken');
+$client = new \D3\LinkmobilityClient\Client('personal accesstoken');
-$client->setLogger($logger);  // optional
+\D3\LinkmobilityClient\LoggerHandler::getInstance()->setLogger($logger);  // optional
 $request = new D3\LinkmobilityClient\SMS\RequestFactory($message, $client)->getSmsRequest())
     ->addRecipient(new D3\LinkmobilityClient\ValueObject\Recipient('recipient number', 'DE'));
 $response = $client->request($request)
@@ -39,6 +39,12 @@ Wenn Sie eine Verbesserungsvorschlag haben, legen Sie einen Fork des Respoitorie
 - Übertragen Sie den Branch (git push origin feature/AmazingFeature)
 - Öffnen Sie einen Pull Request
 
+## Support
+
+Bei Fragen zum *Messaging Service* und dessen *Verträgen* kontaktieren Sie bitte das [LINK Mobility Team](https://www.linkmobility.de/kontakt).
+
+Zu *technischen Anfragen* finden Sie die Kontaktmöglichkeiten in der [composer.json](composer.json).
+
 ## Lizenz
 (Stand: 13.07.2022)
 

Tests/ALoggerHandlerTest.php

@@ -0,0 +1,104 @@
+<?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 ALoggerHandlerTest extends ApiTestCase
+{
+    /** tests must run as first, because of singleton, which must not initialized before */
+
+    /** @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
+     * @return void
+     * @covers \D3\LinkmobilityClient\LoggerHandler::getInstance
+     */
+    public function testGetInstance()
+    {
+        // not existing instance
+        $this->assertInstanceOf(
+            LoggerHandler::class,
+            LoggerHandler::getInstance()
+        );
+
+        // existing instance
+        $this->assertInstanceOf(
+            LoggerHandler::class,
+            LoggerHandler::getInstance()
+        );
+    }
+
+    /**
+     * @test
+     * @throws ReflectionException
+     * @covers \D3\LinkmobilityClient\LoggerHandler::__construct
+     */
+    public function testConstruct()
+    {
+        $this->assertInstanceOf(
+            LoggerInterface::class,
+            $this->callMethod($this->loggerHandler, 'getLogger')
+        );
+    }
+
+    /**
+     * @test
+     * @return void
+     * @throws ReflectionException
+     * @covers \D3\LinkmobilityClient\LoggerHandler::setLogger
+     * @covers \D3\LinkmobilityClient\LoggerHandler::getLogger
+     */
+    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/ApiTestCase.php

@@ -31,7 +31,7 @@ abstract class ApiTestCase extends TestCase
      * @return mixed
      * @throws ReflectionException
      */
-    public function callMethod(object $object, string $methodName, array $arguments = [])
+    public function callMethod($object, string $methodName, array $arguments = [])
     {
         $class = new ReflectionClass($object);
         $method = $class->getMethod($methodName);
@@ -47,7 +47,7 @@ abstract class ApiTestCase extends TestCase
      * @param $value
      * @throws ReflectionException
      */
-    public function setValue(object $object, string $valueName, $value)
+    public function setValue($object, string $valueName, $value)
     {
         $reflection = new ReflectionClass($object);
         $property = $reflection->getProperty($valueName);
@@ -63,7 +63,7 @@ abstract class ApiTestCase extends TestCase
      * @return mixed
      * @throws ReflectionException
      */
-    public function getValue(object $object, string $valueName)
+    public function getValue($object, string $valueName)
     {
         $reflection = new ReflectionClass($object);
         $property = $reflection->getProperty($valueName);

Tests/ClientTest.php

@@ -17,20 +17,18 @@ 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 GuzzleHttp\Psr7\Response as GuzzleResponse;
 use PHPUnit\Framework\MockObject\MockObject;
-use Psr\Http\Message\ResponseInterface as MessageResponseInterface;
 use Psr\Http\Message\StreamInterface;
-use Psr\Log\AbstractLogger;
-use Psr\Log\LoggerInterface;
 use ReflectionException;
 
 class ClientTest extends ApiTestCase
@@ -67,6 +65,7 @@ class ClientTest extends ApiTestCase
      * @param $apiClient
      * @return void
      * @throws ReflectionException
+     * @covers \D3\LinkmobilityClient\Client::__construct
      */
     public function testConstruct($apiKey, $apiUrl, $apiClient)
     {
@@ -94,15 +93,38 @@ class ClientTest extends ApiTestCase
         return [
             'api key only'  => ['apiKey', null, null],
             'all without client'  => ['apiKey', new Url(), null],
-            'all arguments'  => ['apiKey', new Url(), new GuzzleClient()]
+            'all arguments'  => ['apiKey', new Url(), new GuzzleClient()],
         ];
     }
 
+    /**
+     * @test
+     * @throws ReflectionException
+     * @return void
+     * @covers \D3\LinkmobilityClient\Client::getDefaultClient
+     */
+    public function testGetDefaultClient()
+    {
+        /** @var Client|MockObject $sut */
+        $sut = $this->getMockBuilder(Client::class)
+            ->setConstructorArgs(['accessTokenFixture'])
+            ->getMock();
+
+        $this->assertInstanceOf(
+            GuzzleClient::class,
+            $this->callMethod(
+                $sut,
+                'getDefaultClient'
+            )
+        );
+    }
+
     /**
      * @test
      * @return void
      * @throws ReflectionException
      * @dataProvider requestPassedDataProvider
+     * @covers \D3\LinkmobilityClient\Client::request
      *
      */
     public function testRequest($requestIsValid)
@@ -164,48 +186,27 @@ class ClientTest extends ApiTestCase
     {
         return [
             'request is valid'      => [true],
-            'request is not valid'  => [false]
+            'request is not valid'  => [false],
         ];
     }
 
     /**
      * @test
-     * @param $useLogger
-     * @param $okStatus
      * @return void
      * @throws ReflectionException
-     * @dataProvider rawRequestDataProvider
+     * @covers \D3\LinkmobilityClient\Client::rawRequest
      */
-    public function testRawRequest($useLogger, $okStatus)
+    public function testRawRequest()
     {
-        $statusCode = $okStatus ? '200' : '301';
-
         /** @var StreamInterface|MockObject $streamMock */
         $streamMock = $this->getMockBuilder(StreamInterface::class)
             ->getMock();
 
-        /** @var MessageResponseInterface|MockObject $responseMock */
+        /** @var GuzzleResponse|MockObject $responseMock */
-        $responseMock = $this->getMockBuilder(MessageResponseInterface::class)
+        $responseMock = $this->getMockBuilder( GuzzleResponse::class)
-            ->onlyMethods([
-                'getStatusCode',
-                'getBody',
-                'withStatus',
-                'getReasonPhrase',
-                'getProtocolVersion',
-                'withProtocolVersion',
-                'getHeaders',
-                'hasHeader',
-                'getHeader',
-                'getHeaderLine',
-                'withHeader',
-                'withAddedHeader',
-                'withoutHeader',
-                'withBody'
-            ])
             ->disableOriginalConstructor()
             ->getMock();
-        $responseMock->expects($this->atLeastOnce())->method('getStatusCode')->willReturn($statusCode);
+        $responseMock->expects($this->atLeastOnce())
-        $responseMock->expects($useLogger && $okStatus ? $this->atLeastOnce() : $this->never())
             ->method('getBody')->willReturn($streamMock);
 
         /** @var GuzzleClient|MockObject $requestClientMock */
@@ -214,27 +215,15 @@ class ClientTest extends ApiTestCase
             ->getMock();
         $requestClientMock->expects($this->once())->method('request')->willReturn($responseMock);
 
-        /** @var LoggerInterface|MockObject $loggerMock */
-        $loggerMock = $this->getMockBuilder(AbstractLogger::class)
-            ->onlyMethods(['debug', 'error', 'log'])
-            ->getMock();
-
         /** @var Client|MockObject $clientMock */
         $clientMock = $this->getMockBuilder(Client::class)
             ->disableOriginalConstructor()
             ->onlyMethods([
-                'hasLogger',
+                'getLoggerHandler',
-                'getLogger'
             ])
             ->getMock();
-        $clientMock->method('hasLogger')->willReturn($useLogger);
-        $clientMock->expects($useLogger ? $this->atLeastOnce() : $this->never())
-            ->method('getLogger')->willReturn($loggerMock);
         $this->setValue($clientMock, 'requestClient', $requestClientMock);
 
-        if (false === $okStatus) {
-            $this->expectException(ApiException::class);
-        }
         $this->assertSame(
             $responseMock,
             $this->callMethod($clientMock, 'rawRequest', ['myUrl'])
@@ -242,42 +231,53 @@ class ClientTest extends ApiTestCase
     }
 
     /**
-     * @return array
+     * @test
+     * @return void
+     * @throws ReflectionException
+     * @covers \D3\LinkmobilityClient\Client::getLoggerHandler
      */
-    public function rawRequestDataProvider(): array
+    public function testGetLoggerHandler()
     {
-        return [
+        $this->assertInstanceOf(
-            'has logger, OK status' => [true, true],
+            LoggerHandler::class,
-            'has no logger, OK status' => [false, true],
+            $this->callMethod(
-            'has logger, NOK status' => [true, false],
+                $this->api,
-            'has no logger, NOK status' => [false, false],
+                'getLoggerHandler'
-        ];
+            )
+        );
     }
 
     /**
      * @test
      * @return void
-     * @throws ReflectionException
+     * @throws \PHPUnit\Framework\ExpectationFailedException
+     * @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
+     * @covers \D3\LinkmobilityClient\Client::getLoggerMiddleware
      */
-    public function testLogger()
+    public function testGetLoggerMiddleware()
     {
-        $this->assertFalse($this->callMethod($this->api, 'hasLogger'));
+        $this->assertIsCallable(
-        $this->assertNull($this->callMethod($this->api, 'getLogger'));
+            $this->callMethod(
-
+                $this->api,
-        /** @var LoggerInterface|MockObject $loggerMock */
+                'getLoggerMiddleware'
-        $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(
+     * @test
-            $loggerMock,
+     * @return void
-            $this->callMethod($this->api, 'getLogger')
+     * @throws \PHPUnit\Framework\ExpectationFailedException
+     * @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
+     * @covers \D3\LinkmobilityClient\Client::getRetryMiddleware
+     */
+    public function testGetRetryMiddleware()
+    {
+        $this->assertIsCallable(
+            $this->callMethod(
+                $this->api,
+                'getRetryMiddleware'
+            )
         );
     }
 }

Tests/README.md

@@ -7,5 +7,5 @@ composer create-project -s dev --prefer-source [--repository '{"type": "vcs", "u
 # Run tests
 
 ```
-./vendor/bin/phpunit [--no-coverage]
+./vendor/bin/phpunit [--no-coverage] [--coverage-html=cov]
 ```

Tests/RecipientsList/RecipientsListTest.php

@@ -19,13 +19,10 @@ use D3\LinkmobilityClient\Client;
 use D3\LinkmobilityClient\RecipientsList\RecipientsList;
 use D3\LinkmobilityClient\Tests\ApiTestCase;
 use D3\LinkmobilityClient\ValueObject\Recipient;
-use libphonenumber\NumberParseException;
+use libphonenumber\PhoneNumberFormat;
-use libphonenumber\PhoneNumber;
 use libphonenumber\PhoneNumberType;
 use libphonenumber\PhoneNumberUtil;
 use PHPUnit\Framework\MockObject\MockObject;
-use Psr\Log\AbstractLogger;
-use Psr\Log\LoggerInterface;
 use ReflectionException;
 use stdClass;
 
@@ -34,7 +31,7 @@ class RecipientsListTest extends ApiTestCase
     /** @var RecipientsList */
     public $recipientsList;
 
-    private $phoneNumberFixture = '01527565839';
+    private $phoneNumberFixture;
     private $phoneCountryFixture = 'DE';
 
     /**
@@ -50,6 +47,10 @@ class RecipientsListTest extends ApiTestCase
             ->getMock();
 
         $this->recipientsList = new RecipientsList($clientMock);
+
+        $phoneUtil = PhoneNumberUtil::getInstance();
+        $example = $phoneUtil->getExampleNumberForType($this->phoneCountryFixture, PhoneNumberType::MOBILE);
+        $this->phoneNumberFixture = $phoneUtil->format($example, PhoneNumberFormat::NATIONAL);
     }
 
     /**
@@ -65,6 +66,7 @@ class RecipientsListTest extends ApiTestCase
     /**
      * @test
      * @return void
+     * @covers \D3\LinkmobilityClient\RecipientsList\RecipientsList::__construct
      */
     public function testConstruct()
     {
@@ -84,33 +86,10 @@ class RecipientsListTest extends ApiTestCase
     /**
      * @test
      * @throws ReflectionException
-     */
+     * @covers \D3\LinkmobilityClient\RecipientsList\RecipientsList::add
-    public function testGetPhoneNumberUtil()
-    {
-        $this->assertInstanceOf(
-            PhoneNumberUtil::class,
-            $this->callMethod(
-                $this->recipientsList,
-                'getPhoneNumberUtil'
-            )
-        );
-    }
-
-    /**
-     * @test
-     * @throws ReflectionException
      */
     public function testAddValidNumber()
     {
-        /** @var PhoneNumberUtil|MockObject $phoneNumberUtilMock */
-        $phoneNumberUtilMock = $this->getMockBuilder(PhoneNumberUtil::class)
-            ->onlyMethods(['parse', 'isValidNumber', 'getNumberType'])
-            ->disableOriginalConstructor()
-            ->getMock();
-        $phoneNumberUtilMock->method('parse')->willReturn(new PhoneNumber());
-        $phoneNumberUtilMock->method('isValidNumber')->willReturn(true);
-        $phoneNumberUtilMock->method('getNumberType')->willReturn(PhoneNumberType::MOBILE);
-
         /** @var Recipient|MockObject $recipientMock */
         $recipientMock = $this->getMockBuilder(Recipient::class)
             ->onlyMethods(['get', 'getCountryCode'])
@@ -119,15 +98,6 @@ class RecipientsListTest extends ApiTestCase
         $recipientMock->method('get')->willReturn($this->phoneNumberFixture);
         $recipientMock->method('getCountryCode')->willReturn($this->phoneCountryFixture);
 
-        /** @var RecipientsList|MockObject $recListMock */
-        $recListMock = $this->getMockBuilder(RecipientsList::class)
-            ->onlyMethods(['getPhoneNumberUtil'])
-            ->setConstructorArgs([$this->recipientsList->getClient()])
-            ->getMock();
-        $recListMock->method('getPhoneNumberUtil')->willReturn($phoneNumberUtilMock);
-
-        $this->recipientsList = $recListMock;
-
         $this->assertCount(
             0,
             $this->callMethod($this->recipientsList, 'getRecipientsList')
@@ -151,90 +121,8 @@ class RecipientsListTest extends ApiTestCase
     /**
      * @test
      * @throws ReflectionException
-     * @dataProvider addInvalidNumberDataProvider
+     * @covers \D3\LinkmobilityClient\RecipientsList\RecipientsList::clearRecipents
-     */
+     * @covers \D3\LinkmobilityClient\RecipientsList\RecipientsList::getRecipientsList
-    public function testAddInvalidNumber($unparsable, $invalidNumber, $invalidNumberType)
-    {
-        /** @var PhoneNumberUtil|MockObject $phoneNumberUtilMock */
-        $phoneNumberUtilMock = $this->getMockBuilder(PhoneNumberUtil::class)
-            ->onlyMethods(['parse', 'isValidNumber', 'getNumberType'])
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        if ($unparsable) {
-            $phoneNumberUtilMock->method('parse')->willThrowException(new NumberParseException(0, 'message'));
-        } else {
-            $phoneNumberUtilMock->method('parse')->willReturn(new PhoneNumber());
-        }
-        $phoneNumberUtilMock->method('isValidNumber')->willReturn(!$invalidNumber);
-        $phoneNumberUtilMock->method('getNumberType')->willReturn($invalidNumberType ? PhoneNumberType::FIXED_LINE : PhoneNumberType::MOBILE);
-
-        /** @var Recipient|MockObject $recipientMock */
-        $recipientMock = $this->getMockBuilder(Recipient::class)
-            ->onlyMethods(['get', 'getCountryCode'])
-            ->setConstructorArgs([$this->phoneNumberFixture, $this->phoneCountryFixture])
-            ->getMock();
-        $recipientMock->method('get')->willReturn($this->phoneNumberFixture);
-        $recipientMock->method('getCountryCode')->willReturn($this->phoneCountryFixture);
-
-        /** @var LoggerInterface|MockObject $loggerMock */
-        $loggerMock = $this->getMockBuilder(AbstractLogger::class)
-                           ->onlyMethods(['info', 'log'])
-                           ->getMock();
-        $loggerMock->expects($this->atLeastOnce())->method('info')->willReturn(true);
-
-        /** @var Client|MockObject $clientMock */
-        $clientMock = $this->getMockBuilder(Client::class)
-            ->disableOriginalConstructor()
-            ->onlyMethods(['hasLogger', 'getLogger'])
-            ->getMock();
-        $clientMock->method('hasLogger')->willReturn(true);
-        $clientMock->method('getLogger')->willReturn($loggerMock);
-
-        /** @var RecipientsList|MockObject $recListMock */
-        $recListMock = $this->getMockBuilder(RecipientsList::class)
-            ->onlyMethods(['getPhoneNumberUtil'])
-            ->setConstructorArgs([$clientMock])
-            ->getMock();
-        $recListMock->method('getPhoneNumberUtil')->willReturn($phoneNumberUtilMock);
-
-        $this->recipientsList = $recListMock;
-
-        $this->assertCount(
-            0,
-            $this->callMethod($this->recipientsList, 'getRecipientsList')
-        );
-
-        $this->assertSame(
-            $this->recipientsList,
-            $this->callMethod(
-                $this->recipientsList,
-                'add',
-                [$recipientMock]
-            )
-        );
-
-        $this->assertCount(
-            0,
-            $this->callMethod($this->recipientsList, 'getRecipientsList')
-        );
-    }
-
-    /**
-     * @return array[]
-     */
-    public function addInvalidNumberDataProvider(): array
-    {
-        return [
-            'unparsable'            => [true, false, false],
-            'invalid number'        => [false, true, false],
-            'invalid number type'   => [false, false, true],
-        ];
-    }
-
-    /**
-     * @test
-     * @throws ReflectionException
      */
     public function testClearRecipents()
     {
@@ -262,6 +150,7 @@ class RecipientsListTest extends ApiTestCase
     /**
      * @test
      * @throws ReflectionException
+     * @covers \D3\LinkmobilityClient\RecipientsList\RecipientsList::getRecipients
      */
     public function testGetRecipients()
     {
@@ -278,7 +167,7 @@ class RecipientsListTest extends ApiTestCase
         $this->assertSame(
             [
                 $this->phoneNumberFixture,
-                $this->phoneNumberFixture
+                $this->phoneNumberFixture,
             ],
             $this->callMethod(
                 $this->recipientsList,
@@ -290,6 +179,7 @@ class RecipientsListTest extends ApiTestCase
     /**
      * @test
      * @throws ReflectionException
+     * @covers \D3\LinkmobilityClient\RecipientsList\RecipientsList::getRecipientsList
      */
     public function testGetRecipientsList()
     {
@@ -321,6 +211,10 @@ class RecipientsListTest extends ApiTestCase
     /**
      * @test
      * @throws ReflectionException
+     * @covers \D3\LinkmobilityClient\RecipientsList\RecipientsList::current
+     * @covers \D3\LinkmobilityClient\RecipientsList\RecipientsList::next
+     * @covers \D3\LinkmobilityClient\RecipientsList\RecipientsList::key
+     * @covers \D3\LinkmobilityClient\RecipientsList\RecipientsList::rewind
      */
     public function testCurrentNextKeyRewind()
     {
@@ -369,6 +263,7 @@ class RecipientsListTest extends ApiTestCase
     /**
      * @test
      * @throws ReflectionException
+     * @covers \D3\LinkmobilityClient\RecipientsList\RecipientsList::valid
      */
     public function testValid()
     {
@@ -385,7 +280,7 @@ class RecipientsListTest extends ApiTestCase
             $this->recipientsList,
             'recipients',
             [
-                'fixture' => new stdClass()
+                'fixture' => new stdClass(),
             ]
         );
 
@@ -400,13 +295,15 @@ class RecipientsListTest extends ApiTestCase
     /**
      * @test
      * @throws ReflectionException
+     * @covers \D3\LinkmobilityClient\RecipientsList\RecipientsList::setClient
+     * @covers \D3\LinkmobilityClient\RecipientsList\RecipientsList::getClient
      */
     public function testSetGetClient()
     {
         /** @var Client|MockObject $clientMock */
         $clientMock = $this->getMockBuilder(Client::class)
-                           ->disableOriginalConstructor()
+            ->disableOriginalConstructor()
-                           ->getMock();
+            ->getMock();
 
         $this->assertInstanceOf(
             RecipientsList::class,
@@ -436,11 +333,11 @@ class RecipientsListTest extends ApiTestCase
         $recipientMock = $this->getMockBuilder(Recipient::class)
             ->onlyMethods([
                 'get',
-                'getCountryCode'
+                'getCountryCode',
             ])
             ->setConstructorArgs([
                 $this->phoneNumberFixture,
-                $this->phoneCountryFixture
+                $this->phoneCountryFixture,
             ])
             ->getMock();
         $recipientMock->method('get')->willReturn($this->phoneNumberFixture);
@@ -450,11 +347,11 @@ class RecipientsListTest extends ApiTestCase
         $recipientMock2 = $this->getMockBuilder(Recipient::class)
             ->onlyMethods([
                 'get',
-                'getCountryCode'
+                'getCountryCode',
             ])
             ->setConstructorArgs([
                 $this->phoneNumberFixture,
-                $this->phoneCountryFixture
+                $this->phoneCountryFixture,
             ])
             ->getMock();
         $recipientMock2->method('get')->willReturn($this->phoneNumberFixture);
@@ -462,7 +359,7 @@ class RecipientsListTest extends ApiTestCase
 
         $list = [
             'fixture' => $recipientMock,
-            'fixture2' => $recipientMock2
+            'fixture2' => $recipientMock2,
         ];
 
         $this->setValue(

Tests/Request/AbstractRequest.php

@@ -17,6 +17,7 @@ namespace D3\LinkmobilityClient\Tests\Request;
 
 use Assert\InvalidArgumentException;
 use D3\LinkmobilityClient\Client;
+use D3\LinkmobilityClient\Exceptions\RecipientException;
 use D3\LinkmobilityClient\RecipientsList\RecipientsListInterface;
 use D3\LinkmobilityClient\Request\Request;
 use D3\LinkmobilityClient\Request\RequestInterface;
@@ -24,6 +25,10 @@ use D3\LinkmobilityClient\SMS\Response;
 use D3\LinkmobilityClient\Tests\ApiTestCase;
 use D3\LinkmobilityClient\ValueObject\Recipient;
 use D3\LinkmobilityClient\ValueObject\Sender;
+use libphonenumber\NumberParseException;
+use libphonenumber\PhoneNumberFormat;
+use libphonenumber\PhoneNumberType;
+use libphonenumber\PhoneNumberUtil;
 use PHPUnit\Framework\MockObject\MockObject;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\StreamInterface;
@@ -62,6 +67,8 @@ abstract class AbstractRequest extends ApiTestCase
      * @test
      * @return void
      * @throws ReflectionException
+     * @covers \D3\LinkmobilityClient\SMS\BinaryRequest::__construct
+     * @covers \D3\LinkmobilityClient\SMS\TextRequest::__construct
      */
     public function testConstruct()
     {
@@ -82,23 +89,46 @@ abstract class AbstractRequest extends ApiTestCase
         $requestMock->expects($this->atLeastOnce())->method('setMessage')->with($this->equalTo($messageMock))->willReturnSelf();
         $requestMock->expects($this->atLeastOnce())->method('setClient')->with($this->equalTo($clientMock))->willReturnSelf();
 
-        $this->assertInstanceOf(
+        $this->callMethod(
-            Request::class,
+            $requestMock,
-            $this->callMethod(
+            '__construct',
-                $requestMock,
+            [$messageMock, $clientMock]
-                '__construct',
-                [$messageMock, $clientMock]
-            )
         );
     }
 
     /**
      * @test
      * @throws ReflectionException
+     * @covers \D3\LinkmobilityClient\SMS\BinaryRequest::getUri
+     * @covers \D3\LinkmobilityClient\SMS\TextRequest::getUri
+     */
+    public function testGetUri()
+    {
+        $this->assertIsString(
+            $this->callMethod(
+                $this->request,
+                'getUri'
+            )
+        );
+    }
+
+    /**
+     * @test
+     * @covers \D3\LinkmobilityClient\SMS\BinaryRequest::validate
+     * @covers \D3\LinkmobilityClient\SMS\TextRequest::validate
+     * @covers \D3\LinkmobilityClient\Request\Request::validate
+     * @return void
+     * @throws ReflectionException
+     * @throws RecipientException
+     * @throws NumberParseException
      */
     public function validatePassedTest()
     {
-        $recipient = new Recipient('015792300219', 'DE');
+        $phoneUtil = PhoneNumberUtil::getInstance();
+        $example = $phoneUtil->getExampleNumberForType('DE', PhoneNumberType::MOBILE);
+        $phoneNumberFixture = $phoneUtil->format($example, PhoneNumberFormat::NATIONAL);
+
+        $recipient = new Recipient($phoneNumberFixture, 'DE');
 
         /** @var Request|MockObject $requestMock */
         $requestMock = $this->getMockBuilder($this->testClassName)
@@ -121,11 +151,20 @@ abstract class AbstractRequest extends ApiTestCase
 
     /**
      * @test
+     * @covers \D3\LinkmobilityClient\SMS\BinaryRequest::validate
+     * @covers \D3\LinkmobilityClient\SMS\TextRequest::validate
+     * @return void
+     * @throws NumberParseException
+     * @throws RecipientException
      * @throws ReflectionException
      */
     public function validateFailedTest()
     {
-        $recipient = new Recipient('015792300219', 'DE');
+        $phoneUtil = PhoneNumberUtil::getInstance();
+        $example = $phoneUtil->getExampleNumberForType('DE', PhoneNumberType::MOBILE);
+        $phoneNumberFixture = $phoneUtil->format($example, PhoneNumberFormat::NATIONAL);
+
+        $recipient = new Recipient($phoneNumberFixture, 'DE');
 
         /** @var Request|MockObject $requestMock */
         $requestMock = $this->getMockBuilder($this->testClassName)
@@ -151,6 +190,9 @@ abstract class AbstractRequest extends ApiTestCase
     /**
      * @test
      * @throws ReflectionException
+     * @covers \D3\LinkmobilityClient\SMS\BinaryRequest::getRawBody
+     * @covers \D3\LinkmobilityClient\SMS\TextRequest::getRawBody
+     * @covers \D3\LinkmobilityClient\Request\Request::getRawBody
      */
     public function testGetRawBody()
     {
@@ -175,6 +217,8 @@ abstract class AbstractRequest extends ApiTestCase
      * @test
      * @throws ReflectionException
      * @dataProvider getBodyDataProvider
+     * @covers \D3\LinkmobilityClient\SMS\BinaryRequest::getBody
+     * @covers \D3\LinkmobilityClient\SMS\TextRequest::getBody
      */
     public function testGetBody($contentType, $expected)
     {
@@ -214,25 +258,25 @@ abstract class AbstractRequest extends ApiTestCase
                 ['json' => [
                     'contentCategory' => 'informational',
                     'messageContent' => 'messageContent',
-                    'priority' => 0
+                    'priority' => 0,
-                    ]]
+                    ]],
             ],
             'other' => [
                 'other',
                 [
                     'contentCategory' => 'informational',
                     'messageContent' => 'messageContent',
-                    'priority' => 0
+                    'priority' => 0,
-                ]
+                ],
-            ]
+            ],
         ];
     }
 
-
-
     /**
      * @test
      * @throws ReflectionException
+     * @covers \D3\LinkmobilityClient\SMS\BinaryRequest::getOptions
+     * @covers \D3\LinkmobilityClient\SMS\TextRequest::getOptions
      */
     public function testGetOptions()
     {
@@ -245,20 +289,20 @@ abstract class AbstractRequest extends ApiTestCase
             ['json' => [
                 'contentCategory' => 'informational',
                 'messageContent' => 'messageContent',
-                'priority' => 0
+                'priority' => 0,
             ]]
         );
 
         $this->assertSame(
             ['headers' => [
                 'Accept' => 'application/json',
-                'Content-Type' => 'application/json'
+                'Content-Type' => 'application/json',
             ],
             'json' => [
                 'contentCategory' => 'informational',
                 'messageContent' => 'messageContent',
-                'priority' => 0
+                'priority' => 0,
-            ]],
+            ], ],
             $this->callMethod(
                 $requestMock,
                 'getOptions'
@@ -292,6 +336,10 @@ abstract class AbstractRequest extends ApiTestCase
     /**
      * @test
      * @throws ReflectionException
+     * @covers \D3\LinkmobilityClient\SMS\BinaryRequest::setMessage
+     * @covers \D3\LinkmobilityClient\SMS\TextRequest::setMessage
+     * @covers \D3\LinkmobilityClient\SMS\BinaryRequest::getMessage
+     * @covers \D3\LinkmobilityClient\SMS\TextRequest::getMessage
      */
     public function setGetMessageTest()
     {
@@ -305,6 +353,10 @@ abstract class AbstractRequest extends ApiTestCase
     /**
      * @test
      * @throws ReflectionException
+     * @covers \D3\LinkmobilityClient\SMS\BinaryRequest::setMethod
+     * @covers \D3\LinkmobilityClient\SMS\TextRequest::setMethod
+     * @covers \D3\LinkmobilityClient\SMS\BinaryRequest::getMethod
+     * @covers \D3\LinkmobilityClient\SMS\TextRequest::getMethod
      */
     public function setGetMethodTest()
     {
@@ -314,6 +366,8 @@ abstract class AbstractRequest extends ApiTestCase
     /**
      * @test
      * @throws ReflectionException
+     * @covers \D3\LinkmobilityClient\SMS\BinaryRequest::getMethods
+     * @covers \D3\LinkmobilityClient\SMS\TextRequest::getMethods
      */
     public function getMethodsTest()
     {
@@ -329,6 +383,10 @@ abstract class AbstractRequest extends ApiTestCase
     /**
      * @test
      * @throws ReflectionException
+     * @covers \D3\LinkmobilityClient\SMS\BinaryRequest::setContentType
+     * @covers \D3\LinkmobilityClient\SMS\TextRequest::setContentType
+     * @covers \D3\LinkmobilityClient\SMS\BinaryRequest::getContentType
+     * @covers \D3\LinkmobilityClient\SMS\TextRequest::getContentType
      */
     public function setGetContentTypeTest()
     {
@@ -338,6 +396,10 @@ abstract class AbstractRequest extends ApiTestCase
     /**
      * @test
      * @throws ReflectionException
+     * @covers \D3\LinkmobilityClient\SMS\BinaryRequest::setClientMessageId
+     * @covers \D3\LinkmobilityClient\SMS\TextRequest::setClientMessageId
+     * @covers \D3\LinkmobilityClient\SMS\BinaryRequest::getClientMessageId
+     * @covers \D3\LinkmobilityClient\SMS\TextRequest::getClientMessageId
      */
     public function setGetClientMessageIdTest()
     {
@@ -347,6 +409,10 @@ abstract class AbstractRequest extends ApiTestCase
     /**
      * @test
      * @throws ReflectionException
+     * @covers \D3\LinkmobilityClient\SMS\BinaryRequest::setContentCategory
+     * @covers \D3\LinkmobilityClient\SMS\TextRequest::setContentCategory
+     * @covers \D3\LinkmobilityClient\SMS\BinaryRequest::getContentCategory
+     * @covers \D3\LinkmobilityClient\SMS\TextRequest::getContentCategory
      */
     public function setGetContentCategoryTest()
     {
@@ -356,6 +422,8 @@ abstract class AbstractRequest extends ApiTestCase
     /**
      * @test
      * @throws ReflectionException
+     * @covers \D3\LinkmobilityClient\SMS\BinaryRequest::getContentCategories
+     * @covers \D3\LinkmobilityClient\SMS\TextRequest::getContentCategories
      */
     public function getContentCategoriesTest()
     {
@@ -371,6 +439,10 @@ abstract class AbstractRequest extends ApiTestCase
     /**
      * @test
      * @throws ReflectionException
+     * @covers \D3\LinkmobilityClient\SMS\BinaryRequest::setTestMode
+     * @covers \D3\LinkmobilityClient\SMS\TextRequest::setTestMode
+     * @covers \D3\LinkmobilityClient\SMS\BinaryRequest::getTestMode
+     * @covers \D3\LinkmobilityClient\SMS\TextRequest::getTestMode
      */
     public function setGetTestModeTest()
     {
@@ -380,6 +452,10 @@ abstract class AbstractRequest extends ApiTestCase
     /**
      * @test
      * @throws ReflectionException
+     * @covers \D3\LinkmobilityClient\SMS\BinaryRequest::setMaxSmsPerMessage
+     * @covers \D3\LinkmobilityClient\SMS\TextRequest::setMaxSmsPerMessage
+     * @covers \D3\LinkmobilityClient\SMS\BinaryRequest::getMaxSmsPerMessage
+     * @covers \D3\LinkmobilityClient\SMS\TextRequest::getMaxSmsPerMessage
      */
     public function setGetMaxSmsPerMessageTest()
     {
@@ -389,6 +465,10 @@ abstract class AbstractRequest extends ApiTestCase
     /**
      * @test
      * @throws ReflectionException
+     * @covers \D3\LinkmobilityClient\SMS\BinaryRequest::setMessageType
+     * @covers \D3\LinkmobilityClient\SMS\TextRequest::setMessageType
+     * @covers \D3\LinkmobilityClient\SMS\BinaryRequest::getMessageType
+     * @covers \D3\LinkmobilityClient\SMS\TextRequest::getMessageType
      */
     public function setGetMessageTypeTest()
     {
@@ -398,6 +478,10 @@ abstract class AbstractRequest extends ApiTestCase
     /**
      * @test
      * @throws ReflectionException
+     * @covers \D3\LinkmobilityClient\SMS\BinaryRequest::setNotificationCallbackUrl
+     * @covers \D3\LinkmobilityClient\SMS\TextRequest::setNotificationCallbackUrl
+     * @covers \D3\LinkmobilityClient\SMS\BinaryRequest::getNotificationCallbackUrl
+     * @covers \D3\LinkmobilityClient\SMS\TextRequest::getNotificationCallbackUrl
      */
     public function setGetNotificationCallbackUrlTest()
     {
@@ -407,6 +491,10 @@ abstract class AbstractRequest extends ApiTestCase
     /**
      * @test
      * @throws ReflectionException
+     * @covers \D3\LinkmobilityClient\SMS\BinaryRequest::setPriority
+     * @covers \D3\LinkmobilityClient\SMS\TextRequest::setPriority
+     * @covers \D3\LinkmobilityClient\SMS\BinaryRequest::getPriority
+     * @covers \D3\LinkmobilityClient\SMS\TextRequest::getPriority
      */
     public function setGetPriorityTest()
     {
@@ -416,6 +504,8 @@ abstract class AbstractRequest extends ApiTestCase
     /**
      * @test
      * @throws ReflectionException
+     * @covers \D3\LinkmobilityClient\SMS\BinaryRequest::getRecipientsList
+     * @covers \D3\LinkmobilityClient\SMS\TextRequest::getRecipientsList
      */
     public function getRecipientsListTest()
     {
@@ -431,6 +521,10 @@ abstract class AbstractRequest extends ApiTestCase
     /**
      * @test
      * @throws ReflectionException
+     * @covers \D3\LinkmobilityClient\SMS\BinaryRequest::sendAsFlashSms
+     * @covers \D3\LinkmobilityClient\SMS\TextRequest::sendAsFlashSms
+     * @covers \D3\LinkmobilityClient\SMS\BinaryRequest::doSendAsFlashSms
+     * @covers \D3\LinkmobilityClient\SMS\TextRequest::doSendAsFlashSms
      */
     public function setGetFlashSmsTest()
     {
@@ -440,6 +534,10 @@ abstract class AbstractRequest extends ApiTestCase
     /**
      * @test
      * @throws ReflectionException
+     * @covers \D3\LinkmobilityClient\SMS\BinaryRequest::setSenderAddress
+     * @covers \D3\LinkmobilityClient\SMS\TextRequest::setSenderAddress
+     * @covers \D3\LinkmobilityClient\SMS\BinaryRequest::getSenderAddress
+     * @covers \D3\LinkmobilityClient\SMS\TextRequest::getSenderAddress
      */
     public function setGetSenderAddressTest()
     {
@@ -453,15 +551,66 @@ abstract class AbstractRequest extends ApiTestCase
     /**
      * @test
      * @throws ReflectionException
+     * @dataProvider setGetSenderAddressTypeDataProvider
+     * @covers \D3\LinkmobilityClient\SMS\BinaryRequest::setSenderAddressType
+     * @covers \D3\LinkmobilityClient\SMS\TextRequest::setSenderAddressType
+     * @covers \D3\LinkmobilityClient\SMS\BinaryRequest::getSenderAddressType
+     * @covers \D3\LinkmobilityClient\SMS\TextRequest::getSenderAddressType
      */
-    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'],
+        ];
     }
 
     /**
      * @test
      * @throws ReflectionException
+     * @covers \D3\LinkmobilityClient\SMS\BinaryRequest::getSenderAddressTypes
+     * @covers \D3\LinkmobilityClient\SMS\TextRequest::getSenderAddressTypes
      */
     public function getSenderAddressTypesTest()
     {
@@ -477,6 +626,10 @@ abstract class AbstractRequest extends ApiTestCase
     /**
      * @test
      * @throws ReflectionException
+     * @covers \D3\LinkmobilityClient\SMS\BinaryRequest::setValidityPeriode
+     * @covers \D3\LinkmobilityClient\SMS\TextRequest::setValidityPeriode
+     * @covers \D3\LinkmobilityClient\SMS\BinaryRequest::getValidityPeriode
+     * @covers \D3\LinkmobilityClient\SMS\TextRequest::getValidityPeriode
      */
     public function setGetValidityPeriodeTest()
     {
@@ -487,6 +640,8 @@ abstract class AbstractRequest extends ApiTestCase
      * @test
      * @throws ReflectionException
      * @dataProvider getResponseInstanceDataProvider
+     * @covers \D3\LinkmobilityClient\SMS\BinaryRequest::getResponseInstance
+     * @covers \D3\LinkmobilityClient\SMS\TextRequest::getResponseInstance
      */
     public function testGetResponseInstance(ResponseInterface $response)
     {
@@ -521,7 +676,7 @@ abstract class AbstractRequest extends ApiTestCase
         /** @var StreamInterface|MockObject $streamMock */
         $streamMock = $this->getMockBuilder(StreamInterface::class)
             ->onlyMethods(['getContents', '__toString', 'close', 'detach', 'getSize', 'tell', 'eof', 'isSeekable',
-                'seek', 'rewind', 'isWritable', 'write', 'isReadable', 'read', 'getMetadata'])
+                'seek', 'rewind', 'isWritable', 'write', 'isReadable', 'read', 'getMetadata', ])
             ->getMock();
         $streamMock->method('getContents')->willReturn('{}');
 
@@ -530,18 +685,22 @@ abstract class AbstractRequest extends ApiTestCase
             ->onlyMethods([
                 'getBody', 'getStatusCode', 'withStatus', 'getReasonphrase', 'getProtocolVersion',
                 'withProtocolVersion', 'getHeaders', 'hasHeader', 'getHeader', 'getHeaderLine',
-                'withHeader', 'withAddedHeader', 'withoutHeader', 'withBody'])
+                'withHeader', 'withAddedHeader', 'withoutHeader', 'withBody', ])
             ->getMock();
         $rawResponseMock->method('getBody')->willReturn($streamMock);
 
         return [
-            'SMS Response'  => [$rawResponseMock]
+            'SMS Response'  => [$rawResponseMock],
         ];
     }
 
     /**
      * @test
      * @throws ReflectionException
+     * @covers \D3\LinkmobilityClient\SMS\BinaryRequest::setClient
+     * @covers \D3\LinkmobilityClient\SMS\TextRequest::setClient
+     * @covers \D3\LinkmobilityClient\SMS\BinaryRequest::getClient
+     * @covers \D3\LinkmobilityClient\SMS\TextRequest::getClient
      */
     public function setGetClientTest()
     {
@@ -552,4 +711,33 @@ abstract class AbstractRequest extends ApiTestCase
 
         $this->checkGetterSetter($clientMock, 'setClient', 'getClient');
     }
+
+    /**
+     * @test
+     * @return void
+     * @throws ReflectionException
+     * @covers \D3\LinkmobilityClient\SMS\BinaryRequest::getResponseClass
+     * @covers \D3\LinkmobilityClient\SMS\TextRequest::getResponseClass
+     */
+    public function testGetResponseClass()
+    {
+        $className = $this->callMethod(
+            $this->request,
+            'getResponseClass'
+        );
+
+        $this->assertIsString(
+            $className
+        );
+
+        /** @var \D3\LinkmobilityClient\Response\ResponseInterface|MockObject $responseMock */
+        $responseMock = $this->getMockBuilder($className)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->assertInstanceOf(
+            \D3\LinkmobilityClient\Response\ResponseInterface::class,
+            $responseMock
+        );
+    }
 }

Tests/Response/AbstractResponse.php

@@ -29,13 +29,16 @@ abstract class AbstractResponse extends ApiTestCase
     /**
      * @test
      * @throws ReflectionException
+     * @covers \D3\LinkmobilityClient\SMS\Response::__construct
+     * @covers \D3\LinkmobilityClient\SMS\Response::getRawResponse
+     * @covers \D3\LinkmobilityClient\SMS\Response::getContent
      */
     public function testConstruct()
     {
         /** @var StreamInterface|MockObject $streamMock */
         $streamMock = $this->getMockBuilder(StreamInterface::class)
             ->onlyMethods(['getContents', '__toString', 'close', 'detach', 'getSize', 'tell', 'eof', 'isSeekable',
-                'seek', 'rewind', 'isWritable', 'write', 'isReadable', 'read', 'getMetadata'])
+                'seek', 'rewind', 'isWritable', 'write', 'isReadable', 'read', 'getMetadata', ])
             ->getMock();
         $streamMock->expects($this->atLeastOnce())->method('getContents')->willReturn(
             '{
@@ -50,7 +53,7 @@ abstract class AbstractResponse extends ApiTestCase
             ->onlyMethods([
                 'getBody', 'getStatusCode', 'withStatus', 'getReasonphrase', 'getProtocolVersion',
                 'withProtocolVersion', 'getHeaders', 'hasHeader', 'getHeader', 'getHeaderLine',
-                'withHeader', 'withAddedHeader', 'withoutHeader', 'withBody'])
+                'withHeader', 'withAddedHeader', 'withoutHeader', 'withBody', ])
             ->getMock();
         $rawResponseMock->method('getBody')->willReturn($streamMock);
 
@@ -83,7 +86,7 @@ abstract class AbstractResponse extends ApiTestCase
      */
     protected function checkProperties($expected, $propertyName, $methodName)
     {
-        /** @var Response $response */
+        /** @var Response|MockObject $responseMock */
         $responseMock = $this->getMockBuilder($this->testClassName)
             ->disableOriginalConstructor()
             ->onlyMethods(['getContent'])
@@ -102,6 +105,7 @@ abstract class AbstractResponse extends ApiTestCase
     /**
      * @test
      * @throws ReflectionException
+     * @covers \D3\LinkmobilityClient\SMS\Response::getInternalStatus
      */
     public function testGetInternalStatus()
     {
@@ -111,6 +115,7 @@ abstract class AbstractResponse extends ApiTestCase
     /**
      * @test
      * @throws ReflectionException
+     * @covers \D3\LinkmobilityClient\SMS\Response::getStatusMessage
      */
     public function testGetStatusMessage()
     {
@@ -120,6 +125,17 @@ abstract class AbstractResponse extends ApiTestCase
     /**
      * @test
      * @throws ReflectionException
+     * @covers \D3\LinkmobilityClient\SMS\Response::getClientMessageId
+     */
+    public function testGetClientMessageId()
+    {
+        $this->checkProperties('clientMessageId', 'clientMessageId', 'getClientMessageId');
+    }
+
+    /**
+     * @test
+     * @throws ReflectionException
+     * @covers \D3\LinkmobilityClient\SMS\Response::getTransferId
      */
     public function testGetTransferId()
     {
@@ -129,6 +145,7 @@ abstract class AbstractResponse extends ApiTestCase
     /**
      * @test
      * @throws ReflectionException
+     * @covers \D3\LinkmobilityClient\SMS\Response::getSmsCount
      */
     public function testGetSmsCount()
     {
@@ -142,6 +159,7 @@ abstract class AbstractResponse extends ApiTestCase
      *
      * @throws ReflectionException
      * @dataProvider isSuccessfulDataProvider
+     * @covers \D3\LinkmobilityClient\SMS\Response::isSuccessful
      */
     public function testIsSuccessful($statusCode, $expected)
     {
@@ -180,6 +198,7 @@ abstract class AbstractResponse extends ApiTestCase
      *
      * @throws ReflectionException
      * @dataProvider getErrorMessageDataProvider
+     * @covers \D3\LinkmobilityClient\SMS\Response::getErrorMessage
      */
     public function testGetErrorMessage($successful, $expected)
     {
@@ -207,7 +226,7 @@ abstract class AbstractResponse extends ApiTestCase
     {
         return [
             'successful'    => [true, ''],
-            'not successful'=> [false, 'fixtureMessage']
+            'not successful'=> [false, 'fixtureMessage'],
         ];
     }
 }

Tests/SMS/RequestFactoryTest.php

@@ -30,6 +30,7 @@ class RequestFactoryTest extends ApiTestCase
      * @test
      * @return void
      * @throws ReflectionException
+     * @covers \D3\LinkmobilityClient\SMS\RequestFactory::__construct
      */
     public function testConstruct()
     {
@@ -59,6 +60,7 @@ class RequestFactoryTest extends ApiTestCase
      * @return void
      * @throws ReflectionException
      * @dataProvider getTextSmsRequestDataProvider
+     * @covers \D3\LinkmobilityClient\SMS\RequestFactory::getSmsRequest
      */
     public function testGetTextSmsRequest($encoding, $expectedClass)
     {
@@ -98,8 +100,8 @@ class RequestFactoryTest extends ApiTestCase
     public function getTextSmsRequestDataProvider(): array
     {
         return [
-            'binary'    => [RequestFactory::GSM_UCS2, BinaryRequest::class],
+            'binary'    => [SmsLength::ENCODING_UCS2, BinaryRequest::class],
-            'ascii'     => [RequestFactory::GSM_7BIT, TextRequest::class]
+            'ascii'     => [SmsLength::ENCODING_7BIT, TextRequest::class],
         ];
     }
 
@@ -107,6 +109,7 @@ class RequestFactoryTest extends ApiTestCase
      * @test
      * @return void
      * @throws ReflectionException
+     * @covers \D3\LinkmobilityClient\SMS\RequestFactory::getSmsLength
      */
     public function testGetSmsLengthInstance()
     {

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
@@ -44,6 +45,7 @@ class UrlTest extends ApiTestCase
      * @test
      * @return void
      * @throws ReflectionException
+     * @covers \D3\LinkmobilityClient\Url\Url::getBaseUri
      */
     public function testGetBaseUri()
     {
@@ -58,4 +60,36 @@ class UrlTest extends ApiTestCase
             )
         );
     }
+
+    /**
+     * @test
+     * @throws ReflectionException
+     * @covers \D3\LinkmobilityClient\Url\Url::getTextSmsUri
+     */
+    public function testGetTextSmsUri()
+    {
+        $uri = $this->callMethod(
+            $this->url,
+            'getTextSmsUri'
+        );
+
+        $this->assertIsString($uri);
+        $this->assertStringStartsWith('/', $uri);
+    }
+
+    /**
+     * @test
+     * @throws ReflectionException
+     * @covers \D3\LinkmobilityClient\Url\Url::getBinarySmsUri
+     */
+    public function testGetBinarySmsUri()
+    {
+        $uri = $this->callMethod(
+            $this->url,
+            'getBinarySmsUri'
+        );
+
+        $this->assertIsString($uri);
+        $this->assertStringStartsWith('/', $uri);
+    }
 }

Tests/ValueObject/RecipientTest.php

@@ -16,10 +16,13 @@ declare(strict_types=1);
 namespace D3\LinkmobilityClient\Tests\ValueObject;
 
 use Assert\InvalidArgumentException;
+use D3\LinkmobilityClient\Exceptions\RecipientException;
 use D3\LinkmobilityClient\Tests\ApiTestCase;
 use D3\LinkmobilityClient\ValueObject\Recipient;
 use libphonenumber\NumberParseException;
 use libphonenumber\PhoneNumber;
+use libphonenumber\PhoneNumberFormat;
+use libphonenumber\PhoneNumberType;
 use libphonenumber\PhoneNumberUtil;
 use PHPUnit\Framework\MockObject\MockObject;
 use ReflectionException;
@@ -29,17 +32,22 @@ class RecipientTest extends ApiTestCase
     /** @var Recipient */
     public $recipient;
 
-    private $phoneNumberFixture = '01527565839';
+    private $phoneNumberFixture;
     private $phoneCountryFixture = 'DE';
 
     /**
      * @return void
      * @throws NumberParseException
+     * @throws RecipientException
      */
     public function setUp(): void
     {
         parent::setUp();
 
+        $phoneUtil = PhoneNumberUtil::getInstance();
+        $example = $phoneUtil->getExampleNumberForType($this->phoneCountryFixture, PhoneNumberType::MOBILE);
+        $this->phoneNumberFixture = $phoneUtil->format($example, PhoneNumberFormat::NATIONAL);
+
         $this->recipient = new Recipient($this->phoneNumberFixture, $this->phoneCountryFixture);
     }
 
@@ -57,17 +65,21 @@ class RecipientTest extends ApiTestCase
      * @test
      * @return void
      * @throws NumberParseException
+     * @throws RecipientException
      * @throws ReflectionException
+     * @covers \D3\LinkmobilityClient\ValueObject\Recipient::__construct
      */
     public function testConstructValid()
     {
         /** @var PhoneNumberUtil|MockObject $phoneNumberUtilMock */
         $phoneNumberUtilMock = $this->getMockBuilder(PhoneNumberUtil::class)
-            ->onlyMethods(['parse', 'format'])
+            ->onlyMethods(['parse', 'format', 'isValidNumber', 'getNumberType'])
             ->disableOriginalConstructor()
             ->getMock();
         $phoneNumberUtilMock->method('parse')->willReturn(new PhoneNumber());
         $phoneNumberUtilMock->method('format')->willReturn('+491527565839');
+        $phoneNumberUtilMock->method('isValidNumber')->willReturn(true);
+        $phoneNumberUtilMock->method('getNumberType')->willReturn(PhoneNumberType::MOBILE);
 
         /** @var Recipient|MockObject $recipientMock */
         $recipientMock = $this->getMockBuilder(Recipient::class)
@@ -78,7 +90,7 @@ class RecipientTest extends ApiTestCase
         $recipientMock->__construct($this->phoneNumberFixture, $this->phoneCountryFixture);
 
         $this->assertSame(
-            '491527565839',
+            '+491527565839',
             $this->callMethod(
                 $recipientMock,
                 'get'
@@ -100,17 +112,20 @@ class RecipientTest extends ApiTestCase
      * @param $number
      * @param $country
      * @param $validNumber
+     * @param $numberType
      * @param $expectedException
      *
      * @return void
      * @throws NumberParseException
+     * @throws RecipientException
      * @dataProvider constructInvalidDataProvider
+     * @covers       \D3\LinkmobilityClient\ValueObject\Recipient::__construct
      */
-    public function testConstructInvalid($number, $country, $validNumber, $expectedException)
+    public function testConstructInvalid($number, $country, $validNumber, $numberType, $expectedException)
     {
         /** @var PhoneNumberUtil|MockObject $phoneNumberUtilMock */
         $phoneNumberUtilMock = $this->getMockBuilder(PhoneNumberUtil::class)
-            ->onlyMethods(['parse', 'format', 'isValidNumber'])
+            ->onlyMethods(['parse', 'format', 'isValidNumber', 'getNumberType'])
             ->disableOriginalConstructor()
             ->getMock();
         if ($number === 'abc') {
@@ -120,6 +135,7 @@ class RecipientTest extends ApiTestCase
         }
         $phoneNumberUtilMock->method('format')->willReturn($number);
         $phoneNumberUtilMock->method('isValidNumber')->willReturn($validNumber);
+        $phoneNumberUtilMock->method('getNumberType')->willReturn($numberType);
 
         /** @var Recipient|MockObject $recipientMock */
         $recipientMock = $this->getMockBuilder(Recipient::class)
@@ -133,21 +149,27 @@ class RecipientTest extends ApiTestCase
     }
 
     /**
-     * @return string[][]
+     * @return array[]
      */
     public function constructInvalidDataProvider(): array
     {
+        $phoneUtil = PhoneNumberUtil::getInstance();
+        $example = $phoneUtil->getExampleNumberForType($this->phoneCountryFixture, PhoneNumberType::MOBILE);
+        $phoneNumberFixture = $phoneUtil->format($example, PhoneNumberFormat::NATIONAL);
+
         return [
-            'empty number'          => ['', 'DE', true, InvalidArgumentException::class],
+            'empty number'          => ['', 'DE', true, PhoneNumberType::MOBILE, InvalidArgumentException::class],
-            'invalid country code'  => [$this->phoneNumberFixture, 'DEX', true, InvalidArgumentException::class],
+            'invalid country code'  => [$phoneNumberFixture, 'DEX', true, PhoneNumberType::MOBILE, InvalidArgumentException::class],
-            'unparsable'            => ['abc', 'DE', true, NumberParseException::class],
+            'unparsable'            => ['abc', 'DE', true, PhoneNumberType::MOBILE, NumberParseException::class],
-            'invalid number'        => ['abc', 'DE', false, NumberParseException::class]
+            'invalid number'        => ['abcd', 'DE', false, PhoneNumberType::MOBILE, RecipientException::class],
+            'not mobile number'     => ['abcd', 'DE', true, PhoneNumberType::FIXED_LINE, RecipientException::class],
         ];
     }
 
     /**
      * @test
      * @throws ReflectionException
+     * @covers \D3\LinkmobilityClient\ValueObject\Recipient::getPhoneNumberUtil
      */
     public function testGetPhoneNumberUtil()
     {
@@ -159,4 +181,65 @@ class RecipientTest extends ApiTestCase
             )
         );
     }
+
+    /**
+     * @test
+     * @return void
+     * @throws ReflectionException
+     * @covers \D3\LinkmobilityClient\ValueObject\Recipient::getCountryCode
+     */
+    public function testGetCountryCode()
+    {
+        $this->assertSame(
+            $this->phoneCountryFixture,
+            $this->callMethod(
+                $this->recipient,
+                'getCountryCode'
+            )
+        );
+    }
+
+    /**
+     * @test
+     * @return void
+     * @throws ReflectionException
+     * @covers \D3\LinkmobilityClient\ValueObject\ValueObject::get
+     * @covers \D3\LinkmobilityClient\ValueObject\StringValueObject::get
+     * @covers \D3\LinkmobilityClient\ValueObject\StringValueObject::__toString
+     * @covers \D3\LinkmobilityClient\ValueObject\Recipient::get
+     */
+    public function testGet()
+    {
+        $this->assertSame(
+            '+4915123456789',
+            (string) $this->recipient
+        );
+
+        $this->assertSame(
+            '+4915123456789',
+            $this->callMethod(
+                $this->recipient,
+                'get'
+            )
+        );
+    }
+
+    /**
+     * @test
+     * @return void
+     * @throws ReflectionException
+     * @covers \D3\LinkmobilityClient\ValueObject\ValueObject::getFormatted
+     * @covers \D3\LinkmobilityClient\ValueObject\StringValueObject::getFormatted
+     * @covers \D3\LinkmobilityClient\ValueObject\Recipient::getFormatted
+     */
+    public function testGetFormatted()
+    {
+        $this->assertSame(
+            '4915123456789',
+            $this->callMethod(
+                $this->recipient,
+                'getFormatted'
+            )
+        );
+    }
 }

Tests/ValueObject/SenderTest.php

@@ -21,16 +21,18 @@ use D3\LinkmobilityClient\Tests\ApiTestCase;
 use D3\LinkmobilityClient\ValueObject\Sender;
 use libphonenumber\NumberParseException;
 use libphonenumber\PhoneNumber;
+use libphonenumber\PhoneNumberFormat;
+use libphonenumber\PhoneNumberType;
 use libphonenumber\PhoneNumberUtil;
 use PHPUnit\Framework\MockObject\MockObject;
 use ReflectionException;
 
 class SenderTest extends ApiTestCase
 {
-    /** @var Sender */
+    /** @var Sender|MockObject */
     public $sender;
 
-    private $phoneNumberFixture = '015792300219';
+    private $phoneNumberFixture;
     private $phoneCountryFixture = 'DE';
 
     /**
@@ -42,6 +44,10 @@ class SenderTest extends ApiTestCase
     {
         parent::setUp();
 
+        $phoneUtil = PhoneNumberUtil::getInstance();
+        $example = $phoneUtil->getExampleNumberForType($this->phoneCountryFixture, PhoneNumberType::MOBILE);
+        $this->phoneNumberFixture = $phoneUtil->format($example, PhoneNumberFormat::NATIONAL);
+
         $this->sender = new Sender($this->phoneNumberFixture, $this->phoneCountryFixture);
     }
 
@@ -61,8 +67,10 @@ class SenderTest extends ApiTestCase
      * @throws NumberParseException
      * @throws RecipientException
      * @throws ReflectionException
+     * @dataProvider constructValidDataProvider
+     * @covers \D3\LinkmobilityClient\ValueObject\Sender::__construct
      */
-    public function testConstructValid()
+    public function testConstructValid($number, $country, $hasNumber)
     {
         /** @var PhoneNumberUtil|MockObject $phoneNumberUtilMock */
         $phoneNumberUtilMock = $this->getMockBuilder(PhoneNumberUtil::class)
@@ -79,27 +87,42 @@ class SenderTest extends ApiTestCase
             ->disableOriginalConstructor()
             ->getMock();
         $senderMock->method('getPhoneNumberUtil')->willReturn($phoneNumberUtilMock);
-        $senderMock->__construct($this->phoneNumberFixture, $this->phoneCountryFixture);
+        $senderMock->__construct($number, $country);
 
         $this->assertSame(
-            '4915792300219',
+            $hasNumber,
             $this->callMethod(
                 $senderMock,
                 'get'
-            )
+            ) === '4915792300219'
         );
     }
 
+    /**
+     * @return array[]
+     */
+    public function constructValidDataProvider(): array
+    {
+        $phoneUtil = PhoneNumberUtil::getInstance();
+        $example = $phoneUtil->getExampleNumberForType($this->phoneCountryFixture, PhoneNumberType::MOBILE);
+        $this->phoneNumberFixture = $phoneUtil->format($example, PhoneNumberFormat::NATIONAL);
+
+        return [
+            'null number'           => [null, $this->phoneCountryFixture, false],
+            'null country'          => [$this->phoneNumberFixture, null, false],
+            'all values'            => [$this->phoneNumberFixture, $this->phoneCountryFixture, true],
+        ];
+    }
+
     /**
      * @test
      * @param $number
      * @param $country
      * @param $validNumber
      * @param $expectedException
-     *
+     * @throws ReflectionException
-     * @throws NumberParseException
-     * @throws RecipientException
      * @dataProvider constructInvalidDataProvider
+     * @covers       \D3\LinkmobilityClient\ValueObject\Sender::__construct
      */
     public function testConstructInvalid($number, $country, $validNumber, $expectedException)
     {
@@ -109,12 +132,14 @@ class SenderTest extends ApiTestCase
             ->disableOriginalConstructor()
             ->getMock();
         if ($number === 'abc') {
-            $phoneNumberUtilMock->method('parse')->willThrowException(new NumberParseException(0, 'message'));
+            $phoneNumberUtilMock->expects($this->exactly((int) ($country !== 'DEX')))->method('parse')
+                ->willThrowException(new NumberParseException(0, 'message'));
         } else {
-            $phoneNumberUtilMock->method('parse')->willReturn(new PhoneNumber());
+            $phoneNumberUtilMock->expects($this->exactly((int) ($country !== 'DEX')))->method('parse')
+                ->willReturn(new PhoneNumber());
         }
         $phoneNumberUtilMock->method('format')->willReturn($number);
-        $phoneNumberUtilMock->method('isValidNumber')->willReturn($validNumber);
+        $phoneNumberUtilMock->method('isValidNumber')->willReturn((bool) $validNumber);
 
         /** @var Sender|MockObject $senderMock */
         $senderMock = $this->getMockBuilder(Sender::class)
@@ -124,25 +149,35 @@ class SenderTest extends ApiTestCase
         $senderMock->method('getPhoneNumberUtil')->willReturn($phoneNumberUtilMock);
 
         $this->expectException($expectedException);
-        $senderMock->__construct($number, $country);
+
+        $this->callMethod(
+            $senderMock,
+            '__construct',
+            [$number, $country]
+        );
     }
 
     /**
-     * @return string[][]
+     * @return array[]
      */
     public function constructInvalidDataProvider(): array
     {
+        $phoneUtil = PhoneNumberUtil::getInstance();
+        $example = $phoneUtil->getExampleNumberForType($this->phoneCountryFixture, PhoneNumberType::MOBILE);
+        $phoneNumberFixture = $phoneUtil->format($example, PhoneNumberFormat::NATIONAL);
+
         return [
             'empty number'          => ['', 'DE', true, InvalidArgumentException::class],
-            'invalid country code'  => [$this->phoneNumberFixture, 'DEX', true, InvalidArgumentException::class],
+            'invalid country code'  => [$phoneNumberFixture, 'DEX', true, InvalidArgumentException::class],
             'unparsable'            => ['abc', 'DE', true, NumberParseException::class],
-            'invalid number'        => ['abc', 'DE', false, NumberParseException::class]
+            'invalid number'        => ['abcd', 'DE', false, RecipientException::class],
         ];
     }
 
     /**
      * @test
      * @throws ReflectionException
+     * @covers \D3\LinkmobilityClient\ValueObject\Sender::getPhoneNumberUtil
      */
     public function testGetPhoneNumberUtil()
     {
@@ -154,4 +189,42 @@ class SenderTest extends ApiTestCase
             )
         );
     }
+
+    /**
+     * @test
+     * @return void
+     * @throws ReflectionException
+     * @covers \D3\LinkmobilityClient\ValueObject\ValueObject::get
+     * @covers \D3\LinkmobilityClient\ValueObject\StringValueObject::get
+     * @covers \D3\LinkmobilityClient\ValueObject\Sender::get
+     */
+    public function testGet()
+    {
+        $this->assertSame(
+            '+4915123456789',
+            $this->callMethod(
+                $this->sender,
+                'get'
+            )
+        );
+    }
+
+    /**
+     * @test
+     * @return void
+     * @throws ReflectionException
+     * @covers \D3\LinkmobilityClient\ValueObject\ValueObject::getFormatted
+     * @covers \D3\LinkmobilityClient\ValueObject\StringValueObject::getFormatted
+     * @covers \D3\LinkmobilityClient\ValueObject\Sender::getFormatted
+     */
+    public function testGetFormatted()
+    {
+        $this->assertSame(
+            '4915123456789',
+            $this->callMethod(
+                $this->sender,
+                'getFormatted'
+            )
+        );
+    }
 }

Tests/ValueObject/SmsBinaryMessageTest.php

@@ -15,14 +15,13 @@ declare(strict_types=1);
 
 namespace D3\LinkmobilityClient\Tests\ValueObject;
 
-use Assert\InvalidArgumentException;
-use D3\LinkmobilityClient\Tests\ApiTestCase;
 use D3\LinkmobilityClient\ValueObject\SmsBinaryMessage;
+use Phlib\SmsLength\Exception\InvalidArgumentException;
 use Phlib\SmsLength\SmsLength;
 use PHPUnit\Framework\MockObject\MockObject;
 use ReflectionException;
 
-class SmsBinaryMessageTest extends ApiTestCase
+class SmsBinaryMessageTest extends SmsMessageAbstractTest
 {
     /** @var SmsBinaryMessage */
     public $message;
@@ -39,20 +38,12 @@ class SmsBinaryMessageTest extends ApiTestCase
         $this->message = new SmsBinaryMessage($this->messageFixture);
     }
 
-    /**
-     * @return void
-     */
-    public function tearDown(): void
-    {
-        parent::tearDown();
-
-        unset($this->message);
-    }
-
     /**
      * @test
      * @return void
      * @throws ReflectionException
+     * @covers \D3\LinkmobilityClient\ValueObject\SmsBinaryMessage::__construct
+     * @covers \D3\LinkmobilityClient\ValueObject\SmsMessageAbstract::__construct
      */
     public function testConstructValid()
     {
@@ -89,6 +80,8 @@ class SmsBinaryMessageTest extends ApiTestCase
      *
      * @throws ReflectionException
      * @dataProvider constructInvalidDataProvider
+     * @covers \D3\LinkmobilityClient\ValueObject\SmsBinaryMessage::__construct
+     * @covers \D3\LinkmobilityClient\ValueObject\SmsMessageAbstract::__construct
      */
     public function testConstructInvalid($binaryMessage, $valid, $expectedException)
     {
@@ -100,7 +93,7 @@ class SmsBinaryMessageTest extends ApiTestCase
         if ($valid) {
             $smsLengthMock->expects($this->never())->method('validate')->willReturn(true);
         } else {
-            $smsLengthMock->expects($this->atLeastOnce())->method('validate')->willThrowException(new \Phlib\SmsLength\Exception\InvalidArgumentException());
+            $smsLengthMock->expects($this->atLeastOnce())->method('validate')->willThrowException(new InvalidArgumentException());
         }
 
         /** @var SmsBinaryMessage|MockObject $message */
@@ -122,34 +115,11 @@ class SmsBinaryMessageTest extends ApiTestCase
         );
     }
 
-    /**
-     * @return string[][]
-     */
-    public function constructInvalidDataProvider(): array
-    {
-        return [
-            'empty message'          => ['', true, InvalidArgumentException::class],
-            'invalid sms message'    => ['abc', false, \Phlib\SmsLength\Exception\InvalidArgumentException::class]
-        ];
-    }
-
     /**
      * @test
      * @throws ReflectionException
-     */
+     * @covers \D3\LinkmobilityClient\ValueObject\SmsBinaryMessage::chunkCount
-    public function testGetSmsLengthInstance()
+     * @covers \D3\LinkmobilityClient\ValueObject\SmsMessageAbstract::chunkCount
-    {
-        $this->assertInstanceOf(
-            SmsLength::class,
-            $this->callMethod(
-                $this->message,
-                'getSmsLength'
-            )
-        );
-    }
-
-    /**
-     * @throws ReflectionException
      */
     public function testGetChunkCount()
     {
@@ -165,9 +135,9 @@ class SmsBinaryMessageTest extends ApiTestCase
 
         /** @var SmsBinaryMessage|MockObject $message */
         $message = $this->getMockBuilder(SmsBinaryMessage::class)
-                        ->onlyMethods(['getSmsLength'])
+            ->onlyMethods(['getSmsLength'])
-                        ->disableOriginalConstructor()
+            ->disableOriginalConstructor()
-                        ->getMock();
+            ->getMock();
         $message->method('getSmsLength')->willReturn($smsLengthMock);
 
         $this->assertSame(
@@ -180,7 +150,10 @@ class SmsBinaryMessageTest extends ApiTestCase
     }
 
     /**
+     * @test
      * @throws ReflectionException
+     * @covers \D3\LinkmobilityClient\ValueObject\SmsBinaryMessage::length
+     * @covers \D3\LinkmobilityClient\ValueObject\SmsMessageAbstract::length
      */
     public function testGetSize()
     {
@@ -211,7 +184,10 @@ class SmsBinaryMessageTest extends ApiTestCase
     }
 
     /**
+     * @test
      * @throws ReflectionException
+     * @covers \D3\LinkmobilityClient\ValueObject\SmsBinaryMessage::getMessageContent
+     * @covers \D3\LinkmobilityClient\ValueObject\SmsMessageAbstract::getMessageContent
      */
     public function testGetMessageContent()
     {

Tests/ValueObject/SmsMessageAbstractTest.php

@@ -0,0 +1,65 @@
+<?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\ValueObject;
+
+use Assert\InvalidArgumentException;
+use D3\LinkmobilityClient\Tests\ApiTestCase;
+use D3\LinkmobilityClient\ValueObject\SmsBinaryMessage;
+use Phlib\SmsLength\SmsLength;
+use ReflectionException;
+
+abstract class SmsMessageAbstractTest extends ApiTestCase
+{
+    public $message;
+
+    /**
+     * @return void
+     */
+    public function tearDown(): void
+    {
+        parent::tearDown();
+
+        unset($this->message);
+    }
+
+    /**
+     * @return array[]
+     */
+    public function constructInvalidDataProvider(): array
+    {
+        return [
+            'empty message'          => ['', true, InvalidArgumentException::class],
+            'invalid sms message'    => ['abc', false, \Phlib\SmsLength\Exception\InvalidArgumentException::class],
+        ];
+    }
+
+    /**
+     * @test
+     * @throws ReflectionException
+     * @covers \D3\LinkmobilityClient\ValueObject\SmsBinaryMessage::getSmsLength
+     * @covers \D3\LinkmobilityClient\ValueObject\SmsTextMessage::getSmsLength
+     */
+    public function testGetSmsLengthInstance()
+    {
+        $this->assertInstanceOf(
+            SmsLength::class,
+            $this->callMethod(
+                $this->message,
+                'getSmsLength'
+            )
+        );
+    }
+}

Tests/ValueObject/SmsTextMessageTest.php

@@ -21,7 +21,7 @@ use Phlib\SmsLength\SmsLength;
 use PHPUnit\Framework\MockObject\MockObject;
 use ReflectionException;
 
-class SmsTextMessageTest extends SmsBinaryMessageTest
+class SmsTextMessageTest extends SmsMessageAbstractTest
 {
     /** @var SmsTextMessage */
     public $message;
@@ -42,6 +42,8 @@ class SmsTextMessageTest extends SmsBinaryMessageTest
      * @test
      * @return void
      * @throws ReflectionException
+     * @covers \D3\LinkmobilityClient\ValueObject\SmsTextMessage::__construct
+     * @covers \D3\LinkmobilityClient\ValueObject\SmsMessageAbstract::__construct
      */
     public function testConstructValid()
     {
@@ -78,6 +80,8 @@ class SmsTextMessageTest extends SmsBinaryMessageTest
      *
      * @throws ReflectionException
      * @dataProvider constructInvalidDataProvider
+     * @covers \D3\LinkmobilityClient\ValueObject\SmsTextMessage::__construct
+     * @covers \D3\LinkmobilityClient\ValueObject\SmsMessageAbstract::__construct
      */
     public function testConstructInvalid($binaryMessage, $valid, $expectedException)
     {
@@ -110,4 +114,104 @@ class SmsTextMessageTest extends SmsBinaryMessageTest
             )
         );
     }
+
+    /**
+     * @test
+     * @throws ReflectionException
+     * @covers \D3\LinkmobilityClient\ValueObject\SmsTextMessage::chunkCount
+     * @covers \D3\LinkmobilityClient\ValueObject\SmsMessageAbstract::chunkCount
+     */
+    public function testGetChunkCount()
+    {
+        $expected = 2;
+
+        /** @var SmsLength|MockObject $smsLengthMock */
+        $smsLengthMock = $this->getMockBuilder(SmsLength::class)
+            ->onlyMethods(['getMessageCount', 'validate'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $smsLengthMock->expects($this->once())->method('getMessageCount')->willReturn($expected);
+        $smsLengthMock->method('validate')->willReturn(true);
+
+        /** @var SmsTextMessage|MockObject $message */
+        $message = $this->getMockBuilder(SmsTextMessage::class)
+            ->onlyMethods(['getSmsLength'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $message->method('getSmsLength')->willReturn($smsLengthMock);
+
+        $this->assertSame(
+            $expected,
+            $this->callMethod(
+                $message,
+                'chunkCount'
+            )
+        );
+    }
+
+    /**
+     * @test
+     * @throws ReflectionException
+     * @covers \D3\LinkmobilityClient\ValueObject\SmsTextMessage::length
+     * @covers \D3\LinkmobilityClient\ValueObject\SmsMessageAbstract::length
+     */
+    public function testGetSize()
+    {
+        $expected = 55;
+
+        /** @var SmsLength|MockObject $smsLengthMock */
+        $smsLengthMock = $this->getMockBuilder(SmsLength::class)
+            ->onlyMethods(['getSize', 'validate'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $smsLengthMock->expects($this->once())->method('getSize')->willReturn($expected);
+        $smsLengthMock->method('validate')->willReturn(true);
+
+        /** @var SmsTextMessage|MockObject $message */
+        $message = $this->getMockBuilder(SmsTextMessage::class)
+            ->onlyMethods(['getSmsLength'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $message->method('getSmsLength')->willReturn($smsLengthMock);
+
+        $this->assertSame(
+            $expected,
+            $this->callMethod(
+                $message,
+                'length'
+            )
+        );
+    }
+
+    /**
+     * @test
+     * @throws ReflectionException
+     * @covers \D3\LinkmobilityClient\ValueObject\SmsTextMessage::getMessageContent
+     * @covers \D3\LinkmobilityClient\ValueObject\SmsMessageAbstract::getMessageContent
+     */
+    public function testGetMessageContent()
+    {
+        /** @var SmsLength|MockObject $smsLengthMock */
+        $smsLengthMock = $this->getMockBuilder(SmsLength::class)
+            ->onlyMethods(['validate'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $smsLengthMock->method('validate')->willReturn(true);
+
+        /** @var SmsTextMessage|MockObject $message */
+        $message = $this->getMockBuilder(SmsTextMessage::class)
+            ->onlyMethods(['getSmsLength'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $message->method('getSmsLength')->willReturn($smsLengthMock);
+        $message->__construct($this->messageFixture);
+
+        $this->assertSame(
+            'testMessage',
+            $this->callMethod(
+                $message,
+                'getMessageContent'
+            )
+        );
+    }
 }

Tests/ValueObject/ValueObjectTest.php

@@ -0,0 +1,85 @@
+<?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\ValueObject;
+
+use Assert\InvalidArgumentException;
+use D3\LinkmobilityClient\Tests\ApiTestCase;
+use D3\LinkmobilityClient\ValueObject\ValueObject;
+use libphonenumber\PhoneNumberFormat;
+use libphonenumber\PhoneNumberType;
+use libphonenumber\PhoneNumberUtil;
+use PHPUnit\Framework\MockObject\MockObject;
+use ReflectionException;
+
+class ValueObjectTest extends ApiTestCase
+{
+    /** @var ValueObject|MockObject */
+    public $value;
+
+    public function setUp(): void
+    {
+        parent::setUp();
+
+        $this->value = $this->getMockBuilder(ValueObject::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+    }
+
+    /**
+     * @test
+     * @return void
+     * @throws ReflectionException
+     * @covers \D3\LinkmobilityClient\ValueObject\ValueObject::__construct
+     * @covers \D3\LinkmobilityClient\ValueObject\ValueObject::get
+     */
+    public function testConstructValid()
+    {
+        $phoneUtil = PhoneNumberUtil::getInstance();
+        $example = $phoneUtil->getExampleNumberForType('DE', PhoneNumberType::MOBILE);
+        $phoneNumberFixture = $phoneUtil->format($example, PhoneNumberFormat::NATIONAL);
+
+        $this->callMethod(
+            $this->value,
+            '__construct',
+            [$phoneNumberFixture]
+        );
+
+        $this->assertSame(
+            '01512 3456789',
+            $this->getValue(
+                $this->value,
+                'value'
+            )
+        );
+    }
+
+    /**
+     * @test
+     * @return void
+     * @throws ReflectionException
+     * @covers \D3\LinkmobilityClient\ValueObject\ValueObject::__construct
+     */
+    public function testConstructInvalid()
+    {
+        $this->expectException(InvalidArgumentException::class);
+
+        $this->callMethod(
+            $this->value,
+            '__construct',
+            ['']
+        );
+    }
+}

composer.json

@@ -1,7 +1,7 @@
 {
     "name": "d3/linkmobility-php-client",
     "type": "library",
-    "description": "PHP client for LINK Mobility Austria API",
+    "description": "PHP client for LINK Mobility API",
     "keywords": [
         "LINK Mobility",
         "php",
@@ -21,19 +21,20 @@
       "GPL-3.0-or-later"
     ],
     "require": {
-        "php": "^7.0",
+        "php": "^7.3 || ^8.0.3",
-        "beberlei/assert": "^2.9.9",
+        "beberlei/assert": "^3.3",
-        "guzzlehttp/guzzle": "~6.2",
+        "guzzlehttp/guzzle": "^7.3",
-        "psr/http-message": "~1.0",
+        "psr/http-message": "^1.0 || ^2.0",
-        "symfony/options-resolver": "^4.4.37",
+        "phlib/sms-length": "^2.0",
-        "phlib/sms-length": "^1.1.0 || ^2.0.0",
         "giggsey/libphonenumber-for-php": "^8.12.50",
+        "caseyamcl/guzzle_retry_middleware": "^2.8",
         "ext-json": "*"
     },
     "require-dev": {
-        "php": "^7.2",
+        "php": "^7.4 || ~8.0.3",
-        "phpunit/phpunit" : "^8.0",
+        "phpunit/phpunit" : "^9.5",
-        "friendsofphp/php-cs-fixer": "^2.0"
+        "friendsofphp/php-cs-fixer": "^3.9",
+        "phpstan/phpstan": "^1.8"
     },
     "autoload": {
         "psr-4": {
@@ -42,8 +43,9 @@
         }
     },
     "scripts": {
-        "test": "phpunit",
+        "test": "./vendor/bin/phpunit",
         "check-style": "./vendor/bin/php-cs-fixer fix --verbose --dry-run",
-        "fix-style": "./vendor/bin/php-cs-fixer fix --verbose"
+        "fix-style": "./vendor/bin/php-cs-fixer fix --verbose",
+        "check-code": "./vendor/bin/phpstan analyse -c phpstan.neon --no-progress --ansi"
     }
 }

phpstan.neon

@@ -0,0 +1,6 @@
+parameters:
+    paths:
+        - src
+        - Tests
+    level: 5
+    phpVersion: 70300

phpunit.xml

@@ -1,22 +1,20 @@
-
+<?xml version="1.0"?>
-<phpunit
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    bootstrap="vendor/autoload.php"
+         bootstrap="vendor/autoload.php"
-    convertErrorsToExceptions="true"
+         convertErrorsToExceptions="true"
-    convertNoticesToExceptions="true"
+         convertNoticesToExceptions="true"
-    convertWarningsToExceptions="true">
+         convertWarningsToExceptions="true"
-
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
-    <testsuite name="tankerkoenig">
+  <coverage>
-        <directory>./Tests</directory>
+    <include>
-    </testsuite>
+      <directory suffix=".php">src</directory>
-
+    </include>
-    <filter>
+    <report>
-        <whitelist>
+      <clover outputFile="build/logs/clover.xml"/>
-            <directory suffix=".php">src</directory>
+    </report>
-        </whitelist>
+  </coverage>
-    </filter>
+  <testsuite name="linkmobility">
-
+    <directory>./Tests</directory>
-    <logging>
+  </testsuite>
-        <log type="coverage-clover" target="build/logs/clover.xml"/>
+  <logging/>
-    </logging>
-
 </phpunit>

src/Client.php

@@ -15,14 +15,18 @@ declare(strict_types=1);
 
 namespace D3\LinkmobilityClient;
 
-use D3\LinkmobilityClient\Exceptions\ApiException;
+use Assert\InvalidArgumentException;
-use D3\LinkmobilityClient\Exceptions\ExceptionMessages;
 use D3\LinkmobilityClient\Request\RequestInterface;
+use D3\LinkmobilityClient\Url\Url;
+use D3\LinkmobilityClient\Url\UrlInterface;
+use GuzzleHttp\Client as GuzzleClient;
 use GuzzleHttp\ClientInterface;
 use GuzzleHttp\Exception\GuzzleException;
-use InvalidArgumentException;
+use GuzzleHttp\HandlerStack;
+use GuzzleHttp\MessageFormatter;
+use GuzzleHttp\Middleware;
+use GuzzleRetry\GuzzleRetryMiddleware;
 use Psr\Http\Message\ResponseInterface;
-use Psr\Log\LoggerInterface;
 
 class Client
 {
@@ -30,20 +34,32 @@ class Client
     public $apiUrl;
     public $requestClient;
 
-    private $logger;
-
     public function __construct(string $accessToken, UrlInterface $apiUrl = null, ClientInterface $client = null)
     {
         $this->accessToken = $accessToken;
         $this->apiUrl = $apiUrl ?: new Url();
-        $this->requestClient = $client ?: new \GuzzleHttp\Client([ 'base_uri' => $this->apiUrl->getBaseUri() ]);
+        $this->requestClient = $client ?: $this->getDefaultClient();
+    }
+
+    /**
+     * @return GuzzleClient
+     */
+    protected function getDefaultClient(): GuzzleClient
+    {
+        $handlerStack = HandlerStack::create();
+        $handlerStack->push($this->getLoggerMiddleware());
+        $handlerStack->push($this->getRetryMiddleware());
+
+        return new GuzzleClient( [
+            'base_uri'  => $this->apiUrl->getBaseUri(),
+            'handler'   => $handlerStack
+        ]);
     }
 
     /**
      * @param RequestInterface $request
      *
      * @return Response\ResponseInterface
-     * @throws ApiException
      * @throws GuzzleException
      * @throws InvalidArgumentException
      */
@@ -62,64 +78,47 @@ class Client
      * @param array  $options
      *
      * @return ResponseInterface
-     * @throws ApiException
      * @throws GuzzleException
      */
     protected function rawRequest($url, string $method = RequestInterface::METHOD_GET, array $options = []): ResponseInterface
     {
         $options['headers']['Authorization'] = 'Bearer '.$this->accessToken;
 
-        if ($this->hasLogger()) {
+        $response = $this->requestClient->request($method, $url, $options);
-            $this->getLogger()->debug('request '.$url, $options);
+        $response->getBody()->rewind();
-        }
-
-        $response = $this->requestClient->request(
-            $method,
-            $url,
-            $options
-        );
-
-        if ($response->getStatusCode() != 200) {
-            $message = sprintf(ExceptionMessages::NOK_REQUEST_RETURN, $url, $response->getStatusCode());
-            if ($this->hasLogger()) {
-                $this->getLogger()->error($message);
-            }
-            throw new ApiException($message);
-        }
-
-        if ($this->hasLogger()) {
-            $response->getBody()->rewind();
-            $this->getLogger()->debug('response', [$response->getBody()->getContents()]);
-        }
 
         return $response;
     }
 
     /**
-     * @param mixed $logger
+     * @return LoggerHandler
+     */
+    public function getLoggerHandler(): LoggerHandler
+    {
+        return LoggerHandler::getInstance();
+    }
+
+    /**
+     * @param string $loglevel
      *
-     * @return Client
+     * @return callable
      */
-    public function setLogger(LoggerInterface $logger): Client
+    protected function getLoggerMiddleware(string $loglevel = 'debug'): callable
     {
-        $this->logger = $logger;
+        return Middleware::log(
-
+            $this->getLoggerHandler()->getLogger(),
-        return $this;
+            new MessageFormatter(MessageFormatter::DEBUG),
+            $loglevel
+        );
     }
 
     /**
-     * @return bool
+     * @return callable
      */
-    public function hasLogger(): bool
+    protected function getRetryMiddleware(): callable
     {
-        return $this->logger instanceof LoggerInterface;
+        return GuzzleRetryMiddleware::factory([
-    }
+            'max_retry_attempts' => 3
-
+        ]);
-    /**
-     * @return LoggerInterface|null
-     */
-    public function getLogger()
-    {
-        return $this->hasLogger() ? $this->logger : null;
     }
 }

src/Exceptions/ExceptionMessages.php

@@ -17,11 +17,15 @@ namespace D3\LinkmobilityClient\Exceptions;
 
 class ExceptionMessages
 {
-    public const INVALID_SENDER            = 'invalid sender phone number';
+    public const INVALID_SENDER             = 'invalid sender phone number';
 
-    public const NOK_REQUEST_RETURN        = 'request %1$s returns status code %2$s';
+    public const NOK_REQUEST_RETURN         = 'request %1$s returns status code %2$s';
 
-    public const INVALID_RECIPIENT_PHONE   = 'invalid recipient phone number';
+    public const INVALID_RECIPIENT_PHONE    = 'invalid recipient phone number';
 
-    public const NOT_A_MOBILE_NUMBER       = 'not a mobile 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

@@ -15,6 +15,6 @@ declare(strict_types=1);
 
 namespace D3\LinkmobilityClient\Exceptions;
 
-class ApiException extends LinkmobilityException
+class NoSenderDefinedException extends LinkmobilityException
 {
 }

src/LoggerHandler.php

@@ -0,0 +1,59 @@
+<?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
+{
+    /** @var LoggerHandler */
+    private static $instance = null;
+    private $logger;
+
+    /**
+     * @return LoggerHandler
+     */
+    public static function getInstance(): LoggerHandler
+    {
+        if (self::$instance === null) {
+            self::$instance = new self();
+        }
+
+        return self::$instance;
+    }
+
+    public function __construct()
+    {
+        $this->setLogger(new NullLogger());
+    }
+
+    /**
+     * @param LoggerInterface $logger
+     */
+    public function setLogger(LoggerInterface $logger)
+    {
+        $this->logger = $logger;
+    }
+
+    /**
+     * @return LoggerInterface
+     */
+    public function getLogger(): LoggerInterface
+    {
+        return $this->logger;
+    }
+}

src/RecipientsList/RecipientsList.php

@@ -16,13 +16,8 @@ declare(strict_types=1);
 namespace D3\LinkmobilityClient\RecipientsList;
 
 use D3\LinkmobilityClient\Client;
-use D3\LinkmobilityClient\Exceptions\ExceptionMessages;
-use D3\LinkmobilityClient\Exceptions\RecipientException;
 use D3\LinkmobilityClient\ValueObject\Recipient;
 use Iterator;
-use libphonenumber\NumberParseException;
-use libphonenumber\PhoneNumberType;
-use libphonenumber\PhoneNumberUtil;
 
 class RecipientsList implements RecipientsListInterface, Iterator
 {
@@ -36,17 +31,15 @@ class RecipientsList implements RecipientsListInterface, Iterator
      */
     private $recipients = [];
 
-    public function __construct(Client $client)
-    {
-        $this->setClient($client);
-    }
-
     /**
-     * @return PhoneNumberUtil
+     * @deprecated unused client parameter will remove
+     * @param Client|null $client
      */
-    protected function getPhoneNumberUtil(): PhoneNumberUtil
+    public function __construct(Client $client = null)
     {
-        return PhoneNumberUtil::getInstance();
+        if ($client) {
+            $this->setClient( $client );
+        }
     }
 
     /**
@@ -56,34 +49,7 @@ class RecipientsList implements RecipientsListInterface, Iterator
      */
     public function add(Recipient $recipient): RecipientsListInterface
     {
-        $phoneUtil = $this->getPhoneNumberUtil();
+        $this->recipients[ md5(serialize($recipient)) ] = $recipient;
-        try {
-            $phoneNumber = $phoneUtil->parse($recipient->get(), $recipient->getCountryCode());
-
-            if (false === $phoneUtil->isValidNumber($phoneNumber)) {
-                throw new RecipientException(ExceptionMessages::INVALID_RECIPIENT_PHONE);
-            } elseif (
-                false === in_array(
-                    $phoneUtil->getNumberType($phoneNumber),
-                    [
-                        PhoneNumberType::MOBILE,
-                        PhoneNumberType::FIXED_LINE_OR_MOBILE
-                    ]
-                )
-            ) {
-                throw new RecipientException(ExceptionMessages::NOT_A_MOBILE_NUMBER);
-            }
-
-            $this->recipients[ md5(serialize($recipient)) ] = $recipient;
-        } catch (NumberParseException $e) {
-            if ($this->getClient()->hasLogger()) {
-                $this->getClient()->getLogger()->info($e->getMessage());
-            }
-        } catch (RecipientException $e) {
-            if ($this->getClient()->hasLogger()) {
-                $this->getClient()->getLogger()->info($e->getMessage());
-            }
-        }
 
         return $this;
     }
@@ -98,12 +64,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
             )
@@ -150,6 +119,7 @@ class RecipientsList implements RecipientsListInterface, Iterator
     }
 
     /**
+     * @deprecated
      * @return Client
      */
     public function getClient(): Client
@@ -158,6 +128,7 @@ class RecipientsList implements RecipientsListInterface, Iterator
     }
 
     /**
+     * @deprecated
      * @param Client $client
      *
      * @return RecipientsList

src/RecipientsList/RecipientsListInterface.php

@@ -20,6 +20,10 @@ use D3\LinkmobilityClient\ValueObject\Recipient;
 
 interface RecipientsListInterface
 {
+    /**
+     * @deprecated unused client parameter will remove
+     * @param Client $client
+     */
     public function __construct(Client $client);
 
     public function add(Recipient $recipient): RecipientsListInterface;
@@ -27,4 +31,6 @@ interface RecipientsListInterface
     public function clearRecipents(): RecipientsListInterface;
 
     public function getRecipients(): array;
+
+    public function getRecipientsList(): array;
 }

src/Request/Request.php

@@ -16,7 +16,9 @@ declare(strict_types=1);
 namespace D3\LinkmobilityClient\Request;
 
 use Assert\Assert;
+use Assert\InvalidArgumentException;
 use D3\LinkmobilityClient\Client;
+use D3\LinkmobilityClient\Exceptions\ExceptionMessages;
 use D3\LinkmobilityClient\RecipientsList\RecipientsList;
 use D3\LinkmobilityClient\RecipientsList\RecipientsListInterface;
 use D3\LinkmobilityClient\Response\ResponseInterface;
@@ -24,9 +26,7 @@ use D3\LinkmobilityClient\ValueObject\Recipient;
 use D3\LinkmobilityClient\ValueObject\Sender;
 use D3\LinkmobilityClient\ValueObject\SmsMessageAbstract;
 use D3\LinkmobilityClient\ValueObject\SmsMessageInterface;
-use D3\LinkmobilityClient\ValueObject\StringValueObject;
 use GuzzleHttp\RequestOptions;
-use InvalidArgumentException;
 
 abstract class Request implements RequestInterface
 {
@@ -106,7 +106,7 @@ abstract class Request implements RequestInterface
     private $test = false;
 
     /**
-     * @var bool
+     * @var int
      */
     private $maxSmsPerMessage = 0;
 
@@ -118,10 +118,13 @@ abstract class Request implements RequestInterface
         $this->recipientsList = new RecipientsList($client);
         $this->setMessage($message);
         $this->setClient($client);
-
-        return $this;
     }
 
+    /**
+     * @return string
+     */
+    abstract public function getUri(): string;
+
     /**
      * @throws InvalidArgumentException
      */
@@ -135,7 +138,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
@@ -163,7 +166,7 @@ abstract class Request implements RequestInterface
             'senderAddress'     => $this->getSenderAddress() ? $this->getSenderAddress()->getFormatted() : null,
             'senderAddressType' => $this->getSenderAddressType(),
             'test'              => $this->getTestMode(),
-            'validityPeriode'   => $this->getValidityPeriode()
+            'validityPeriode'   => $this->getValidityPeriode(),
         ];
     }
 
@@ -194,18 +197,18 @@ abstract class Request implements RequestInterface
                 'headers' => [
                     'Accept'            => $this->contentType,
                     'Content-Type'      => $this->contentType,
-                ]
+                ],
             ],
             $this->getBody()
         );
     }
 
     /**
-     * @param StringValueObject $message
+     * @param SmsMessageInterface $message
      *
      * @return $this
      */
-    public function setMessage(StringValueObject $message): Request
+    public function setMessage(SmsMessageInterface $message): Request
     {
         $this->message = $message;
 
@@ -274,7 +277,7 @@ abstract class Request implements RequestInterface
         return $this;
     }
 
-    public function getClientMessageId()
+    public function getClientMessageId(): ?string
     {
         return $this->clientMessageId;
     }
@@ -300,7 +303,7 @@ abstract class Request implements RequestInterface
     {
         return [
             RequestInterface::CONTENTCATEGORY_ADVERTISEMENT    => RequestInterface::CONTENTCATEGORY_ADVERTISEMENT,
-            RequestInterface::CONTENTCATEGORY_INFORMATIONAL    => RequestInterface::CONTENTCATEGORY_INFORMATIONAL
+            RequestInterface::CONTENTCATEGORY_INFORMATIONAL    => RequestInterface::CONTENTCATEGORY_INFORMATIONAL,
         ];
     }
 
@@ -370,7 +373,7 @@ abstract class Request implements RequestInterface
     /**
      * @return string|null
      */
-    public function getNotificationCallbackUrl()
+    public function getNotificationCallbackUrl(): ?string
     {
         return $this->notificationCallbackUrl;
     }
@@ -390,7 +393,7 @@ abstract class Request implements RequestInterface
     /**
      * @return int|null
      */
-    public function getPriority()
+    public function getPriority(): ?int
     {
         return $this->priority;
     }
@@ -416,7 +419,7 @@ abstract class Request implements RequestInterface
     }
 
     /**
-     * @return bool|null
+     * @return bool
      */
     public function doSendAsFlashSms(): bool
     {
@@ -438,7 +441,7 @@ abstract class Request implements RequestInterface
     /**
      * @return Sender|null
      */
-    public function getSenderAddress()
+    public function getSenderAddress(): ?Sender
     {
         return $this->senderAddress;
     }
@@ -458,9 +461,9 @@ abstract class Request implements RequestInterface
     /**
      * @return string|null
      */
-    public function getSenderAddressType()
+    public function getSenderAddressType(): ?string
     {
-        return $this->senderAddressType;
+        return $this->getSenderAddress() && $this->getSenderAddress()->get() ? $this->senderAddressType : null;
     }
 
     /**
@@ -472,7 +475,7 @@ abstract class Request implements RequestInterface
             RequestInterface::SENDERADDRESSTYPE_ALPHANUMERIC    => RequestInterface::SENDERADDRESSTYPE_ALPHANUMERIC,
             RequestInterface::SENDERADDRESSTYPE_INTERNATIONAL   => RequestInterface::SENDERADDRESSTYPE_INTERNATIONAL,
             RequestInterface::SENDERADDRESSTYPE_NATIONAL        => RequestInterface::SENDERADDRESSTYPE_NATIONAL,
-            RequestInterface::SENDERADDRESSTYPE_SHORTCODE       => RequestInterface::SENDERADDRESSTYPE_SHORTCODE
+            RequestInterface::SENDERADDRESSTYPE_SHORTCODE       => RequestInterface::SENDERADDRESSTYPE_SHORTCODE,
         ];
     }
 
@@ -491,7 +494,7 @@ abstract class Request implements RequestInterface
     /**
      * @return int|null
      */
-    public function getValidityPeriode()
+    public function getValidityPeriode(): ?int
     {
         return $this->validityPeriode;
     }
@@ -517,6 +520,7 @@ abstract class Request implements RequestInterface
 
     /**
      * @param Client $client
+     * @return Request
      */
     public function setClient(Client $client): Request
     {

src/Request/RequestInterface.php

@@ -15,14 +15,16 @@ declare(strict_types=1);
 
 namespace D3\LinkmobilityClient\Request;
 
+use Assert\InvalidArgumentException;
 use D3\LinkmobilityClient\Client;
+use D3\LinkmobilityClient\RecipientsList\RecipientsListInterface;
 use D3\LinkmobilityClient\ValueObject\SmsMessageInterface;
-use InvalidArgumentException;
 use Psr\Http\Message\ResponseInterface as PsrResponseInterface;
 use D3\LinkmobilityClient\Response\ResponseInterface as LMResponseInterface;
 
 interface RequestInterface
 {
+    // @codeCoverageIgnoreStart
     public const METHOD_GET = 'GET';
     public const METHOD_POST = 'POST';
     public const METHOD_PUT = 'PUT';
@@ -41,10 +43,20 @@ interface RequestInterface
     public const SENDERADDRESSTYPE_INTERNATIONAL = 'international';
     public const SENDERADDRESSTYPE_ALPHANUMERIC = 'alphanumeric';
     public const SENDERADDRESSTYPE_SHORTCODE = 'shortcode';
+    // @codeCoverageIgnoreEnd
 
+    /**
+     * @param SmsMessageInterface $message
+     * @param Client              $client
+     */
     public function __construct(SmsMessageInterface $message, Client $client);
 
-    public function setMethod(string $method);
+    /**
+     * @param string $method
+     *
+     * @return Request
+     */
+    public function setMethod(string $method): Request;
 
     /**
      * Must return the HTTP verb for this request, i.e. GET, POST, PUT
@@ -53,6 +65,18 @@ interface RequestInterface
      */
     public function getMethod(): string;
 
+    /**
+     * @param bool $test
+     *
+     * @return Request
+     */
+    public function setTestMode(bool $test): Request;
+
+    /**
+     * @return bool
+     */
+    public function getTestMode(): bool;
+
     /**
      * Must return the URI for the request with a leading slash, i.e. /messages.json
      *
@@ -81,6 +105,11 @@ interface RequestInterface
      */
     public function getResponseInstance(PsrResponseInterface $rawResponse): LMResponseInterface;
 
+    /**
+     * @return RecipientsListInterface
+     */
+    public function getRecipientsList(): RecipientsListInterface;
+
     /**
      * Must return the options for this request. If there are none, return [] (empty array)
      *

src/Response/Response.php

@@ -72,7 +72,7 @@ abstract class Response implements ResponseInterface
     /**
      * @return string|null
      */
-    public function getClientMessageId()
+    public function getClientMessageId(): ?string
     {
         return $this->getContent()[self::CLIENTMESSAGEID];
     }
@@ -80,13 +80,13 @@ abstract class Response implements ResponseInterface
     /**
      * @return string|null
      */
-    public function getTransferId()
+    public function getTransferId(): ?string
     {
         return $this->getContent()[self::TRANSFERID];
     }
 
     /**
-     * @return string|null
+     * @return int
      */
     public function getSmsCount(): int
     {

src/SMS/BinaryRequest.php

@@ -16,9 +16,10 @@ declare(strict_types=1);
 namespace D3\LinkmobilityClient\SMS;
 
 use Assert\Assert;
+use Assert\InvalidArgumentException;
 use D3\LinkmobilityClient\Request\Request;
+use D3\LinkmobilityClient\Url\Url;
 use D3\LinkmobilityClient\ValueObject\SmsBinaryMessage;
-use InvalidArgumentException;
 
 class BinaryRequest extends Request implements SmsRequestInterface
 {
@@ -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
@@ -35,7 +36,7 @@ class BinaryRequest extends Request implements SmsRequestInterface
         return array_merge(
             parent::getRawBody(),
             [
-                'userDataHeaderPresent' => true
+                'userDataHeaderPresent' => true,
             ]
         );
     }

src/SMS/RequestFactory.php

@@ -20,21 +20,15 @@ use D3\LinkmobilityClient\ValueObject\SmsBinaryMessage;
 use D3\LinkmobilityClient\ValueObject\SmsTextMessage;
 use Phlib\SmsLength\SmsLength;
 
-class RequestFactory
+class RequestFactory implements RequestFactoryInterface
 {
-    /**
-     * @deprecated is SmsLength constant from version 2.1
-     */
-    public const GSM_7BIT = '7-bit';
-
-    /**
-     * @deprecated is SmsLength constant from version 2.1
-     */
-    public const GSM_UCS2 = 'ucs-2';
-
     protected $message;
     protected $client;
 
+    /**
+     * @param $message
+     * @param Client $client
+     */
     public function __construct($message, Client $client)
     {
         $this->message = $message;
@@ -46,7 +40,7 @@ class RequestFactory
      */
     public function getSmsRequest(): SmsRequestInterface
     {
-        if ($this->getSmsLength()->getEncoding() === self::GSM_7BIT) {
+        if ($this->getSmsLength()->getEncoding() === SmsLength::ENCODING_7BIT) {
             $message = new SmsTextMessage($this->message);
             return new TextRequest($message, $this->client);
         }

src/SMS/RequestFactoryInterface.php

@@ -15,9 +15,11 @@ declare(strict_types=1);
 
 namespace D3\LinkmobilityClient\SMS;
 
+use D3\LinkmobilityClient\Client;
+
 interface RequestFactoryInterface
 {
-    public function __construct($message);
+    public function __construct($message, Client $client);
 
-    public function getRequest(): SmsRequestInterface;
+    public function getSmsRequest(): SmsRequestInterface;
 }

src/SMS/Response.php

@@ -15,6 +15,8 @@ declare(strict_types=1);
 
 namespace D3\LinkmobilityClient\SMS;
 
-class Response extends \D3\LinkmobilityClient\Response\Response
+use D3\LinkmobilityClient\Response\Response as BaseResponse;
+
+class Response extends BaseResponse
 {
 }

src/SMS/TextRequest.php

@@ -16,9 +16,10 @@ declare(strict_types=1);
 namespace D3\LinkmobilityClient\SMS;
 
 use Assert\Assert;
+use Assert\InvalidArgumentException;
 use D3\LinkmobilityClient\Request\Request;
+use D3\LinkmobilityClient\Url\Url;
 use D3\LinkmobilityClient\ValueObject\SmsTextMessage;
-use InvalidArgumentException;
 
 class TextRequest extends Request implements SmsRequestInterface
 {
@@ -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(): string
+    {
+        return '/rest/smsmessaging/text';
+    }
+
+    /**
+     * @return string
+     */
+    public function getBinarySmsUri(): string
+    {
+        return '/rest/smsmessaging/binary';
+    }
 }

src/Url/UrlInterface.php

@@ -13,9 +13,13 @@
 
 declare(strict_types=1);
 
-namespace D3\LinkmobilityClient;
+namespace D3\LinkmobilityClient\Url;
 
 interface UrlInterface
 {
     public function getBaseUri(): string;
+
+    public function getTextSmsUri(): string;
+
+    public function getBinarySmsUri(): string;
 }

src/ValueObject/Recipient.php

@@ -16,12 +16,24 @@ declare(strict_types=1);
 namespace D3\LinkmobilityClient\ValueObject;
 
 use Assert\Assert;
+use Assert\InvalidArgumentException;
+use D3\LinkmobilityClient\Exceptions\ExceptionMessages;
+use D3\LinkmobilityClient\Exceptions\RecipientException;
 use libphonenumber\NumberParseException;
 use libphonenumber\PhoneNumberFormat;
+use libphonenumber\PhoneNumberType;
 use libphonenumber\PhoneNumberUtil;
 
 class Recipient extends StringValueObject
 {
+    /**
+     * @var array
+     */
+    protected $allowedNumberTypes = [
+        PhoneNumberType::MOBILE,
+        PhoneNumberType::FIXED_LINE_OR_MOBILE,
+    ];
+
     /**
      * @var string
      */
@@ -32,15 +44,29 @@ class Recipient extends StringValueObject
      * @param string $iso2CountryCode
      *
      * @throws NumberParseException
+     * @throws RecipientException
+     * @throws InvalidArgumentException
      */
     public function __construct(string $number, string $iso2CountryCode)
     {
+        Assert::that($number)->notEmpty();
         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_RECIPIENT_PHONE);
+        } elseif (
+            false === in_array(
+                $phoneUtil->getNumberType($phoneNumber),
+                $this->allowedNumberTypes
+            )
+        ) {
+            throw new RecipientException(ExceptionMessages::NOT_A_MOBILE_NUMBER);
+        }
 
         parent::__construct($number);
         $this->countryCode = $iso2CountryCode;
@@ -61,4 +87,9 @@ class Recipient extends StringValueObject
     {
         return $this->countryCode;
     }
+
+    public function getFormatted(): string
+    {
+        return ltrim(parent::getFormatted(), '+');
+    }
 }

src/ValueObject/Sender.php

@@ -16,35 +16,49 @@ declare(strict_types=1);
 namespace D3\LinkmobilityClient\ValueObject;
 
 use Assert\Assert;
+use Assert\InvalidArgumentException;
 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
+     * @param string|null $number
-     * @param string $iso2CountryCode
+     * @param string|null $iso2CountryCode
      *
-     * @throws RecipientException
      * @throws NumberParseException
+     * @throws RecipientException
+     * @throws InvalidArgumentException
      */
-    public function __construct(string $number, string $iso2CountryCode)
+    public function __construct(string $number = null, string $iso2CountryCode = null)
     {
-        Assert::that($iso2CountryCode)->string()->length(2);
+        try {
+            if (is_null($number) || is_null($iso2CountryCode)) {
+                throw new NoSenderDefinedException();
+            }
 
-        $phoneUtil = $this->getPhoneNumberUtil();
+            Assert::that($iso2CountryCode)->string()->length(2);
 
-        $phoneNumber = $phoneUtil->parse($number, strtoupper($iso2CountryCode));
+            $phoneUtil = $this->getPhoneNumberUtil();
-        $number = ltrim($phoneUtil->format($phoneNumber, PhoneNumberFormat::E164), '+');
 
-        if (false === $phoneUtil->isValidNumber($phoneNumber)) {
+            $phoneNumber = $phoneUtil->parse($number, strtoupper($iso2CountryCode));
-            throw new RecipientException(ExceptionMessages::INVALID_SENDER);
+            $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
+            );
         }
-
-        parent::__construct($number);
     }
 
     /**
@@ -55,11 +69,8 @@ class Sender extends StringValueObject
         return PhoneNumberUtil::getInstance();
     }
 
-    /**
+    public function getFormatted(): string
-     * @return int
-     */
-    public function getFormatted()
     {
-        return parent::getFormatted();
+        return ltrim(parent::getFormatted(), '+');
     }
 }

src/ValueObject/SmsBinaryMessage.php

@@ -35,7 +35,7 @@ class SmsBinaryMessage extends SmsMessageAbstract
     public function getMessageContent()
     {
         return str_split(
-            base64_encode($this->get()),
+            base64_encode(parent::getMessageContent()),
             SmsLength::MAXIMUM_CHARACTERS_UCS2_SINGLE
         );
     }

src/ValueObject/SmsMessageAbstract.php

@@ -43,6 +43,9 @@ abstract class SmsMessageAbstract extends StringValueObject implements SmsMessag
         return $this->getSmsLength()->getSize();
     }
 
+    /**
+     * @return mixed
+     */
     public function getMessageContent()
     {
         return $this->get();

src/ValueObject/SmsTextMessage.php

@@ -15,7 +15,7 @@ declare(strict_types=1);
 
 namespace D3\LinkmobilityClient\ValueObject;
 
-use InvalidArgumentException;
+use Assert\InvalidArgumentException;
 
 class SmsTextMessage extends SmsMessageAbstract
 {

src/ValueObject/StringValueObject.php

@@ -15,17 +15,8 @@ declare(strict_types=1);
 
 namespace D3\LinkmobilityClient\ValueObject;
 
-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 +26,4 @@ abstract class StringValueObject extends ValueObject
     {
         return $this->value;
     }
-
-    public function getFormatted()
-    {
-        return $this->get();
-    }
 }

src/ValueObject/ValueObject.php

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