Merge pull request #519 from magento-performance/ACPT-1219

ACPT-1219: Fix Static Tests failures for application-Server PR

Author: andimov

app/code/Magento/Bundle/Pricing/Adjustment/Calculator.php

@@ -215,7 +215,8 @@ protected function getSelectionAmounts(Product $bundleProduct, $searchMin, $useR
      * @param Option $option
      * @param bool $canSkipRequiredOption
      * @return bool
-     * @deprecated 100.2.0
+     * @deprecated 100.2.0 Not used anymore.
+     * @see Nothing
      */
     protected function canSkipOption($option, $canSkipRequiredOption)
     {
@@ -227,7 +228,8 @@ protected function canSkipOption($option, $canSkipRequiredOption)
      *
      * @param Product $bundleProduct
      * @return bool
-     * @deprecated 100.2.0
+     * @deprecated 100.2.0 Not used anymore.
+     * @see Nothing
      */
     protected function hasRequiredOption($bundleProduct)
     {
@@ -246,6 +248,7 @@ function ($item) {
      * @param Product $saleableItem
      * @return \Magento\Bundle\Model\ResourceModel\Option\Collection
      * @deprecated 100.2.0
+     * @see Nothing
      */
     protected function getBundleOptions(Product $saleableItem)
     {

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

@@ -92,6 +92,7 @@ public function calculateOptions(
             /** @var \Magento\Bundle\Pricing\Price\BundleSelectionPrice $selectionPriceList */
             $selectionPriceList = $this->calculator->createSelectionPriceList($option, $bundleProduct);
             $selectionPriceList = $this->calculator->processOptions($option, $selectionPriceList, $searchMin);
+            // phpcs:ignore Magento2.Performance.ForeachArrayMerge
             $priceList = array_merge($priceList, $selectionPriceList);
         }
         $amount = $this->calculator->calculateBundleAmount(0., $bundleProduct, $priceList);

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

@@ -7,6 +7,7 @@
 namespace Magento\Bundle\Pricing\Price;
 
 use Magento\Bundle\Pricing\Adjustment\BundleCalculatorInterface;
+use Magento\Catalog\Pricing\Price\RegularPrice;
 use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
 use Magento\Framework\Pricing\Amount\AmountInterface;
 use Magento\Catalog\Pricing\Price\CustomOptionPrice;
@@ -15,7 +16,7 @@
 /**
  * Bundle product regular price model
  */
-class BundleRegularPrice extends \Magento\Catalog\Pricing\Price\RegularPrice implements RegularPriceInterface, ResetAfterRequestInterface
+class BundleRegularPrice extends RegularPrice implements RegularPriceInterface, ResetAfterRequestInterface
 {
     /**
      * @var BundleCalculatorInterface

app/code/Magento/BundleGraphQl/Model/Resolver/BundleItems.php

@@ -58,8 +58,6 @@ public function __construct(
     }
 
     /**
-     * Fetch and format bundle option items.
-     *
      * @inheritDoc
      */
     public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)

app/code/Magento/BundleImportExport/Model/Import/Product/Type/Bundle.php

@@ -25,8 +25,8 @@
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class Bundle extends \Magento\CatalogImportExport\Model\Import\Product\Type\AbstractType
-    implements ResetAfterRequestInterface
+class Bundle extends \Magento\CatalogImportExport\Model\Import\Product\Type\AbstractType implements
+    ResetAfterRequestInterface
 {
     /**
      * Delimiter before product option value.
@@ -796,6 +796,4 @@ public function _resetState(): void
         $this->_cachedOptionSelectQuery = [];
         $this->_cachedSkuToProducts = [];
     }
-
-
 }

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

@@ -19,9 +19,9 @@
  */
 class Category extends AbstractHelper implements ResetAfterRequestInterface
 {
-    const XML_PATH_USE_CATEGORY_CANONICAL_TAG = 'catalog/seo/category_canonical_tag';
+    public const XML_PATH_USE_CATEGORY_CANONICAL_TAG = 'catalog/seo/category_canonical_tag';
 
-    const XML_PATH_CATEGORY_ROOT_ID = 'catalog/category/root_id';
+    public const XML_PATH_CATEGORY_ROOT_ID = 'catalog/category/root_id';
 
     /**
      * Store categories cache
@@ -31,14 +31,14 @@ class Category extends AbstractHelper implements ResetAfterRequestInterface
     protected $_storeCategories = [];
 
     /**
-     * Store manager
+     * Store manager instance
      *
      * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
     /**
-     * Category factory
+     * Category factory instance
      *
      * @var \Magento\Catalog\Model\CategoryFactory
      */

app/code/Magento/Catalog/Model/Layer/FilterList.php

@@ -16,10 +16,10 @@
  */
 class FilterList implements ResetAfterRequestInterface
 {
-    const CATEGORY_FILTER   = 'category';
-    const ATTRIBUTE_FILTER  = 'attribute';
-    const PRICE_FILTER      = 'price';
-    const DECIMAL_FILTER    = 'decimal';
+    public const CATEGORY_FILTER   = 'category';
+    public const ATTRIBUTE_FILTER  = 'attribute';
+    public const PRICE_FILTER      = 'price';
+    public const DECIMAL_FILTER    = 'decimal';
 
     /**
      * Filter factory

app/code/Magento/CatalogGraphQl/Model/Resolver/Product/PriceRange.php

@@ -8,8 +8,6 @@
 namespace Magento\CatalogGraphQl\Model\Resolver\Product;
 
 use Magento\CatalogGraphQl\Model\PriceRangeDataProvider;
-use Magento\CatalogGraphQl\Model\Resolver\Product\Price\Discount;
-use Magento\CatalogGraphQl\Model\Resolver\Product\Price\ProviderPool as PriceProviderPool;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Config\Element\Field;
@@ -26,13 +24,9 @@ class PriceRange implements ResolverInterface
     private PriceRangeDataProvider $priceRangeDataProvider;
 
     /**
-     * @param PriceProviderPool $priceProviderPool Deprecated.  @use $priceRangeDataProvider
-     * @param Discount $discount Deprecated.  @use $priceRangeDataProvider
      * @param PriceRangeDataProvider|null $priceRangeDataProvider
      */
     public function __construct(
-        PriceProviderPool $priceProviderPool,
-        Discount $discount,
         PriceRangeDataProvider $priceRangeDataProvider = null
     ) {
         $this->priceRangeDataProvider = $priceRangeDataProvider

app/code/Magento/CatalogInventory/Model/StockRegistryStorage.php

@@ -10,9 +10,6 @@
 use Magento\CatalogInventory\Api\Data\StockStatusInterface;
 use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
 
-/**
- * Class StockRegistryStorage
- */
 class StockRegistryStorage implements ResetAfterRequestInterface
 {
     /**
@@ -31,6 +28,8 @@ class StockRegistryStorage implements ResetAfterRequestInterface
     private $stockStatuses = [];
 
     /**
+     * Get Stock Data
+     *
      * @param int $scopeId
      * @return StockInterface
      */
@@ -40,6 +39,8 @@ public function getStock($scopeId)
     }
 
     /**
+     * Set Stock cache
+     *
      * @param int $scopeId
      * @param StockInterface $value
      * @return void
@@ -50,6 +51,8 @@ public function setStock($scopeId, StockInterface $value)
     }
 
     /**
+     * Delete cached Stock based on scopeId
+     *
      * @param int|null $scopeId
      * @return void
      */
@@ -63,6 +66,8 @@ public function removeStock($scopeId = null)
     }
 
     /**
+     * Retrieve Stock Item
+     *
      * @param int $productId
      * @param int $scopeId
      * @return StockItemInterface
@@ -73,6 +78,8 @@ public function getStockItem($productId, $scopeId)
     }
 
     /**
+     * Update Stock Item
+     *
      * @param int $productId
      * @param int $scopeId
      * @param StockItemInterface $value
@@ -84,6 +91,8 @@ public function setStockItem($productId, $scopeId, StockItemInterface $value)
     }
 
     /**
+     * Remove stock Item based on productId & scopeId
+     *
      * @param int $productId
      * @param int|null $scopeId
      * @return void
@@ -98,6 +107,8 @@ public function removeStockItem($productId, $scopeId = null)
     }
 
     /**
+     * Retrieve stock status
+     *
      * @param int $productId
      * @param int $scopeId
      * @return StockStatusInterface
@@ -108,6 +119,8 @@ public function getStockStatus($productId, $scopeId)
     }
 
     /**
+     * Update stock Status
+     *
      * @param int $productId
      * @param int $scopeId
      * @param StockStatusInterface $value
@@ -119,6 +132,8 @@ public function setStockStatus($productId, $scopeId, StockStatusInterface $value
     }
 
     /**
+     * Clear stock status
+     *
      * @param int $productId
      * @param int|null $scopeId
      * @return void

app/code/Magento/Config/Console/Command/ConfigShow/ValueProcessor.php

@@ -26,7 +26,7 @@ class ValueProcessor
     /**
      * Placeholder for the output of sensitive data.
      */
-    const SAFE_PLACEHOLDER = '******';
+    public const SAFE_PLACEHOLDER = '******';
 
     /**
      * System configuration structure factory.