Merge remote-tracking branch 'anzin/php8-compatibility/fixes-for-integration-tests-p1' into platform-health

xmav · xmav · commit ca753ec60cba · 2021-09-30T19:31:47.000-05:00
diff --git a/app/code/Magento/Analytics/Model/Config/Mapper.php b/app/code/Magento/Analytics/Model/Config/Mapper.php
@@ -52,10 +52,9 @@ public function execute($configData)
                 $providerData['parameters'] = !empty($providerData['parameters'])
                     ? reset($providerData['parameters'])
                     : [];
-                $providerData['parameters'] = array_map(
-                    'reset',
-                    $providerData['parameters']
-                );
+                array_walk($providerData['parameters'], function (&$array) {
+                    $array = reset($array);
+                });
                 $providers[$providerType] = $providerData;
             }
             $files[$fileData['name']] = $fileData;
diff --git a/app/code/Magento/Customer/Model/AccountManagement.php b/app/code/Magento/Customer/Model/AccountManagement.php
@@ -1116,7 +1116,7 @@ public function validate(CustomerInterface $customer)
                 // phpcs:ignore Magento2.Functions.DiscouragedFunction
                 call_user_func_array(
                     'array_merge',
-                    $this->getEavValidator()->getMessages()
+                    array_values($this->getEavValidator()->getMessages())
                 )
             );
         }
diff --git a/app/code/Magento/CustomerImportExport/Model/ResourceModel/Import/Address/Storage.php b/app/code/Magento/CustomerImportExport/Model/ResourceModel/Import/Address/Storage.php
@@ -98,6 +98,7 @@ private function loadAddresses(array $customerIds): void
         $select->reset(Select::COLUMNS)->columns([$tableId . '.entity_id', $tableId . '.parent_id']);
 
         $pageSize = $this->config->getValue(AbstractEntity::XML_PATH_PAGE_SIZE);
+        $pageSize = $pageSize !== null ? (int) $pageSize : null;
         $getChuck = function (int $offset) use ($customerIds, $pageSize) {
             return array_slice($customerIds, $offset, $pageSize);
         };
diff --git a/app/code/Magento/Paypal/Model/Cart.php b/app/code/Magento/Paypal/Model/Cart.php
@@ -150,7 +150,7 @@ protected function _importItemsFromSalesModel()
         $this->addSubtotal($this->_salesModel->getBaseSubtotal());
         $this->addTax($this->_salesModel->getBaseTaxAmount());
         $this->addShipping($this->_salesModel->getBaseShippingAmount());
-        $this->addDiscount(abs($this->_salesModel->getBaseDiscountAmount()));
+        $this->addDiscount(abs((float) $this->_salesModel->getBaseDiscountAmount()));
     }
 
     /**
diff --git a/app/code/Magento/Paypal/Model/Express/Checkout.php b/app/code/Magento/Paypal/Model/Express/Checkout.php
@@ -505,7 +505,7 @@ public function start($returnUrl, $cancelUrl, $button = null)
         $solutionType = $this->_config->getMerchantCountry() == 'DE'
             ? \Magento\Paypal\Model\Config::EC_SOLUTION_TYPE_MARK
             : $this->_config->getValue('solutionType');
-        $totalAmount = round($this->_quote->getBaseGrandTotal(), 2);
+        $totalAmount = round((float)$this->_quote->getBaseGrandTotal(), 2);
         $this->_getApi()->setAmount($totalAmount)
             ->setCurrencyCode($this->_quote->getBaseCurrencyCode())
             ->setInvNum($this->_quote->getReservedOrderId())
@@ -663,7 +663,7 @@ public function returnFromPaypal($token, string $payerIdentifier = null)
         ) === \Magento\Paypal\Model\Config::REQUIRE_BILLING_ADDRESS_ALL;
 
         if ($isButton && !$requireBillingAddress && !$quote->isVirtual()) {
-            $billingAddress = clone $shippingAddress;
+            $billingAddress = clone $shippingAddress; /** @phpstan-ignore-line */
             $billingAddress->unsAddressId()->unsAddressType()->setCustomerAddressId(null);
             $data = $billingAddress->getData();
             $data['save_in_address_book'] = 0;
