magento#34505: fixes for php 8.1 compatibility

Author: karyna-t

app/code/Magento/Bundle/Pricing/Price/BundleSelectionPrice.php

@@ -7,6 +7,7 @@
 
 use Magento\Bundle\Model\Product\Price;
 use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Type;
 use Magento\Catalog\Pricing\Price as CatalogPrice;
 use Magento\Framework\Event\ManagerInterface;
 use Magento\Framework\Pricing\Adjustment\CalculatorInterface;
@@ -162,10 +163,10 @@ public function getAmount()
         if ($product->hasData($bundleSelectionKey)) {
             return $product->getData($bundleSelectionKey);
         }
-        $value = $this->getValue();
+        $value = (string) $this->getValue();
         if (!isset($this->amount[$value])) {
             $exclude = null;
-            if ($this->getProduct()->getTypeId() == \Magento\Catalog\Model\Product\Type::TYPE_BUNDLE) {
+            if ($this->getProduct()->getTypeId() === Type::TYPE_BUNDLE) {
                 $exclude = $this->excludeAdjustment;
             }
             $this->amount[$value] = $this->calculator->getAmount(

app/code/Magento/CatalogImportExport/Model/Import/Product/Type/AbstractType.php

@@ -23,8 +23,6 @@
 abstract class AbstractType
 {
     /**
-     * Common attributes cache
-     *
      * @var array
      */
     public static $commonAttributesCache = [];
@@ -149,8 +147,6 @@ abstract class AbstractType
     protected $metadataPool;
 
     /**
-     * Product entity link field
-     *
      * @var string
      */
     private $productEntityLinkField;
@@ -332,6 +328,7 @@ protected function attachAttributesById($attributeSetName, $attributeIds)
 
             if ($attribute->getIsVisible() || in_array($attributeCode, $this->_forcedAttributesCodes)) {
                 if (!isset(self::$commonAttributesCache[$attributeId])) {
+                    $defaultValue = $attribute->getDefaultValue();
                     self::$commonAttributesCache[$attributeId] = [
                         'id' => $attributeId,
                         'code' => $attributeCode,
@@ -342,9 +339,8 @@ protected function attachAttributesById($attributeSetName, $attributeIds)
                         'is_static' => $attribute->isStatic(),
                         'apply_to' => $attribute->getApplyTo(),
                         'type' => \Magento\ImportExport\Model\Import::getAttributeType($attribute),
-                        'default_value' => strlen(
-                            $attribute->getDefaultValue()
-                        ) ? $attribute->getDefaultValue() : null,
+                        'default_value' => (is_string($defaultValue) && strlen($defaultValue)) ?
+                            $attribute->getDefaultValue() : null,
                         'options' => $this->_entityModel->getAttributeOptions(
                             $attribute,
                             $this->_indexValueAttributes
@@ -597,6 +593,7 @@ public function saveData()
     protected function getMetadataPool()
     {
         if (!$this->metadataPool) {
+            // phpcs:ignore Magento2.PHP.AutogeneratedClassNotInConstructor
             $this->metadataPool = \Magento\Framework\App\ObjectManager::getInstance()
                 ->get(\Magento\Framework\EntityManager\MetadataPool::class);
         }

app/code/Magento/Cms/Model/Block.php

@@ -107,7 +107,8 @@ public function beforeSave()
         }
 
         $needle = 'block_id="' . $this->getId() . '"';
-        if (strstr($this->getContent(), (string) $needle) !== false) {
+        $content = ($this->getContent() !== null) ? $this->getContent() : '';
+        if (strpos($content, $needle) !== false) {
             throw new \Magento\Framework\Exception\LocalizedException(
                 __('Make sure that static block content does not reference the block itself.')
             );
@@ -121,9 +122,9 @@ public function beforeSave()
         parent::beforeSave();
 
         //Validating HTML content.
-        if ($this->getContent() && $this->getContent() !== $this->getOrigData(self::CONTENT)) {
+        if ($content && $content !== $this->getOrigData(self::CONTENT)) {
             try {
-                $this->wysiwygValidator->validate($this->getContent());
+                $this->wysiwygValidator->validate($content);
             } catch (ValidationException $exception) {
                 throw new ValidationException(
                     __('Content field contains restricted HTML elements. %1', $exception->getMessage()),

app/code/Magento/Downloadable/Helper/Catalog/Product/Configuration.php

@@ -64,7 +64,7 @@ public function getLinks(\Magento\Catalog\Model\Product\Configuration\Item\ItemI
     public function getLinksTitle($product)
     {
         $title = $product->getLinksTitle();
-        if (strlen($title)) {
+        if ($title !== null && strlen($title)) {
             return $title;
         }
         return $this->scopeConfig->getValue(

app/code/Magento/Payment/Block/Info/Instructions.php

@@ -34,9 +34,8 @@ class Instructions extends \Magento\Payment\Block\Info
     public function getInstructions()
     {
         if ($this->_instructions === null) {
-            $this->_instructions = $this->getInfo()->getAdditionalInformation(
-                'instructions'
-            ) ?: trim($this->getMethod()->getConfigData('instructions'));
+            $this->_instructions = $this->getInfo()->getAdditionalInformation('instructions')
+                ?: trim($this->getMethod()->getConfigData('instructions') ?? '');
         }
         return $this->_instructions;
     }

app/code/Magento/Sales/Model/Order.php

@@ -2037,16 +2037,19 @@ public function getCustomerName()
         }
 
         $customerName = '';
-        if ($this->isVisibleCustomerPrefix() && strlen($this->getCustomerPrefix())) {
-            $customerName .= $this->getCustomerPrefix() . ' ';
+        $prefix = $this->getCustomerPrefix();
+        if (($prefix !== null) && $this->isVisibleCustomerPrefix() && strlen($prefix)) {
+            $customerName .= $prefix . ' ';
         }
         $customerName .= $this->getCustomerFirstname();
-        if ($this->isVisibleCustomerMiddlename() && strlen($this->getCustomerMiddlename())) {
-            $customerName .= ' ' . $this->getCustomerMiddlename();
+        $middlename = $this->getCustomerMiddlename();
+        if (($middlename !== null) && $this->isVisibleCustomerMiddlename() && strlen($middlename)) {
+            $customerName .= ' ' . $middlename;
         }
         $customerName .= ' ' . $this->getCustomerLastname();
-        if ($this->isVisibleCustomerSuffix() && strlen($this->getCustomerSuffix())) {
-            $customerName .= ' ' . $this->getCustomerSuffix();
+        $suffix = $this->getCustomerSuffix();
+        if (($suffix !== null) && $this->isVisibleCustomerSuffix() && strlen($suffix)) {
+            $customerName .= ' ' . $suffix;
         }
 
         return $customerName;

lib/internal/Magento/Framework/Image/Adapter/Gd2.php

@@ -916,7 +916,7 @@ private function imagecopymergeWithAlphaFix(
             return false;
         }
 
-        $transparency = 127 - (($pct*127)/100);
+        $transparency = (int) (127 - (($pct * 127) / 100));
         if (false === imagefilter($tmpImg, IMG_FILTER_COLORIZE, 0, 0, 0, $transparency)) {
             return false;
         }

lib/internal/Magento/Framework/Pricing/Price/AbstractPrice.php

@@ -99,10 +99,11 @@ abstract public function getValue();
      */
     public function getAmount()
     {
-        if (!isset($this->amount[$this->getValue()])) {
-            $this->amount[$this->getValue()] = $this->calculator->getAmount($this->getValue(), $this->getProduct());
+        $valueKey = (string) $this->getValue();
+        if (!isset($this->amount[$valueKey])) {
+            $this->amount[$valueKey] = $this->calculator->getAmount($this->getValue(), $this->getProduct());
         }
-        return $this->amount[$this->getValue()];
+        return $this->amount[$valueKey];
     }
 
     /**

lib/internal/Magento/Framework/Search/Dynamic/Algorithm/Auto.php

@@ -80,10 +80,7 @@ private function getRange($bucket, array $dimensions, EntityStorage $entityStora
     private function getMaxPriceInt(EntityStorage $entityStorage)
     {
         $aggregations = $this->dataProvider->getAggregations($entityStorage);
-        $maxPrice = $aggregations['max'];
-        $maxPrice = floor($maxPrice);
-
-        return $maxPrice;
+        return ($aggregations['max'] !== null) ? floor($aggregations['max']) : 0;
     }
 
     /**

setup/src/Magento/Setup/Console/Command/GenerateFixturesCommand.php

@@ -167,7 +167,7 @@ private function executeFixture(\Magento\Setup\Fixtures\Fixture $fixture, Output
         $startTime = microtime(true);
         $fixture->execute($output);
         $endTime = microtime(true);
-        $resultTime = $endTime - $startTime;
+        $resultTime = (int) ($endTime - $startTime);
         $output->writeln('<info> done in ' . gmdate('H:i:s', $resultTime) . '</info>');
     }
 }

setup/src/Magento/Setup/Model/BatchInsert.php

@@ -86,10 +86,11 @@ public function flush()
                 $this->dataStorage->setSize($this->currentStorageIndex);
             }
 
+            $this->dataStorage->rewind();
             $this->getDbConnection()
                 ->insertArray(
                     $this->insertIntoTable,
-                    array_keys(reset($this->dataStorage)),
+                    array_keys($this->dataStorage->current()),
                     $this->dataStorage->toArray()
                 );