D3Public
/
linkmobility-php-client
8
0
Vork 0
Code Pull-aanvragen Projecten Publicaties Activiteit

Vergelijk commits

basis: D3Public:2.0.0
Branches Labels
D3Public:main
D3Public:rel_2.x
D3Public:rel_1.x
D3Public:2.2.0
D3Public:2.1.0
D3Public:2.0.3
D3Public:2.0.2
D3Public:1.3.2
D3Public:1.3.1
D3Public:2.0.1
D3Public:2.0.0
D3Public:1.3.0
D3Public:1.2.1
D3Public:1.2.0
D3Public:1.1.0
D3Public:1.0.0
..
vergelijk: D3Public:1.3.0
Branches Labels
D3Public:main
D3Public:rel_2.x
D3Public:rel_1.x
D3Public:2.2.0
D3Public:2.1.0
D3Public:2.0.3
D3Public:2.0.2
D3Public:1.3.2
D3Public:1.3.1
D3Public:2.0.1
D3Public:2.0.0
D3Public:1.3.0
D3Public:1.2.1
D3Public:1.2.0
D3Public:1.1.0
D3Public:1.0.0

No commits in common. "2.0.0" and "1.3.0" have entirely different histories.
2.0.0 ... 1.3.0

27 gewijzigde bestanden met toevoegingen van 127 en 135 verwijderingen
Statistieken weergeven Expand all files Collapse all files

2
.php-cs-fixer.php
Bestand weergeven

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

6
CHANGELOG.md
Bestand weergeven

@ -2,12 +2,6 @@
---
## 2.0.0.0 (2022-07-19)
- adjust to PHP >= 7.3 and current dependency packages
---
## 1.3.0.0 (2022-07-18)
- tests use generated example phone numbers

8
Tests/ClientTest.php
Bestand weergeven

@ -96,7 +96,7 @@ 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()]
];
}
@ -167,7 +167,7 @@ class ClientTest extends ApiTestCase
{
return [
'request is valid' => [true],
'request is not valid' => [false],
'request is not valid' => [false]
];
}
@ -203,7 +203,7 @@ class ClientTest extends ApiTestCase
'withHeader',
'withAddedHeader',
'withoutHeader',
'withBody',
'withBody'
])
->disableOriginalConstructor()
->getMock();
@ -232,7 +232,7 @@ class ClientTest extends ApiTestCase
$clientMock = $this->getMockBuilder(Client::class)
->disableOriginalConstructor()
->onlyMethods([
'getLoggerHandler',
'getLoggerHandler'
])
->getMock();
$clientMock->expects($this->atLeastOnce())

16
Tests/RecipientsList/RecipientsListTest.php
Bestand weergeven

@ -50,7 +50,7 @@ class RecipientsListTest extends ApiTestCase
$phoneUtil = PhoneNumberUtil::getInstance();
$example = $phoneUtil->getExampleNumberForType($this->phoneCountryFixture, PhoneNumberType::MOBILE);
$this->phoneNumberFixture = $phoneUtil->format($example, PhoneNumberFormat::NATIONAL);
$this->phoneNumberFixture = $phoneUtil->format($example, PhoneNumberFormat::NATIONAL);
}
/**
@ -167,7 +167,7 @@ class RecipientsListTest extends ApiTestCase
$this->assertSame(
[
$this->phoneNumberFixture,
$this->phoneNumberFixture,
$this->phoneNumberFixture
],
$this->callMethod(
$this->recipientsList,
@ -280,7 +280,7 @@ class RecipientsListTest extends ApiTestCase
$this->recipientsList,
'recipients',
[
'fixture' => new stdClass(),
'fixture' => new stdClass()
]
);
@ -333,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);
@ -347,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);
@ -359,7 +359,7 @@ class RecipientsListTest extends ApiTestCase
$list = [
'fixture' => $recipientMock,
'fixture2' => $recipientMock2,
'fixture2' => $recipientMock2
];
$this->setValue(

40
Tests/Request/AbstractRequest.php
Bestand weergeven

@ -17,7 +17,6 @@ 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;
@ -25,7 +24,6 @@ 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;
@ -117,19 +115,16 @@ abstract class AbstractRequest extends ApiTestCase
/**
* @test
* @throws ReflectionException
* @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()
{
$phoneUtil = PhoneNumberUtil::getInstance();
$example = $phoneUtil->getExampleNumberForType('DE', PhoneNumberType::MOBILE);
$phoneNumberFixture = $phoneUtil->format($example, PhoneNumberFormat::NATIONAL);
$phoneNumberFixture = $phoneUtil->format($example, PhoneNumberFormat::NATIONAL);
$recipient = new Recipient($phoneNumberFixture, 'DE');
@ -154,18 +149,15 @@ abstract class AbstractRequest extends ApiTestCase
/**
* @test
* @throws ReflectionException
* @covers \D3\LinkmobilityClient\SMS\BinaryRequest::validate
* @covers \D3\LinkmobilityClient\SMS\TextRequest::validate
* @return void
* @throws NumberParseException
* @throws RecipientException
* @throws ReflectionException
*/
public function validateFailedTest()
{
$phoneUtil = PhoneNumberUtil::getInstance();
$example = $phoneUtil->getExampleNumberForType('DE', PhoneNumberType::MOBILE);
$phoneNumberFixture = $phoneUtil->format($example, PhoneNumberFormat::NATIONAL);
$phoneNumberFixture = $phoneUtil->format($example, PhoneNumberFormat::NATIONAL);
$recipient = new Recipient($phoneNumberFixture, 'DE');
@ -261,17 +253,17 @@ abstract class AbstractRequest extends ApiTestCase
['json' => [
'contentCategory' => 'informational',
'messageContent' => 'messageContent',
'priority' => 0,
]],
'priority' => 0
]]
],
'other' => [
'other',
[
'contentCategory' => 'informational',
'messageContent' => 'messageContent',
'priority' => 0,
],
],
'priority' => 0
]
]
];
}
@ -292,20 +284,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'
@ -679,7 +671,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('{}');
@ -688,12 +680,12 @@ 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]
];
}

