Merge remote-tracking branch 'origin/2.4.7-develop' into spartans_pr_29032024_AC-11661

Author: glo60612

app/code/Magento/Directory/Test/Mftf/Test/CustomCurrencySymbolWithSpaceTest.xml

@@ -70,10 +70,10 @@
         <actionGroup ref="AdminReloadDashboardDataActionGroup" stepKey="reloadDashboardData" />
         <!--Verify there is a space between custom currency symbol respective amounts on admin dashboard-->
         <grabTextFrom selector="{{AdminDashboardSection.dashboardTotals('Revenue')}}" stepKey="grabStartQuantity"/>
-        <assertEquals stepKey="assertInputIsDisabled">
+        <assertRegExp stepKey="assertInputIsDisabled">
             <actualResult type="const">$grabStartQuantity</actualResult>
-            <expectedResult type="string">IDRx 0.00</expectedResult>
-        </assertEquals>
+            <expectedResult type="string">/IDRx \d+\.\d+/</expectedResult>
+        </assertRegExp>
 
         <!--Verify Category in store front page-->
         <amOnPage url="{{StorefrontCategoryPage.url($createDefaultCategory.custom_attributes[url_key]$)}}" stepKey="openStorefrontCategoryPage"/>

dev/tests/integration/testsuite/Magento/Paypal/Controller/Transparent/RedirectTest.php

@@ -8,7 +8,7 @@
 namespace Magento\Paypal\Controller\Transparent;
 
 use Magento\TestFramework\TestCase\AbstractController;
-use Zend\Stdlib\Parameters;
+use Laminas\Stdlib\Parameters;
 
 /**
  * Tests PayPal transparent redirect controller.

lib/internal/Magento/Framework/ObjectManager/Resetter/ResetterInterface.php

@@ -9,7 +9,6 @@
 
 use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
 use Magento\Framework\ObjectManagerInterface;
-use WeakMap;
 
 /**
  * Interface that keeps track of the instances that need to be reset, and resets them