fix unit tests to be compatible with php8

magento · Sep 10, 2021 · 5d32f99 · 5d32f99
1 parent c03b8a4
commit 5d32f99
Show file tree

Hide file tree

Showing 25 changed files with 77 additions and 76 deletions.
diff --git a/app/code/Magento/Captcha/Test/Unit/Model/DefaultTest.php b/app/code/Magento/Captcha/Test/Unit/Model/DefaultTest.php
@@ -51,9 +51,9 @@ class DefaultTest extends TestCase
         'case_sensitive' => '0',
         'shown_to_logged_in_user' => ['contact_us' => 1],
         'always_for' => [
-            'user_create',
-            'user_forgotpassword',
-            'contact_us',
+            'user_create' => '1',
+            'user_forgotpassword' => '1',
+            'contact_us' => '1'
         ],
     ];
 

diff --git a/app/code/Magento/Catalog/Model/ProductLink/CollectionProvider.php b/app/code/Magento/Catalog/Model/ProductLink/CollectionProvider.php
@@ -88,7 +88,7 @@ function (array $itemA, array $itemB): int {
                 $posA = (int)$itemA['position'];
                 $posB = (int)$itemB['position'];
 
-                return $posA <=> $posB;
+                return (($posA - $posB) > 0) ? 1 : -1;  // for PHP 7 and 8 consistency
             }
         );
 

diff --git a/app/code/Magento/CatalogInventory/Test/Unit/Model/Config/Backend/ManagestockTest.php b/app/code/Magento/CatalogInventory/Test/Unit/Model/Config/Backend/ManagestockTest.php
@@ -9,12 +9,18 @@
 
 use Magento\CatalogInventory\Model\Config\Backend\Managestock;
 use Magento\CatalogInventory\Model\Indexer\Stock\Processor;
+use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
 class ManagestockTest extends TestCase
 {
+    /**
+     * @var ScopeConfigInterface|MockObject
+     */
+    private $configMock;
+
     /** @var  Processor|MockObject */
     protected $stockIndexerProcessor;
 
@@ -27,10 +33,15 @@ protected function setUp(): void
             Processor::class
         )->disableOriginalConstructor()
             ->getMock();
+        $this->configMock = $this->getMockBuilder(ScopeConfigInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
         $this->model = (new ObjectManager($this))->getObject(
             Managestock::class,
             [
-                'stockIndexerProcessor' => $this->stockIndexerProcessor,
+                'config' => $this->configMock,
+                'stockIndexerProcessor' => $this->stockIndexerProcessor
             ]
         );
     }
@@ -57,6 +68,8 @@ public function testSaveAndRebuildIndex($newStockValue, $callCount)
     {
         $this->model->setValue($newStockValue);
         $this->stockIndexerProcessor->expects($this->exactly($callCount))->method('markIndexerAsInvalid');
+        $this->configMock->method('getValue')->willReturn(0);   // old value for stock status
+
         $this->model->afterSave();
     }
 }
diff --git a/app/code/Magento/CatalogRule/Test/Unit/Model/RuleTest.php b/app/code/Magento/CatalogRule/Test/Unit/Model/RuleTest.php
@@ -278,7 +278,7 @@ public function validateDataDataProvider(): array
             [
                 [
                     'simple_action' => 'by_percent',
-                    'discount_amount' => '9,99'
+                    'discount_amount' => '9.99'
                 ],
                 true
             ],