6
Tests/Response/AbstractResponse.php
Bestand weergeven

@ -38,7 +38,7 @@ abstract class AbstractResponse 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->expects($this->atLeastOnce())->method('getContents')->willReturn(
'{
@ -53,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);
@ -226,7 +226,7 @@ abstract class AbstractResponse extends ApiTestCase
{
return [
'successful' => [true, ''],
'not successful'=> [false, 'fixtureMessage'],
'not successful'=> [false, 'fixtureMessage']
];
}
}

4
Tests/SMS/RequestFactoryTest.php
Bestand weergeven

@ -100,8 +100,8 @@ class RequestFactoryTest extends ApiTestCase
public function getTextSmsRequestDataProvider(): array
{
return [
'binary' => [SmsLength::ENCODING_UCS2, BinaryRequest::class],
'ascii' => [SmsLength::ENCODING_7BIT, TextRequest::class],
'binary' => [RequestFactory::GSM_UCS2, BinaryRequest::class],
'ascii' => [RequestFactory::GSM_7BIT, TextRequest::class]
];
}

6
Tests/ValueObject/RecipientTest.php
Bestand weergeven

@ -46,7 +46,7 @@ class RecipientTest extends ApiTestCase
$phoneUtil = PhoneNumberUtil::getInstance();
$example = $phoneUtil->getExampleNumberForType($this->phoneCountryFixture, PhoneNumberType::MOBILE);
$this->phoneNumberFixture = $phoneUtil->format($example, PhoneNumberFormat::NATIONAL);
$this->phoneNumberFixture = $phoneUtil->format($example, PhoneNumberFormat::NATIONAL);
$this->recipient = new Recipient($this->phoneNumberFixture, $this->phoneCountryFixture);
}
@ -155,14 +155,14 @@ class RecipientTest extends ApiTestCase
{
$phoneUtil = PhoneNumberUtil::getInstance();
$example = $phoneUtil->getExampleNumberForType($this->phoneCountryFixture, PhoneNumberType::MOBILE);
$phoneNumberFixture = $phoneUtil->format($example, PhoneNumberFormat::NATIONAL);
$phoneNumberFixture = $phoneUtil->format($example, PhoneNumberFormat::NATIONAL);
return [
'empty number' => ['', 'DE', true, PhoneNumberType::MOBILE, InvalidArgumentException::class],
'invalid country code' => [$phoneNumberFixture, 'DEX', true, PhoneNumberType::MOBILE, InvalidArgumentException::class],
'unparsable' => ['abc', 'DE', true, PhoneNumberType::MOBILE, NumberParseException::class],
'invalid number' => ['abcd', 'DE', false, PhoneNumberType::MOBILE, RecipientException::class],
'not mobile number' => ['abcd', 'DE', true, PhoneNumberType::FIXED_LINE, RecipientException::class],
'not mobile number' => ['abcd', 'DE', false, PhoneNumberType::FIXED_LINE, RecipientException::class]
];
}

