ACPT-1552

JacobBrownAustin · JacobBrownAustin · commit 04313b28cb0a · 2023-12-13T10:48:58.000-06:00
Fixing static test failures
diff --git a/app/code/Magento/BundleGraphQl/Model/Cart/BuyRequest/BundleDataProvider.php b/app/code/Magento/BundleGraphQl/Model/Cart/BuyRequest/BundleDataProvider.php
@@ -25,6 +25,7 @@ class BundleDataProvider implements BuyRequestDataProviderInterface
     /**
      * @param ArrayManager $arrayManager @deprecated @see $arrayManagerFactory
      * @param ArrayManagerFactory|null $arrayManagerFactory
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function __construct(
         ArrayManager $arrayManager,
@@ -34,7 +35,6 @@ public function __construct(
             ?? ObjectManager::getInstance()->get(ArrayManagerFactory::class);
     }
 
-
     /**
      * @inheritdoc
      */
diff --git a/app/code/Magento/Catalog/Model/Product/Type.php b/app/code/Magento/Catalog/Model/Product/Type.php
@@ -24,17 +24,17 @@
  */
 class Type implements OptionSourceInterface, ResetAfterRequestInterface
 {
-    const TYPE_SIMPLE = 'simple';
+    public const TYPE_SIMPLE = 'simple';
 
-    const TYPE_BUNDLE = 'bundle';
+    public const TYPE_BUNDLE = 'bundle';
 
-    const TYPE_VIRTUAL = 'virtual';
+    public const TYPE_VIRTUAL = 'virtual';
 
-    const DEFAULT_TYPE = 'simple';
+    public const DEFAULT_TYPE = 'simple';
 
-    const DEFAULT_TYPE_MODEL = Simple::class;
+    public const DEFAULT_TYPE_MODEL = Simple::class;
 
-    const DEFAULT_PRICE_MODEL = Price::class;
+    public const DEFAULT_PRICE_MODEL = Price::class;
 
     /**
      * @var ConfigInterface
@@ -56,8 +56,6 @@ class Type implements OptionSourceInterface, ResetAfterRequestInterface
     protected $_compositeTypes;
 
     /**
-     * Price models
-     *
      * @var array|null|Price
      */
     protected $_priceModels;
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Webapi/Rest/RequestTypeBasedDeserializerTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Webapi/Rest/RequestTypeBasedDeserializerTest.php
@@ -19,6 +19,9 @@
 use Magento\Framework\Xml\ParserFactory as ParserXmlFactory;
 use PHPUnit\Framework\MockObject\MockObject;
 
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class RequestTypeBasedDeserializerTest extends \PHPUnit\Framework\TestCase
 {
     /** @var RequestTypeBasedDeserializer */
diff --git a/app/code/Magento/ConfigurableProductGraphQl/Model/Cart/BuyRequest/SuperAttributeDataProvider.php b/app/code/Magento/ConfigurableProductGraphQl/Model/Cart/BuyRequest/SuperAttributeDataProvider.php
@@ -25,6 +25,8 @@
 
 /**
  * DataProvider for building super attribute options in buy requests
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class SuperAttributeDataProvider implements BuyRequestDataProviderInterface
 {
@@ -60,6 +62,7 @@ class SuperAttributeDataProvider implements BuyRequestDataProviderInterface
      * @param MetadataPool $metadataPool
      * @param StockStateInterface $stockState
      * @param ArrayManagerFactory|null $arrayManagerFactory
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function __construct(
         ArrayManager $arrayManager,
diff --git a/app/code/Magento/PaypalGraphQl/Model/PayflowProAdditionalDataProvider.php b/app/code/Magento/PaypalGraphQl/Model/PayflowProAdditionalDataProvider.php
@@ -18,6 +18,8 @@ class PayflowProAdditionalDataProvider implements AdditionalDataProviderInterfac
 {
     /**
      * @param ArrayManager $arrayManager
+     * phpcs:disable Magento2.CodeAnalysis.EmptyBlock
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function __construct(
         ArrayManager $arrayManager
diff --git a/app/code/Magento/PaypalGraphQl/Model/PayflowProCcVaultAdditionalDataProvider.php b/app/code/Magento/PaypalGraphQl/Model/PayflowProCcVaultAdditionalDataProvider.php
@@ -15,10 +15,12 @@
  */
 class PayflowProCcVaultAdditionalDataProvider implements AdditionalDataProviderInterface
 {
-    const CC_VAULT_CODE = 'payflowpro_cc_vault';
+    public const CC_VAULT_CODE = 'payflowpro_cc_vault';
 
     /**
      * @param ArrayManager $arrayManager
+     * phpcs:ignore Magento2.CodeAnalysis.EmptyBlock
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function __construct(
         ArrayManager $arrayManager
diff --git a/app/code/Magento/PaypalGraphQl/Model/Plugin/Resolver/SetPaymentMethodOnCart.php b/app/code/Magento/PaypalGraphQl/Model/Plugin/Resolver/SetPaymentMethodOnCart.php
@@ -9,14 +9,14 @@
 
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
-use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Framework\Stdlib\ArrayManager;
 use Magento\Framework\Stdlib\ArrayManagerFactory;
 use Magento\Paypal\Model\Express\Checkout\Factory as CheckoutFactory;
-use Magento\Framework\Stdlib\ArrayManager;
 use Magento\PaypalGraphQl\Model\Provider\Checkout as CheckoutProvider;
 use Magento\PaypalGraphQl\Model\Provider\Config as ConfigProvider;
 
@@ -58,6 +58,7 @@ class SetPaymentMethodOnCart
      * @param ConfigProvider $configProvider
      * @param array $allowedPaymentMethodCodes
      * @param ArrayManagerFactory|null $arrayManagerFactory
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function __construct(
         CheckoutFactory $checkoutFactory,
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/BuyRequest/CustomizableOptionsDataProvider.php b/app/code/Magento/QuoteGraphQl/Model/Cart/BuyRequest/CustomizableOptionsDataProvider.php
@@ -24,9 +24,11 @@ class CustomizableOptionsDataProvider implements BuyRequestDataProviderInterface
     /**
      * @param ArrayManager $arrayManager @deprecated @see $arrayManagerFactory
      * @param ArrayManagerFactory|null $arrayManagerFactory
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function __construct(
-        ArrayManager $arrayManager
+        ArrayManager $arrayManager,
+        ?ArrayManagerFactory $arrayManagerFactory = null,
     ) {
         $this->arrayManagerFactory = $arrayManagerFactory
             ?? ObjectManager::getInstance()->get(ArrayManagerFactory::class);
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/BuyRequest/QuantityDataProvider.php b/app/code/Magento/QuoteGraphQl/Model/Cart/BuyRequest/QuantityDataProvider.php
@@ -25,6 +25,7 @@ class QuantityDataProvider implements BuyRequestDataProviderInterface
     /**
      * @param ArrayManager $arrayManager @deprecated @see $arrayManagerFactory
      * @param ArrayManagerFactory|null $arrayManagerFactory
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function __construct(
         ArrayManager $arrayManager,
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Attribute.php b/app/code/Magento/Sales/Model/ResourceModel/Attribute.php
@@ -50,6 +50,8 @@ public function _resetState(): void
     }
 
     /**
+     * Gets the connection, lazy loading it if needed
+     *
      * @return \Magento\Framework\DB\Adapter\AdapterInterface
      */
     protected function getConnection()
diff --git a/lib/internal/Magento/Framework/App/Route/Config.php b/lib/internal/Magento/Framework/App/Route/Config.php
@@ -1,7 +1,5 @@
 <?php
 /**
- * Routes configuration model
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
diff --git a/lib/internal/Magento/Framework/HTTP/PhpEnvironment/RemoteAddress.php b/lib/internal/Magento/Framework/HTTP/PhpEnvironment/RemoteAddress.php
@@ -41,6 +41,8 @@ class RemoteAddress implements ResetAfterRequestInterface
     private readonly ?array $trustedProxies;
 
     /**
+     * Constructor
+     *
      * @param RequestInterface $httpRequest
      * @param array $alternativeHeaders
      * @param string[]|null $trustedProxies
@@ -55,6 +57,9 @@ public function __construct(
         $this->trustedProxies = $trustedProxies;
     }
 
+    /**
+     * @inheritDoc
+     */
     public function _resetState(): void
     {
         $this->remoteAddress = null;
diff --git a/lib/internal/Magento/Framework/Model/ResourceModel/AbstractResource.php b/lib/internal/Magento/Framework/Model/ResourceModel/AbstractResource.php
@@ -82,7 +82,8 @@ public function addCommitCallback($callback)
     /**
      * Commit resource transaction
      *
-     * @deprecated see \Magento\Framework\Model\ExecuteCommitCallbacks::afterCommit
+     * @deprecated
+     * @see \Magento\Framework\Model\ExecuteCommitCallbacks::afterCommit
      * @return $this
      */
     public function commit()
@@ -248,7 +249,6 @@ protected function _getColumnsForEntityLoad(\Magento\Framework\Model\AbstractMod
      * Get serializer
      *
      * @return Json
-     * @deprecated 101.0.0
      * @since 101.0.0
      */
     protected function getSerializer()
@@ -263,7 +263,6 @@ protected function getSerializer()
      * Get logger
      *
      * @return \Psr\Log\LoggerInterface
-     * @deprecated 101.0.1
      */
     private function getLogger()
     {
diff --git a/lib/internal/Magento/Framework/Module/ModuleList/Loader.php b/lib/internal/Magento/Framework/Module/ModuleList/Loader.php
@@ -7,12 +7,12 @@
 namespace Magento\Framework\Module\ModuleList;
 
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Component\ComponentRegistrar;
+use Magento\Framework\Component\ComponentRegistrarInterface;
+use Magento\Framework\Filesystem\DriverInterface;
 use Magento\Framework\Module\Declaration\Converter\Dom;
 use Magento\Framework\Xml\Parser;
 use Magento\Framework\Xml\ParserFactory;
-use Magento\Framework\Component\ComponentRegistrarInterface;
-use Magento\Framework\Component\ComponentRegistrar;
-use Magento\Framework\Filesystem\DriverInterface;
 
 /**
  * Loader of module list information from the filesystem
@@ -29,17 +29,13 @@ class Loader
     private $converter;
 
     /**
-     * Parser
-     *
      * @var \Magento\Framework\Xml\Parser
      * @deprecated
      * @see $parserFactory
      */
     private $parser;
 
     /**
-     * Module registry
-     *
      * @var ComponentRegistrarInterface
      */
     private $moduleRegistry;
diff --git a/lib/internal/Magento/Framework/Search/Request/Cleaner.php b/lib/internal/Magento/Framework/Search/Request/Cleaner.php
@@ -8,8 +8,8 @@
 
 use Magento\Framework\Exception\StateException;
 use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
-use Magento\Framework\Search\Request\Aggregation\StatusInterface as AggregationStatus;
 use Magento\Framework\Phrase;
+use Magento\Framework\Search\Request\Aggregation\StatusInterface as AggregationStatus;
 
 /**
  * @api
diff --git a/lib/internal/Magento/Framework/Validator/Factory.php b/lib/internal/Magento/Framework/Validator/Factory.php
@@ -6,13 +6,12 @@
 
 namespace Magento\Framework\Validator;
 
+use Magento\Framework\Cache\FrontendInterface;
 use Magento\Framework\Module\Dir\Reader;
 use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
 use Magento\Framework\ObjectManagerInterface;
-use Magento\Framework\Phrase;
 use Magento\Framework\Translate\Adapter;
 use Magento\Framework\Validator;
-use Magento\Framework\Cache\FrontendInterface;
 
 /**
  * Factory for \Magento\Framework\Validator and \Magento\Framework\Validator\Builder.
@@ -66,6 +65,9 @@ public function __construct(
         $this->moduleReader = $moduleReader;
     }
 
+    /**
+     * @inheritDoc
+     */
     public function _resetState(): void
     {
         $this->_configFiles = null;
diff --git a/lib/internal/Magento/Framework/View/Asset/Source.php b/lib/internal/Magento/Framework/View/Asset/Source.php
@@ -46,12 +46,6 @@ class Source implements ResetAfterRequestInterface
      */
     protected $fallback;
 
-    /**
-     * @var \Magento\Framework\View\Design\Theme\ListInterface
-     * @deprecated 100.0.2
-     */
-    private $themeList;
-
     /**
      * @var ChainFactoryInterface
      */
@@ -76,6 +70,7 @@ class Source implements ResetAfterRequestInterface
      * @param \Magento\Framework\View\Design\FileResolution\Fallback\StaticFile $fallback
      * @param \Magento\Framework\View\Design\Theme\ListInterface $themeList
      * @param ChainFactoryInterface $chainFactory
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function __construct(
         \Magento\Framework\Filesystem $filesystem,
@@ -91,7 +86,6 @@ public function __construct(
         $this->tmpDir = $filesystem->getDirectoryWrite(DirectoryList::TMP_MATERIALIZATION_DIR);
         $this->preProcessorPool = $preProcessorPool;
         $this->fallback = $fallback;
-        $this->themeList = $themeList;
         $this->chainFactory = $chainFactory;
     }
 
@@ -288,6 +282,7 @@ private function findFile(LocalInterface $asset, \Magento\Framework\View\Asset\F
      * @return bool|string
      * @deprecated 100.1.0 If custom vendor directory is outside Magento root,
      * then this method will return unexpected result.
+     * @see don't use
      */
     public function findRelativeSourceFilePath(LocalInterface $asset)
     {
diff --git a/lib/internal/Magento/Framework/View/Design/Fallback/RulePool.php b/lib/internal/Magento/Framework/View/Design/Fallback/RulePool.php
@@ -18,22 +18,19 @@
  */
 class RulePool implements ResetAfterRequestInterface
 {
-    /**#@+
+    /**
      * Supported types of fallback rules
      */
-    const TYPE_FILE = 'file';
-    const TYPE_LOCALE_FILE = 'locale';
-    const TYPE_TEMPLATE_FILE = 'template';
-    const TYPE_STATIC_FILE = 'static';
-    const TYPE_EMAIL_TEMPLATE = 'email';
-    /**#@-*/
+    public const TYPE_FILE = 'file';
+    public const TYPE_LOCALE_FILE = 'locale';
+    public const TYPE_TEMPLATE_FILE = 'template';
+    public const TYPE_STATIC_FILE = 'static';
+    public const TYPE_EMAIL_TEMPLATE = 'email';
 
-    /**#@-*/
+    /** @var mixed */
     protected $filesystem;
 
     /**
-     * Rules
-     *
      * @var array
      */
     private $rules = [];

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,9 @@`
`19`	`19`	`use Magento\Framework\Xml\ParserFactory as ParserXmlFactory;`
`20`	`20`	`use PHPUnit\Framework\MockObject\MockObject;`
`21`	`21`
	`22`	`+/**`
	`23`	`+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)`
	`24`	`+ */`
`22`	`25`	`class RequestTypeBasedDeserializerTest extends \PHPUnit\Framework\TestCase`
`23`	`26`	`{`
`24`	`27`	`/** @var RequestTypeBasedDeserializer */`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,8 @@ class PayflowProAdditionalDataProvider implements AdditionalDataProviderInterfac`
`18`	`18`	`{`
`19`	`19`	`/**`
`20`	`20`	`* @param ArrayManager $arrayManager`
	`21`	`+ * phpcs:disable Magento2.CodeAnalysis.EmptyBlock`
	`22`	`+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)`
`21`	`23`	`*/`
`22`	`24`	`public function __construct(`
`23`	`25`	`ArrayManager $arrayManager`
Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,8 @@ public function _resetState(): void`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`/**`
	`53`	`+ * Gets the connection, lazy loading it if needed`
	`54`	`+ *`
`53`	`55`	`* @return \Magento\Framework\DB\Adapter\AdapterInterface`
`54`	`56`	`*/`
`55`	`57`	`protected function getConnection()`