Skip to content

Commit 39b3f3a

Browse files
committed
MC-16926: [Backport for 2.2.x] Use Escaper methods
- clean up code
1 parent df4bd0c commit 39b3f3a

File tree

4 files changed

+20
-18
lines changed

4 files changed

+20
-18
lines changed

app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/SubscriptionStatusLabelTest.php

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,11 @@ protected function setUp()
5757

5858
$objectManager = new ObjectManager($this);
5959
$escaper = $objectManager->getObject(\Magento\Framework\Escaper::class);
60-
$reflection = new \ReflectionClass($this->abstractElementMock);
61-
$reflection_property = $reflection->getProperty('_escaper');
62-
$reflection_property->setAccessible(true);
63-
$reflection_property->setValue($this->abstractElementMock, $escaper);
60+
$objectManager->setBackwardCompatibleProperty(
61+
$this->abstractElementMock,
62+
'_escaper',
63+
$escaper
64+
);
6465

6566
$this->formMock = $this->getMockBuilder(Form::class)
6667
->disableOriginalConstructor()

app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/VerticalTest.php

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,11 @@ protected function setUp()
4242

4343
$objectManager = new ObjectManager($this);
4444
$escaper = $objectManager->getObject(\Magento\Framework\Escaper::class);
45-
$reflection = new \ReflectionClass($this->abstractElementMock);
46-
$reflection_property = $reflection->getProperty('_escaper');
47-
$reflection_property->setAccessible(true);
48-
$reflection_property->setValue($this->abstractElementMock, $escaper);
45+
$objectManager->setBackwardCompatibleProperty(
46+
$this->abstractElementMock,
47+
'_escaper',
48+
$escaper
49+
);
4950

5051
$this->contextMock = $this->getMockBuilder(Context::class)
5152
->disableOriginalConstructor()

app/code/Magento/Customer/Test/Unit/Model/Renderer/RegionTest.php

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,11 @@ public function testRender($regionCollection)
6363

6464
$objectManager = new ObjectManager($this);
6565
$escaper = $objectManager->getObject(\Magento\Framework\Escaper::class);
66-
$reflection = new \ReflectionClass($elementMock);
67-
$reflection_property = $reflection->getProperty('_escaper');
68-
$reflection_property->setAccessible(true);
69-
$reflection_property->setValue($elementMock, $escaper);
66+
$objectManager->setBackwardCompatibleProperty(
67+
$elementMock,
68+
'_escaper',
69+
$escaper
70+
);
7071

7172
$formMock->expects(
7273
$this->any()

app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Field/Enable/AbstractEnableTest.php

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@ class AbstractEnableTest extends \PHPUnit\Framework\TestCase
3333
*/
3434
protected function setUp()
3535
{
36-
$objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
37-
3836
$this->elementMock = $this->getMockBuilder(\Magento\Framework\Data\Form\Element\AbstractElement::class)
3937
->setMethods(
4038
[
@@ -48,10 +46,11 @@ protected function setUp()
4846

4947
$objectManager = new ObjectManager($this);
5048
$escaper = $objectManager->getObject(\Magento\Framework\Escaper::class);
51-
$reflection = new \ReflectionClass($this->elementMock);
52-
$reflection_property = $reflection->getProperty('_escaper');
53-
$reflection_property->setAccessible(true);
54-
$reflection_property->setValue($this->elementMock, $escaper);
49+
$objectManager->setBackwardCompatibleProperty(
50+
$this->elementMock,
51+
'_escaper',
52+
$escaper
53+
);
5554

5655
$this->abstractEnable = $objectManager->getObject(
5756
\Magento\Paypal\Test\Unit\Block\Adminhtml\System\Config\Field\Enable\AbstractEnable\Stub::class,

0 commit comments

Comments
 (0)