Skip to content

Commit 8d7a451

Browse files
author
Graham Wharton
committed
Corrected linefeeds
1 parent 47c5f72 commit 8d7a451

File tree

2 files changed

+127
-127
lines changed

2 files changed

+127
-127
lines changed

‎lib/internal/Magento/Framework/Mail/Template/TransportBuilderByStore.php

Lines changed: 61 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,62 @@
1-
<?php
2-
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
5-
*/
6-
7-
namespace Magento\Framework\Mail\Template;
8-
9-
use Magento\Framework\Mail\MessageInterface;
10-
11-
/**
12-
* Class TransportBuilderByStore
13-
*
14-
* @deprecated The ability to set From address based on store is now available
15-
* in the \Magento\Framework\Mail\Template\TransportBuilder class
16-
* @see \Magento\Framework\Mail\Template\TransportBuilder::setFromByStore
17-
*/
18-
class TransportBuilderByStore
19-
{
20-
/**
21-
* Message.
22-
*
23-
* @var \Magento\Framework\Mail\Message
24-
*/
25-
protected $message;
26-
27-
/**
28-
* Sender resolver.
29-
*
30-
* @var \Magento\Framework\Mail\Template\SenderResolverInterface
31-
*/
32-
private $senderResolver;
33-
34-
/**
35-
* @param MessageInterface $message
36-
* @param SenderResolverInterface $senderResolver
37-
*/
38-
public function __construct(
39-
MessageInterface $message,
40-
SenderResolverInterface $senderResolver
41-
) {
42-
$this->message = $message;
43-
$this->senderResolver = $senderResolver;
44-
}
45-
46-
/**
47-
* Set mail from address by store.
48-
*
49-
* @param string|array $from
50-
* @param string|int $store
51-
*
52-
* @return $this
53-
*/
54-
public function setFromByStore($from, $store)
55-
{
56-
$result = $this->senderResolver->resolve($from, $store);
57-
$this->message->clearFrom();
58-
$this->message->setFrom($result['email'], $result['name']);
59-
60-
return $this;
61-
}
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
7+
namespace Magento\Framework\Mail\Template;
8+
9+
use Magento\Framework\Mail\MessageInterface;
10+
11+
/**
12+
* Class TransportBuilderByStore
13+
*
14+
* @deprecated The ability to set From address based on store is now available
15+
* in the \Magento\Framework\Mail\Template\TransportBuilder class
16+
* @see \Magento\Framework\Mail\Template\TransportBuilder::setFromByStore
17+
*/
18+
class TransportBuilderByStore
19+
{
20+
/**
21+
* Message.
22+
*
23+
* @var \Magento\Framework\Mail\Message
24+
*/
25+
protected $message;
26+
27+
/**
28+
* Sender resolver.
29+
*
30+
* @var \Magento\Framework\Mail\Template\SenderResolverInterface
31+
*/
32+
private $senderResolver;
33+
34+
/**
35+
* @param MessageInterface $message
36+
* @param SenderResolverInterface $senderResolver
37+
*/
38+
public function __construct(
39+
MessageInterface $message,
40+
SenderResolverInterface $senderResolver
41+
) {
42+
$this->message = $message;
43+
$this->senderResolver = $senderResolver;
44+
}
45+
46+
/**
47+
* Set mail from address by store.
48+
*
49+
* @param string|array $from
50+
* @param string|int $store
51+
*
52+
* @return $this
53+
*/
54+
public function setFromByStore($from, $store)
55+
{
56+
$result = $this->senderResolver->resolve($from, $store);
57+
$this->message->clearFrom();
58+
$this->message->setFrom($result['email'], $result['name']);
59+
60+
return $this;
61+
}
6262
}

‎lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderByStoreTest.php

Lines changed: 66 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,67 @@
1-
<?php
2-
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
5-
*/
6-
7-
namespace Magento\Framework\Mail\Test\Unit\Template;
8-
9-
use Magento\Framework\Mail\Template\TransportBuilderByStore;
10-
11-
class TransportBuilderByStoreTest extends \PHPUnit\Framework\TestCase
12-
{
13-
/**
14-
* @var \Magento\Framework\Mail\Template\TransportBuilderByStore
15-
*/
16-
protected $model;
17-
18-
/**
19-
* @var \Magento\Framework\Mail\Message | \PHPUnit_Framework_MockObject_MockObject
20-
*/
21-
protected $messageMock;
22-
23-
/**
24-
* @var \Magento\Framework\Mail\Template\SenderResolverInterface | \PHPUnit_Framework_MockObject_MockObject
25-
*/
26-
protected $senderResolverMock;
27-
28-
/**
29-
* @return void
30-
*/
31-
protected function setUp()
32-
{
33-
$objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
34-
$this->messageMock = $this->createMock(\Magento\Framework\Mail\Message::class);
35-
$this->senderResolverMock = $this->createMock(\Magento\Framework\Mail\Template\SenderResolverInterface::class);
36-
37-
$this->model = $objectManagerHelper->getObject(
38-
TransportBuilderByStore::class,
39-
[
40-
'message' => $this->messageMock,
41-
'senderResolver' => $this->senderResolverMock,
42-
]
43-
);
44-
}
45-
46-
/**
47-
* @return void
48-
*/
49-
public function testSetFromByStore()
50-
{
51-
$sender = ['email' => '[email protected]', 'name' => 'name'];
52-
$store = 1;
53-
$this->senderResolverMock->expects($this->once())
54-
->method('resolve')
55-
->with($sender, $store)
56-
->willReturn($sender);
57-
$this->messageMock->expects($this->once())
58-
->method('setFrom')
59-
->with('[email protected]', 'name')
60-
->willReturnSelf();
61-
$this->messageMock->expects($this->once())
62-
->method('clearFrom')
63-
->willReturnSelf();
64-
65-
$this->model->setFromByStore($sender, $store);
66-
}
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
7+
namespace Magento\Framework\Mail\Test\Unit\Template;
8+
9+
use Magento\Framework\Mail\Template\TransportBuilderByStore;
10+
11+
class TransportBuilderByStoreTest extends \PHPUnit\Framework\TestCase
12+
{
13+
/**
14+
* @var \Magento\Framework\Mail\Template\TransportBuilderByStore
15+
*/
16+
protected $model;
17+
18+
/**
19+
* @var \Magento\Framework\Mail\Message | \PHPUnit_Framework_MockObject_MockObject
20+
*/
21+
protected $messageMock;
22+
23+
/**
24+
* @var \Magento\Framework\Mail\Template\SenderResolverInterface | \PHPUnit_Framework_MockObject_MockObject
25+
*/
26+
protected $senderResolverMock;
27+
28+
/**
29+
* @return void
30+
*/
31+
protected function setUp()
32+
{
33+
$objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
34+
$this->messageMock = $this->createMock(\Magento\Framework\Mail\Message::class);
35+
$this->senderResolverMock = $this->createMock(\Magento\Framework\Mail\Template\SenderResolverInterface::class);
36+
37+
$this->model = $objectManagerHelper->getObject(
38+
TransportBuilderByStore::class,
39+
[
40+
'message' => $this->messageMock,
41+
'senderResolver' => $this->senderResolverMock,
42+
]
43+
);
44+
}
45+
46+
/**
47+
* @return void
48+
*/
49+
public function testSetFromByStore()
50+
{
51+
$sender = ['email' => '[email protected]', 'name' => 'name'];
52+
$store = 1;
53+
$this->senderResolverMock->expects($this->once())
54+
->method('resolve')
55+
->with($sender, $store)
56+
->willReturn($sender);
57+
$this->messageMock->expects($this->once())
58+
->method('setFrom')
59+
->with('[email protected]', 'name')
60+
->willReturnSelf();
61+
$this->messageMock->expects($this->once())
62+
->method('clearFrom')
63+
->willReturnSelf();
64+
65+
$this->model->setFromByStore($sender, $store);
66+
}
6767
}

0 commit comments

Comments
 (0)