Merge remote-tracking branch 'SilinMykola/php81-compatibility/deprecations-unit' into ph-delivery

Author: xmav

app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Attribute/SaveTest.php

@@ -121,7 +121,10 @@ class SaveTest extends AttributeTest
     protected function setUp(): void
     {
         parent::setUp();
-        $this->filterManagerMock = $this->createMock(FilterManager::class);
+        $this->filterManagerMock = $this->getMockBuilder(FilterManager::class)
+            ->addMethods(['stripTags'])
+            ->disableOriginalConstructor()
+            ->getMock();
         $this->productHelperMock = $this->createMock(ProductHelper::class);
         $this->attributeSetMock = $this->createMock(AttributeSetInterface::class);
         $this->builderMock = $this->createMock(Build::class);
@@ -132,34 +135,38 @@ protected function setUp(): void
         $this->sessionMock = $this->createMock(Session::class);
         $this->layoutFactoryMock = $this->createMock(LayoutFactory::class);
         $this->buildFactoryMock = $this->getMockBuilder(BuildFactory::class)
-            ->setMethods(['create'])
+            ->onlyMethods(['create'])
             ->disableOriginalConstructor()
             ->getMock();
         $this->attributeFactoryMock = $this->getMockBuilder(AttributeFactory::class)
-            ->setMethods(['create'])
+            ->onlyMethods(['create'])
             ->disableOriginalConstructor()
             ->getMock();
         $this->validatorFactoryMock = $this->getMockBuilder(ValidatorFactory::class)
-            ->setMethods(['create'])
+            ->onlyMethods(['create'])
             ->disableOriginalConstructor()
             ->getMock();
         $this->groupCollectionFactoryMock = $this->getMockBuilder(CollectionFactory::class)
-            ->setMethods(['create'])
+            ->onlyMethods(['create'])
             ->disableOriginalConstructor()
             ->getMock();
         $this->redirectMock = $this->getMockBuilder(ResultRedirect::class)
-            ->setMethods(['setData', 'setPath'])
+            ->onlyMethods(['setPath'])
+            ->addMethods(['setData'])
             ->disableOriginalConstructor()
             ->getMock();
         $this->productAttributeMock = $this->getMockBuilder(ProductAttributeInterface::class)
-            ->setMethods(
+            ->onlyMethods(
+                [
+                    'getBackendType',
+                    'getFrontendClass'
+                ]
+            )->addMethods(
                 [
                     'getId',
                     'get',
                     'getBackendTypeByInput',
                     'getDefaultValueByInput',
-                    'getBackendType',
-                    'getFrontendClass',
                     'addData',
                     'save'
                 ]
@@ -292,7 +299,9 @@ public function testExecute()
             'new_attribute_set_name' => 'Test attribute set name',
             'frontend_input' => 'test_frontend_input',
         ];
-
+        $this->filterManagerMock
+            ->method('stripTags')
+            ->willReturn('Test attribute set name');
         $this->requestMock->expects($this->any())
             ->method('getParam')
             ->willReturnMap([

app/code/Magento/Catalog/Test/Unit/Model/Category/FileInfoTest.php

@@ -116,6 +116,9 @@ function ($arg) use ($baseDirectory, $pubDirectory) {
         $this->pubDirectory->method('getAbsolutePath')
             ->willReturn('/a/b/c/pub/');
 
+        $this->store->method('getBaseUrl')
+            ->willReturn('https://example.com/');
+
         $this->model = new FileInfo(
             $this->filesystem,
             $this->mime,

app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/ValidatorTest.php

@@ -12,6 +12,7 @@
 use Magento\CatalogImportExport\Model\Import\Product\Validator;
 use Magento\CatalogImportExport\Model\Import\Product\Validator\Media;
 use Magento\CatalogImportExport\Model\Import\Product\Validator\Website;
+use Magento\Framework\Stdlib\StringUtils;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\ImportExport\Model\Import;
 use PHPUnit\Framework\MockObject\MockObject;
@@ -64,7 +65,10 @@ protected function setUp(): void
         $this->objectManagerHelper = new ObjectManagerHelper($this);
         $this->validator = $this->objectManagerHelper->getObject(
             Validator::class,
-            ['validators' => $this->validators]
+            [
+                'string' => new StringUtils(),
+                'validators' => $this->validators
+            ]
         );
         $this->validator->init($this->context);
     }

app/code/Magento/Customer/Model/Metadata/Form/Text.php

@@ -1,7 +1,5 @@
 <?php
 /**
- * Form Element Text Data Model
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -126,7 +124,7 @@ private function validateLength($value, AttributeMetadataInterface $attribute, a
         // validate length
         $label = __($attribute->getStoreLabel());
 
-        $length = $this->_string->strlen(trim($value));
+        $length = $value ? $this->_string->strlen(trim($value)) : 0;
 
         $validateRules = $attribute->getValidationRules();
 

app/code/Magento/Customer/Test/Unit/Block/Adminhtml/Edit/Tab/View/PersonalInfoTest.php

@@ -246,7 +246,7 @@ public function getStoreLastLoginDateDataProvider()
     {
         return [
             ['2015-03-04 12:00:00', '2015-03-04 12:00:00'],
-            ['Never', null]
+            ['Never', '']
         ];
     }
 

app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/FileTest.php

@@ -27,7 +27,7 @@
  */
 class FileTest extends AbstractFormTestCase
 {
-    const ENTITY_TYPE = 0;
+    public const ENTITY_TYPE = 0;
 
     /**
      * @var MockObject|EncoderInterface
@@ -130,7 +130,7 @@ public function testExtractValueNoRequestScope($expected, $attributeCode = '', $
                 'entityTypeCode' => self::ENTITY_TYPE,
             ]
         );
-
+        $model->setRequestScope('');
         $this->assertEquals($expected, $model->extractValue($this->requestMock));
         if (!empty($attributeCode)) {
             unset($_FILES[$attributeCode]);

app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/MultiselectTest.php

@@ -1,10 +1,11 @@
-<?php declare(strict_types=1);
+<?php
 /**
- * test Magento\Customer\Model\Metadata\Form\Multiselect
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\Customer\Test\Unit\Model\Metadata\Form;
 
 use Magento\Customer\Api\Data\OptionInterface;
@@ -143,7 +144,7 @@ public function outputValueTextDataProvider()
     {
         return [
             'empty' => ['', ''],
-            'null' => [null, ''],
+            'null' => [false, ''],
             'number' => [14, 'fourteen'],
             'string' => ['some key', 'some string'],
             'array' => [[14, 'some key'], 'fourteen, some string'],
@@ -174,7 +175,7 @@ public function outputValueJsonDataProvider()
     {
         return [
             'empty' => ['', ['']],
-            'null' => [null, ['']],
+            'null' => [false, ['']],
             'number' => [14, ['14']],
             'string' => ['some key', ['some key']],
             'array' => [[14, 'some key'], ['14', 'some key']],
@@ -195,27 +196,21 @@ protected function runOutputValueTest($value, $expected, $format)
             ->disableOriginalConstructor()
             ->setMethods(['getLabel', 'getValue'])
             ->getMockForAbstractClass();
-        $option1->expects($this->any())
-            ->method('getLabel')
+        $option1->method('getLabel')
             ->willReturn('fourteen');
-        $option1->expects($this->any())
-            ->method('getValue')
+        $option1->method('getValue')
             ->willReturn('14');
 
         $option2 = $this->getMockBuilder(OptionInterface::class)
             ->disableOriginalConstructor()
             ->setMethods(['getLabel', 'getValue'])
             ->getMockForAbstractClass();
-        $option2->expects($this->any())
-            ->method('getLabel')
+        $option2->method('getLabel')
             ->willReturn('some string');
-        $option2->expects($this->any())
-            ->method('getValue')
+        $option2->method('getValue')
             ->willReturn('some key');
 
-        $this->attributeMetadataMock->expects(
-            $this->any()
-        )->method(
+        $this->attributeMetadataMock->method(
             'getOptions'
         )->willReturn(
             [

app/code/Magento/MediaStorage/Test/Unit/App/MediaTest.php

@@ -37,9 +37,9 @@
  */
 class MediaTest extends TestCase
 {
-    const MEDIA_DIRECTORY = 'mediaDirectory';
-    const RELATIVE_FILE_PATH = 'test/file.png';
-    const CACHE_FILE_PATH = 'var';
+    public const MEDIA_DIRECTORY = 'mediaDirectory';
+    public const RELATIVE_FILE_PATH = 'test/file.png';
+    public const CACHE_FILE_PATH = 'var';
 
     /**
      * @var Media
@@ -264,7 +264,7 @@ protected function createMediaModel(bool $isAllowed = true): Media
             $this->syncFactoryMock,
             $this->responseMock,
             $isAllowedCallback,
-            false,
+            self::MEDIA_DIRECTORY,
             self::CACHE_FILE_PATH,
             self::RELATIVE_FILE_PATH,
             $this->filesystemMock,

app/code/Magento/Paypal/Test/Unit/Model/Api/NvpTest.php

@@ -197,7 +197,7 @@ public function callDataProvider()
                 10417
             ],
             [
-                "\r\n" . 'ACK[7]=Failure&L_ERRORCODE0[5]=10417&L_SHORTMESSAGE0[8]=Message.',
+                "\r\n" . 'ACK[7]=Failure&L_ERRORCODE0[5]=10417&L_SHORTMESSAGE0[8]=Message.&L_LONGMESSAGE0[15]=',
                 [10417, 10422],
                 ProcessableException::class,
                 'PayPal gateway has rejected request. #10417: Message.',

app/code/Magento/Rule/Test/Unit/Model/Condition/Product/AbstractProductTest.php

@@ -208,6 +208,7 @@ public function testValidateSetEntityAttributeValuesWithResource()
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
         $product->setAtribute('attribute');
+        $product->setData('someAttribute', '');
         $product->setId(12);
 
         $this->_configProperty->setValue(