Skip to content

Commit b24fbcf

Browse files
karyna-tandrewbess
authored andcommitted
CE#34567: Fix deprecation issues for Integration Tests
1 parent c4003e8 commit b24fbcf

File tree

4 files changed

+19
-9
lines changed

4 files changed

+19
-9
lines changed

app/code/Magento/Reports/Controller/Adminhtml/Report/AbstractReport.php

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ abstract class AbstractReport extends \Magento\Backend\App\Action
3030
*
3131
* @see _isAllowed()
3232
*/
33-
const ADMIN_RESOURCE = 'Magento_Reports::report';
33+
public const ADMIN_RESOURCE = 'Magento_Reports::report';
3434

3535
/**
3636
* @var \Magento\Framework\App\Response\Http\FileFactory
@@ -100,7 +100,9 @@ protected function _getSession()
100100
*/
101101
public function _initAction()
102102
{
103+
// phpcs:ignore Magento2.Legacy.ObsoleteResponse
103104
$this->_view->loadLayout();
105+
// phpcs:ignore Magento2.Legacy.ObsoleteResponse
104106
$this->_addBreadcrumb(__('Reports'), __('Reports'));
105107
return $this;
106108
}
@@ -176,10 +178,9 @@ protected function _showLastExecutionTime($flagCode, $refreshCode)
176178
*/
177179
private function initFilterData(): \Magento\Framework\DataObject
178180
{
179-
$requestData = $this->backendHelper
180-
->prepareFilterString(
181-
$this->getRequest()->getParam('filter')
182-
);
181+
$requestData = $this->backendHelper->prepareFilterString(
182+
$this->getRequest()->getParam('filter', ''),
183+
);
183184

184185
$filterRules = ['from' => $this->_dateFilter, 'to' => $this->_dateFilter];
185186
$inputFilter = new \Zend_Filter_Input($filterRules, [], $requestData);

dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Set/SaveTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,7 @@ public function testGotErrorDuringCreateAttributeSetWithoutName(): void
164164
[
165165
'gotoEdit' => '1',
166166
'skeleton_set' => $this->getCatalogProductDefaultAttributeSetId(),
167+
'attribute_set_name' => ''
167168
]
168169
);
169170
$this->dispatch('backend/catalog/product_set/save/');

dev/tests/integration/testsuite/Magento/Customer/Ui/Component/Listing/Address/DataProviderTest.php

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ class DataProviderTest extends TestCase
4242
*/
4343
protected function setUp(): void
4444
{
45-
$this->initLocaleResolverMock();
4645
$this->requestMock = $this->createMock(RequestInterface::class);
4746
$this->dataProvider = Bootstrap::getObjectManager()->create(
4847
DataProvider::class,
@@ -68,7 +67,9 @@ public function testGetDataByRegion(array $filterData)
6867
{
6968
$customerId = 1;
7069
$locale = 'JA_jp';
70+
$this->initLocaleResolverMock();
7171
$this->localeResolverMock->method('getLocale')->willReturn($locale);
72+
7273
$this->requestMock->method('getParam')->with('parent_id')->willReturn($customerId);
7374
$this->dataProvider = Bootstrap::getObjectManager()->create(
7475
DataProvider::class,
@@ -108,9 +109,16 @@ public function getDataByRegionDataProvider(): array
108109
private function initLocaleResolverMock()
109110
{
110111
$this->localeResolverMock = $this->createMock(ResolverInterface::class);
111-
Bootstrap::getObjectManager()->removeSharedInstance(ResolverInterface::class);
112-
Bootstrap::getObjectManager()->removeSharedInstance(Resolver::class);
113112
Bootstrap::getObjectManager()->addSharedInstance($this->localeResolverMock, ResolverInterface::class);
114113
Bootstrap::getObjectManager()->addSharedInstance($this->localeResolverMock, Resolver::class);
115114
}
115+
116+
/**
117+
* @inheritdoc
118+
*/
119+
protected function tearDown(): void
120+
{
121+
Bootstrap::getObjectManager()->removeSharedInstance(ResolverInterface::class);
122+
Bootstrap::getObjectManager()->removeSharedInstance(Resolver::class);
123+
}
116124
}

lib/internal/Magento/Framework/Stdlib/StringUtils.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ public function split($value, $length = 1, $keepWords = false, $trim = false, $w
149149
*/
150150
public function strlen($string)
151151
{
152-
return mb_strlen($string, self::ICONV_CHARSET);
152+
return $string !== null ? mb_strlen($string, self::ICONV_CHARSET) : 0;
153153
}
154154

155155
/**

0 commit comments

Comments
 (0)