Skip to content

Commit 0fbfc49

Browse files
committed
Merge remote-tracking branch 'github-magento2ce/MAGETWO-88965' into EPAM-PR-56
2 parents bc0b412 + 3b73c50 commit 0fbfc49

File tree

2 files changed

+6
-14
lines changed

2 files changed

+6
-14
lines changed

app/code/Magento/Backend/Block/Widget/Grid/Column/Multistore.php

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
declare(strict_types=1);
7+
68
namespace Magento\Backend\Block\Widget\Grid\Column;
79

810
/**
@@ -14,15 +16,6 @@
1416
*/
1517
class Multistore extends \Magento\Backend\Block\Widget\Grid\Column
1618
{
17-
/**
18-
* @param \Magento\Backend\Block\Template\Context $context
19-
* @param array $data
20-
*/
21-
public function __construct(\Magento\Backend\Block\Template\Context $context, array $data = [])
22-
{
23-
parent::__construct($context, $data);
24-
}
25-
2619
/**
2720
* Get header css class name
2821
*

dev/tests/static/testsuite/Magento/Test/Legacy/LayoutTest.php

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,15 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
declare(strict_types=1);
67

7-
/**
8-
* Coverage of obsolete nodes in layout
9-
*/
108
namespace Magento\Test\Legacy;
119

1210
use Magento\Framework\Component\ComponentRegistrar;
1311

12+
/**
13+
* Coverage of obsolete nodes in layout
14+
*/
1415
class LayoutTest extends \PHPUnit\Framework\TestCase
1516
{
1617
/**
@@ -356,8 +357,6 @@ public function getAllowedActionNodeMethods()
356357
'unsetChildren',
357358
'updateButton',
358359
'setIsProductListingContext',
359-
'checkCompanyStatus', // MAGETWO-88965
360-
'setRendererType', // MAGETWO-88965
361360
];
362361
}
363362
}

0 commit comments

Comments
 (0)