Compare commits

...

7 Commits
1.2.1 ... 1.3.0

17 changed files with 559 additions and 192 deletions

View File

@ -2,6 +2,38 @@
---
## 1.3.0.0 (2022-07-18)
- tests use generated example phone numbers
- move recipient checks from list to recipient itself
- tests added
---
## 1.2.1.0 (2022-07-15)
- extend log messages
- sanitize special phone number format before request
---
## 1.2.0.0 (2022-07-14)
- make sender number optional
- assign sender address type only if sender is set
- collect exception messages in a class
- collect URI parts in a class
- extract logger handler from client
---
## 1.1.0.0 (2022-07-13)
- make installable in PHP 8
- remove unused dependency
---
## 1.0.0.0 (2022-07-13)
- initial implementation

View File

@ -21,8 +21,10 @@ use Psr\Log\AbstractLogger;
use Psr\Log\LoggerInterface;
use ReflectionException;
class LoggerHandlerTest extends ApiTestCase
class ALoggerHandlerTest extends ApiTestCase
{
/** tests must run as first, because of singleton, which must not initialized before */
/** @var LoggerHandler */
public $loggerHandler;
@ -46,9 +48,30 @@ class LoggerHandlerTest extends ApiTestCase
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()
{
@ -62,6 +85,8 @@ class LoggerHandlerTest extends ApiTestCase
* @test
* @return void
* @throws ReflectionException
* @covers \D3\LinkmobilityClient\LoggerHandler::setLogger
* @covers \D3\LinkmobilityClient\LoggerHandler::getLogger
*/
public function testLogger()
{

View File

@ -68,6 +68,7 @@ class ClientTest extends ApiTestCase
* @param $apiClient
* @return void
* @throws ReflectionException
* @covers \D3\LinkmobilityClient\Client::__construct
*/
public function testConstruct($apiKey, $apiUrl, $apiClient)
{
@ -104,6 +105,7 @@ class ClientTest extends ApiTestCase
* @return void
* @throws ReflectionException
* @dataProvider requestPassedDataProvider
* @covers \D3\LinkmobilityClient\Client::request
*
*/
public function testRequest($requestIsValid)
@ -175,6 +177,7 @@ class ClientTest extends ApiTestCase
* @return void
* @throws ReflectionException
* @dataProvider rawRequestDataProvider
* @covers \D3\LinkmobilityClient\Client::rawRequest
*/
public function testRawRequest($okStatus)
{
@ -255,4 +258,21 @@ class ClientTest extends ApiTestCase
'NOK status' => [false],
];
}
/**
* @test
* @return void
* @throws ReflectionException
* @covers \D3\LinkmobilityClient\Client::getLoggerHandler
*/
public function testGetLoggerHandler()
{
$this->assertInstanceOf(
LoggerHandler::class,
$this->callMethod(
$this->api,
'getLoggerHandler'
)
);
}
}

View File

@ -16,17 +16,13 @@ declare(strict_types=1);
namespace D3\LinkmobilityClient\Tests\RecipientsList;
use D3\LinkmobilityClient\Client;
use D3\LinkmobilityClient\LoggerHandler;
use D3\LinkmobilityClient\RecipientsList\RecipientsList;
use D3\LinkmobilityClient\Tests\ApiTestCase;
use D3\LinkmobilityClient\ValueObject\Recipient;
use libphonenumber\NumberParseException;
use libphonenumber\PhoneNumber;
use libphonenumber\PhoneNumberFormat;
use libphonenumber\PhoneNumberType;
use libphonenumber\PhoneNumberUtil;
use PHPUnit\Framework\MockObject\MockObject;
use Psr\Log\AbstractLogger;
use Psr\Log\LoggerInterface;
use ReflectionException;
use stdClass;
@ -35,7 +31,7 @@ class RecipientsListTest extends ApiTestCase
/** @var RecipientsList */
public $recipientsList;
private $phoneNumberFixture = '01527565839';
private $phoneNumberFixture;
private $phoneCountryFixture = 'DE';
/**
@ -51,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);
}
/**
@ -66,6 +66,7 @@ class RecipientsListTest extends ApiTestCase
/**
* @test
* @return void
* @covers \D3\LinkmobilityClient\RecipientsList\RecipientsList::__construct
*/
public function testConstruct()
{
@ -85,33 +86,10 @@ class RecipientsListTest extends ApiTestCase
/**
* @test
* @throws ReflectionException
*/
public function testGetPhoneNumberUtil()
{
$this->assertInstanceOf(
PhoneNumberUtil::class,
$this->callMethod(
$this->recipientsList,
'getPhoneNumberUtil'
)
);
}
/**
* @test
* @throws ReflectionException
* @covers \D3\LinkmobilityClient\RecipientsList\RecipientsList::add
*/
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'])
@ -120,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')
@ -152,95 +121,8 @@ class RecipientsListTest extends ApiTestCase
/**
* @test
* @throws ReflectionException
* @dataProvider addInvalidNumberDataProvider
*/
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 LoggerHandler|MockObject $loggerHandlerMock */
$loggerHandlerMock = $this->getMockBuilder(LoggerHandler::class)
->onlyMethods(['getLogger'])
->getMock();
$loggerHandlerMock->method('getLogger')->willReturn($loggerMock);
/** @var Client|MockObject $clientMock */
$clientMock = $this->getMockBuilder(Client::class)
->disableOriginalConstructor()
->onlyMethods(['getLoggerHandler'])
->getMock();
$clientMock->method('getLoggerHandler')->willReturn($loggerHandlerMock);
/** @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
* @covers \D3\LinkmobilityClient\RecipientsList\RecipientsList::clearRecipents
* @covers \D3\LinkmobilityClient\RecipientsList\RecipientsList::getRecipientsList
*/
public function testClearRecipents()
{
@ -268,6 +150,7 @@ class RecipientsListTest extends ApiTestCase
/**
* @test
* @throws ReflectionException
* @covers \D3\LinkmobilityClient\RecipientsList\RecipientsList::getRecipients
*/
public function testGetRecipients()
{
@ -296,6 +179,7 @@ class RecipientsListTest extends ApiTestCase
/**
* @test
* @throws ReflectionException
* @covers \D3\LinkmobilityClient\RecipientsList\RecipientsList::getRecipientsList
*/
public function testGetRecipientsList()
{
@ -327,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()
{
@ -375,6 +263,7 @@ class RecipientsListTest extends ApiTestCase
/**
* @test
* @throws ReflectionException
* @covers \D3\LinkmobilityClient\RecipientsList\RecipientsList::valid
*/
public function testValid()
{
@ -406,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()
->getMock();
->disableOriginalConstructor()
->getMock();
$this->assertInstanceOf(
RecipientsList::class,

View File

@ -24,6 +24,9 @@ use D3\LinkmobilityClient\SMS\Response;
use D3\LinkmobilityClient\Tests\ApiTestCase;
use D3\LinkmobilityClient\ValueObject\Recipient;
use D3\LinkmobilityClient\ValueObject\Sender;
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 +65,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()
{
@ -95,6 +100,8 @@ abstract class AbstractRequest extends ApiTestCase
/**
* @test
* @throws ReflectionException
* @covers \D3\LinkmobilityClient\SMS\BinaryRequest::getUri
* @covers \D3\LinkmobilityClient\SMS\TextRequest::getUri
*/
public function testGetUri()
{
@ -109,10 +116,17 @@ 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
*/
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)
@ -136,10 +150,16 @@ abstract class AbstractRequest extends ApiTestCase
/**
* @test
* @throws ReflectionException
* @covers \D3\LinkmobilityClient\SMS\BinaryRequest::validate
* @covers \D3\LinkmobilityClient\SMS\TextRequest::validate
*/
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)
@ -165,6 +185,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()
{
@ -189,6 +212,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)
{
@ -245,6 +270,8 @@ abstract class AbstractRequest extends ApiTestCase
/**
* @test
* @throws ReflectionException
* @covers \D3\LinkmobilityClient\SMS\BinaryRequest::getOptions
* @covers \D3\LinkmobilityClient\SMS\TextRequest::getOptions
*/
public function testGetOptions()
{
@ -304,6 +331,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()
{
@ -317,6 +348,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()
{
@ -326,6 +361,8 @@ abstract class AbstractRequest extends ApiTestCase
/**
* @test
* @throws ReflectionException
* @covers \D3\LinkmobilityClient\SMS\BinaryRequest::getMethods
* @covers \D3\LinkmobilityClient\SMS\TextRequest::getMethods
*/
public function getMethodsTest()
{
@ -341,6 +378,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()
{
@ -350,6 +391,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()
{
@ -359,6 +404,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()
{
@ -368,6 +417,8 @@ abstract class AbstractRequest extends ApiTestCase
/**
* @test
* @throws ReflectionException
* @covers \D3\LinkmobilityClient\SMS\BinaryRequest::getContentCategories
* @covers \D3\LinkmobilityClient\SMS\TextRequest::getContentCategories
*/
public function getContentCategoriesTest()
{
@ -383,6 +434,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()
{
@ -392,6 +447,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()
{
@ -401,6 +460,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()
{
@ -410,6 +473,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()
{
@ -419,6 +486,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()
{
@ -428,6 +499,8 @@ abstract class AbstractRequest extends ApiTestCase
/**
* @test
* @throws ReflectionException
* @covers \D3\LinkmobilityClient\SMS\BinaryRequest::getRecipientsList
* @covers \D3\LinkmobilityClient\SMS\TextRequest::getRecipientsList
*/
public function getRecipientsListTest()
{
@ -443,6 +516,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()
{
@ -452,6 +529,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()
{
@ -466,6 +547,10 @@ 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 testSetGetSenderAddressType($hasSender, $addressType, $expected)
{
@ -519,6 +604,8 @@ abstract class AbstractRequest extends ApiTestCase
/**
* @test
* @throws ReflectionException
* @covers \D3\LinkmobilityClient\SMS\BinaryRequest::getSenderAddressTypes
* @covers \D3\LinkmobilityClient\SMS\TextRequest::getSenderAddressTypes
*/
public function getSenderAddressTypesTest()
{
@ -534,6 +621,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()
{
@ -544,6 +635,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)
{
@ -599,6 +692,10 @@ abstract class AbstractRequest extends ApiTestCase
/**
* @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()
{
@ -609,4 +706,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
);
}
}

View File

@ -29,6 +29,9 @@ 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()
{
@ -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)
{

View File

@ -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)
{
@ -107,6 +109,7 @@ class RequestFactoryTest extends ApiTestCase
* @test
* @return void
* @throws ReflectionException
* @covers \D3\LinkmobilityClient\SMS\RequestFactory::getSmsLength
*/
public function testGetSmsLengthInstance()
{

View File

@ -45,6 +45,7 @@ class UrlTest extends ApiTestCase
* @test
* @return void
* @throws ReflectionException
* @covers \D3\LinkmobilityClient\Url\Url::getBaseUri
*/
public function testGetBaseUri()
{
@ -63,6 +64,7 @@ class UrlTest extends ApiTestCase
/**
* @test
* @throws ReflectionException
* @covers \D3\LinkmobilityClient\Url\Url::getTextSmsUri
*/
public function testGetTextSmsUri()
{
@ -78,6 +80,7 @@ class UrlTest extends ApiTestCase
/**
* @test
* @throws ReflectionException
* @covers \D3\LinkmobilityClient\Url\Url::getBinarySmsUri
*/
public function testGetBinarySmsUri()
{

View File

@ -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)
@ -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)
@ -137,17 +153,23 @@ class RecipientTest extends ApiTestCase
*/
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],
'unparsable' => ['abc', 'DE', true, NumberParseException::class],
'invalid number' => ['abc', 'DE', false, NumberParseException::class]
'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', false, 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'
)
);
}
}

View File

@ -16,11 +16,14 @@ 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 libphonenumber\NumberParseException;
use libphonenumber\PhoneNumber;
use libphonenumber\PhoneNumberFormat;
use libphonenumber\PhoneNumberType;
use libphonenumber\PhoneNumberUtil;
use PHPUnit\Framework\MockObject\MockObject;
use ReflectionException;
@ -30,7 +33,7 @@ class SenderTest extends ApiTestCase
/** @var Sender */
public $sender;
private $phoneNumberFixture = '015792300219';
private $phoneNumberFixture;
private $phoneCountryFixture = 'DE';
/**
@ -42,6 +45,11 @@ class SenderTest extends ApiTestCase
{
parent::setUp();
$phoneUtil = PhoneNumberUtil::getInstance();
$example = $phoneUtil->getExampleNumberForType($this->phoneCountryFixture, PhoneNumberType::MOBILE);
$this->phoneNumberFixture = $phoneUtil->format($example, PhoneNumberFormat::NATIONAL);
/** @var Sender|MockObject sender */
$this->sender = new Sender($this->phoneNumberFixture, $this->phoneCountryFixture);
}
@ -61,8 +69,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,17 +89,33 @@ 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
@ -100,6 +126,7 @@ class SenderTest extends ApiTestCase
* @throws NumberParseException
* @throws RecipientException
* @dataProvider constructInvalidDataProvider
* @covers \D3\LinkmobilityClient\ValueObject\Sender::__construct
*/
public function testConstructInvalid($number, $country, $validNumber, $expectedException)
{
@ -109,12 +136,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,7 +153,12 @@ class SenderTest extends ApiTestCase
$senderMock->method('getPhoneNumberUtil')->willReturn($phoneNumberUtilMock);
$this->expectException($expectedException);
$senderMock->__construct($number, $country);
$this->callMethod(
$senderMock,
'__construct',
[$number, $country]
);
}
/**
@ -132,17 +166,22 @@ class SenderTest extends ApiTestCase
*/
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 +193,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'
)
);
}
}

View File

@ -53,6 +53,7 @@ class SmsBinaryMessageTest extends ApiTestCase
* @test
* @return void
* @throws ReflectionException
* @covers \D3\LinkmobilityClient\ValueObject\SmsBinaryMessage::__construct
*/
public function testConstructValid()
{
@ -89,6 +90,7 @@ class SmsBinaryMessageTest extends ApiTestCase
*
* @throws ReflectionException
* @dataProvider constructInvalidDataProvider
* @covers \D3\LinkmobilityClient\ValueObject\SmsBinaryMessage::__construct
*/
public function testConstructInvalid($binaryMessage, $valid, $expectedException)
{
@ -136,6 +138,7 @@ class SmsBinaryMessageTest extends ApiTestCase
/**
* @test
* @throws ReflectionException
* @covers \D3\LinkmobilityClient\ValueObject\SmsBinaryMessage::getSmsLength
*/
public function testGetSmsLengthInstance()
{
@ -149,7 +152,9 @@ class SmsBinaryMessageTest extends ApiTestCase
}
/**
* @test
* @throws ReflectionException
* @covers \D3\LinkmobilityClient\ValueObject\SmsBinaryMessage::chunkCount
*/
public function testGetChunkCount()
{
@ -180,7 +185,9 @@ class SmsBinaryMessageTest extends ApiTestCase
}
/**
* @test
* @throws ReflectionException
* @covers \D3\LinkmobilityClient\ValueObject\SmsBinaryMessage::length
*/
public function testGetSize()
{
@ -211,7 +218,10 @@ class SmsBinaryMessageTest extends ApiTestCase
}
/**
* @test
* @throws ReflectionException
* @covers \D3\LinkmobilityClient\ValueObject\SmsBinaryMessage::getMessageContent
* @covers \D3\LinkmobilityClient\ValueObject\SmsMessageAbstract::getMessageContent
*/
public function testGetMessageContent()
{

View File

@ -42,6 +42,7 @@ class SmsTextMessageTest extends SmsBinaryMessageTest
* @test
* @return void
* @throws ReflectionException
* @covers \D3\LinkmobilityClient\ValueObject\SmsTextMessage::__construct
*/
public function testConstructValid()
{
@ -78,6 +79,7 @@ class SmsTextMessageTest extends SmsBinaryMessageTest
*
* @throws ReflectionException
* @dataProvider constructInvalidDataProvider
* @covers \D3\LinkmobilityClient\ValueObject\SmsTextMessage::__construct
*/
public function testConstructInvalid($binaryMessage, $valid, $expectedException)
{

View File

@ -0,0 +1,88 @@
<?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\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;
use PHPUnit\Framework\MockObject\MockObject;
use ReflectionException;
class ValueObjectTest extends ApiTestCase
{
public function setUp(): void
{
parent::setUp();
/** @var ValueObject|MockObject value */
$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',
['']
);
}
}

View File

@ -5,7 +5,7 @@
convertNoticesToExceptions="true"
convertWarningsToExceptions="true">
<testsuite name="tankerkoenig">
<testsuite name="linkmobility">
<directory>./Tests</directory>
</testsuite>

View File

@ -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
{
@ -41,14 +36,6 @@ class RecipientsList implements RecipientsListInterface, Iterator
$this->setClient($client);
}
/**
* @return PhoneNumberUtil
*/
protected function getPhoneNumberUtil(): PhoneNumberUtil
{
return PhoneNumberUtil::getInstance();
}
/**
* @param Recipient $recipient
*
@ -56,30 +43,7 @@ class RecipientsList implements RecipientsListInterface, Iterator
*/
public function add(Recipient $recipient): RecipientsListInterface
{
$phoneUtil = $this->getPhoneNumberUtil();
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) {
$this->client->getLoggerHandler()->getLogger()->info($e->getMessage(), [$recipient]);
} catch (RecipientException $e) {
$this->client->getLoggerHandler()->getLogger()->info($e->getMessage(), [$recipient]);
}
$this->recipients[ md5(serialize($recipient)) ] = $recipient;
return $this;
}

View File

@ -16,12 +16,23 @@ declare(strict_types=1);
namespace D3\LinkmobilityClient\ValueObject;
use Assert\Assert;
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,16 +43,29 @@ class Recipient extends StringValueObject
* @param string $iso2CountryCode
*
* @throws NumberParseException
* @throws RecipientException
*/
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 = $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;
}

View File

@ -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
);
}