diff --git a/app/code/Magento/Quote/Model/ResourceModel/Quote.php b/app/code/Magento/Quote/Model/ResourceModel/Quote.php
@@ -61,8 +61,11 @@ protected function _getLoadSelect($field, $value, $object)
     {
         $select = parent::_getLoadSelect($field, $value, $object);
         $storeIds = $object->getSharedStoreIds();
+
         if ($storeIds) {
-            if ($storeIds != ['*']) {
+            // The comparison the arrays [0] != ['*'] returns `true` in PHP >= 8 and `false` otherwise
+            // This check emulates an old behavior (as it was in PHP 7)
+            if ($storeIds !== ['*'] && $storeIds !== [0]) {
                 $select->where('store_id IN (?)', $storeIds);
             }
         } else {
diff --git a/app/code/Magento/Sales/Model/Order/ShipmentFactory.php b/app/code/Magento/Sales/Model/Order/ShipmentFactory.php
@@ -165,7 +165,7 @@ private function validateItem(\Magento\Sales\Model\Order\Item $orderItem, array
 
         // Remove from shipment items without qty or with qty=0
         if (!$orderItem->isDummy(true)
-            && (!isset($items[$orderItem->getId()]) || $items[$orderItem->getId()] <= 0)
+            && (!isset($items[$orderItem->getId()]) || (int) $items[$orderItem->getId()] <= 0)
         ) {
             return false;
         }
@@ -281,12 +281,14 @@ protected function canShipItem($item, array $items = [])
                     return isset($items[$parent->getId()]) && $items[$parent->getId()] > 0;
                 }
             }
-        } else {
-            return $item->getQtyToShip() > 0;
         }
+
+        return $item->getQtyToShip() > 0;
     }
 
     /**
+     * Casts Qty to float or integer type
+     *
      * @param Item $item
      * @param string|int|float $qty
      * @return float|int
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Status.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Status.php
@@ -206,7 +206,7 @@ public function checkIsStateLast($state)
             $this->getConnection()->select()
                 ->from(['sss' => $this->stateTable], [])
                 ->where('state = ?', $state)
-                ->columns([new\Zend_Db_Expr('COUNT(1)')])
+                ->columns([new \Zend_Db_Expr('COUNT(1)')])
         ));
     }
 
diff --git a/app/code/Magento/Usps/Model/Carrier.php b/app/code/Magento/Usps/Model/Carrier.php
@@ -634,7 +634,9 @@ protected function _parseXmlResponse($response)
                             );
                         }
                     }
-                    asort($priceArr);
+                    uasort($priceArr, function ($previous, $next) {
+                        return ($previous <= $next) ? -1 : 1;
+                    });
                 } elseif (!$isUS && is_object($xml->Package->Service)) {
                     /*
                      * International Rates
@@ -654,7 +656,9 @@ protected function _parseXmlResponse($response)
                             );
                         }
                     }
-                    asort($priceArr);
+                    uasort($priceArr, function ($previous, $next) {
+                        return ($previous <= $next) ? -1 : 1;
+                    });
                 }
             }
         }
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/AbstractProductExportImportTestCase.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/AbstractProductExportImportTestCase.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\CatalogImportExport\Model;
 
+use Magento\CatalogImportExport\Model\Export\Product;
 use Magento\Framework\App\Bootstrap;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\ImportExport\Model\Export\Adapter\AbstractAdapter;
@@ -358,13 +359,10 @@ protected function executeImportReplaceTest(
             $index++;
         }
 
-        $exportProduct = $this->objectManager->create(\Magento\CatalogImportExport\Model\Export\Product::class);
+        $exportProduct = $this->objectManager->create(Product::class);
         if ($usePagination) {
             /** @var \ReflectionProperty $itemsPerPageProperty */
-            $itemsPerPageProperty = $this->objectManager->create(\ReflectionProperty::class, [
-                'class' => \Magento\CatalogImportExport\Model\Export\Product::class,
-                'name' => '_itemsPerPage'
-            ]);
+            $itemsPerPageProperty = new \ReflectionProperty(Product::class, '_itemsPerPage');
             $itemsPerPageProperty->setAccessible(true);
             $itemsPerPageProperty->setValue($exportProduct, 1);
         }
