Skip to content

Commit f77f54d

Browse files
committed
Backport additional changes
1 parent 43cc9a4 commit f77f54d

File tree

3 files changed

+24
-9
lines changed

3 files changed

+24
-9
lines changed

app/code/Magento/Sales/Model/Order/Address/Validator.php

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ class Validator
4848

4949
/**
5050
* @param DirectoryHelper $directoryHelper
51-
* @param CountryFactory $countryFactory
52-
* @param EavConfig $eavConfig
51+
* @param CountryFactory $countryFactory
52+
* @param EavConfig $eavConfig
5353
*/
5454
public function __construct(
5555
DirectoryHelper $directoryHelper,
@@ -195,23 +195,32 @@ protected function isStateRequired($countryId)
195195
}
196196

197197
/**
198+
* Check whether telephone is required for address.
199+
*
198200
* @return bool
201+
* @throws \Magento\Framework\Exception\LocalizedException
199202
*/
200203
protected function isTelephoneRequired()
201204
{
202205
return ($this->eavConfig->getAttribute('customer_address', 'telephone')->getIsRequired());
203206
}
204207

205208
/**
209+
* Check whether company is required for address.
210+
*
206211
* @return bool
212+
* @throws \Magento\Framework\Exception\LocalizedException
207213
*/
208214
protected function isCompanyRequired()
209215
{
210216
return ($this->eavConfig->getAttribute('customer_address', 'company')->getIsRequired());
211217
}
212218

213219
/**
220+
* Check whether fax is required for address.
221+
*
214222
* @return bool
223+
* @throws \Magento\Framework\Exception\LocalizedException
215224
*/
216225
protected function isFaxRequired()
217226
{

lib/internal/Magento/Framework/Locale/Format.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
*/
66
namespace Magento\Framework\Locale;
77

8+
/**
9+
* Price locale format.
10+
*/
811
class Format implements \Magento\Framework\Locale\FormatInterface
912
{
1013
/**

lib/internal/Magento/Framework/Locale/Resolver.php

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@
99
use Magento\Framework\App\DeploymentConfig;
1010
use Magento\Framework\App\ObjectManager;
1111

12+
/**
13+
* Manages locale config information.
14+
*/
1215
class Resolver implements ResolverInterface
1316
{
1417
/**
@@ -76,15 +79,15 @@ public function __construct(
7679
}
7780

7881
/**
79-
* {@inheritdoc}
82+
* @inheritdoc
8083
*/
8184
public function getDefaultLocalePath()
8285
{
8386
return $this->defaultLocalePath;
8487
}
8588

8689
/**
87-
* {@inheritdoc}
90+
* @inheritdoc
8891
*/
8992
public function setDefaultLocale($locale)
9093
{
@@ -93,7 +96,7 @@ public function setDefaultLocale($locale)
9396
}
9497

9598
/**
96-
* {@inheritdoc}
99+
* @inheritdoc
97100
*/
98101
public function getDefaultLocale()
99102
{
@@ -111,7 +114,7 @@ public function getDefaultLocale()
111114
}
112115

113116
/**
114-
* {@inheritdoc}
117+
* @inheritdoc
115118
*/
116119
public function setLocale($locale = null)
117120
{
@@ -124,7 +127,7 @@ public function setLocale($locale = null)
124127
}
125128

126129
/**
127-
* {@inheritdoc}
130+
* @inheritdoc
128131
*/
129132
public function getLocale()
130133
{
@@ -135,7 +138,7 @@ public function getLocale()
135138
}
136139

137140
/**
138-
* {@inheritdoc}
141+
* @inheritdoc
139142
*/
140143
public function emulate($scopeId)
141144
{
@@ -155,7 +158,7 @@ public function emulate($scopeId)
155158
}
156159

157160
/**
158-
* {@inheritdoc}
161+
* @inheritdoc
159162
*/
160163
public function revert()
161164
{

0 commit comments

Comments
 (0)