ACPT-1666: Fix race conditions in _resetState methods

Author: andimov

app/code/Magento/BundleGraphQl/Model/Cart/BuyRequest/BundleDataProvider.php

@@ -19,6 +19,8 @@ class BundleDataProvider implements BuyRequestDataProviderInterface
 {
     /**
      * @var ArrayManagerFactory
+     *
+     * @SuppressWarnings(PHPCS)
      */
     private readonly ArrayManagerFactory $arrayManagerFactory;
 
@@ -34,7 +36,6 @@ public function __construct(
             ?? ObjectManager::getInstance()->get(ArrayManagerFactory::class);
     }
 
-
     /**
      * @inheritdoc
      */

app/code/Magento/ConfigurableProductGraphQl/Model/Cart/BuyRequest/SuperAttributeDataProvider.php

@@ -30,6 +30,8 @@ class SuperAttributeDataProvider implements BuyRequestDataProviderInterface
 {
     /**
      * @var ArrayManagerFactory
+     *
+     * @SuppressWarnings(PHPCS)
      */
     private readonly ArrayManagerFactory $arrayManagerFactory;
 

app/code/Magento/Integration/Model/CustomUserContext.php

@@ -14,11 +14,15 @@ class CustomUserContext implements UserContextInterface
 {
     /**
      * @var int|null
+     *
+     * @SuppressWarnings(PHPCS)
      */
     private readonly ?int $userId;
 
     /**
      * @var int|null
+     *
+     * @SuppressWarnings(PHPCS)
      */
     private readonly ?int $userType;
 

app/code/Magento/JwtUserToken/Model/Data/JwtUserContext.php

@@ -14,11 +14,15 @@ class JwtUserContext implements UserContextInterface
 {
     /**
      * @var int|null
+     *
+     * @SuppressWarnings(PHPCS)
      */
     private readonly ?int $userId;
 
     /**
      * @var int|null
+     *
+     * @SuppressWarnings(PHPCS)
      */
     private readonly ?int $userType;
 

app/code/Magento/PaypalGraphQl/Model/PayflowProAdditionalDataProvider.php

@@ -19,9 +19,8 @@ class PayflowProAdditionalDataProvider implements AdditionalDataProviderInterfac
     /**
      * @param ArrayManager $arrayManager
      */
-    public function __construct(
-        ArrayManager $arrayManager
-    ) {
+    public function __construct(ArrayManager $arrayManager)
+    {
     }
 
     /**

app/code/Magento/PaypalGraphQl/Model/PayflowProCcVaultAdditionalDataProvider.php

@@ -15,14 +15,13 @@
  */
 class PayflowProCcVaultAdditionalDataProvider implements AdditionalDataProviderInterface
 {
-    const CC_VAULT_CODE = 'payflowpro_cc_vault';
+    public const CC_VAULT_CODE = 'payflowpro_cc_vault';
 
     /**
      * @param ArrayManager $arrayManager
      */
-    public function __construct(
-        ArrayManager $arrayManager
-    ) {
+    public function __construct(ArrayManager $arrayManager)
+    {
     }
 
     /**

app/code/Magento/PaypalGraphQl/Model/Plugin/Resolver/SetPaymentMethodOnCart.php

@@ -29,7 +29,10 @@ class SetPaymentMethodOnCart
 
     private const PATH_PAYMENT_METHOD_DATA = 'input/payment_method';
 
-    private $allowedPaymentMethodCodes = [];
+    /**
+     * @var array $allowedPaymentMethodCodes
+     */
+    private array $allowedPaymentMethodCodes = [];
 
     /**
      * @var CheckoutFactory

app/code/Magento/Quote/Model/Quote/Address/Total/AbstractTotal.php

@@ -10,6 +10,7 @@
 /**
  * Sales Quote Address Total  abstract model
  *
+ * phpcs:disable Magento2.Classes.AbstractApi
  * @api
  * @SuppressWarnings(PHPMD.NumberOfChildren)
  * @SuppressWarnings(PHPMD.UnusedFormalParameter)
@@ -139,7 +140,7 @@ public function fetch(\Magento\Quote\Model\Quote $quote, \Magento\Quote\Model\Qu
     /**
      * Set address which can be used inside totals calculation
      *
-     * @param   \Magento\Quote\Model\Quote\Address $address
+     * @param \Magento\Quote\Model\Quote\Address $address
      * @return $this
      */
     protected function _setAddress(\Magento\Quote\Model\Quote\Address $address)
@@ -216,7 +217,7 @@ protected function _setBaseAmount($baseAmount)
     /**
      * Add total model amount value to address
      *
-     * @param   float $amount
+     * @param float $amount
      * @return $this
      */
     protected function _addAmount($amount)

app/code/Magento/QuoteGraphQl/Model/Cart/BuyRequest/CustomizableOptionsDataProvider.php

@@ -18,6 +18,8 @@ class CustomizableOptionsDataProvider implements BuyRequestDataProviderInterface
 {
     /**
      * @var ArrayManagerFactory
+     *
+     * @SuppressWarnings(PHPCS)
      */
     private readonly ArrayManagerFactory $arrayManagerFactory;
 
@@ -26,7 +28,8 @@ class CustomizableOptionsDataProvider implements BuyRequestDataProviderInterface
      * @param ArrayManagerFactory|null $arrayManagerFactory
      */
     public function __construct(
-        ArrayManager $arrayManager
+        ArrayManager $arrayManager,
+        ArrayManagerFactory $arrayManagerFactory = null
     ) {
         $this->arrayManagerFactory = $arrayManagerFactory
             ?? ObjectManager::getInstance()->get(ArrayManagerFactory::class);

app/code/Magento/QuoteGraphQl/Model/Cart/BuyRequest/QuantityDataProvider.php

@@ -19,6 +19,8 @@ class QuantityDataProvider implements BuyRequestDataProviderInterface
 {
     /**
      * @var ArrayManagerFactory
+     *
+     * @SuppressWarnings(PHPCS)
      */
     private readonly ArrayManagerFactory $arrayManagerFactory;