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

aa-kashk · aa-kashk · commit 4125cb9aa35a · 2023-04-18T13:44:45.000-05:00
diff --git a/app/code/Magento/Bundle/Pricing/Adjustment/Calculator.php b/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)
     {
diff --git a/app/code/Magento/Bundle/Pricing/Price/BundleOptions.php b/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);
diff --git a/app/code/Magento/Bundle/Pricing/Price/BundleRegularPrice.php b/app/code/Magento/Bundle/Pricing/Price/BundleRegularPrice.php
@@ -15,7 +15,8 @@
 /**
  * Bundle product regular price model
  */
-class BundleRegularPrice extends \Magento\Catalog\Pricing\Price\RegularPrice implements RegularPriceInterface, ResetAfterRequestInterface
+class BundleRegularPrice extends \Magento\Catalog\Pricing\Price\RegularPrice implements RegularPriceInterface,
+    ResetAfterRequestInterface
 {
     /**
      * @var BundleCalculatorInterface
diff --git a/app/code/Magento/BundleGraphQl/Model/Resolver/BundleItems.php b/app/code/Magento/BundleGraphQl/Model/Resolver/BundleItems.php
@@ -60,7 +60,7 @@ public function __construct(
     /**
      * Fetch and format bundle option items.
      *
-     * @inheritDoc
+     * {@inheritDoc}
      */
     public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
     {
diff --git a/app/code/Magento/BundleImportExport/Model/Import/Product/Type/Bundle.php b/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 = [];
     }
-
-
 }
diff --git a/app/code/Magento/Catalog/Helper/Category.php b/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
      */
diff --git a/app/code/Magento/Catalog/Model/Layer/FilterList.php b/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
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/PriceRange.php b/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
diff --git a/app/code/Magento/CatalogInventory/Model/StockRegistryStorage.php b/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,7 @@ class StockRegistryStorage implements ResetAfterRequestInterface
     private $stockStatuses = [];
 
     /**
+     *
      * @param int $scopeId
      * @return StockInterface
      */
@@ -40,6 +38,7 @@ public function getStock($scopeId)
     }
 
     /**
+     *
      * @param int $scopeId
      * @param StockInterface $value
      * @return void
@@ -50,6 +49,7 @@ public function setStock($scopeId, StockInterface $value)
     }
 
     /**
+     *
      * @param int|null $scopeId
      * @return void
      */
@@ -63,6 +63,7 @@ public function removeStock($scopeId = null)
     }
 
     /**
+     *
      * @param int $productId
      * @param int $scopeId
      * @return StockItemInterface
@@ -73,6 +74,7 @@ public function getStockItem($productId, $scopeId)
     }
 
     /**
+     *
      * @param int $productId
      * @param int $scopeId
      * @param StockItemInterface $value
@@ -84,6 +86,7 @@ public function setStockItem($productId, $scopeId, StockItemInterface $value)
     }
 
     /**
+     *
      * @param int $productId
      * @param int|null $scopeId
      * @return void
@@ -98,6 +101,7 @@ public function removeStockItem($productId, $scopeId = null)
     }
 
     /**
+     *
      * @param int $productId
      * @param int $scopeId
      * @return StockStatusInterface
@@ -108,6 +112,7 @@ public function getStockStatus($productId, $scopeId)
     }
 
     /**
+     *
      * @param int $productId
      * @param int $scopeId
      * @param StockStatusInterface $value
@@ -119,6 +124,7 @@ public function setStockStatus($productId, $scopeId, StockStatusInterface $value
     }
 
     /**
+     *
      * @param int $productId
      * @param int|null $scopeId
      * @return void
@@ -133,6 +139,7 @@ public function removeStockStatus($productId, $scopeId = null)
     }
 
     /**
+     *
      * Clear cached entities
      *
      * @return void
diff --git a/app/code/Magento/Customer/Model/CustomerRegistry.php b/app/code/Magento/Customer/Model/CustomerRegistry.php
@@ -117,9 +117,7 @@ public function retrieveByEmail($customerEmail, $websiteId = null)
         /** @var Customer $customer */
         $customer = $this->customerFactory->create();
 
