#34505: fix failed static tests

Author: karyna-t

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

@@ -16,6 +16,7 @@
  *
  * @api
  * @SuppressWarnings(PHPMD.TooManyFields)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @since 100.0.2
  */
 class Image extends AbstractHelper implements ArgumentInterface
@@ -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;

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

@@ -72,7 +72,9 @@ class Category extends \Magento\Catalog\Model\AbstractModel implements
 
     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;

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

@@ -155,6 +155,7 @@ class DataProvider
      * @param int $antiGapMultiplier
      * @param GetSearchableProductsSelect|null $getSearchableProductsSelect
      * @throws Exception
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         ResourceConnection $resource,
@@ -210,7 +211,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 +228,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
+                )
             );
         }
 

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());

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;

app/code/Magento/SalesRule/Model/RulesApplier.php

@@ -18,6 +18,8 @@
 
 /**
  * Rule applier model
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class RulesApplier
 {

app/code/Magento/Tax/Model/ResourceModel/Calculation.php

@@ -14,18 +14,14 @@ class Calculation extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
     /**
      * Store ISO 3166-1 alpha-2 USA country code
      */
-    const USA_COUNTRY_CODE = 'US';
+    public const USA_COUNTRY_CODE = 'US';
 
     /**
-     * Rates cache
-     *
      * @var array
      */
     protected $_ratesCache = [];
 
     /**
-     * Tax data
-     *
      * @var \Magento\Tax\Helper\Data
      */
     protected $_taxData;
@@ -254,8 +250,9 @@ protected function _createSearchPostCodeTemplates($postcode, $exactPostcode = nu
     }
 
     /**
-     * Returns tax rates for request - either pereforms SELECT from DB, or returns already cached result
-     * Notice that productClassId due to optimization can be array of ids
+     * Returns tax rates for request - either pereforms SELECT from DB, or returns already cached result.
+     *
+     * Notice that productClassId due to optimization can be array of ids.
      *
      * @param \Magento\Framework\DataObject $request
      * @return array
@@ -342,6 +339,8 @@ protected function _getRates($request)
             $postcodeIsNumeric = is_numeric($postcode);
             $postcodeIsRange = false;
             $originalPostcode = null;
+            $zipFrom = null;
+            $zipTo = null;
             if (is_string($postcode) && preg_match('/^(.+)-(.+)$/', $postcode, $matches)) {
                 if ($countryId == self::USA_COUNTRY_CODE && is_numeric($matches[2]) && strlen($matches[2]) == 4) {
                     $postcodeIsNumeric = true;
@@ -354,6 +353,7 @@ protected function _getRates($request)
                 }
             }
 
+            $selectClone = null;
             if ($postcodeIsNumeric || $postcodeIsRange) {
                 $selectClone = clone $select;
                 $selectClone->where('rate.zip_is_range IS NOT NULL');

lib/internal/Magento/Framework/Reflection/TypeProcessor.php

@@ -27,21 +27,21 @@ class TypeProcessor
     /**#@+
      * Pre-normalized type constants
      */
-    const STRING_TYPE = 'str';
-    const INT_TYPE = 'integer';
-    const BOOLEAN_TYPE = 'bool';
-    const ANY_TYPE = 'mixed';
+    public const STRING_TYPE = 'str';
+    public const INT_TYPE = 'integer';
+    public const BOOLEAN_TYPE = 'bool';
+    public const ANY_TYPE = 'mixed';
     /**#@-*/
 
     /**#@+
      * Normalized type constants
      */
-    const NORMALIZED_STRING_TYPE = 'string';
-    const NORMALIZED_INT_TYPE = 'int';
-    const NORMALIZED_FLOAT_TYPE = 'float';
-    const NORMALIZED_DOUBLE_TYPE = 'double';
-    const NORMALIZED_BOOLEAN_TYPE = 'boolean';
-    const NORMALIZED_ANY_TYPE = 'anyType';
+    public const NORMALIZED_STRING_TYPE = 'string';
+    public const NORMALIZED_INT_TYPE = 'int';
+    public const NORMALIZED_FLOAT_TYPE = 'float';
+    public const NORMALIZED_DOUBLE_TYPE = 'double';
+    public const NORMALIZED_BOOLEAN_TYPE = 'boolean';
+    public const NORMALIZED_ANY_TYPE = 'anyType';
     /**#@-*/
 
     /**
@@ -857,6 +857,7 @@ private function getMethodReturnAnnotation(MethodReflection $methodReflection)
         $methodName = $methodReflection->getName();
         $returnAnnotations = $this->getReturnFromDocBlock($methodReflection);
 
+        // @phpstan-ignore-next-line as $returnAnnotations can be empty
         if (empty($returnAnnotations)) {
             $classReflection = $methodReflection->getDeclaringClass();
             // method can inherit doc block from implemented interface, like for interceptors
@@ -871,6 +872,7 @@ private function getMethodReturnAnnotation(MethodReflection $methodReflection)
                 }
             }
 
+            // @phpstan-ignore-next-line as $returnAnnotations can be empty
             if (empty($returnAnnotations)) {
                 while ($classReflection->getParentClass()) {
                     $classReflection = $classReflection->getParentClass();
@@ -883,6 +885,7 @@ private function getMethodReturnAnnotation(MethodReflection $methodReflection)
                 }
 
                 // throw an exception if even implemented interface doesn't have return annotations
+                // @phpstan-ignore-next-line as $returnAnnotations can be empty
                 if (empty($returnAnnotations)) {
                     throw new \InvalidArgumentException(
                         "Method's return type must be specified using @return annotation. "