Merge branch '2.4-develop' into bugfix/grid_selected_spacing

Author: engcom-Charlie

dev/tests/integration/framework/Magento/TestFramework/Annotation/AppIsolation.php

@@ -14,6 +14,8 @@
 
 /**
  * Implementation of the @magentoAppIsolation DocBlock annotation - isolation of global application objects in memory
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class AppIsolation
 {
@@ -50,6 +52,13 @@ public function __construct(Application $application)
     protected function _isolateApp()
     {
         if ($this->hasNonIsolatedTests) {
+            // Clear fixture resolver state before app reinitialization
+            try {
+                $resolver = \Magento\TestFramework\Workaround\Override\Fixture\Resolver::getInstance();
+                $resolver->setCurrentTest(null);
+            } catch (\RuntimeException $e) {
+                // Resolver not initialized yet, ignore
+            }
             $this->application->reinitialize();
             $_SESSION = [];
             $_COOKIE = [];

dev/tests/integration/framework/Magento/TestFramework/App/Config.php

@@ -1,9 +1,7 @@
 <?php
 /**
- * Application configuration object. Used to access configuration when application is initialized and installed.
- *
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2016 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\TestFramework\App;
 
@@ -70,14 +68,21 @@ public function setValue(
     ) {
         $result = $this->get('system');
 
+        $originalScope = $scope;
         if ($scope === 'store') {
             $scope = 'stores';
         } elseif ($scope === 'website') {
             $scope = 'websites';
         }
 
         if (empty($scopeCode)) {
-            $scopeCode = $this->getScopeCodeResolver()->resolve($scope, $scopeCode);
+            // Use original scope type for resolver, as it expects 'store'/'website', not 'stores'/'websites'
+            try {
+                $scopeCode = $this->getScopeCodeResolver()->resolve($originalScope, $scopeCode);
+            } catch (\Exception $e) {
+                // If scope resolver fails (e.g., during app isolation), fallback to default scope code
+                $scopeCode = null;
+            }
         }
 
         $keys = explode('/', $path);
@@ -99,7 +104,7 @@ public function setValue(
      * @param mixed $value
      * @return void
      */
-    private function updateResult(array $keys, & $result, $value)
+    private function updateResult(array $keys, &$result, $value)
     {
         $key = array_shift($keys);