diff --git a/app/code/Magento/CatalogUrlRewrite/Observer/AfterImportDataObserver.php b/app/code/Magento/CatalogUrlRewrite/Observer/AfterImportDataObserver.php
@@ -397,7 +397,7 @@ private function generateUrls()
      */
     private function isGlobalScope($storeId)
     {
-        return null === $storeId || $storeId == Store::DEFAULT_STORE_ID;
+        return null === $storeId || ((int) $storeId == Store::DEFAULT_STORE_ID);
     }
 
     /**

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
@@ -388,7 +388,7 @@ public function testCompactValueNoDelete(): void
             [
                 'value' => 'value',
                 'isAjax' => false,
-                'entityTypeCode' => self::ENTITY_TYPE
+                'entityTypeCode' => 'customer'
             ]
         );
 
@@ -641,7 +641,7 @@ public function testCompactValueRemoveUiComponentValue(): void
             [
                 'value' => $value,
                 'isAjax' => false,
-                'entityTypeCode' => self::ENTITY_TYPE
+                'entityTypeCode' => 'customer'
             ]
         );
 

diff --git a/app/code/Magento/ImportExport/Test/Unit/Model/Import/EntityAbstractTest.php b/app/code/Magento/ImportExport/Test/Unit/Model/Import/EntityAbstractTest.php
@@ -71,7 +71,7 @@ protected function _getModelDependencies()
         $resource = $this->createMock(ResourceConnection::class);
 
         $data = [
-            'coreString' => $string,
+            'string' => $string,
             'scopeConfig' => $scopeConfig,
             'importFactory' => $importFactory,
             'resourceHelper' => $resourceHelper,

diff --git a/app/code/Magento/Quote/Test/Unit/Model/Quote/Item/UpdaterTest.php b/app/code/Magento/Quote/Test/Unit/Model/Quote/Item/UpdaterTest.php
@@ -142,7 +142,7 @@ public function testUpdateNotQtyDecimal($qty, $expectedQty)
             ->method('getProduct')
             ->willReturn($this->productMock);
 
-        $result = $this->object->update($this->itemMock, ['qty' => $qty]);
+        $result = $this->object->update($this->itemMock, ['qty' => (double) $qty]);
         $this->assertEquals($result, $this->object);
     }
 

diff --git a/app/code/Magento/Quote/Test/Unit/Model/QuoteManagementTest.php b/app/code/Magento/Quote/Test/Unit/Model/QuoteManagementTest.php
@@ -862,7 +862,7 @@ public function testPlaceOrderIfCustomerIsGuest(): void
             ->setConstructorArgs(
                 [
                     'eventManager' => $this->eventManager,
-                    'quoteValidator' => $this->submitQuoteValidator,
+                    'submitQuoteValidator' => $this->submitQuoteValidator,
                     'orderFactory' => $this->orderFactory,
                     'orderManagement' => $this->orderManagement,
                     'customerManagement' => $this->customerManagement,
@@ -930,7 +930,7 @@ public function testPlaceOrder(): void
             ->setConstructorArgs(
                 [
                     'eventManager' => $this->eventManager,
-                    'quoteValidator' => $this->submitQuoteValidator,
+                    'submitQuoteValidator' => $this->submitQuoteValidator,
                     'orderFactory' => $this->orderFactory,
                     'orderManagement' => $this->orderManagement,
                     'customerManagement' => $this->customerManagement,

diff --git a/app/code/Magento/SalesRule/Test/Unit/Model/Quote/DiscountTest.php b/app/code/Magento/SalesRule/Test/Unit/Model/Quote/DiscountTest.php
@@ -140,14 +140,6 @@ function ($argument) {
             ]
         );
         $discountData = $this->getMockBuilder(Data::class)
-            ->setConstructorArgs(
-                [
-                    'amount' => 0,
-                    'baseAmount' => 0,
-                    'originalAmount' => 0,
-                    'baseOriginalAmount' => 0
-                ]
-            )
             ->getMock();
         $this->discountFactory->expects($this->any())
             ->method('create')

diff --git a/app/code/Magento/SalesRule/Test/Unit/Model/RulesApplierTest.php b/app/code/Magento/SalesRule/Test/Unit/Model/RulesApplierTest.php
@@ -110,14 +110,6 @@ public function testApplyRulesWhenRuleWithStopRulesProcessingIsUsed(
         $ruleId = 1;
         $appliedRuleIds = [$ruleId => $ruleId];
         $discountData = $this->getMockBuilder(Data::class)
-            ->setConstructorArgs(
-                [
-                    'amount' => 0,
-                    'baseAmount' => 0,
-                    'originalAmount' => 0,
-                    'baseOriginalAmount' => 0
-                ]
-            )
             ->getMock();
         $this->discountFactory->expects($this->any())
             ->method('create')
@@ -294,14 +286,6 @@ protected function applyRule(MockObject $item, MockObject $rule): void
             ['fixQuantity', 'calculate']
         );
         $discountData = $this->getMockBuilder(Data::class)
-            ->setConstructorArgs(
-                [
-                    'amount' => 30,
-                    'baseAmount' => 30,
-                    'originalAmount' => 30,
-                    'baseOriginalAmount' => 30
-                ]
-            )
             ->getMock();
         $this->validatorUtility->expects($this->any())
             ->method('getItemQty')

diff --git a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Delete.php b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Delete.php
@@ -29,7 +29,7 @@ public function execute()
                     \Magento\Framework\View\Design\ThemeInterface::class
                 )->load($themeId);
                 if (!$theme->getId()) {
-                    throw new \InvalidArgumentException(sprintf('We cannot find a theme with id "%1".', $themeId));
+                    throw new \InvalidArgumentException(__('We cannot find a theme with id "%1".', $themeId));
                 }
                 if (!$theme->isVirtual()) {
                     throw new \InvalidArgumentException(

diff --git a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/DownloadCustomCss.php b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/DownloadCustomCss.php
@@ -28,7 +28,7 @@ public function execute()
             $themeFactory = $this->_objectManager->create(\Magento\Framework\View\Design\Theme\FlyweightFactory::class);
             $theme = $themeFactory->create($themeId);
             if (!$theme) {
-                throw new \InvalidArgumentException(sprintf('We cannot find a theme with id "%1".', $themeId));
+                throw new \InvalidArgumentException(__('We cannot find a theme with id "%1".', $themeId));
             }
 
             $customCssFiles = $theme->getCustomization()->getFilesByType(

diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/Generator/EntityAbstractTest.php b/lib/internal/Magento/Framework/Code/Test/Unit/Generator/EntityAbstractTest.php
@@ -262,10 +262,10 @@ protected function _prepareMocksForValidateData(
         }
 
         return [
-            'source_class' => $this->sourceClass,
-            'result_class' => $this->resultClass,
-            'io_object' => $ioObject,
-            'code_generator' => null,
+            'sourceClassName' => $this->sourceClass,
+            'resultClassName' => $this->resultClass,
+            'ioObject' => $ioObject,
+            'classGenerator' => null,
             'definedClasses' => $definedClassesMock,
         ];
     }
@@ -298,17 +298,17 @@ protected function _prepareMocksForGenerateCode($willWriteCode)
 
         // Add configuration for the generation step
         /** @var \PHPUnit\Framework\MockObject\MockObject $ioObject */
