Skip to content

Commit 239013e

Browse files
committed
Fix static test failures
1 parent adde574 commit 239013e

File tree

5 files changed

+8
-5
lines changed

5 files changed

+8
-5
lines changed

app/code/Magento/Customer/Block/Address/Book.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,7 @@ public function getAdditionalAddresses()
166166
try {
167167
$addresses = $this->addressesGrid->getAdditionalAddresses();
168168
} catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
169+
return false;
169170
}
170171
return empty($addresses) ? false : $addresses;
171172
}
@@ -197,6 +198,7 @@ public function getCustomer()
197198
try {
198199
$customer = $this->currentCustomer->getCustomer();
199200
} catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
201+
return null;
200202
}
201203
return $customer;
202204
}

app/code/Magento/Customer/Block/Adminhtml/Form/Element/Boolean.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,16 @@
44
* See COPYING.txt for license details.
55
*/
66

7+
namespace Magento\Customer\Block\Adminhtml\Form\Element;
8+
79
/**
810
* Customer Widget Form Boolean Element Block
911
*/
10-
namespace Magento\Customer\Block\Adminhtml\Form\Element;
11-
1212
class Boolean extends \Magento\Framework\Data\Form\Element\Select
1313
{
1414
/**
1515
* Prepare default SELECT values
16+
*
1617
* @return void
1718
*/
1819
protected function _construct()

app/code/Magento/Customer/Block/Adminhtml/Form/Element/File.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ class File extends \Magento\Framework\Data\Form\Element\AbstractElement
1616
protected $_assetRepo;
1717

1818
/**
19-
* Adminhtml data
20-
*
2119
* @var \Magento\Backend\Helper\Data
2220
*/
2321
protected $_adminhtmlData = null;

app/code/Magento/Customer/Block/Adminhtml/Grid/Filter/Country.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ public function __construct(
3232
}
3333

3434
/**
35+
* Return options
36+
*
3537
* @return array
3638
*/
3739
protected function _getOptions()

app/code/Magento/Customer/Controller/Adminhtml/System/Config/Validatevat.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ abstract class Validatevat extends \Magento\Backend\App\Action
1515
*
1616
* @see _isAllowed()
1717
*/
18-
const ADMIN_RESOURCE = 'Magento_Customer::manage';
18+
public const ADMIN_RESOURCE = 'Magento_Customer::manage';
1919

2020
/**
2121
* Perform customer VAT ID validation

0 commit comments

Comments
 (0)