Skip to content

Commit 244f62d

Browse files
author
Jan Polak
committed
code cleanup
1 parent 8e29726 commit 244f62d

File tree

3 files changed

+17
-9
lines changed

3 files changed

+17
-9
lines changed

app/code/Magento/OneTouchOrdering/Controller/Button/Available.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
use Magento\Framework\Controller\Result\Json as JsonResult;
1111
use Magento\Framework\Controller\ResultFactory;
1212
use Magento\OneTouchOrdering\Model\Config;
13-
use Magento\OneTouchOrdering\Model\CustomerAddressesFormater;
13+
use Magento\OneTouchOrdering\Model\CustomerAddressesFormatter;
1414
use Magento\OneTouchOrdering\Model\OneTouchOrdering;
1515
use Magento\Customer\Model\Session;
1616

@@ -25,7 +25,7 @@ class Available extends Action
2525
*/
2626
private $customerSession;
2727
/**
28-
* @var CustomerAddressesFormater
28+
* @var CustomerAddressesFormatter
2929
*/
3030
private $customerAddressesFormater;
3131
/**
@@ -37,7 +37,7 @@ public function __construct(
3737
Context $context,
3838
OneTouchOrdering $oneTouchOrdering,
3939
Session $customerSession,
40-
CustomerAddressesFormater $customerAddressesFormater,
40+
CustomerAddressesFormatter $customerAddressesFormater,
4141
Config $oneTouchOrderingConfig
4242
) {
4343
parent::__construct($context);

app/code/Magento/OneTouchOrdering/Model/CustomerAddressesFormater.php renamed to app/code/Magento/OneTouchOrdering/Model/CustomerAddressesFormatter.php

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,13 @@
1212
* Class CustomerAddresses
1313
* @package Magento\OneTouchOrdering\Model
1414
*/
15-
class CustomerAddressesFormater
15+
class CustomerAddressesFormatter
1616
{
1717

18+
/**
19+
* @param Customer $customer
20+
* @return array
21+
*/
1822
public function getFormattedAddresses(Customer $customer): array
1923
{
2024
$addresses = $customer->getAddresses();
@@ -33,7 +37,11 @@ public function getFormattedAddresses(Customer $customer): array
3337
return $addressesFormatted;
3438
}
3539

36-
private function format(Address $address)
40+
/**
41+
* @param Address $address
42+
* @return string
43+
*/
44+
private function format(Address $address): string
3745
{
3846
return sprintf(
3947
"%s, %s, %s, %s %s, %s",

app/code/Magento/OneTouchOrdering/Test/Unit/Model/CustomerAddressesFormaterTest.php renamed to app/code/Magento/OneTouchOrdering/Test/Unit/Model/CustomerAddressesFormatterTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
use Magento\Customer\Model\Customer;
1313
use Magento\Directory\Model\Country;
1414
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
15-
use Magento\OneTouchOrdering\Model\CustomerAddressesFormater;
15+
use Magento\OneTouchOrdering\Model\CustomerAddressesFormatter;
1616
use PHPUnit\Framework\TestCase;
1717

18-
class CustomerAddressesFormaterTest extends TestCase
18+
class CustomerAddressesFormatterTest extends TestCase
1919
{
2020
/**
2121
* @var \PHPUnit_Framework_MockObject_MockObject|Customer
@@ -26,7 +26,7 @@ class CustomerAddressesFormaterTest extends TestCase
2626
*/
2727
protected $address;
2828
/**
29-
* @var CustomerAddressesFormater
29+
* @var CustomerAddressesFormatter
3030
*/
3131
protected $customerAddresses;
3232

@@ -39,7 +39,7 @@ public function setUp()
3939
->disableOriginalConstructor()
4040
->setMethods(['getCountryModel', 'getId', 'getName'])
4141
->getMock();
42-
$this->customerAddresses = $objectManager->getObject(CustomerAddressesFormater::class);
42+
$this->customerAddresses = $objectManager->getObject(CustomerAddressesFormatter::class);
4343
}
4444

4545
public function testGetFormattedAddresses()

0 commit comments

Comments
 (0)