Skip to content

Commit 4e683ee

Browse files
committed
Fix Magento Unit Tests to be compatible with PHP 8.1
1 parent 203a44f commit 4e683ee

File tree

8 files changed

+19
-7
lines changed

8 files changed

+19
-7
lines changed

app/code/Magento/CatalogWidget/Test/Unit/Block/Product/Widget/ConditionsTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,7 @@ public function testRender()
223223
$this->contextMock->expects($this->once())->method('getEnginePool')->willReturn($templateEnginePoolMock);
224224
$templateEnginePoolMock->expects($this->once())->method('get')->willReturn($templateEngineMock);
225225
$templateEngineMock->expects($this->once())->method('render')->willReturn('html');
226+
$resolverMock->method('getTemplateFileName')->willReturn('');
226227

227228
$this->widgetConditions = $this->objectManagerHelper->getObject(
228229
Conditions::class,

app/code/Magento/Fedex/Test/Unit/Model/CarrierTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -455,7 +455,7 @@ public function testGetTrackingErrorResponse()
455455
$this->trackErrorFactory->expects($this->once())
456456
->method('create')
457457
->willReturn($error);
458-
458+
$this->serializer->method('serialize')->willReturn('');
459459
$this->carrier->getTracking($tracking);
460460
$tracks = $this->carrier->getResult()->getAllTrackings();
461461

app/code/Magento/ImportExport/Test/Unit/Model/ImportTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -940,6 +940,7 @@ public function testCreateHistoryReportThrowException()
940940
->expects($this->never())
941941
->method('getRelativePath');
942942
$phrase = $this->createMock(Phrase::class);
943+
$phrase->method('render')->willReturn('');
943944
$this->_driver
944945
->expects($this->any())
945946
->method('fileGetContents')

app/code/Magento/Reports/Test/Unit/Model/ResourceModel/Order/CollectionTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -247,6 +247,7 @@ public function testPrepareSummary($useAggregatedData, $mainTable, $isFilter, $g
247247
$orderMock = $this->getMockBuilder(Order::class)
248248
->disableOriginalConstructor()
249249
->getMock();
250+
$orderMock->method('getStoreTZOffsetQuery')->willReturn('');
250251

251252
$this->orderFactoryMock
252253
->expects($this->any())

lib/internal/Magento/Framework/App/DeploymentConfig.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ private function flattenParams(array $params, $path = null, array &$flattenResul
226226
// allow reading values from env variables
227227
// value need to be specified in %env(NAME, "default value")% format
228228
// like #env(DB_PASSWORD), #env(DB_NAME, "test")
229-
if (preg_match(self::ENV_NAME_PATTERN, $param, $matches)) {
229+
if ($param !== null && preg_match(self::ENV_NAME_PATTERN, $param, $matches)) {
230230
$param = getenv($matches['name']) ?: ($matches['default'] ?? null);
231231
}
232232

lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/MultiselectTest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ public function testHiddenFieldPresentInMultiSelect()
7373
$fieldId = 'fieldId';
7474
$this->_model->setCanBeEmpty(true);
7575
$this->_model->setName($fieldName);
76+
$this->_model->setValue('');
7677
$this->_model->setId($fieldId);
7778
$elementHtml = $this->_model->getElementHtml();
7879
$this->assertStringContainsString(
@@ -91,6 +92,7 @@ public function testHiddenDisabledFieldPresentInMultiSelect()
9192
$fieldName = 'fieldName';
9293
$this->_model->setDisabled(true);
9394
$this->_model->setName($fieldName);
95+
$this->_model->setValue('');
9496
$elementHtml = $this->_model->getElementHtml();
9597
$this->assertStringContainsString('<input type="hidden" name="' . $fieldName . '_disabled"', $elementHtml);
9698
}
@@ -106,6 +108,7 @@ public function testHiddenDisabledFieldNotPresentInMultiSelect()
106108
$fieldName = 'fieldName';
107109
$this->_model->setDisabled(false);
108110
$this->_model->setName($fieldName);
111+
$this->_model->setValue('');
109112
$elementHtml = $this->_model->getElementHtml();
110113
$this->assertStringNotContainsString('<input type="hidden" name="' . $fieldName . '_disabled"', $elementHtml);
111114
}

lib/internal/Magento/Framework/Filesystem/Driver/File.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
67
namespace Magento\Framework\Filesystem\Driver;
78

89
use Magento\Framework\Exception\FileSystemException;
@@ -175,10 +176,13 @@ public function isDirectory($path)
175176
public function fileGetContents($path, $flag = null, $context = null)
176177
{
177178
$filename = $this->getScheme() . $path;
179+
178180
if (!$this->stateful) {
179181
clearstatcache(false, $filename);
180182
}
183+
$flag = $flag ?? false;
181184
$result = @file_get_contents($filename, $flag, $context);
185+
182186
if (false === $result) {
183187
throw new FileSystemException(
184188
new Phrase(
@@ -624,10 +628,13 @@ public function touch($path, $modificationTime = null)
624628
*/
625629
public function filePutContents($path, $content, $mode = null)
626630
{
631+
$mode = $mode ?? 0;
627632
$result = @file_put_contents($this->getScheme() . $path, $content, $mode);
633+
628634
if ($this->stateful) {
629635
clearstatcache(true, $this->getScheme() . $path);
630636
}
637+
631638
if ($result === false) {
632639
throw new FileSystemException(
633640
new Phrase(
@@ -636,6 +643,7 @@ public function filePutContents($path, $content, $mode = null)
636643
)
637644
);
638645
}
646+
639647
return $result;
640648
}
641649

lib/internal/Magento/Framework/View/Test/Unit/Asset/RepositoryTest.php

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -372,12 +372,10 @@ public function testCreateRelated($filePath, $resultFilePath, $module)
372372

373373
$originalAssetMock = $this->getMockBuilder(File::class)
374374
->disableOriginalConstructor()
375-
->setMethods(['getModule', 'getContext'])
375+
->onlyMethods(['getModule', 'getContext', 'getFilePath'])
376376
->getMock();
377-
$originalAssetMock
378-
->expects($this->any())
379-
->method('getContext')
380-
->willReturn($originalContextMock);
377+
$originalAssetMock->method('getContext')->willReturn($originalContextMock);
378+
$originalAssetMock->method('getFilePath')->willReturn('');
381379

382380
$assetMock = $this->getMockBuilder(File::class)
383381
->disableOriginalConstructor()

0 commit comments

Comments
 (0)