ACPT-1194: Fixing bugs found by web api functional tests

Author: JacobBrownAustin

app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice/AbstractGroupPrice.php

@@ -10,13 +10,14 @@
 use Magento\Catalog\Model\Attribute\ScopeOverriddenValue;
 use Magento\Catalog\Model\Product\Attribute\Backend\Price;
 use Magento\Customer\Api\GroupManagementInterface;
+use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
 
 /**
  * Catalog product abstract group price backend attribute model
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-abstract class AbstractGroupPrice extends Price
+abstract class AbstractGroupPrice extends Price implements ResetAfterRequestInterface
 {
     /**
      * @var \Magento\Framework\EntityManager\MetadataPool
@@ -26,7 +27,7 @@ abstract class AbstractGroupPrice extends Price
     /**
      * Website currency codes and rates
      *
-     * @var array
+     * @var array|null
      */
     protected $_rates;
 
@@ -82,6 +83,14 @@ public function __construct(
         );
     }
 
+    /**
+     * @inheritdoc
+     */
+    public function _resetState() : void
+    {
+        $this->_rates = null;
+    }
+
     /**
      * Retrieve websites currency rates and base currency codes
      *

app/code/Magento/Eav/Model/Config.php

@@ -990,5 +990,12 @@ public function _resetState(): void
     {
         $this->attributesPerSet = [];
         $this->_attributeData = [];
+        foreach($this->attributes as $attributesGroupedByEntityTypeCode) {
+            foreach($attributesGroupedByEntityTypeCode as $attribute) {
+                if ($attribute instanceof ResetAfterRequestInterface) {
+                    $attribute->_resetState();
+                }
+            }
+        }
     }
 }

app/code/Magento/Eav/Model/Entity/Attribute/AbstractAttribute.php

@@ -9,6 +9,7 @@
 
 use Magento\Framework\Api\AttributeValueFactory;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
 use Magento\Framework\Serialize\Serializer\Json;
 
 /**
@@ -23,7 +24,8 @@
  */
 abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtensibleModel implements
     AttributeInterface,
-    \Magento\Eav\Api\Data\AttributeInterface
+    \Magento\Eav\Api\Data\AttributeInterface,
+    ResetAfterRequestInterface
 {
     const TYPE_STATIC = 'static';
 
@@ -216,6 +218,16 @@ public function __construct(
             ?: \Magento\Framework\App\ObjectManager::getInstance()->get(FrontendLabelFactory::class);
     }
 
+    /**
+     * @inheritdoc
+     */
+    public function _resetState() : void
+    {
+        if ($this->_backend instanceof ResetAfterRequestInterface) {
+            $this->_backend->_resetState();
+        }
+    }
+
     /**
      * Get Serializer instance.
      *

app/code/Magento/Store/Model/StoreManager.php

@@ -6,8 +6,6 @@
 namespace Magento\Store\Model;
 
 use Magento\Framework\App\ObjectManager;
-use Magento\Framework\Exception\NoSuchEntityException;
-use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
 use Magento\Store\Api\StoreResolverInterface;
 use Magento\Store\Model\ResourceModel\StoreWebsiteRelation;
 

dev/tests/api-functional/testsuite/Magento/GraphQl/Newsletter/Guest/SubscribeEmailToNewsletterTest.php

@@ -31,6 +31,9 @@ protected function setUp(): void
         $this->subscriberResource = $objectManager->get(SubscriberResourceModel::class);
     }
 
+    /**
+     * @magentoConfigFixture default_store newsletter/subscription/allow_guest_subscribe 1
+     */
     public function testAddEmailIntoNewsletterSubscription()
     {
         $query = $this->getQuery('guest@example.com');
@@ -41,6 +44,9 @@ public function testAddEmailIntoNewsletterSubscription()
         self::assertEquals('SUBSCRIBED', $response['subscribeEmailToNewsletter']['status']);
     }
 
+    /**
+     * @magentoConfigFixture default_store newsletter/subscription/allow_guest_subscribe 1
+     */
     public function testNewsletterSubscriptionWithIncorrectEmailFormat()
     {
         $query = $this->getQuery('guest.example.com');
@@ -68,6 +74,7 @@ public function testNewsletterSubscriptionWithDisallowedGuestSubscription()
 
     /**
      * @magentoApiDataFixture Magento/Newsletter/_files/guest_subscriber.php
+     * @magentoConfigFixture default_store newsletter/subscription/allow_guest_subscribe 1
      */
     public function testNewsletterSubscriptionWithAlreadySubscribedEmail()
     {

lib/internal/Magento/Framework/Acl/Builder.php

@@ -5,6 +5,8 @@
  */
 namespace Magento\Framework\Acl;
 
+use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
+
 /**
  * Access Control List Builder. Retrieves required role/rule/resource loaders
  * and uses them to populate provided ACL object. Acl object is put to cache after creation.
@@ -13,7 +15,7 @@
  * @api
  * @since 100.0.2
  */
-class Builder
+class Builder implements ResetAfterRequestInterface
 {
     /**
      * Acl object
@@ -85,4 +87,12 @@ public function resetRuntimeAcl()
         $this->_acl = null;
         return $this;
     }
+
+    /**
+     * @inheritdoc
+     */
+    public function _resetState(): void
+    {
+        $this->resetRuntimeAcl();
+    }
 }

lib/internal/Magento/Framework/Pricing/Price/Collection.php

@@ -6,6 +6,7 @@
 
 namespace Magento\Framework\Pricing\Price;
 
+use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
 use Magento\Framework\Pricing\SaleableInterface;
 
 /**
@@ -14,7 +15,7 @@
  * @api
  * @since 100.0.2
  */
-class Collection implements \Iterator
+class Collection implements \Iterator, ResetAfterRequestInterface
 {
     /**
      * @var Pool
@@ -74,6 +75,14 @@ public function __construct(
         $this->priceModels = [];
     }
 
+    /**
+     * @inheritdoc
+     */
+    public function _resetState() : void
+    {
+        $this->priceModels = [];
+    }
+
     /**
      * Reset the Collection to the first element
      *