diff --git a/src/Application/Model/Configuration.php b/src/Application/Model/Configuration.php index 9da0a7c..7b82141 100644 --- a/src/Application/Model/Configuration.php +++ b/src/Application/Model/Configuration.php @@ -25,7 +25,7 @@ class Configuration */ public function getApiToken(): string { - $token = trim(Registry::getConfig()->getConfigParam('d3linkmobility_apitoken')); + $token = trim((string) Registry::getConfig()->getConfigParam('d3linkmobility_apitoken')); Assert::that($token)->string()->notEmpty(); diff --git a/src/Application/Model/MessageTypes/Sms.php b/src/Application/Model/MessageTypes/Sms.php index acdb4a1..b928691 100644 --- a/src/Application/Model/MessageTypes/Sms.php +++ b/src/Application/Model/MessageTypes/Sms.php @@ -25,6 +25,7 @@ use D3\Linkmobility4OXID\Application\Model\UserRecipients; use D3\LinkmobilityClient\Exceptions\ApiException; use D3\LinkmobilityClient\Request\RequestInterface; use D3\LinkmobilityClient\SMS\SmsRequestInterface; +use D3\LinkmobilityClient\ValueObject\Recipient; use D3\LinkmobilityClient\ValueObject\Sender; use Exception; use GuzzleHttp\Exception\GuzzleException; diff --git a/tests/Application/Model/SmsTest.php b/tests/Application/Model/MessageTypes/SmsTest.php similarity index 79% rename from tests/Application/Model/SmsTest.php rename to tests/Application/Model/MessageTypes/SmsTest.php index 3c4c836..4a27f59 100644 --- a/tests/Application/Model/SmsTest.php +++ b/tests/Application/Model/MessageTypes/SmsTest.php @@ -13,11 +13,13 @@ declare(strict_types=1); -namespace D3\Linkmobility4OXID\Tests\Application\Model; +namespace D3\Linkmobility4OXID\Tests\Application\Model\MessageTypes; -use D3\Linkmobility4OXID\Application\Controller\Admin\AdminOrder; -use D3\Linkmobility4OXID\Application\Model\Sms; +use D3\Linkmobility4OXID\Application\Model\MessageTypes\Sms; use D3\ModCfg\Tests\unit\d3ModCfgUnitTestCase; +use libphonenumber\PhoneNumberFormat; +use libphonenumber\PhoneNumberType; +use libphonenumber\PhoneNumberUtil; use OxidEsales\Eshop\Application\Model\Country; use OxidEsales\Eshop\Application\Model\Order; use PHPUnit\Framework\MockObject\MockObject; @@ -28,6 +30,7 @@ class SmsTest extends d3ModCfgUnitTestCase /** @var Sms */ protected $model; protected $countryId = 'countryIdNo1'; + protected $exampleNumber; public function setUp() { @@ -41,6 +44,10 @@ class SmsTest extends d3ModCfgUnitTestCase 'oxisoalpha2' => 'DE' ]); $country->save(); + + $phoneUtil = PhoneNumberUtil::getInstance(); + $example = $phoneUtil->getExampleNumberForType('DE', PhoneNumberType::MOBILE); + $this->exampleNumber = $phoneUtil->format($example, PhoneNumberFormat::NATIONAL); } public function tearDown() @@ -82,11 +89,10 @@ class SmsTest extends d3ModCfgUnitTestCase switch ($aArgs[0]) { case 'oxdelfon': - return '015792300219'; + case 'oxbillfon': + return $this->exampleNumber; case 'oxdelcountryid': return $this->countryId; - case 'oxbillfon': - return '015792300219'; } $this->fail('Unknown variable '.$aArgs[0]);