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

Tests/ClientTest.php

@@ -205,7 +205,7 @@ class ClientTest extends ApiTestCase
             ->disableOriginalConstructor()
             ->getMock();
         $responseMock->expects($this->atLeastOnce())->method('getStatusCode')->willReturn($statusCode);
-        $responseMock->expects($okStatus ? $this->atLeastOnce() : $this->never())
+        $responseMock->expects($this->atLeastOnce())
             ->method('getBody')->willReturn($streamMock);
 
         /** @var GuzzleClient|MockObject $requestClientMock */

Tests/ValueObject/RecipientTest.php

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

src/Client.php

@@ -68,7 +68,7 @@ class Client
     {
         $options['headers']['Authorization'] = 'Bearer '.$this->accessToken;
 
-        $this->getLoggerHandler()->getLogger()->debug('request '.$url, $options);
+        $this->getLoggerHandler()->getLogger()->debug('linkmobility request: '.$url, $options);
 
         $response = $this->requestClient->request(
             $method,
@@ -78,7 +78,8 @@ class Client
 
         if ($response->getStatusCode() != 200) {
             $message = sprintf(ExceptionMessages::NOK_REQUEST_RETURN, $url, $response->getStatusCode());
-            $this->getLoggerHandler()->getLogger()->error($message);
+            $response->getBody()->rewind();
+            $this->getLoggerHandler()->getLogger()->error($message, [$response->getBody()->getContents()]);
             throw new ApiException($message);
         }
 

src/RecipientsList/RecipientsList.php

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

src/ValueObject/Recipient.php

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

src/ValueObject/Sender.php

@@ -45,7 +45,7 @@ class Sender extends ValueObject
             $phoneUtil = $this->getPhoneNumberUtil();
 
             $phoneNumber = $phoneUtil->parse($number, strtoupper($iso2CountryCode));
-            $number      = ltrim($phoneUtil->format($phoneNumber, PhoneNumberFormat::E164), '+');
+            $number      = $phoneUtil->format($phoneNumber, PhoneNumberFormat::E164);
 
             if (false === $phoneUtil->isValidNumber($phoneNumber)) {
                 throw new RecipientException(ExceptionMessages::INVALID_SENDER);
@@ -66,4 +66,9 @@ class Sender extends ValueObject
     {
         return PhoneNumberUtil::getInstance();
     }
+
+    public function getFormatted()
+    {
+        return ltrim(parent::getFormatted(), '+');
+    }
 }