Static test issues fixed;

Author: glo80326

app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php

@@ -1109,7 +1109,6 @@ private function calculateGroupCode(AttributeGroupInterface $group)
     private function getLocaleCurrency()
     {
         if ($this->localeCurrency === null) {
-            // phpcs:ignore Magento2.PHP.AutogeneratedClassNotInConstructor
             $this->localeCurrency = \Magento\Framework\App\ObjectManager::getInstance()->get(CurrencyInterface::class);
         }
         return $this->localeCurrency;

app/code/Magento/CatalogRule/Model/ResourceModel/Rule/Collection.php

@@ -163,7 +163,6 @@ public function addCustomerGroupFilter($customerGroupId)
     private function getAssociatedEntitiesMap()
     {
         if (!$this->_associatedEntitiesMap) {
-            // phpcs:ignore Magento2.PHP.AutogeneratedClassNotInConstructor
             $this->_associatedEntitiesMap = \Magento\Framework\App\ObjectManager::getInstance()
                 // phpstan:ignore
                 ->get(\Magento\CatalogRule\Model\ResourceModel\Rule\AssociatedEntityMap::class)

app/code/Magento/Msrp/Model/Product/Options.php

@@ -38,8 +38,7 @@ public function __construct(
      * Is enabled
      *
      * @param \Magento\Catalog\Model\Product $product
-     * @phpcs:ignore
-     * @param null $visibility
+     * @param int|null $visibility
      * @return bool|null
      */
     public function isEnabled($product, $visibility = null)

app/code/Magento/Payment/Model/Method/Cc.php

@@ -15,8 +15,6 @@
  * @method \Magento\Quote\Api\Data\PaymentMethodExtensionInterface getExtensionAttributes()
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @deprecated 100.0.8
- * @api
- * @phpcs:ignoreFile
  */
 class Cc extends \Magento\Payment\Model\Method\AbstractMethod
 {
@@ -213,6 +211,7 @@ public function validate()
      * Check if verification should be used.
      *
      * @return bool
+     * @api
      */
     public function hasVerification()
     {
@@ -227,6 +226,7 @@ public function hasVerification()
      * Get list of credit cards verification reg exp.
      *
      * @return array
+     * @api
      */
     public function getVerificationRegEx()
     {
@@ -305,6 +305,7 @@ public function assignData(\Magento\Framework\DataObject $data)
      *
      * @param string $type
      * @return bool
+     * @api
      */
     public function otherCcType($type)
     {
@@ -316,6 +317,7 @@ public function otherCcType($type)
      *
      * @param   string $ccNumber
      * @return  bool
+     * @api
      */
     public function validateCcNum($ccNumber)
     {
@@ -355,6 +357,7 @@ public function validateCcNum($ccNumber)
      *
      * @param string $ccNumber
      * @return bool
+     * @api
      */
     public function validateCcNumOther($ccNumber)
     {

app/code/Magento/Persistent/Model/Session.php

@@ -392,7 +392,6 @@ private function setCookie($value, $duration, $path)
     private function getRequest()
     {
         if ($this->request == null) {
-            // phpcs:ignore Magento2.PHP.AutogeneratedClassNotInConstructor
             $this->request = \Magento\Framework\App\ObjectManager::getInstance()
                 ->get(\Magento\Framework\App\Request\Http::class);
         }

app/code/Magento/Shipping/Model/Carrier/AbstractCarrierOnline.php

@@ -428,8 +428,7 @@ protected function _setCachedQuotes($requestParams, $response)
      */
     protected function _prepareServiceName($name)
     {
-        //@phpcs:ignore
-        $name = html_entity_decode((string)$name);
+        $name = htmlspecialchars_decode((string)$name);
         $name = strip_tags(preg_replace('#&\w+;#', '', $name));
 
         return trim($name);

app/code/Magento/Vault/Model/Ui/Adminhtml/TokensConfigProvider.php

@@ -271,7 +271,6 @@ private function getOrderPaymentEntityId()
     private function getPaymentDataHelper()
     {
         if ($this->paymentDataHelper === null) {
-            // phpcs:ignore Magento2.PHP.AutogeneratedClassNotInConstructor
             $this->paymentDataHelper = ObjectManager::getInstance()->get(Data::class);
         }
         return $this->paymentDataHelper;
@@ -286,7 +285,6 @@ private function getPaymentDataHelper()
     private function getOrderRepository()
     {
         if ($this->orderRepository === null) {
-            // phpcs:ignore Magento2.PHP.AutogeneratedClassNotInConstructor
             $this->orderRepository = ObjectManager::getInstance()
                 ->get(OrderRepositoryInterface::class);
         }
@@ -303,7 +301,6 @@ private function getOrderRepository()
     private function getPaymentTokenManagement()
     {
         if ($this->paymentTokenManagement === null) {
-            // phpcs:ignore Magento2.PHP.AutogeneratedClassNotInConstructor
             $this->paymentTokenManagement = ObjectManager::getInstance()
                 ->get(PaymentTokenManagementInterface::class);
         }

lib/internal/Magento/Framework/Model/ResourceModel/AbstractResource.php

@@ -201,7 +201,6 @@ protected function _prepareTableValueForSave($value, $type)
     {
         $type = strtolower($type);
         if ($type == 'decimal' || $type == 'numeric' || $type == 'float') {
-            // phpcs:ignore Magento2.PHP.AutogeneratedClassNotInConstructor
             $value = \Magento\Framework\App\ObjectManager::getInstance()->get(
                 \Magento\Framework\Locale\FormatInterface::class
             )->getNumber(
@@ -255,7 +254,6 @@ protected function _getColumnsForEntityLoad(\Magento\Framework\Model\AbstractMod
     protected function getSerializer()
     {
         if (null === $this->serializer) {
-            // phpcs:ignore Magento2.PHP.AutogeneratedClassNotInConstructor
             $this->serializer = ObjectManager::getInstance()->get(Json::class);
         }
         return $this->serializer;
@@ -270,7 +268,6 @@ protected function getSerializer()
     private function getLogger()
     {
         if (null === $this->_logger) {
-            // phpcs:ignore Magento2.PHP.AutogeneratedClassNotInConstructor
             $this->_logger = ObjectManager::getInstance()->get(\Psr\Log\LoggerInterface::class);
         }
         return $this->_logger;

lib/internal/Magento/Framework/Model/ResourceModel/Db/AbstractDb.php

@@ -155,7 +155,6 @@ public function __sleep()
      */
     public function __wakeup()
     {
-        // phpcs:ignore Magento2.PHP.AutogeneratedClassNotInConstructor
         $this->_resources = \Magento\Framework\App\ObjectManager::getInstance()
             ->get(\Magento\Framework\App\ResourceConnection::class);
     }

lib/internal/Magento/Framework/Validator/DataObject.php

@@ -66,11 +66,10 @@ public function isValid($entity)
         foreach ($this->_rules as $fieldName => $validator) {
             $value = $fieldName ? $entity->getDataUsingMethod($fieldName) : $entity;
             if (!$validator->isValid($value)) {
-                //@phpcs:ignore
-                $this->_messages = array_merge($this->_messages, array_values($validator->getMessages()));
+                $this->_messages[] =  array_values($validator->getMessages());
             }
         }
-        return empty($this->_messages);
+        return empty(array_merge([], ...$this->_messages));
     }
 
     /**