Skip to content

Commit 19f70ff

Browse files
author
silinmykola
committed
fix for static tests
1 parent 9f12628 commit 19f70ff

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

lib/internal/Magento/Framework/App/Test/Unit/ViewTest.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,7 @@ public function testLoadLayoutWhenLayoutAlreadyLoaded(): void
155155
$this->expectException('RuntimeException');
156156
$this->expectExceptionMessage('Layout must be loaded only once.');
157157
$this->_view->setIsLayoutLoaded(true);
158+
// phpcs:ignore Magento2.Legacy.ObsoleteResponse
158159
$this->_view->loadLayout();
159160
}
160161

@@ -167,6 +168,7 @@ public function testLoadLayoutWithDefaultSetup(): void
167168
->method('addHandle')
168169
->withConsecutive(['default']);
169170
$this->_requestMock->method('getFullActionName')->willReturn('action_name');
171+
// phpcs:ignore Magento2.Legacy.ObsoleteResponse
170172
$this->_view->loadLayout();
171173
}
172174

@@ -176,6 +178,7 @@ public function testLoadLayoutWithDefaultSetup(): void
176178
public function testLoadLayoutWhenBlocksNotGenerated(): void
177179
{
178180
$this->_requestMock->method('getFullActionName')->willReturn('action_name');
181+
// phpcs:ignore Magento2.Legacy.ObsoleteResponse
179182
$this->_view->loadLayout('', false, true);
180183
}
181184

@@ -185,6 +188,7 @@ public function testLoadLayoutWhenBlocksNotGenerated(): void
185188
public function testLoadLayoutWhenXmlNotGenerated(): void
186189
{
187190
$this->_requestMock->method('getFullActionName')->willReturn('action_name');
191+
// phpcs:ignore Magento2.Legacy.ObsoleteResponse
188192
$this->_view->loadLayout('', true, false);
189193
}
190194

@@ -270,6 +274,7 @@ public function testRenderLayoutIfActionFlagExist(): void
270274
->with('', 'no-renderLayout')
271275
->willReturn(true);
272276
$this->_eventManagerMock->expects($this->never())->method('dispatch');
277+
// phpcs:ignore Magento2.Legacy.ObsoleteResponse
273278
$this->_view->renderLayout();
274279
}
275280

@@ -284,6 +289,7 @@ public function testRenderLayoutWhenOutputNotEmpty(): void
284289
->willReturn(false);
285290
$this->_layoutMock->expects($this->once())->method('addOutputElement')->with('output');
286291
$this->resultPage->expects($this->once())->method('renderResult')->with($this->response);
292+
// phpcs:ignore Magento2.Legacy.ObsoleteResponse
287293
$this->_view->renderLayout('output');
288294
}
289295

@@ -299,6 +305,7 @@ public function testRenderLayoutWhenOutputEmpty(): void
299305

300306
$this->_layoutMock->expects($this->never())->method('addOutputElement');
301307
$this->resultPage->expects($this->once())->method('renderResult')->with($this->response);
308+
// phpcs:ignore Magento2.Legacy.ObsoleteResponse
302309
$this->_view->renderLayout();
303310
}
304311
}

lib/internal/Magento/Framework/ObjectManager/Config/Config.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010
use Magento\Framework\ObjectManager\RelationsInterface;
1111
use Magento\Framework\Serialize\SerializerInterface;
1212

13+
/**
14+
* The object manager config
15+
*/
1316
class Config implements \Magento\Framework\ObjectManager\ConfigInterface
1417
{
1518
/**
@@ -27,7 +30,7 @@ class Config implements \Magento\Framework\ObjectManager\ConfigInterface
2730
protected $_definitions;
2831

2932
/**
30-
* Current cache key
33+
* The current cache key
3134
*
3235
* @var string
3336
*/
@@ -41,7 +44,7 @@ class Config implements \Magento\Framework\ObjectManager\ConfigInterface
4144
protected $_preferences = [];
4245

4346
/**
44-
* Virtual types
47+
* The list of virtual types
4548
*
4649
* @var array
4750
*/

0 commit comments

Comments
 (0)