@@ -407,16 +405,16 @@ protected function executeImportReplaceTest(
     /**
      * Export products in the system.
      *
-     * @param \Magento\CatalogImportExport\Model\Export\Product|null $exportProduct
+     * @param Product|null $exportProduct
      * @return string Return exported file
      */
-    private function exportProducts(\Magento\CatalogImportExport\Model\Export\Product $exportProduct = null)
+    private function exportProducts(Product $exportProduct = null)
     {
         $csvfile = uniqid('importexport_') . '.csv';
         $this->csvFile = $csvfile;
 
         $exportProduct = $exportProduct ?: $this->objectManager->create(
-            \Magento\CatalogImportExport\Model\Export\Product::class
+            Product::class
         );
         $this->writer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
             \Magento\ImportExport\Model\Export\Adapter\Csv::class,
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Filter/TemplateTest.php b/dev/tests/integration/testsuite/Magento/Framework/Filter/TemplateTest.php
@@ -56,6 +56,7 @@ public function getThings()
             ['name' => 'Richard', 'age' => 24],
             ['name' => 'Jane', 'age' => 12],
             ['name' => 'Spot', 'age' => 7],
+            ['name' => 'Bill', 'age' => '25']
         ];
     }
 
@@ -89,28 +90,32 @@ public function getFilterForDataProvider()
         2 name: Spot, lastname: , age: 7
     </li>
 
+    <li>
+        3 name: Bill, lastname: , age: 25
+    </li>
+
 </ul>
 EXPECTED_RESULT;
 
         $template2 = <<<TEMPLATE
 <ul>
-    {{for item in order.all_visible_items}}
+{{for item in order.all_visible_items}}
     <li>
         index: {{var loop.index}} sku: {{var item.sku}}
         name: {{var item.name}} price: {{var item.price}} quantity: {{var item.ordered_qty}}
     </li>
-    {{/for}}
+{{/for}}
 </ul>
 TEMPLATE;
 
         $expectedResult2 = <<<EXPECTED_RESULT
 <ul>
-    
+
     <li>
         index: 0 sku: ABC123
         name: Product ABC price: 123 quantity: 2
     </li>
