Skip to content
This repository was archived by the owner on Apr 29, 2019. It is now read-only.

Commit 760c0bd

Browse files
committed
MAGETWO-81153: Backward incompatible changes of 2.2.1 release
- get rid from helper interface
1 parent be9bd1a commit 760c0bd

File tree

2 files changed

+3
-11
lines changed

2 files changed

+3
-11
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,9 @@ class Edit extends \Magento\Directory\Block\Data
4747
* @var \Magento\Framework\Api\DataObjectHelper
4848
*/
4949
protected $dataObjectHelper;
50+
5051
/**
51-
* @var AttributeChecker|null
52+
* @var AttributeChecker
5253
*/
5354
private $attributeChecker;
5455

@@ -67,8 +68,7 @@ class Edit extends \Magento\Directory\Block\Data
6768
* @param \Magento\Customer\Helper\Session\CurrentCustomer $currentCustomer
6869
* @param \Magento\Framework\Api\DataObjectHelper $dataObjectHelper
6970
* @param array $data
70-
*
71-
* @param AttributeChecker|null $attributeChecker
71+
* @param AttributeChecker $attributeChecker
7272
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
7373
*/
7474
public function __construct(

app/code/Magento/Customer/Test/Unit/Model/AttributeCheckerTest.php

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,12 @@
1212
use Magento\Customer\Model\AttributeChecker;
1313
use Magento\Customer\Model\Attribute;
1414
use Magento\Customer\Model\Metadata\AttributeResolver;
15-
use Magento\Framework\App\Helper\Context;
1615

1716
class AttributeCheckerTest extends \PHPUnit\Framework\TestCase
1817
{
1918
/** @var AttributeChecker|\PHPUnit_Framework_MockObject_MockObject */
2019
private $model;
2120

22-
/** @var Context */
23-
private $context;
24-
2521
/** @var AttributeResolver|\PHPUnit_Framework_MockObject_MockObject */
2622
private $attributeResolver;
2723

@@ -30,16 +26,12 @@ class AttributeCheckerTest extends \PHPUnit\Framework\TestCase
3026

3127
protected function setUp()
3228
{
33-
$this->context = $this->getMockBuilder(Context::class)
34-
->disableOriginalConstructor()
35-
->getMock();
3629
$this->addressMetadataService = $this->getMockForAbstractClass(AddressMetadataInterface::class);
3730
$this->attributeResolver = $this->getMockBuilder(AttributeResolver::class)
3831
->disableOriginalConstructor()
3932
->getMock();
4033

4134
$this->model = new AttributeChecker(
42-
$this->context,
4335
$this->addressMetadataService,
4436
$this->attributeResolver
4537
);

0 commit comments

Comments
 (0)