D3Public
/
linkmobility4oxid
8
0
Fork 1
Code Pull-Requests Projekte Releases Aktivität

improve code syntax

Dieser Commit ist enthalten in:
Daniel Seifert 2023-01-17 09:15:27 +01:00
Ursprung 2897097076
Commit bd466266cc
Signiert von: DanielS
GPG-Schlüssel-ID: 8A7C4C6ED1915C6F
16 geänderte Dateien mit 51 neuen und 51 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

8
src/Application/Controller/Admin/AdminOrder.php
Datei anzeigen

@ -67,10 +67,10 @@ class AdminOrder extends AdminController
protected function sendMessage(): string
{
try {
$sms = $this->getSms( $this->getMessageBody() );
return $sms->sendOrderMessage( $this->item ) ?
$this->getSuccessSentMessage( $sms )->getMessage() :
$this->getUnsuccessfullySentMessage( $sms );
$sms = $this->getSms($this->getMessageBody());
return $sms->sendOrderMessage($this->item) ?
$this->getSuccessSentMessage($sms)->getMessage() :
$this->getUnsuccessfullySentMessage($sms);
} catch (noRecipientFoundException $e) {
/** @var LoggerHandler $loggerHandler */
$loggerHandler = d3GetOxidDIC()->get(LoggerHandler::class);

8
src/Application/Controller/Admin/AdminUser.php
Datei anzeigen

@ -69,11 +69,11 @@ class AdminUser extends AdminController
protected function sendMessage(): string
{
try {
$sms = $this->getSms( $this->getMessageBody() );
$sms = $this->getSms($this->getMessageBody());
return $sms->sendUserAccountMessage( $this->item ) ?
$this->getSuccessSentMessage( $sms )->getMessage() :
$this->getUnsuccessfullySentMessage( $sms );
return $sms->sendUserAccountMessage($this->item) ?
$this->getSuccessSentMessage($sms)->getMessage() :
$this->getUnsuccessfullySentMessage($sms);
} catch (noRecipientFoundException $e) {
/** @var LoggerHandler $loggerHandler */
$loggerHandler = d3GetOxidDIC()->get(LoggerHandler::class);

8
src/Application/Model/MessageSender.php
Datei anzeigen

@ -33,8 +33,8 @@ class MessageSender
public function sendOrderFinishedMessage(Order $order, string $messageBody): void
{
try {
if ( $this->getConfiguration()->sendOrderFinishedMessage() ) {
$this->sendMessageByOrder( $order, $messageBody );
if ($this->getConfiguration()->sendOrderFinishedMessage()) {
$this->sendMessageByOrder($order, $messageBody);
}
} catch (noRecipientFoundException $e) {
/** @var LoggerHandler $loggerHandler */
@ -52,8 +52,8 @@ class MessageSender
public function sendSendedNowMessage(Order $order, string $messageBody): void
{
try {
if ( $this->getConfiguration()->sendOrderSendedNowMessage() ) {
$this->sendMessageByOrder( $order, $messageBody );
if ($this->getConfiguration()->sendOrderSendedNowMessage()) {
$this->sendMessageByOrder($order, $messageBody);
}
} catch (noRecipientFoundException $e) {
/** @var LoggerHandler $loggerHandler */

4
src/Modules/Core/EmailCore.php
Datei anzeigen

@ -89,8 +89,8 @@ class EmailCore extends EmailCore_parent
public function d3SendOrderFinishedMessageToUser(Order $order): void
{
/** @var MessageSender $messageSender */
$messageSender = d3GetOxidDIC()->get( MessageSender::class );
$messageSender->sendOrderFinishedMessage( $order, $this->d3GetOrderFinishedSmsMessageBody( $order ) );
$messageSender = d3GetOxidDIC()->get(MessageSender::class);
$messageSender->sendOrderFinishedMessage($order, $this->d3GetOrderFinishedSmsMessageBody($order));
}
/**

2
src/Setup/Actions.php
Datei anzeigen

@ -180,7 +180,7 @@ class Actions
*/
public function checkCmsItems()
{
foreach(
foreach (
[
'd3linkmobilityordercanceled' => 'addCms1Item',
'd3linkmobilityfinishedorder' => 'addCms2Item',

4
src/tests/integration/adminOrderTest.php
Datei anzeigen

@ -57,7 +57,7 @@ class adminOrderTest extends LMIntegrationTestCase
d3GetOxidDIC()->set(Configuration::class, $configuration);
/** @var Order $order */
$this->order = $order = oxNew( Order::class);
$this->order = $order = oxNew(Order::class);
$order->setId($this->orderId);
$order->assign([
'oxbillfon' => '01512 3456789',
@ -292,7 +292,7 @@ class adminOrderTest extends LMIntegrationTestCase
$_POST['messagebody'] = 'testMessage';
$_POST['oxid'] = $this->orderId;
$this->order->assign( [
$this->order->assign([
'oxbillfon' => '',
'oxbillcountryid' => ''
]);

6
src/tests/integration/canceledOrderTest.php
Datei anzeigen

@ -70,7 +70,7 @@ class canceledOrderTest extends LMIntegrationTestCase
$user->save();
/** @var Order $order */
$this->order = $order = oxNew( Order::class);
$this->order = $order = oxNew(Order::class);
$order->setId($this->orderId);
$order->assign([
'oxbillfon' => '01512 3456789',
@ -162,7 +162,7 @@ class canceledOrderTest extends LMIntegrationTestCase
$history
);
$this->order->assign( [
$this->order->assign([
'oxbillfon' => '222',
'oxbillcountryid' => 'a7c40f631fc920687.20179984',
]);
@ -324,7 +324,7 @@ class canceledOrderTest extends LMIntegrationTestCase
$history
);
$this->order->assign( [
$this->order->assign([
'oxbillfon' => '',
'oxbillcountryid' => ''
]);

6
src/tests/integration/finishedOrderTest.php
Datei anzeigen

@ -73,7 +73,7 @@ class finishedOrderTest extends LMIntegrationTestCase
$user->save();
/** @var Order $order */
$this->order = $order = oxNew( Order::class);
$this->order = $order = oxNew(Order::class);
$order->setId($this->orderId);
$order->assign([
'oxordernr' => '12345',
@ -173,7 +173,7 @@ class finishedOrderTest extends LMIntegrationTestCase
$history
);
$this->order->assign( [
$this->order->assign([
'oxbillfon' => '222',
'oxbillcountryid' => 'a7c40f631fc920687.20179984',
]);
@ -356,7 +356,7 @@ class finishedOrderTest extends LMIntegrationTestCase
$history
);
$this->order->assign( [
$this->order->assign([
'oxbillfon' => '',
'oxbillcountryid' => ''
]);

6
src/tests/integration/sendedNowOrderTest.php
Datei anzeigen

@ -64,7 +64,7 @@ class sendedNowOrderTest extends LMIntegrationTestCase
$user->save();
/** @var Order $order */
$this->order = $order = oxNew( Order::class);
$this->order = $order = oxNew(Order::class);
$order->setId($this->orderId);
$order->assign([
'oxbillfon' => '01512 3456789',
@ -158,7 +158,7 @@ class sendedNowOrderTest extends LMIntegrationTestCase
$history
);
$this->order->assign( [
$this->order->assign([
'oxbillfon' => '222',
'oxbillcountryid' => 'a7c40f631fc920687.20179984',
]);
@ -326,7 +326,7 @@ class sendedNowOrderTest extends LMIntegrationTestCase
$history
);
$this->order->assign( [
$this->order->assign([
'oxbillfon' => '',
'oxbillcountryid' => ''
]);

18
src/tests/unit/Application/Model/MessageSenderTest.php
Datei anzeigen

@ -76,10 +76,10 @@ class MessageSenderTest extends LMUnitTestCase
->getMock();
$sut->method('getConfiguration')->willReturn($configurationMock);
if ($throwException) {
$sut->expects( $invocationCount )->method( 'sendMessageByOrder' )
->willThrowException( oxNew( noRecipientFoundException::class ) );
$sut->expects($invocationCount)->method('sendMessageByOrder')
->willThrowException(oxNew(noRecipientFoundException::class));
} else {
$sut->expects( $invocationCount )->method( 'sendMessageByOrder' );
$sut->expects($invocationCount)->method('sendMessageByOrder');
}
$this->callMethod(
@ -134,10 +134,10 @@ class MessageSenderTest extends LMUnitTestCase
->getMock();
$sut->method('getConfiguration')->willReturn($configurationMock);
if ($throwException) {
$sut->expects( $invocationCount )->method( 'sendMessageByOrder' )
->willThrowException( oxNew( noRecipientFoundException::class ) );
$sut->expects($invocationCount)->method('sendMessageByOrder')
->willThrowException(oxNew(noRecipientFoundException::class));
} else {
$sut->expects( $invocationCount )->method( 'sendMessageByOrder' );
$sut->expects($invocationCount)->method('sendMessageByOrder');
}
$this->callMethod(
@ -192,10 +192,10 @@ class MessageSenderTest extends LMUnitTestCase
->getMock();
$sut->method('getConfiguration')->willReturn($configurationMock);
if ($throwException) {
$sut->expects( $invocationCount )->method( 'sendMessageByOrder' )
->willThrowException( oxNew( noRecipientFoundException::class ) );
$sut->expects($invocationCount)->method('sendMessageByOrder')
->willThrowException(oxNew(noRecipientFoundException::class));
} else {
$sut->expects( $invocationCount )->method( 'sendMessageByOrder' );
$sut->expects($invocationCount)->method('sendMessageByOrder');
}
$this->callMethod(