17
Tests/ValueObject/SenderTest.php
Bestand weergeven

@ -16,6 +16,7 @@ declare(strict_types=1);
namespace D3\LinkmobilityClient\Tests\ValueObject;
use Assert\InvalidArgumentException;
use D3\LinkmobilityClient\Exceptions\NoSenderDefinedException;
use D3\LinkmobilityClient\Exceptions\RecipientException;
use D3\LinkmobilityClient\Tests\ApiTestCase;
use D3\LinkmobilityClient\ValueObject\Sender;
@ -46,7 +47,7 @@ class SenderTest extends ApiTestCase
$phoneUtil = PhoneNumberUtil::getInstance();
$example = $phoneUtil->getExampleNumberForType($this->phoneCountryFixture, PhoneNumberType::MOBILE);
$this->phoneNumberFixture = $phoneUtil->format($example, PhoneNumberFormat::NATIONAL);
$this->phoneNumberFixture = $phoneUtil->format($example, PhoneNumberFormat::NATIONAL);
/** @var Sender|MockObject sender */
$this->sender = new Sender($this->phoneNumberFixture, $this->phoneCountryFixture);
@ -106,12 +107,12 @@ class SenderTest extends ApiTestCase
{
$phoneUtil = PhoneNumberUtil::getInstance();
$example = $phoneUtil->getExampleNumberForType($this->phoneCountryFixture, PhoneNumberType::MOBILE);
$this->phoneNumberFixture = $phoneUtil->format($example, PhoneNumberFormat::NATIONAL);
$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],
'all values' => [$this->phoneNumberFixture, $this->phoneCountryFixture, true]
];
}
@ -121,9 +122,11 @@ class SenderTest extends ApiTestCase
* @param $country
* @param $validNumber
* @param $expectedException
* @throws ReflectionException
*
* @throws NumberParseException
* @throws RecipientException
* @dataProvider constructInvalidDataProvider
* @covers \D3\LinkmobilityClient\ValueObject\Sender::__construct
* @covers \D3\LinkmobilityClient\ValueObject\Sender::__construct
*/
public function testConstructInvalid($number, $country, $validNumber, $expectedException)
{
@ -165,13 +168,13 @@ class SenderTest extends ApiTestCase
{
$phoneUtil = PhoneNumberUtil::getInstance();
$example = $phoneUtil->getExampleNumberForType($this->phoneCountryFixture, PhoneNumberType::MOBILE);
$phoneNumberFixture = $phoneUtil->format($example, PhoneNumberFormat::NATIONAL);
$phoneNumberFixture = $phoneUtil->format($example, PhoneNumberFormat::NATIONAL);
return [
'empty number' => ['', 'DE', true, InvalidArgumentException::class],
'invalid country code' => [$phoneNumberFixture, 'DEX', true, InvalidArgumentException::class],
'unparsable' => ['abc', 'DE', true, NumberParseException::class],
'invalid number' => ['abcd', 'DE', false, RecipientException::class],
'invalid number' => ['abcd', 'DE', false, RecipientException::class]
];
}

2
Tests/ValueObject/SmsBinaryMessageTest.php
Bestand weergeven

@ -131,7 +131,7 @@ class SmsBinaryMessageTest extends ApiTestCase
{
return [
'empty message' => ['', true, InvalidArgumentException::class],
'invalid sms message' => ['abc', false, \Phlib\SmsLength\Exception\InvalidArgumentException::class],
'invalid sms message' => ['abc', false, \Phlib\SmsLength\Exception\InvalidArgumentException::class]
];
}

9
Tests/ValueObject/ValueObjectTest.php
Bestand weergeven

@ -16,8 +16,13 @@ declare(strict_types=1);
namespace D3\LinkmobilityClient\Tests\ValueObject;
use Assert\InvalidArgumentException;
use D3\LinkmobilityClient\Exceptions\NoSenderDefinedException;
use D3\LinkmobilityClient\Exceptions\RecipientException;
use D3\LinkmobilityClient\Tests\ApiTestCase;
use D3\LinkmobilityClient\ValueObject\Sender;
use D3\LinkmobilityClient\ValueObject\ValueObject;
use libphonenumber\NumberParseException;
use libphonenumber\PhoneNumber;
use libphonenumber\PhoneNumberFormat;
use libphonenumber\PhoneNumberType;
use libphonenumber\PhoneNumberUtil;
@ -47,7 +52,7 @@ class ValueObjectTest extends ApiTestCase
{
$phoneUtil = PhoneNumberUtil::getInstance();
$example = $phoneUtil->getExampleNumberForType('DE', PhoneNumberType::MOBILE);
$phoneNumberFixture = $phoneUtil->format($example, PhoneNumberFormat::NATIONAL);
$phoneNumberFixture = $phoneUtil->format($example, PhoneNumberFormat::NATIONAL);
$this->callMethod(
$this->value,
@ -80,4 +85,4 @@ class ValueObjectTest extends ApiTestCase
['']
);
}
}
}