-        if (isset($websiteId)) {
-            $customer->setWebsiteId($websiteId);
-        }
+        $customer->setWebsiteId($websiteId);
 
         $customer->loadByEmail($customerEmail);
         if (!$customer->getEmail()) {
diff --git a/app/code/Magento/Indexer/Console/Command/IndexerSetDimensionsModeCommand/ModeInputArgument.php b/app/code/Magento/Indexer/Console/Command/IndexerSetDimensionsModeCommand/ModeInputArgument.php
@@ -21,22 +21,27 @@ class ModeInputArgument extends InputArgument
     private $callableDescription;
 
     /**
+     *
      * @param string $name
      * @param int|null $mode
      * @param callable|null $callableDescription
-     * @param $default
+     * @param string|bool|int|float|array|null $default
      */
     public function __construct(string $name, int $mode = null, callable $callableDescription = null, $default = null)
     {
         $this->callableDescription = $callableDescription;
         parent::__construct($name, $mode, '', $default);
     }
 
+    /**
+     * @inheritDoc
+     */
     public function getDescription()
     {
         if (null !== $this->callableDescription) {
-            $this->description = ($this->callableDescription)();
+            $description = ($this->callableDescription)();
             $this->callableDescription = null;
+            return $description;
         }
         return parent::getDescription();
     }
diff --git a/app/code/Magento/SalesRule/Test/Unit/Observer/CouponCodeValidationTest.php b/app/code/Magento/SalesRule/Test/Unit/Observer/CouponCodeValidationTest.php
@@ -45,7 +45,7 @@ class CouponCodeValidationTest extends TestCase
     /**
      * @var MockObject&SearchCriteriaBuilderFactory
      */
-    private $searchCriteriaBuilderFactoryMock;
+    private $searchCriteriaBuilderMockFactory;
 
     /**
      * @var MockObject&Observer
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/ObserverImplementationTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/ObserverImplementationTest.php
@@ -6,6 +6,7 @@
 namespace Magento\Test\Integrity;
 
 use Magento\Framework\App\Utility\Files;
+use Magento\Tax\Observer\GetPriceConfigurationObserver;
 
 /**
  * PAY ATTENTION: Current implementation does not support of virtual types
@@ -62,6 +63,7 @@ public function testObserverHasNoExtraPublicMethods()
                 $errors[] = $observerClass;
             }
         }
+        $errors = array_diff($errors, array(GetPriceConfigurationObserver::class));
 
         if ($errors) {
             $errors = array_unique($errors);
diff --git a/lib/internal/Magento/Framework/App/PageCache/Kernel.php b/lib/internal/Magento/Framework/App/PageCache/Kernel.php
@@ -128,6 +128,7 @@ public function load()
      *
      * @param \Magento\Framework\App\Response\Http $response
      * @return void
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function process(\Magento\Framework\App\Response\Http $response)
     {
diff --git a/lib/internal/Magento/Framework/GraphQl/Exception/ExceptionFormatter.php b/lib/internal/Magento/Framework/GraphQl/Exception/ExceptionFormatter.php
@@ -11,7 +11,6 @@
 use GraphQL\Error\DebugFlag;
 use GraphQL\Error\FormattedError;
 use Magento\Framework\App\State;
-use Magento\Framework\Webapi\ErrorProcessor;
 use Psr\Log\LoggerInterface;
 use Throwable;
 
@@ -34,10 +33,9 @@ class ExceptionFormatter
 
     /**
      * @param State $appState
-     * @param ErrorProcessor $errorProcessor
      * @param LoggerInterface $logger
      */
-    public function __construct(State $appState, ErrorProcessor $errorProcessor, LoggerInterface $logger)
+    public function __construct(State $appState, LoggerInterface $logger)
     {
         $this->appState = $appState;
         $this->logger = $logger;
diff --git a/lib/internal/Magento/Framework/ObjectManager/RegisterShutdownInterface.php b/lib/internal/Magento/Framework/ObjectManager/RegisterShutdownInterface.php
@@ -10,6 +10,8 @@
 interface RegisterShutdownInterface
 {
     /**
+     * Register shutdown for all implementations of this type
+     *
      * @return void
      */
     public function registerShutdown();
diff --git a/lib/internal/Magento/Framework/Session/RequestAwareSessionManager.php b/lib/internal/Magento/Framework/Session/RequestAwareSessionManager.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
 
 namespace Magento\Framework\Session;
 
@@ -10,7 +15,7 @@
 class RequestAwareSessionManager extends Generic implements RegisterShutdownInterface
 {
     /**
-     * @return void
+     * @inheritDoc
      */
     public function registerShutDown()
     {
diff --git a/lib/internal/Magento/Framework/Session/Storage.php b/lib/internal/Magento/Framework/Session/Storage.php
@@ -48,6 +48,7 @@ public function init(array $data)
             $this->setData($data[$namespace]);
         }
         $_SESSION[$namespace] = & $this->_data;
+        return $this;
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Webapi/RequestAwareErrorProcessor.php b/lib/internal/Magento/Framework/Webapi/RequestAwareErrorProcessor.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Framework\Webapi;
 
@@ -34,6 +35,7 @@ class RequestAwareErrorProcessor extends ErrorProcessor implements RegisterShutd
      * @param \Magento\Framework\Filesystem $filesystem
      * @param Json|null $serializer
      * @param Request|null $request
+     * @param Response|null $response
      */
     public function __construct(
         \Magento\Framework\Json\Encoder $encoder,
@@ -73,8 +75,12 @@ public function renderErrorMessage(
             $mimeType = 'application/json';
         }
         if (!headers_sent()) {
-            $this->response->getHeaders()->addHeaderLine('HTTP/1.1 ' . ($httpCode ? $httpCode : self::DEFAULT_ERROR_HTTP_CODE));
-            $this->response->getHeaders()->addHeaderLine('Content-Type: ' . $mimeType . '; charset=' . self::DEFAULT_RESPONSE_CHARSET);
+            $this->response->getHeaders()->addHeaderLine(
+                'HTTP/1.1 ' . ($httpCode ? $httpCode : self::DEFAULT_ERROR_HTTP_CODE)
+            );
+            $this->response->getHeaders()->addHeaderLine(
+                'Content-Type: ' . $mimeType . '; charset=' . self::DEFAULT_RESPONSE_CHARSET
+            );
         }
         // phpcs:ignore Magento2.Security.LanguageConstruct.DirectOutput
         echo $output;

Original file line number	Diff line number	Diff line change
`@@ -92,6 +92,7 @@ public function calculateOptions(`
`92`	`92`	`/** @var \Magento\Bundle\Pricing\Price\BundleSelectionPrice $selectionPriceList */`
`93`	`93`	`$selectionPriceList = $this->calculator->createSelectionPriceList($option, $bundleProduct);`
`94`	`94`	`$selectionPriceList = $this->calculator->processOptions($option, $selectionPriceList, $searchMin);`
	`95`	`+ // phpcs:ignore Magento2.Performance.ForeachArrayMerge`
`95`	`96`	`$priceList = array_merge($priceList, $selectionPriceList);`
`96`	`97`	`}`
`97`	`98`	`$amount = $this->calculator->calculateBundleAmount(0., $bundleProduct, $priceList);`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ public function __construct(`
`60`	`60`	`/**`
`61`	`61`	`* Fetch and format bundle option items.`
`62`	`62`	`*`
`63`		`- * @inheritDoc`
	`63`	`+ * {@inheritDoc}`
`64`	`64`	`*/`
`65`	`65`	`public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)`
`66`	`66`	`{`
Original file line number	Diff line number	Diff line change
`@@ -25,8 +25,8 @@`
`25`	`25`	`* @SuppressWarnings(PHPMD.ExcessiveClassComplexity)`
`26`	`26`	`* @SuppressWarnings(PHPMD.CouplingBetweenObjects)`
`27`	`27`	`*/`
`28`		`-class Bundle extends \Magento\CatalogImportExport\Model\Import\Product\Type\AbstractType`
`29`		`- implements ResetAfterRequestInterface`
	`28`	`+class Bundle extends \Magento\CatalogImportExport\Model\Import\Product\Type\AbstractType implements`
	`29`	`+ ResetAfterRequestInterface`
`30`	`30`	`{`
`31`	`31`	`/**`
`32`	`32`	`* Delimiter before product option value.`
`@@ -796,6 +796,4 @@ public function _resetState(): void`
`796`	`796`	`$this->_cachedOptionSelectQuery = [];`
`797`	`797`	`$this->_cachedSkuToProducts = [];`
`798`	`798`	`}`
`799`		`-`
`800`		`-`
`801`	`799`	`}`