Merge branch '2.4-develop' of https://github.com/magento-commerce/magento2ce into ACP2E-98

Author: Mohan Ahuja

composer.lock

@@ -10,6 +10,7 @@
 require_once __DIR__ . '/../../../../app/bootstrap.php';
 require_once __DIR__ . '/autoload.php';
 
+error_reporting(E_ALL);
 $testsBaseDir = dirname(__DIR__);
 $integrationTestsDir = realpath("{$testsBaseDir}/../integration");
 $fixtureBaseDir = $integrationTestsDir . '/testsuite';

dev/tests/api-functional/framework/bootstrap.php

@@ -13,6 +13,7 @@
 require_once __DIR__ . '/../../../../app/bootstrap.php';
 require_once __DIR__ . '/autoload.php';
 
+error_reporting(E_ALL);
 // phpcs:ignore Magento2.Functions.DiscouragedFunction
 $testsBaseDir = dirname(__DIR__);
 $fixtureBaseDir = $testsBaseDir. '/testsuite';

dev/tests/integration/framework/bootstrap.php

@@ -12,6 +12,7 @@
 //to handle different types of errors on CI
 require __DIR__ . '/../../error_handler.php';
 
+error_reporting(E_ALL);
 $testsBaseDir = dirname(__DIR__);
 $integrationTestsDir = realpath("{$testsBaseDir}/../integration");
 $fixtureBaseDir = $integrationTestsDir . '/testsuite';

dev/tests/setup-integration/framework/bootstrap.php

@@ -254,6 +254,11 @@
             <stringProp name="Argument.value">${__P(admin_browse_product_filter_text,Product)}</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
+          <elementProp name="admin_token" elementType="Argument">
+            <stringProp name="Argument.name">admin_token</stringProp>
+            <stringProp name="Argument.value">${__P(admin_token,admin_token)}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
           <elementProp name="admin_users_distribution_per_admin_pool" elementType="Argument">
             <stringProp name="Argument.name">admin_users_distribution_per_admin_pool</stringProp>
             <stringProp name="Argument.value">${__P(admin_users_distribution_per_admin_pool,1)}</stringProp>