14
composer.json
Bestand weergeven

@ -21,18 +21,18 @@
"GPL-3.0-or-later"
],
"require": {
"php": "^7.3 || ^8.0",
"beberlei/assert": "^3.3",
"guzzlehttp/guzzle": "^7.4",
"php": "^7.0 || ^8.0",
"beberlei/assert": "^2.9.9",
"guzzlehttp/guzzle": "~6.2 || ^7.4",
"psr/http-message": "~1.0",
"phlib/sms-length": "^2.0",
"phlib/sms-length": "^1.1.0 || ^2.0.0",
"giggsey/libphonenumber-for-php": "^8.12.50",
"ext-json": "*"
},
"require-dev": {
"php": "^7.4",
"phpunit/phpunit" : "^9.5",
"friendsofphp/php-cs-fixer": "^3.9"
"php": "^7.2",
"phpunit/phpunit" : "^8.0",
"friendsofphp/php-cs-fixer": "^2.0"
},
"autoload": {
"psr-4": {

40
phpunit.xml
Bestand weergeven

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

2
src/LoggerHandler.php
Bestand weergeven

@ -23,7 +23,7 @@ class LoggerHandler
private static $instance = null;
private $logger;
public static function getInstance(): ?LoggerHandler
public static function getInstance()
{
if (self::$instance === null) {
self::$instance = new self();

21
src/Request/Request.php
Bestand weergeven

@ -169,7 +169,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()
];
}
@ -200,7 +200,7 @@ abstract class Request implements RequestInterface
'headers' => [
'Accept' => $this->contentType,
'Content-Type' => $this->contentType,
],
]
],
$this->getBody()
);
@ -280,7 +280,7 @@ abstract class Request implements RequestInterface
return $this;
}
public function getClientMessageId(): ?string
public function getClientMessageId()
{
return $this->clientMessageId;
}
@ -306,7 +306,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
];
}
@ -376,7 +376,7 @@ abstract class Request implements RequestInterface
/**
* @return string|null
*/
public function getNotificationCallbackUrl(): ?string
public function getNotificationCallbackUrl()
{
return $this->notificationCallbackUrl;
}
@ -396,7 +396,7 @@ abstract class Request implements RequestInterface
/**
* @return int|null
*/
public function getPriority(): ?int
public function getPriority()
{
return $this->priority;
}
@ -444,7 +444,7 @@ abstract class Request implements RequestInterface
/**
* @return Sender|null
*/
public function getSenderAddress(): ?Sender
public function getSenderAddress()
{
return $this->senderAddress;
}
@ -464,7 +464,7 @@ abstract class Request implements RequestInterface
/**
* @return string|null
*/
public function getSenderAddressType(): ?string
public function getSenderAddressType()
{
return $this->getSenderAddress() && $this->getSenderAddress()->get() ? $this->senderAddressType : null;
}
@ -478,7 +478,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
];
}
@ -497,7 +497,7 @@ abstract class Request implements RequestInterface
/**
* @return int|null
*/
public function getValidityPeriode(): ?int
public function getValidityPeriode()
{
return $this->validityPeriode;
}
@ -523,7 +523,6 @@ abstract class Request implements RequestInterface
/**
* @param Client $client
* @return Request
*/
public function setClient(Client $client): Request
{

6
src/Response/Response.php
Bestand weergeven

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

2
src/SMS/BinaryRequest.php
Bestand weergeven

@ -36,7 +36,7 @@ class BinaryRequest extends Request implements SmsRequestInterface
return array_merge(
parent::getRawBody(),
[
'userDataHeaderPresent' => true,
'userDataHeaderPresent' => true
]
);
}

18
src/SMS/RequestFactory.php
Bestand weergeven

