magento-engcom/magento2ce#4251: Code style fixes

Author: Stanislav Idolov

app/code/Magento/CatalogImportExport/Model/Import/Product.php

@@ -651,7 +651,7 @@ class Product extends AbstractEntity
     private $_logger;
 
     /**
-     * {@inheritdoc}
+     * @var string
      */
     protected $masterAttributeCode = 'sku';
 
@@ -692,15 +692,11 @@ class Product extends AbstractEntity
     protected $rowNumbers = [];
 
     /**
-     * Product entity link field
-     *
      * @var string
      */
     private $productEntityLinkField;
 
     /**
-     * Product entity identifier field
-     *
      * @var string
      */
     private $productEntityIdentifierField;
@@ -720,15 +716,11 @@ class Product extends AbstractEntity
     private $filesystem;
 
     /**
-     * Catalog config.
-     *
      * @var CatalogConfig
      */
     private $catalogConfig;
 
     /**
-     * Stock Item Importer
-     *
      * @var StockItemImporterInterface
      */
     private $stockItemImporter;

app/code/Magento/JwtFrameworkAdapter/Model/JwsManager.php

@@ -26,6 +26,8 @@
 
 /**
  * Works with JWS.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class JwsManager
 {
@@ -77,20 +79,11 @@ public function __construct(
      */
     public function build(JwsInterface $jws, EncryptionSettingsInterface $encryptionSettings): string
     {
-        if (!$encryptionSettings instanceof JwsSignatureJwks) {
-            throw new JwtException('Can only work with JWK encryption settings for JWS tokens');
-        }
-        $signaturesCount = count($encryptionSettings->getJwkSet()->getKeys());
-        if ($jws->getProtectedHeaders() && count($jws->getProtectedHeaders()) !== $signaturesCount) {
-            throw new MalformedTokenException('Number of headers must equal to number of JWKs');
-        }
-        if ($jws->getUnprotectedHeaders()
-            && count($jws->getUnprotectedHeaders()) !== $signaturesCount
-        ) {
-            throw new MalformedTokenException('There must be an equal number of protected and unprotected headers.');
-        }
+        $this->validate($jws, $encryptionSettings);
         $builder = $this->jwsBuilder->create();
         $builder = $builder->withPayload($jws->getPayload()->getContent());
+        $signaturesCount = count($encryptionSettings->getJwkSet()->getKeys());
+
         for ($i = 0; $i < $signaturesCount; $i++) {
             $jwk = $encryptionSettings->getJwkSet()->getKeys()[$i];
             $protected = [];
@@ -101,6 +94,7 @@ public function build(JwsInterface $jws, EncryptionSettingsInterface $encryption
                 $protected['kid'] = $jwk->getKeyId();
             }
             if ($jws->getProtectedHeaders()) {
+                // phpcs:ignore Magento2.Performance.ForeachArrayMerge
                 $protected = array_merge($protected, $this->extractHeaderData($jws->getProtectedHeaders()[$i]));
             }
             $protected['alg'] = $protected['alg'] ?? $jwk->getAlgorithm();
@@ -124,6 +118,28 @@ public function build(JwsInterface $jws, EncryptionSettingsInterface $encryption
         return $this->jwsSerializer->serialize('jws_compact', $jwsCreated);
     }
 
+    /**
+     * Validate jws and encryption settings.
+     *
+     * @param JwsInterface $jws
+     * @param EncryptionSettingsInterface $encryptionSettings
+     */
+    private function validate(JwsInterface $jws, EncryptionSettingsInterface $encryptionSettings): void
+    {
+        if (!$encryptionSettings instanceof JwsSignatureJwks) {
+            throw new JwtException('Can only work with JWK encryption settings for JWS tokens');
+        }
+        $signaturesCount = count($encryptionSettings->getJwkSet()->getKeys());
+        if ($jws->getProtectedHeaders() && count($jws->getProtectedHeaders()) !== $signaturesCount) {
+            throw new MalformedTokenException('Number of headers must equal to number of JWKs');
+        }
+        if ($jws->getUnprotectedHeaders()
+            && count($jws->getUnprotectedHeaders()) !== $signaturesCount
+        ) {
+            throw new MalformedTokenException('There must be an equal number of protected and unprotected headers.');
+        }
+    }
+
     /**
      * Read and verify JWS token.
      *

lib/internal/Magento/Framework/Mail/Message.php

@@ -22,8 +22,6 @@ class Message implements MailMessageInterface
     protected $zendMessage;
 
     /**
-     * Message type
-     *
      * @var string
      */
     private $messageType = Mime::TYPE_TEXT;