Merge remote-tracking branch 'magento-l3/ACP2E-1653' into L3-PR-2023-09-06

Author: mirceaRosmeteniuc

dev/tests/api-functional/framework/Magento/TestFramework/Bootstrap/WebapiDocBlock.php

@@ -7,6 +7,7 @@
 namespace Magento\TestFramework\Bootstrap;
 
 use Magento\TestFramework\Annotation\ApiConfigFixture;
+use Magento\TestFramework\Annotation\AppArea;
 use Magento\TestFramework\Annotation\ConfigFixture;
 use Magento\TestFramework\Event\Transaction;
 
@@ -28,7 +29,7 @@ protected function _getSubscribers(\Magento\TestFramework\Application $applicati
     {
         $subscribers = parent::_getSubscribers($application);
         foreach ($subscribers as $key => $subscriber) {
-            if (get_class($subscriber) === ConfigFixture::class || get_class($subscriber) === Transaction::class) {
+            if (in_array(get_class($subscriber), [ConfigFixture::class, Transaction::class, AppArea::class])) {
                 unset($subscribers[$key]);
             }
         }
@@ -41,6 +42,7 @@ protected function _getSubscribers(\Magento\TestFramework\Application $applicati
             )
         );
         $subscribers[] = new ApiConfigFixture();
+        $subscribers[] = new AppArea($application);
 
         return $subscribers;
     }

dev/tests/integration/testsuite/Magento/Config/App/Config/Type/SystemTest.php

@@ -73,4 +73,10 @@ public function testEnvGetValueStoreScope()
             $this->system->get('stores/default/abc/qrs/xyz')
         );
     }
+
+    protected function tearDown(): void
+    {
+        unset($_ENV['CONFIG__STORES__DEFAULT__ABC__QRS__XYZ']);
+        parent::tearDown();
+    }
 }