@ -20,15 +20,21 @@ use D3\LinkmobilityClient\ValueObject\SmsBinaryMessage;
use D3\LinkmobilityClient\ValueObject\SmsTextMessage;
use Phlib\SmsLength\SmsLength;
class RequestFactory implements RequestFactoryInterface
class RequestFactory
{
/**
* @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;
@ -40,7 +46,7 @@ class RequestFactory implements RequestFactoryInterface
*/
public function getSmsRequest(): SmsRequestInterface
{
if ($this->getSmsLength()->getEncoding() === SmsLength::ENCODING_7BIT) {
if ($this->getSmsLength()->getEncoding() === self::GSM_7BIT) {
$message = new SmsTextMessage($this->message);
return new TextRequest($message, $this->client);
}

6
src/SMS/RequestFactoryInterface.php
Bestand weergeven

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

4
src/SMS/Response.php
Bestand weergeven

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

4
src/Url/Url.php
Bestand weergeven

@ -30,7 +30,7 @@ class Url implements UrlInterface
/**
* @return string
*/
public function getTextSmsUri(): string
public function getTextSmsUri()
{
return '/rest/smsmessaging/text';
}
@ -38,7 +38,7 @@ class Url implements UrlInterface
/**
* @return string
*/
public function getBinarySmsUri(): string
public function getBinarySmsUri()
{
return '/rest/smsmessaging/binary';
}

4
src/Url/UrlInterface.php
Bestand weergeven

@ -18,8 +18,4 @@ namespace D3\LinkmobilityClient\Url;
interface UrlInterface
{
public function getBaseUri(): string;
public function getTextSmsUri(): string;
public function getBinarySmsUri(): string;
}

10
src/ValueObject/Recipient.php
Bestand weergeven

@ -30,7 +30,7 @@ class Recipient extends StringValueObject
*/
protected $allowedNumberTypes = [
PhoneNumberType::MOBILE,
PhoneNumberType::FIXED_LINE_OR_MOBILE,
PhoneNumberType::FIXED_LINE_OR_MOBILE
];
/**
@ -53,7 +53,7 @@ class Recipient extends StringValueObject
$phoneUtil = $this->getPhoneNumberUtil();
$phoneNumber = $phoneUtil->parse($number, strtoupper($iso2CountryCode));
$number = $phoneUtil->format($phoneNumber, PhoneNumberFormat::E164);
$number = $phoneUtil->format( $phoneNumber, PhoneNumberFormat::E164 );
if (false === $phoneUtil->isValidNumber($phoneNumber)) {
throw new RecipientException(ExceptionMessages::INVALID_RECIPIENT_PHONE);
@ -63,9 +63,9 @@ class Recipient extends StringValueObject
$this->allowedNumberTypes
)
) {
throw new RecipientException(ExceptionMessages::NOT_A_MOBILE_NUMBER);
throw new RecipientException( ExceptionMessages::NOT_A_MOBILE_NUMBER);
}
parent::__construct($number);
$this->countryCode = $iso2CountryCode;
}
@ -86,7 +86,7 @@ class Recipient extends StringValueObject
return $this->countryCode;
}
public function getFormatted(): string
public function getFormatted()
{
return ltrim(parent::getFormatted(), '+');
}

8
src/ValueObject/Sender.php
Bestand weergeven

@ -27,11 +27,11 @@ use libphonenumber\PhoneNumberUtil;
class Sender extends ValueObject
{
/**
* @param string|null $number
* @param string|null $iso2CountryCode
* @param string $number
* @param string $iso2CountryCode
*
* @throws NumberParseException
* @throws RecipientException
* @throws NumberParseException
*/
public function __construct(string $number = null, string $iso2CountryCode = null)
{
@ -67,7 +67,7 @@ class Sender extends ValueObject
return PhoneNumberUtil::getInstance();
}
public function getFormatted(): string
public function getFormatted()
{
return ltrim(parent::getFormatted(), '+');
}

3
src/ValueObject/SmsMessageAbstract.php
Bestand weergeven

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

2
src/ValueObject/StringValueObject.php
Bestand weergeven

@ -15,6 +15,8 @@ declare(strict_types=1);
namespace D3\LinkmobilityClient\ValueObject;
use Assert\Assert;
abstract class StringValueObject extends ValueObject
{
public function __toString()

2
src/ValueObject/ValueObject.php
Bestand weergeven

@ -33,7 +33,7 @@ abstract class ValueObject
return $this->value;
}
public function getFormatted(): string
public function getFormatted()
{
return $this->get();
}