-        $ioObject = $mocks['io_object'];
+        $ioObject = $mocks['ioObject'];
         if ($willWriteCode) {
             $ioObject->expects($this->once())->method('writeResultFile')->with(self::RESULT_FILE, self::RESULT_CODE);
         }
         $ioObject->expects($this->any())->method('generateResultFileName')->willReturn(self::RESULT_FILE);
 
         return [
-            'source_class' => $mocks['source_class'],
-            'result_class' => $mocks['result_class'],
-            'io_object' => $ioObject,
-            'code_generator' => $codeGenerator,
+            'sourceClassName' => $mocks['sourceClassName'],
+            'resultClassName' => $mocks['resultClassName'],
+            'ioObject' => $ioObject,
+            'classGenerator' => $codeGenerator,
             'definedClasses' => $mocks['definedClasses'],
         ];
     }

diff --git a/lib/internal/Magento/Framework/DB/Statement/Pdo/Mysql.php b/lib/internal/Magento/Framework/DB/Statement/Pdo/Mysql.php
@@ -40,7 +40,7 @@ public function _executeWithBinding(array $params)
         // Separate array with values, as they are bound by reference
         foreach ($params as $name => $param) {
             $dataType = \PDO::PARAM_STR;
-            $length = null;
+            $length = 0;
             $driverOptions = null;
 
             if ($param instanceof Parameter) {

diff --git a/lib/internal/Magento/Framework/DB/Test/Unit/DB/Statement/MysqlTest.php b/lib/internal/Magento/Framework/DB/Test/Unit/DB/Statement/MysqlTest.php
@@ -114,8 +114,8 @@ public function testExecuteWhenParamsAsParameterObject()
     {
         $param1 = $this->createMock(Parameter::class);
         $param1Value = 'SomeValue';
-        $param1DataType = 'dataType';
-        $param1Length = '9';
+        $param1DataType = \PDO::PARAM_STR;
+        $param1Length = 9;
         $param1DriverOptions = 'some driver options';
         $param1->expects($this->once())
             ->method('getIsBlob')
@@ -145,7 +145,7 @@ public function testExecuteWhenParamsAsParameterObject()
             ->method('bindParam')
             ->withConsecutive(
                 [':param1', $param1Value, $param1DataType, $param1Length, $param1DriverOptions],
-                [':param2', 'value2', \PDO::PARAM_STR, null, null]
+                [':param2', 'value2', \PDO::PARAM_STR, 0, null]
             );
         $this->pdoStatementMock->expects($this->once())
             ->method('execute');

diff --git a/lib/internal/Magento/Framework/DataObject/Test/Unit/CopyTest.php b/lib/internal/Magento/Framework/DataObject/Test/Unit/CopyTest.php
@@ -397,7 +397,7 @@ public function testGetDataObjectFieldFromExtensibleEntity()
         $targetMock
             ->expects($this->any())
             ->method('getExtensionAttributes')
-            ->willReturn(null);
+            ->willReturnSelf();
 
         $this->eventManagerMock->expects($this->once())->method('dispatch');
         $result = $this->copy->copyFieldsetToTarget('fieldset', 'aspect', $sourceMock, $targetMock);

diff --git a/lib/internal/Magento/Framework/Session/Test/Unit/SaveHandlerTest.php b/lib/internal/Magento/Framework/Session/Test/Unit/SaveHandlerTest.php
@@ -127,7 +127,8 @@ public function testWriteMoreThanSessionMaxSize()
 
         $this->saveHandlerAdapterMock->expects($this->once())
             ->method('read')
-            ->with('test_session_id');
+            ->with('test_session_id')
+            ->willReturn('test_session_data');
 
         $this->assertTrue($this->saveHandler->write("test_session_id", "testdata"));
     }

diff --git a/lib/internal/Magento/Framework/Validator/Test/Unit/CurrencyTest.php b/lib/internal/Magento/Framework/Validator/Test/Unit/CurrencyTest.php
@@ -17,10 +17,10 @@ class CurrencyTest extends TestCase
      * @var array
      */
     protected $expectedCurrencies = [
-        'USD',
-        'EUR',
-        'UAH',
-        'GBP',
+        'USD' => 'US Dollar (USD)',
+        'EUR' => 'Euro (EUR)',
+        'UAH' => 'Ukrainian Hryvnia (UAH)',
+        'GBP' => 'British Pound (GBP)'
     ];
 
     public function testIsValid()

diff --git a/lib/internal/Magento/Framework/Validator/Test/Unit/LocaleTest.php b/lib/internal/Magento/Framework/Validator/Test/Unit/LocaleTest.php
@@ -17,10 +17,10 @@ class LocaleTest extends TestCase
      * @var array
      */
     protected $expectedLocales = [
-        'en_US',
-        'en_GB',
-        'uk_UA',
-        'de_DE',
+        'en_US' => 'English (United States)',
+        'en_GB' => 'English (United Kingdom)',
+        'uk_UA' => 'Ukrainian (Ukraine)',
+        'de_DE' => 'German (Germany)'
     ];
 
     public function testIsValid()

diff --git a/lib/internal/Magento/Framework/Validator/Test/Unit/TimezoneTest.php b/lib/internal/Magento/Framework/Validator/Test/Unit/TimezoneTest.php
@@ -17,10 +17,10 @@ class TimezoneTest extends TestCase
      * @var array
      */
     protected $expectedTimezones = [
-        'Australia/Darwin',
-        'America/Los_Angeles',
-        'Europe/Kiev',
-        'Asia/Jerusalem',
+        'Australia/Darwin' => 'Darwind description',
+        'America/Los_Angeles' => 'Los_Angeles description',
+        'Europe/Kiev' => 'Kiev description',
+        'Asia/Jerusalem' => 'Jerusalem description'
     ];
 
     public function testIsValid()

diff --git a/lib/internal/Magento/Framework/View/Template/Html/Minifier.php b/lib/internal/Magento/Framework/View/Template/Html/Minifier.php
@@ -125,7 +125,7 @@ function ($match) use (&$heredocs) {
 
                 return '__MINIFIED_HEREDOC__' .(count($heredocs) - 1);
             },
-            $content
+            ($content ?? '')
         );
         $content = preg_replace(
             '#(?<!]]>)\s+</#',
@@ -149,7 +149,7 @@ function ($match) use (&$heredocs) {
                                 preg_replace(
                                     '#(?<!:)//[^\n\r]*(\<\?php)[^\n\r]*(\s\?\>)[^\n\r]*#',
                                     '',
-                                    $content
+                                    ($content ?? '')
                                 )
                             )
                         )
@@ -164,7 +164,7 @@ function ($match) use (&$heredocs) {
             function ($match) use ($heredocs) {
                 return $heredocs[(int)$match[1]];
             },
-            $content
+            ($content ?? '')
         );
 
         if (!$this->htmlDirectory->isExist()) {

diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Generator/BlockTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Generator/BlockTest.php
@@ -74,9 +74,7 @@ public function testProcess(
                         'actions' => [
                             [
                                 $methodName,
-                                [
-                                    'test_argument' => $argumentData
-                                ],
+                                [$argumentData],
                                 'config_path',
                                 'scope',
                             ],
-Original file line number
+Diff line change
@@ Expand Up / @@ -278,7 +278,7 @@ public function validateDataDataProvider(): array @@
                 [
                     [
                         'simple_action' => 'by_percent',
-                        'discount_amount' => '9,99'
+                        'discount_amount' => '9.99'
                     ],
                     true
                 ],
@@ Expand Down @@