Skip to content

Commit 77f0b86

Browse files
committed
Remove the added constants to fix the Semantic Version Checker build warnings.
1 parent 30d6b04 commit 77f0b86

File tree

9 files changed

+10
-16
lines changed

9 files changed

+10
-16
lines changed

app/code/Magento/Sales/Model/Order/Email/Sender.php

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,6 @@
1818
*/
1919
abstract class Sender
2020
{
21-
/**
22-
* Copy methods
23-
*/
24-
const COPY_METHOD_BCC = 'bcc';
25-
const COPY_METHOD_COPY = 'copy';
26-
2721
/**
2822
* @var \Magento\Sales\Model\Order\Email\SenderBuilderFactory
2923
*/
@@ -93,7 +87,7 @@ protected function checkAndSend(Order $order)
9387
$this->logger->error($e->getMessage());
9488
return false;
9589
}
96-
if ($this->identityContainer->getCopyMethod() == self::COPY_METHOD_COPY) {
90+
if ($this->identityContainer->getCopyMethod() == 'copy') {
9791
try {
9892
$sender->sendCopyTo();
9993
} catch (\Exception $e) {

app/code/Magento/Sales/Model/Order/Email/SenderBuilder.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public function send()
6565

6666
$copyTo = $this->identityContainer->getEmailCopyTo();
6767

68-
if (!empty($copyTo) && $this->identityContainer->getCopyMethod() == Sender::COPY_METHOD_BCC) {
68+
if (!empty($copyTo) && $this->identityContainer->getCopyMethod() == 'bcc') {
6969
foreach ($copyTo as $email) {
7070
$this->transportBuilder->addBcc($email);
7171
}

app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Sender/EmailSenderTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ public function testSend($configValue, $forceSyncMode, $isComment, $emailSending
285285
if ($emailSendingResult) {
286286
$this->identityContainerMock->expects($this->once())
287287
->method('getCopyMethod')
288-
->willReturn($this->subject::COPY_METHOD_COPY);
288+
->willReturn('copy');
289289

290290
$this->senderBuilderFactoryMock->expects($this->once())
291291
->method('create')

app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/CreditmemoSenderTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ public function testSend($configValue, $forceSyncMode, $customerNoteNotify, $ema
140140
if ($emailSendingResult) {
141141
$this->identityContainerMock->expects($this->once())
142142
->method('getCopyMethod')
143-
->willReturn($this->sender::COPY_METHOD_COPY);
143+
->willReturn('copy');
144144

145145
$this->senderBuilderFactoryMock->expects($this->once())
146146
->method('create')

app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/InvoiceSenderTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ public function testSend($configValue, $forceSyncMode, $customerNoteNotify, $ema
146146
if ($emailSendingResult) {
147147
$this->identityContainerMock->expects($this->once())
148148
->method('getCopyMethod')
149-
->willReturn($this->sender::COPY_METHOD_COPY);
149+
->willReturn('copy');
150150

151151
$this->senderBuilderFactoryMock->expects($this->once())
152152
->method('create')

app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/OrderSenderTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public function testSend($configValue, $forceSyncMode, $emailSendingResult, $sen
7979
if ($emailSendingResult) {
8080
$this->identityContainerMock->expects($this->once())
8181
->method('getCopyMethod')
82-
->willReturn($this->sender::COPY_METHOD_COPY);
82+
->willReturn('copy');
8383

8484
$addressMock = $this->createMock(\Magento\Sales\Model\Order\Address::class);
8585

@@ -220,7 +220,7 @@ public function testSendVirtualOrder($isVirtualOrder, $formatCallCount, $expecte
220220

221221
$this->identityContainerMock->expects($this->once())
222222
->method('getCopyMethod')
223-
->willReturn($this->sender::COPY_METHOD_COPY);
223+
->willReturn('copy');
224224

225225
$addressMock = $this->createMock(\Magento\Sales\Model\Order\Address::class);
226226

app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/ShipmentSenderTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ public function testSend($configValue, $forceSyncMode, $customerNoteNotify, $ema
146146
if ($emailSendingResult) {
147147
$this->identityContainerMock->expects($this->once())
148148
->method('getCopyMethod')
149-
->willReturn($this->sender::COPY_METHOD_COPY);
149+
->willReturn('copy');
150150

151151
$this->senderBuilderFactoryMock->expects($this->once())
152152
->method('create')

app/code/Magento/Sales/Test/Unit/Model/Order/Invoice/Sender/EmailSenderTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ public function testSend($configValue, $forceSyncMode, $isComment, $emailSending
284284
if ($emailSendingResult) {
285285
$this->identityContainerMock->expects($this->once())
286286
->method('getCopyMethod')
287-
->willReturn($this->subject::COPY_METHOD_COPY);
287+
->willReturn('copy');
288288

289289
$this->senderBuilderFactoryMock->expects($this->once())
290290
->method('create')

app/code/Magento/Sales/Test/Unit/Model/Order/Shipment/Sender/EmailSenderTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ public function testSend($configValue, $forceSyncMode, $isComment, $emailSending
286286
if ($emailSendingResult) {
287287
$this->identityContainerMock->expects($this->once())
288288
->method('getCopyMethod')
289-
->willReturn($this->subject::COPY_METHOD_COPY);
289+
->willReturn('copy');
290290

291291
$this->senderBuilderFactoryMock->expects($this->once())
292292
->method('create')

0 commit comments

Comments
 (0)