Fix Magento Unit Tests to be compatible with PHP 8.1

silinmykola · silinmykola · commit 8806093d7706 · 2021-11-24T12:03:53.000+01:00
diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Attribute/SaveTest.php b/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([
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Category/FileInfoTest.php b/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('');
+
         $this->model = new FileInfo(
             $this->filesystem,
             $this->mime,
diff --git a/app/code/Magento/Customer/Model/Metadata/Form/Text.php b/app/code/Magento/Customer/Model/Metadata/Form/Text.php
@@ -126,7 +126,7 @@ private function validateLength($value, AttributeMetadataInterface $attribute, a
         // validate length
         $label = __($attribute->getStoreLabel());
 
-        $length = $this->_string->strlen(trim($value));
+        $length = $this->_string->strlen(trim((string) $value));
 
         $validateRules = $attribute->getValidationRules();
 
diff --git a/app/code/Magento/Customer/Test/Unit/Block/Adminhtml/Edit/Tab/View/PersonalInfoTest.php b/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', '']
         ];
     }
 
diff --git a/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/FileTest.php b/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/FileTest.php
@@ -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]);
diff --git a/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/MultiselectTest.php b/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/MultiselectTest.php
@@ -143,7 +143,6 @@ public function outputValueTextDataProvider()
     {
         return [
             'empty' => ['', ''],
-            'null' => [null, ''],
             'number' => [14, 'fourteen'],
             'string' => ['some key', 'some string'],
             'array' => [[14, 'some key'], 'fourteen, some string'],
diff --git a/app/code/Magento/MediaStorage/Test/Unit/App/MediaTest.php b/app/code/Magento/MediaStorage/Test/Unit/App/MediaTest.php
@@ -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,
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/Api/NvpTest.php b/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.',
diff --git a/app/code/Magento/Rule/Test/Unit/Model/Condition/Product/AbstractProductTest.php b/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(
diff --git a/app/code/Magento/Theme/Test/Unit/Model/Wysiwyg/StorageTest.php b/app/code/Magento/Theme/Test/Unit/Model/Wysiwyg/StorageTest.php
@@ -462,7 +462,10 @@ public function testDeleteDirectory(): void
             ->willReturn($this->storageRoot);
         $this->directoryWrite->expects($this->once())->method('delete')->with($directoryPath);
         $this->directoryWrite->expects($this->once())->method('getAbsolutePath')->willreturn('');
-
+        $this->filesystemDriver->expects($this->once())
+            ->method('getRealPathSafety')
+            ->with('')
+            ->willReturn('');
         $this->storageModel->deleteDirectory($directoryPath);
     }
 
@@ -478,7 +481,10 @@ public function testDeleteRootDirectory(): void
         $this->helperStorage->expects($this->atLeastOnce())
             ->method('getStorageRoot')
             ->willReturn($this->storageRoot);
-
+        $this->filesystemDriver->expects($this->once())
+            ->method('getRealPathSafety')
+            ->with('')
+            ->willReturn('');
         $this->storageModel->deleteDirectory($directoryPath);
     }
 
diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/Generator/EntityAbstractTest.php b/lib/internal/Magento/Framework/Code/Test/Unit/Generator/EntityAbstractTest.php
@@ -294,7 +294,7 @@ protected function _prepareMocksForGenerateCode($willWriteCode)
 
         $codeGenerator->expects($this->once())
             ->method('generate')
-            ->willReturn($willWriteCode ? self::RESULT_CODE : null);
+            ->willReturn($willWriteCode ? self::RESULT_CODE : '');
 
         // Add configuration for the generation step
         /** @var \PHPUnit\Framework\MockObject\MockObject $ioObject */
diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/GeneratorTest.php b/lib/internal/Magento/Framework/Code/Test/Unit/GeneratorTest.php
@@ -126,9 +126,16 @@ public function testGenerateClass($className, $entityType): void
         $this->expectException('RuntimeException');
         $fullClassName = $className . $entityType;
 
-        $entityGeneratorMock = $this->getMockBuilder(EntityAbstract::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $entityGeneratorMock = $this->getMockForAbstractClass(
+            EntityAbstract::class,
+            [],
+            '',
+            true,
+            true,
+            true,
+            ['getSourceClassName']
+        );
+        $entityGeneratorMock->method('getSourceClassName')->willReturn('');
         $this->objectManagerMock
             ->expects($this->once())
             ->method('create')
@@ -184,9 +191,16 @@ public function testGenerateClassWhenClassIsNotGenerationSuccess(): void
         $expectedEntities = array_values($this->expectedEntities);
         $resultClassName = self::SOURCE_CLASS . ucfirst(array_shift($expectedEntities));
 
-        $entityGeneratorMock = $this->getMockBuilder(EntityAbstract::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $entityGeneratorMock = $this->getMockForAbstractClass(
+            EntityAbstract::class,
+            [],
+            '',
+            true,
+            true,
+            true,
+            ['getSourceClassName']
+        );
+        $entityGeneratorMock->method('getSourceClassName')->willReturn('');
         $this->objectManagerMock
             ->expects($this->once())
             ->method('create')
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Asset/Bundle/ManagerTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Asset/Bundle/ManagerTest.php
@@ -118,6 +118,13 @@ public function testAddAssetWithExcludedFile()
         $this->asset->expects($this->atLeastOnce())
             ->method('getFilePath')
             ->willReturn('source/file.min.js');
+        $this->asset->expects($this->once())
+            ->method('getPath')
+            ->willReturn('');
+        $dirRead->expects($this->once())
+            ->method('getAbsolutePath')
+            ->with('')
+            ->willReturn(true);
         $this->filesystem->expects($this->once())
             ->method('getDirectoryRead')
             ->with(DirectoryList::APP)
@@ -189,7 +196,9 @@ public function testAddAsset()
     {
         $dirRead = $this->getMockBuilder(ReadInterface::class)
             ->disableOriginalConstructor()
+            ->onlyMethods(['getAbsolutePath'])
             ->getMockForAbstractClass();
+        $dirRead->method('getAbsolutePath')->willReturn('');
         $context = $this->getMockBuilder(FallbackContext::class)
             ->disableOriginalConstructor()
             ->getMock();
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Element/Html/Link/CurrentTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Element/Html/Link/CurrentTest.php
@@ -78,6 +78,12 @@ public function testGetUrl(): void
      */
     public function testIsCurrentIfIsset(): void
     {
+        $pathStub = '';
+        $this->_urlBuilderMock
+            ->method('getUrl')
+            ->with($pathStub)
+            ->will($this->returnValue(''));
+        $this->currentLink->setPath($pathStub);
         $this->currentLink->setCurrent(true);
         $this->assertTrue($this->currentLink->isCurrent());
     }
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Element/UiComponent/ContextTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Element/UiComponent/ContextTest.php
@@ -51,7 +51,9 @@ protected function setUp(): void
             ->getMock();
         $request = $this->getMockBuilder(Http::class)
             ->disableOriginalConstructor()
+            ->onlyMethods(['getHeader'])
             ->getMock();
+        $request->method('getHeader')->willReturn('');
         $buttonProviderFactory =
             $this->getMockBuilder(ButtonProviderFactory::class)
                 ->disableOriginalConstructor()

Original file line number	Diff line number	Diff line change
`@@ -246,7 +246,7 @@ public function getStoreLastLoginDateDataProvider()`
`246`	`246`	`{`
`247`	`247`	`return [`
`248`	`248`	`['2015-03-04 12:00:00', '2015-03-04 12:00:00'],`
`249`		`- ['Never', null]`
	`249`	`+ ['Never', '']`
`250`	`250`	`];`
`251`	`251`	`}`
`252`	`252`
Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ public function testExtractValueNoRequestScope($expected, $attributeCode = '', $`
`130`	`130`	`'entityTypeCode' => self::ENTITY_TYPE,`
`131`	`131`	`]`
`132`	`132`	`);`
`133`		`-`
	`133`	`+ $model->setRequestScope('');`
`134`	`134`	`$this->assertEquals($expected, $model->extractValue($this->requestMock));`
`135`	`135`	`if (!empty($attributeCode)) {`
`136`	`136`	`unset($_FILES[$attributeCode]);`
Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,6 @@ public function outputValueTextDataProvider()`
`143`	`143`	`{`
`144`	`144`	`return [`
`145`	`145`	`'empty' => ['', ''],`
`146`		`- 'null' => [null, ''],`
`147`	`146`	`'number' => [14, 'fourteen'],`
`148`	`147`	`'string' => ['some key', 'some string'],`
`149`	`148`	`'array' => [[14, 'some key'], 'fourteen, some string'],`
Original file line number	Diff line number	Diff line change
`@@ -197,7 +197,7 @@ public function callDataProvider()`
`197`	`197`	`10417`
`198`	`198`	`],`
`199`	`199`	`[`
`200`		`- "\r\n" . 'ACK[7]=Failure&L_ERRORCODE0[5]=10417&L_SHORTMESSAGE0[8]=Message.',`
	`200`	`+ "\r\n" . 'ACK[7]=Failure&L_ERRORCODE0[5]=10417&L_SHORTMESSAGE0[8]=Message.&L_LONGMESSAGE0[15]=',`
`201`	`201`	`[10417, 10422],`
`202`	`202`	`ProcessableException::class,`
`203`	`203`	`'PayPal gateway has rejected request. #10417: Message.',`