Merge remote-tracking branch 'karyna/fix-deprecation-issues-php8.1' into ph-delivery

Author: xmav

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

@@ -30,7 +30,7 @@ abstract class AbstractReport extends \Magento\Backend\App\Action
      *
      * @see _isAllowed()
      */
-    const ADMIN_RESOURCE = 'Magento_Reports::report';
+    public const ADMIN_RESOURCE = 'Magento_Reports::report';
 
     /**
      * @var \Magento\Framework\App\Response\Http\FileFactory
@@ -100,7 +100,9 @@ protected function _getSession()
      */
     public function _initAction()
     {
+        // phpcs:ignore Magento2.Legacy.ObsoleteResponse
         $this->_view->loadLayout();
+        // phpcs:ignore Magento2.Legacy.ObsoleteResponse
         $this->_addBreadcrumb(__('Reports'), __('Reports'));
         return $this;
     }
@@ -176,10 +178,9 @@ protected function _showLastExecutionTime($flagCode, $refreshCode)
      */
     private function initFilterData(): \Magento\Framework\DataObject
     {
-        $requestData = $this->backendHelper
-            ->prepareFilterString(
-                $this->getRequest()->getParam('filter')
-            );
+        $requestData = $this->backendHelper->prepareFilterString(
+            $this->getRequest()->getParam('filter', ''),
+        );
 
         $filterRules = ['from' => $this->_dateFilter, 'to' => $this->_dateFilter];
         $inputFilter = new \Zend_Filter_Input($filterRules, [], $requestData);

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

@@ -164,6 +164,7 @@ public function testGotErrorDuringCreateAttributeSetWithoutName(): void
             [
                 'gotoEdit' => '1',
                 'skeleton_set' => $this->getCatalogProductDefaultAttributeSetId(),
+                'attribute_set_name' => ''
             ]
         );
         $this->dispatch('backend/catalog/product_set/save/');

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

@@ -42,7 +42,6 @@ class DataProviderTest extends TestCase
      */
     protected function setUp(): void
     {
-        $this->initLocaleResolverMock();
         $this->requestMock = $this->createMock(RequestInterface::class);
         $this->dataProvider = Bootstrap::getObjectManager()->create(
             DataProvider::class,
@@ -68,7 +67,9 @@ public function testGetDataByRegion(array $filterData)
     {
         $customerId = 1;
         $locale = 'JA_jp';
+        $this->initLocaleResolverMock();
         $this->localeResolverMock->method('getLocale')->willReturn($locale);
+
         $this->requestMock->method('getParam')->with('parent_id')->willReturn($customerId);
         $this->dataProvider = Bootstrap::getObjectManager()->create(
             DataProvider::class,
@@ -108,9 +109,16 @@ public function getDataByRegionDataProvider(): array
     private function initLocaleResolverMock()
     {
         $this->localeResolverMock = $this->createMock(ResolverInterface::class);
-        Bootstrap::getObjectManager()->removeSharedInstance(ResolverInterface::class);
-        Bootstrap::getObjectManager()->removeSharedInstance(Resolver::class);
         Bootstrap::getObjectManager()->addSharedInstance($this->localeResolverMock, ResolverInterface::class);
         Bootstrap::getObjectManager()->addSharedInstance($this->localeResolverMock, Resolver::class);
     }
+
+    /**
+     * @inheritdoc
+     */
+    protected function tearDown(): void
+    {
+        Bootstrap::getObjectManager()->removeSharedInstance(ResolverInterface::class);
+        Bootstrap::getObjectManager()->removeSharedInstance(Resolver::class);
+    }
 }

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

@@ -149,7 +149,7 @@ public function split($value, $length = 1, $keepWords = false, $trim = false, $w
      */
     public function strlen($string)
     {
-        return mb_strlen($string, self::ICONV_CHARSET);
+        return $string !== null ? mb_strlen($string, self::ICONV_CHARSET) : 0;
     }
 
     /**