-    
+
 </ul>
 EXPECTED_RESULT;
         return [
diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/Utility/Layout.php b/dev/tests/integration/testsuite/Magento/Framework/View/Utility/Layout.php
@@ -10,7 +10,7 @@
 namespace Magento\Framework\View\Utility;
 
 /**
- * Class Layout
+ * The integration testsuite for Layout view utility
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
@@ -71,7 +71,7 @@ public function getLayoutUpdateFromFixture($layoutUpdatesFile)
      *
      * @param string|array $layoutUpdatesFile
      * @param array $args
-     * @return \Magento\Framework\View\Layout|\PHPUnit_Framework_MockObject_MockObject
+     * @return \Magento\Framework\View\Layout|\PHPUnit\Framework\MockObject\MockObject
      */
     public function getLayoutFromFixture($layoutUpdatesFile, array $args = [])
     {
@@ -105,7 +105,7 @@ public function getLayoutDependencies()
             'structure' => $objectManager->create(\Magento\Framework\View\Layout\Data\Structure::class, []),
             'messageManager' => $objectManager->get(\Magento\Framework\Message\ManagerInterface::class),
             'themeResolver' => $objectManager->get(\Magento\Framework\View\Design\Theme\ResolverInterface::class),
-            'reader' => $objectManager->get('commonRenderPool'),
+            'readerPool' => $objectManager->get('commonRenderPool'),
             'generatorPool' => $objectManager->get(\Magento\Framework\View\Layout\GeneratorPool::class),
             'cache' => $objectManager->get(\Magento\Framework\App\Cache\Type\Layout::class),
             'readerContextFactory' => $objectManager->get(\Magento\Framework\View\Layout\Reader\ContextFactory::class),
diff --git a/dev/tests/integration/testsuite/Magento/ImportExport/Model/Export/ConsumerTest.php b/dev/tests/integration/testsuite/Magento/ImportExport/Model/Export/ConsumerTest.php
@@ -93,8 +93,28 @@ public function testProcess(): void
         $this->assertTrue($this->directory->isExist($this->filePath));
         $data = $this->csvReader->getData($this->directory->getAbsolutePath($this->filePath));
         $this->assertCount(2, $data);
-        $skuPosition = array_search(ProductInterface::SKU, array_keys($data));
-        $this->assertNotFalse($skuPosition);
+        $skuPosition = $this->getSkuPosition($data);
+        $this->assertNotNull($skuPosition);
         $this->assertEquals('simple2', $data[1][$skuPosition]);
     }
+
+    /**
+     * Get sku position from array.
+     *
+     * @param array $csvFileData
+     *
+     * @return int|null
+     */
+    private function getSkuPosition(array $csvFileData): ?int
+    {
+        foreach ($csvFileData as $data) {
+            $skuPosition = array_search(ProductInterface::SKU, $data);
+
+            if ($skuPosition !== false) {
+                return $skuPosition;
+            }
+        }
+
+        return null;
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/PaypalGraphQl/PaypalExpressAbstractTest.php b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/PaypalExpressAbstractTest.php
@@ -13,10 +13,12 @@
 use Magento\Framework\Exception\LocalizedExceptionFactory;
 use Magento\Framework\HTTP\Adapter\CurlFactory;
 use Magento\Framework\Locale\ResolverInterface;
+use Magento\Framework\Math\Random;
 use Magento\GraphQl\Controller\GraphQl;
 use Magento\GraphQl\Service\GraphQlRequest;
 use Magento\Payment\Model\Method\Logger;
 use Magento\Paypal\Model\Api\Nvp;
+use Magento\Paypal\Model\Api\NvpFactory;
 use Magento\Paypal\Model\Api\PayflowNvp;
 use Magento\Paypal\Model\Api\AbstractApi;
 use Magento\Paypal\Model\Api\ProcessableExceptionFactory;
@@ -150,21 +152,28 @@ protected function disablePaypalPaymentMethods(): void
     private function getNvpMock(string $nvpClass)
     {
         if (empty($this->nvpMock)) {
+            $constructorArgs = [
+                'customerAddress' => $this->objectManager->get(Address::class),
+                'logger' => $this->objectManager->get(LoggerInterface::class),
+                'customLogger' => $this->objectManager->get(Logger::class),
+                'localeResolver' => $this->objectManager->get(ResolverInterface::class),
+                'regionFactory' => $this->objectManager->get(RegionFactory::class),
+                'countryFactory' => $this->objectManager->get(CountryFactory::class),
+                'processableExceptionFactory' => $this->objectManager->get(ProcessableExceptionFactory::class),
+                'frameworkExceptionFactory' => $this->objectManager->get(LocalizedExceptionFactory::class),
+                'curlFactory' => $this->objectManager->get(CurlFactory::class),
+            ];
+
+            if ($nvpClass === PayflowNvp::class) {
+                $constructorArgs += [
+                    'mathRandom' => $this->objectManager->get(Random::class),
+                    'nvpFactory' => $this->objectManager->get(NvpFactory::class)
+                ];
+            }
+
+            $constructorArgs += ['data' => []];
             $this->nvpMock = $this->getMockBuilder($nvpClass)
-                ->setConstructorArgs(
-                    [
-                        'customerAddress' => $this->objectManager->get(Address::class),
-                        'logger' => $this->objectManager->get(LoggerInterface::class),
-                        'customerLogger' => $this->objectManager->get(Logger::class),
-                        'resolverInterface' => $this->objectManager->get(ResolverInterface::class),
-                        'regionFactory' => $this->objectManager->get(RegionFactory::class),
-                        'countryFactory' => $this->objectManager->get(CountryFactory::class),
-                        'processableExceptionFactory' => $this->objectManager->get(ProcessableExceptionFactory::class),
-                        'frameworkExceptionFactory' => $this->objectManager->get(LocalizedExceptionFactory::class),
-                        'curlFactory' => $this->objectManager->get(CurlFactory::class),
-                        'data' => []
-                    ]
-                )
+                ->setConstructorArgs($constructorArgs)
                 ->setMethods(['call'])
                 ->getMock();
         }
diff --git a/lib/internal/Magento/Framework/Filter/DirectiveProcessor/ForDirective.php b/lib/internal/Magento/Framework/Filter/DirectiveProcessor/ForDirective.php
@@ -132,7 +132,11 @@ private function getLoopReplacementText(
                 $subText = $loopTextToReplace;
                 foreach ($attributes as $attribute) {
                     $text = $this->variableResolver->resolve($attribute[2], $filter, $templateVariables);
-                    $subText = str_replace($attribute[0], $text, $subText);
+                    $subText = str_replace(
+                        $attribute[0],
+                        is_array($text) ? $text : (string) $text,
+                        $subText
+                    );
                 }
                 $loopText[] = $subText;
             }

Original file line number	Diff line number	Diff line change
`@@ -1116,7 +1116,7 @@ public function validate(CustomerInterface $customer)`
`1116`	`1116`	`// phpcs:ignore Magento2.Functions.DiscouragedFunction`
`1117`	`1117`	`call_user_func_array(`
`1118`	`1118`	`'array_merge',`
`1119`		`- $this->getEavValidator()->getMessages()`
	`1119`	`+ array_values($this->getEavValidator()->getMessages())`
`1120`	`1120`	`)`
`1121`	`1121`	`);`
`1122`	`1122`	`}`
Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,7 @@ protected function _importItemsFromSalesModel()`
`150`	`150`	`$this->addSubtotal($this->_salesModel->getBaseSubtotal());`
`151`	`151`	`$this->addTax($this->_salesModel->getBaseTaxAmount());`
`152`	`152`	`$this->addShipping($this->_salesModel->getBaseShippingAmount());`
`153`		`- $this->addDiscount(abs($this->_salesModel->getBaseDiscountAmount()));`
	`153`	`+ $this->addDiscount(abs((float) $this->_salesModel->getBaseDiscountAmount()));`
`154`	`154`	`}`
`155`	`155`
`156`	`156`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -61,8 +61,11 @@ protected function _getLoadSelect($field, $value, $object)`
`61`	`61`	`{`
`62`	`62`	`$select = parent::_getLoadSelect($field, $value, $object);`
`63`	`63`	`$storeIds = $object->getSharedStoreIds();`
	`64`	`+`
`64`	`65`	`if ($storeIds) {`
`65`		`- if ($storeIds != ['*']) {`
	`66`	+ // The comparison the arrays [0] != ['*'] returns `true` in PHP >= 8 and `false` otherwise
	`67`	`+ // This check emulates an old behavior (as it was in PHP 7)`
	`68`	`+ if ($storeIds !== ['*'] && $storeIds !== [0]) {`
`66`	`69`	`$select->where('store_id IN (?)', $storeIds);`
`67`	`70`	`}`
`68`	`71`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,7 @@ private function validateItem(\Magento\Sales\Model\Order\Item $orderItem, array`
`165`	`165`
`166`	`166`	`// Remove from shipment items without qty or with qty=0`
`167`	`167`	`if (!$orderItem->isDummy(true)`
`168`		`- && (!isset($items[$orderItem->getId()]) \|\| $items[$orderItem->getId()] <= 0)`
	`168`	`+ && (!isset($items[$orderItem->getId()]) \|\| (int) $items[$orderItem->getId()] <= 0)`
`169`	`169`	`) {`
`170`	`170`	`return false;`
`171`	`171`	`}`
`@@ -281,12 +281,14 @@ protected function canShipItem($item, array $items = [])`
`281`	`281`	`return isset($items[$parent->getId()]) && $items[$parent->getId()] > 0;`
`282`	`282`	`}`
`283`	`283`	`}`
`284`		`- } else {`
`285`		`- return $item->getQtyToShip() > 0;`
`286`	`284`	`}`
	`285`	`+`
	`286`	`+ return $item->getQtyToShip() > 0;`
`287`	`287`	`}`
`288`	`288`
`289`	`289`	`/**`
	`290`	`+ * Casts Qty to float or integer type`
	`291`	`+ *`
`290`	`292`	`* @param Item $item`
`291`	`293`	`* @param string\|int\|float $qty`
`292`	`294`	`* @return float\|int`
Original file line number	Diff line number	Diff line change
`@@ -206,7 +206,7 @@ public function checkIsStateLast($state)`
`206`	`206`	`$this->getConnection()->select()`
`207`	`207`	`->from(['sss' => $this->stateTable], [])`
`208`	`208`	`->where('state = ?', $state)`
`209`		`- ->columns([new\Zend_Db_Expr('COUNT(1)')])`
	`209`	`+ ->columns([new \Zend_Db_Expr('COUNT(1)')])`
`210`	`210`	`));`
`211`	`211`	`}`
`212`	`212`
Original file line number	Diff line number	Diff line change
`@@ -634,7 +634,9 @@ protected function _parseXmlResponse($response)`
`634`	`634`	`);`
`635`	`635`	`}`
`636`	`636`	`}`
`637`		`- asort($priceArr);`
	`637`	`+ uasort($priceArr, function ($previous, $next) {`
	`638`	`+ return ($previous <= $next) ? -1 : 1;`
	`639`	`+ });`
`638`	`640`	`} elseif (!$isUS && is_object($xml->Package->Service)) {`
`639`	`641`	`/*`
`640`	`642`	`* International Rates`
`@@ -654,7 +656,9 @@ protected function _parseXmlResponse($response)`
`654`	`656`	`);`
`655`	`657`	`}`
`656`	`658`	`}`
`657`		`- asort($priceArr);`
	`659`	`+ uasort($priceArr, function ($previous, $next) {`
	`660`	`+ return ($previous <= $next) ? -1 : 1;`
	`661`	`+ });`
`658`	`662`	`}`
`659`	`663`	`}`
`660`	`664`	`}`