Commits vergleichen
Keine gemeinsamen Commits. "rel_1.x" und "main" haben vollständig unterschiedliche Historien.
|
@ -21,12 +21,11 @@
|
|||
"GPL-3.0-or-later"
|
||||
],
|
||||
"require": {
|
||||
"php": "^7.1 || ^8.0",
|
||||
"oxid-esales/oxideshop-ce": "~6.7.0 || ~6.9.0 || 6.10 - 6.13",
|
||||
"d3/linkmobility-php-client": "^1.2.0 || ^2.0.0",
|
||||
"d3/oxid-dic-handler": "^1.0",
|
||||
"d3/testingtools": "^1.1",
|
||||
"beberlei/assert": "^3.3"
|
||||
"php": "^7.1 || ^8.0",
|
||||
"oxid-esales/oxideshop-ce": "~6.7.0 || ~6.9.0 || 6.10 - 6.13",
|
||||
"d3/linkmobility-php-client": "^1.2.0 || ^2.0.0",
|
||||
"d3/oxid-dic-handler": "^1.0",
|
||||
"d3/testingtools": "^1.1"
|
||||
},
|
||||
"require-dev": {
|
||||
"oxid-esales/oxideshop-ce": "~6.10.0",
|
||||
|
|
|
@ -15,9 +15,6 @@ declare(strict_types=1);
|
|||
|
||||
namespace D3\Linkmobility4OXID\Application\Controller\Admin;
|
||||
|
||||
use Assert\Assert;
|
||||
use Assert\AssertionFailedException;
|
||||
use Assert\InvalidArgumentException;
|
||||
use D3\Linkmobility4OXID\Application\Model\Exceptions\noRecipientFoundException;
|
||||
use D3\Linkmobility4OXID\Application\Model\Exceptions\successfullySentException;
|
||||
use D3\Linkmobility4OXID\Application\Model\MessageTypes\Sms;
|
||||
|
@ -27,6 +24,7 @@ use D3\LinkmobilityClient\Response\ResponseInterface;
|
|||
use D3\LinkmobilityClient\ValueObject\Recipient;
|
||||
use D3\TestingTools\Production\IsMockable;
|
||||
use Exception;
|
||||
use InvalidArgumentException;
|
||||
use OxidEsales\Eshop\Application\Controller\Admin\AdminController;
|
||||
use OxidEsales\Eshop\Application\Model\Order;
|
||||
use OxidEsales\Eshop\Core\Language;
|
||||
|
@ -127,7 +125,7 @@ class AdminOrder extends AdminController
|
|||
|
||||
try {
|
||||
$utilsView->addErrorToDisplay($this->sendMessage());
|
||||
} catch (AssertionFailedException $e) {
|
||||
} catch (InvalidArgumentException $e) {
|
||||
$utilsView->addErrorToDisplay($e->getMessage());
|
||||
}
|
||||
}
|
||||
|
@ -142,8 +140,14 @@ class AdminOrder extends AdminController
|
|||
$request = d3GetOxidDIC()->get('d3ox.linkmobility.'.Request::class);
|
||||
$messageBody = $request->getRequestEscapedParameter('messagebody');
|
||||
|
||||
$excMessage = Registry::getLang()->translateString('D3LM_EXC_MESSAGE_NO_LENGTH');
|
||||
Assert::that($messageBody)->string($excMessage)->minLength(2, $excMessage);
|
||||
if (false === is_string($messageBody) || strlen(trim($messageBody)) <= 1) {
|
||||
/** @var InvalidArgumentException $exc */
|
||||
$exc = oxNew(
|
||||
InvalidArgumentException::class,
|
||||
Registry::getLang()->translateString('D3LM_EXC_MESSAGE_NO_LENGTH')
|
||||
);
|
||||
throw $exc;
|
||||
}
|
||||
|
||||
return $messageBody;
|
||||
}
|
||||
|
|
|
@ -15,9 +15,6 @@ declare(strict_types=1);
|
|||
|
||||
namespace D3\Linkmobility4OXID\Application\Controller\Admin;
|
||||
|
||||
use Assert\Assert;
|
||||
use Assert\AssertionFailedException;
|
||||
use Assert\InvalidArgumentException;
|
||||
use D3\Linkmobility4OXID\Application\Model\Exceptions\noRecipientFoundException;
|
||||
use D3\Linkmobility4OXID\Application\Model\Exceptions\successfullySentException;
|
||||
use D3\Linkmobility4OXID\Application\Model\MessageTypes\Sms;
|
||||
|
@ -26,6 +23,7 @@ use D3\LinkmobilityClient\LoggerHandler;
|
|||
use D3\LinkmobilityClient\Response\ResponseInterface;
|
||||
use D3\LinkmobilityClient\ValueObject\Recipient;
|
||||
use Exception;
|
||||
use InvalidArgumentException;
|
||||
use OxidEsales\Eshop\Application\Controller\Admin\AdminController;
|
||||
use OxidEsales\Eshop\Application\Model\User;
|
||||
use OxidEsales\Eshop\Core\Language;
|
||||
|
@ -130,7 +128,7 @@ class AdminUser extends AdminController
|
|||
|
||||
try {
|
||||
$utilsView->addErrorToDisplay($this->sendMessage());
|
||||
} catch (AssertionFailedException $e) {
|
||||
} catch (InvalidArgumentException $e) {
|
||||
$utilsView->addErrorToDisplay($e->getMessage());
|
||||
}
|
||||
}
|
||||
|
@ -145,8 +143,14 @@ class AdminUser extends AdminController
|
|||
$request = d3GetOxidDIC()->get('d3ox.linkmobility.'.Request::class);
|
||||
$messageBody = $request->getRequestEscapedParameter('messagebody');
|
||||
|
||||
$excMessage = Registry::getLang()->translateString('D3LM_EXC_MESSAGE_NO_LENGTH');
|
||||
Assert::that($messageBody)->string($excMessage)->minLength(2, $excMessage);
|
||||
if (false === is_string($messageBody) || strlen(trim($messageBody)) <= 1) {
|
||||
/** @var InvalidArgumentException $exc */
|
||||
$exc = oxNew(
|
||||
InvalidArgumentException::class,
|
||||
Registry::getLang()->translateString('D3LM_EXC_MESSAGE_NO_LENGTH')
|
||||
);
|
||||
throw $exc;
|
||||
}
|
||||
|
||||
return $messageBody;
|
||||
}
|
||||
|
|
|
@ -16,7 +16,6 @@ declare(strict_types=1);
|
|||
namespace D3\Linkmobility4OXID\Application\Model;
|
||||
|
||||
use Assert\Assert;
|
||||
use Assert\InvalidArgumentException;
|
||||
use OxidEsales\Eshop\Application\Model\Order;
|
||||
use OxidEsales\Eshop\Application\Model\User;
|
||||
use OxidEsales\Eshop\Core\Config;
|
||||
|
@ -41,7 +40,6 @@ class Configuration
|
|||
|
||||
/**
|
||||
* @return string
|
||||
* @throws InvalidArgumentException
|
||||
*/
|
||||
public function getApiToken(): string
|
||||
{
|
||||
|
@ -64,7 +62,6 @@ class Configuration
|
|||
|
||||
/**
|
||||
* @return string|null
|
||||
* @throws InvalidArgumentException
|
||||
*/
|
||||
public function getSmsSenderNumber(): ?string
|
||||
{
|
||||
|
@ -78,7 +75,6 @@ class Configuration
|
|||
|
||||
/**
|
||||
* @return string|null
|
||||
* @throws InvalidArgumentException
|
||||
*/
|
||||
public function getSmsSenderCountry(): ?string
|
||||
{
|
||||
|
@ -90,14 +86,13 @@ class Configuration
|
|||
$country = trim($country);
|
||||
$country = strlen($country) ? strtoupper($country) : null;
|
||||
|
||||
Assert::thatNullOr($country)->string()->length(2);
|
||||
Assert::that($country)->nullOr()->string()->length(2);
|
||||
|
||||
return $country;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return string[]
|
||||
* @throws InvalidArgumentException
|
||||
*/
|
||||
public function getOrderRecipientFields(): array
|
||||
{
|
||||
|
@ -118,7 +113,6 @@ class Configuration
|
|||
|
||||
/**
|
||||
* @return string[]
|
||||
* @throws InvalidArgumentException
|
||||
*/
|
||||
public function getUserRecipientFields(): array
|
||||
{
|
||||
|
|
|
@ -15,7 +15,6 @@ declare(strict_types=1);
|
|||
|
||||
namespace D3\Linkmobility4OXID\Application\Model\MessageTypes;
|
||||
|
||||
use Assert\AssertionFailedException;
|
||||
use D3\Linkmobility4OXID\Application\Model\Configuration;
|
||||
use D3\Linkmobility4OXID\Application\Model\Exceptions\noRecipientFoundException;
|
||||
use D3\Linkmobility4OXID\Application\Model\MessageClient;
|
||||
|
@ -34,6 +33,7 @@ use D3\LinkmobilityClient\ValueObject\Recipient;
|
|||
use D3\LinkmobilityClient\ValueObject\Sender;
|
||||
use Exception;
|
||||
use GuzzleHttp\Exception\GuzzleException;
|
||||
use InvalidArgumentException;
|
||||
use libphonenumber\NumberParseException;
|
||||
use OxidEsales\Eshop\Application\Model\Order;
|
||||
use OxidEsales\Eshop\Application\Model\User;
|
||||
|
@ -143,7 +143,7 @@ class Sms extends AbstractMessage
|
|||
$this->response = $response = $this->submitMessage($recipientsList);
|
||||
|
||||
return $response->isSuccessful();
|
||||
} catch (GuzzleException|AssertionFailedException $e) {
|
||||
} catch (GuzzleException|InvalidArgumentException $e) {
|
||||
$this->getLogger()->error($e->getMessage());
|
||||
// Oxid does not accept throwable interface only exceptions according to definition
|
||||
/** @var UtilsView $utilsView */
|
||||
|
|
Laden…
In neuem Issue referenzieren