Merge remote-tracking branch 'karyna/fix-webapi-for-php8.1' into ph-delivery

Author: xmav

app/code/Magento/Catalog/Helper/Image.php

@@ -16,14 +16,15 @@
  *
  * @api
  * @SuppressWarnings(PHPMD.TooManyFields)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @since 100.0.2
  */
 class Image extends AbstractHelper implements ArgumentInterface
 {
     /**
      * Media config node
      */
-    const MEDIA_TYPE_CONFIG_NODE = 'images';
+    public const MEDIA_TYPE_CONFIG_NODE = 'images';
 
     /**
      * Current model
@@ -47,8 +48,6 @@ class Image extends AbstractHelper implements ArgumentInterface
     protected $_scheduleRotate = false;
 
     /**
-     * Angle
-     *
      * @var int
      */
     protected $_angle;
@@ -61,22 +60,16 @@ class Image extends AbstractHelper implements ArgumentInterface
     protected $_watermark;
 
     /**
-     * Watermark Position
-     *
      * @var string
      */
     protected $_watermarkPosition;
 
     /**
-     * Watermark Size
-     *
      * @var string
      */
     protected $_watermarkSize;
 
     /**
-     * Watermark Image opacity
-     *
      * @var int
      */
     protected $_watermarkImageOpacity;
@@ -89,8 +82,6 @@ class Image extends AbstractHelper implements ArgumentInterface
     protected $_product;
 
     /**
-     * Image File
-     *
      * @var string
      */
     protected $_imageFile;
@@ -108,8 +99,6 @@ class Image extends AbstractHelper implements ArgumentInterface
     protected $_assetRepo;
 
     /**
-     * Product image factory
-     *
      * @var \Magento\Catalog\Model\Product\ImageFactory
      */
     protected $_productImageFactory;
@@ -787,8 +776,8 @@ protected function getImageFile()
      */
     protected function parseSize($string)
     {
-        $size = explode('x', strtolower($string));
-        if (count($size) == 2) {
+        $size = $string !== null ? explode('x', strtolower($string)) : [];
+        if (count($size) === 2) {
             return ['width' => $size[0] > 0 ? $size[0] : null, 'height' => $size[1] > 0 ? $size[1] : null];
         }
         return false;

app/code/Magento/Catalog/Model/Category.php

@@ -48,31 +48,33 @@ class Category extends \Magento\Catalog\Model\AbstractModel implements
      * Entity code.
      * Can be used as part of method name for entity processing
      */
-    const ENTITY = 'catalog_category';
+    public const ENTITY = 'catalog_category';
 
     /**#@+
      * Category display modes
      */
-    const DM_PRODUCT = 'PRODUCTS';
+    public const DM_PRODUCT = 'PRODUCTS';
 
-    const DM_PAGE = 'PAGE';
+    public const DM_PAGE = 'PAGE';
 
-    const DM_MIXED = 'PRODUCTS_AND_PAGE';
+    public const DM_MIXED = 'PRODUCTS_AND_PAGE';
     /**#@-*/
 
     /**
      * Id of root category
      */
-    const ROOT_CATEGORY_ID = 0;
+    public const ROOT_CATEGORY_ID = 0;
 
     /**
      * Id of category tree root
      */
-    const TREE_ROOT_ID = 1;
+    public const TREE_ROOT_ID = 1;
 
-    const CACHE_TAG = 'cat_c';
+    public const CACHE_TAG = 'cat_c';
 
-    /**#@-*/
+    /**
+     * @var string
+     */
     protected $_eventPrefix = 'catalog_category';
 
     /**
@@ -157,29 +159,21 @@ class Category extends \Magento\Catalog\Model\AbstractModel implements
     protected $filter;
 
     /**
-     * Catalog config
-     *
      * @var \Magento\Catalog\Model\Config
      */
     protected $_catalogConfig;
 
     /**
-     * Product collection factory
-     *
      * @var \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory
      */
     protected $_productCollectionFactory;
 
     /**
-     * Store collection factory
-     *
      * @var \Magento\Store\Model\ResourceModel\Store\CollectionFactory
      */
     protected $_storeCollectionFactory;
 
     /**
-     * Category tree factory
-     *
      * @var \Magento\Catalog\Model\ResourceModel\Category\TreeFactory
      */
     protected $_categoryTreeFactory;
@@ -852,7 +846,7 @@ public function getPathIds()
     {
         $ids = $this->getData('path_ids');
         if ($ids === null) {
-            $ids = explode('/', $this->getPath());
+            $ids = $this->getPath() ? explode('/', $this->getPath()) : [];
             $this->setData('path_ids', $ids);
         }
         return $ids;
@@ -866,7 +860,7 @@ public function getPathIds()
     public function getLevel()
     {
         if (!$this->hasLevel()) {
-            return count(explode('/', $this->getPath())) - 1;
+            return $this->getPath() ? count(explode('/', $this->getPath())) - 1 : 0;
         }
         return $this->getData(self::KEY_LEVEL);
     }

app/code/Magento/Catalog/Model/View/Asset/Image.php

@@ -201,8 +201,8 @@ public function getPath()
      */
     public function getSourceFile()
     {
-        return $this->mediaConfig->getBaseMediaPath()
-            . DIRECTORY_SEPARATOR . ltrim($this->getFilePath(), DIRECTORY_SEPARATOR);
+        $path = $this->getFilePath() ? ltrim($this->getFilePath(), DIRECTORY_SEPARATOR) : '';
+        return $this->mediaConfig->getBaseMediaPath() . DIRECTORY_SEPARATOR . $path;
     }
 
     /**

app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/DataProvider.php

@@ -69,15 +69,11 @@ class DataProvider
     private $productAttributeCollectionFactory;
 
     /**
-     * Eav config
-     *
      * @var Config
      */
     private $eavConfig;
 
     /**
-     * Catalog product type
-     *
      * @var Type
      */
     private $catalogProductType;
@@ -90,8 +86,6 @@ class DataProvider
     private $eventManager;
 
     /**
-     * Store manager
-     *
      * @var StoreManagerInterface
      */
     private $storeManager;
@@ -155,6 +149,7 @@ class DataProvider
      * @param int $antiGapMultiplier
      * @param GetSearchableProductsSelect|null $getSearchableProductsSelect
      * @throws Exception
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         ResourceConnection $resource,
@@ -178,7 +173,8 @@ public function __construct(
         $this->engine = $engineProvider->get();
         $this->metadata = $metadataPool->getMetadata(ProductInterface::class);
         $this->antiGapMultiplier = $antiGapMultiplier;
-        $this->selectSearchableProducts = $getSearchableProductsSelect ?: ObjectManager::getInstance()->get(GetSearchableProductsSelect::class);
+        $this->selectSearchableProducts = $getSearchableProductsSelect ?:
+            ObjectManager::getInstance()->get(GetSearchableProductsSelect::class);
     }
 
     /**
@@ -210,7 +206,13 @@ public function getSearchableProducts(
         $lastProductId = 0,
         $batch = 100
     ) {
-        $select = $this->selectSearchableProducts->execute((int)$storeId, $staticFields, $productIds, $lastProductId, $batch);
+        $select = $this->selectSearchableProducts->execute(
+            (int) $storeId,
+            $staticFields,
+            $productIds,
+            $lastProductId,
+            $batch
+        );
         if ($productIds === null) {
             $select->where(
                 'e.entity_id < ?',
@@ -221,7 +223,13 @@ public function getSearchableProducts(
         if ($productIds === null && !$products) {
             // try to search without limit entity_id by batch size for cover case with a big gap between entity ids
             $products = $this->connection->fetchAll(
-                $this->selectSearchableProducts->execute((int)$storeId, $staticFields, $productIds, $lastProductId, $batch)
+                $this->selectSearchableProducts->execute(
+                    (int) $storeId,
+                    $staticFields,
+                    $productIds,
+                    $lastProductId,
+                    $batch
+                )
             );
         }
 
@@ -576,12 +584,14 @@ private function getAttributeValue($attributeId, $valueIds, $storeId)
      * @param int $attributeId
      * @param int|string $valueIds
      * @param int $storeId
+     *
      * @return null|string
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     private function getAttributeOptionValue($attributeId, $valueIds, $storeId)
     {
         $optionKey = $attributeId . '-' . $storeId;
-        $attributeValueIds = explode(',', $valueIds);
+        $attributeValueIds = $valueIds !== null ? explode(',', $valueIds) : [];
         $attributeOptionValue = '';
         if (!array_key_exists($optionKey, $this->attributeOptions)
         ) {
@@ -615,11 +625,11 @@ function ($value) {
     /**
      * Remove whitespaces and tags from attribute value
      *
-     * @param string $value
+     * @param string|null $value
      * @return string
      */
-    private function filterAttributeValue($value)
+    private function filterAttributeValue(?string $value)
     {
-        return preg_replace('/\s+/iu', ' ', trim(strip_tags($value)));
+        return $value !== null ? preg_replace('/\s+/iu', ' ', trim(strip_tags($value))) : '';
     }
 }

app/code/Magento/Indexer/Console/Command/IndexerReindexCommand.php

@@ -115,7 +115,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 $resultTime = microtime(true) - $startTime;
 
                 $output->writeln(
-                    __('has been rebuilt successfully in %time', ['time' => gmdate('H:i:s', $resultTime)])
+                    __('has been rebuilt successfully in %time', ['time' => gmdate('H:i:s', (int) $resultTime)])
                 );
             } catch (\Throwable $e) {
                 $output->writeln('process error during indexation process:');

app/code/Magento/Quote/Model/Quote/Address.php

@@ -132,13 +132,13 @@
 class Address extends AbstractAddress implements
     \Magento\Quote\Api\Data\AddressInterface
 {
-    const RATES_FETCH = 1;
+    public const RATES_FETCH = 1;
 
-    const RATES_RECALCULATE = 2;
+    public const RATES_RECALCULATE = 2;
 
-    const ADDRESS_TYPE_BILLING = 'billing';
+    public const ADDRESS_TYPE_BILLING = 'billing';
 
-    const ADDRESS_TYPE_SHIPPING = 'shipping';
+    public const ADDRESS_TYPE_SHIPPING = 'shipping';
 
     private const CACHED_ITEMS_ALL = 'cached_items_all';
 
@@ -553,6 +553,7 @@ public function importCustomerAddressData(AddressInterface $address)
         );
 
         $quote = $this->getQuote();
+        // @phpstan-ignore-next-line as $quote can be empty
         if ($address->getCustomerId() && (!empty($quote) && $address->getCustomerId() == $quote->getCustomerId())) {
             $customer = $quote->getCustomer();
             $this->setEmail($customer->getEmail());
@@ -1451,7 +1452,8 @@ public function setCountryId($countryId)
      */
     public function getStreet()
     {
-        $street = $this->getData(self::KEY_STREET);
+        $street = $this->getData(self::KEY_STREET) ?? [''];
+
         return is_array($street) ? $street : explode("\n", $street);
     }
 

app/code/Magento/Quote/Model/Quote/TotalsCollector.php

@@ -53,8 +53,6 @@ class TotalsCollector
     protected $collectorList;
 
     /**
-     * Quote validator
-     *
      * @var \Magento\Quote\Model\QuoteValidator
      */
     protected $quoteValidator;
@@ -194,7 +192,7 @@ public function collect(\Magento\Quote\Model\Quote $quote)
     protected function _validateCouponCode(\Magento\Quote\Model\Quote $quote)
     {
         $code = $quote->getData('coupon_code');
-        if (strlen($code)) {
+        if ($code !== null && strlen($code)) {
             $addressHasCoupon = false;
             $addresses = $quote->getAllAddresses();
             if (count($addresses) > 0) {