Merge branch 'magento-commerce:2.4-develop' into ACP2E-782

Author: bubasuma

app/code/Magento/Catalog/Test/Mftf/Test/EnablingManageStockTest.xml

@@ -16,6 +16,7 @@
             <description value="Admin can EnableManage Stock During Product Creation"/>
             <severity value="AVERAGE"/>
             <testCaseId value="MC-27457"/>
+            <group value="catalog"/>
         </annotations>
         <before>
         <!-- Set ManageStock to No-->
@@ -24,6 +25,8 @@
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
         </before>
         <after>
+            <!-- Set ManageStock to Yes-->
+            <magentoCLI command="config:set {{CatalogInventoryManageStockDisable.path}} 1" stepKey="manageStockEnable"/>
             <!--Logout From Admin Panel -->
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutAsAdmin"/>
         </after>

app/code/Magento/Customer/Test/Mftf/Section/AdminCreateUserSection.xml

@@ -19,6 +19,7 @@
         <element name="passwordTextField" type="input" selector="#user_password"/>
         <element name="pwConfirmationTextField" type="input" selector="#user_confirmation"/>
         <element name="currentPasswordField" type="input" selector="#user_current_password"/>
+        <element name="expireAtField" type="input" selector="#user_expires_at"/>
         <element name="createdRoleInUserPage" type="text" selector="//tr//td[contains(text(), '{{arg}}')]" parameterized="true"/>
         <element name="userRoleTab" type="button" selector="#page_tabs_roles_section"/>
         <element name="saveButton" type="button" selector="#save"/>

app/code/Magento/Security/etc/db_schema.xml

@@ -59,7 +59,7 @@
     <table name="admin_user_expiration" resource="default" engine="innodb" comment="Admin User expiration dates table">
         <column xsi:type="int" name="user_id" unsigned="true" nullable="false" identity="false"
                 comment="User ID"/>
-        <column xsi:type="timestamp" name="expires_at" nullable="false" default="0" comment="User Expiration Date"/>
+        <column xsi:type="datetime" name="expires_at" nullable="false" default="0" comment="User Expiration Date"/>
         <constraint xsi:type="primary" referenceId="PRIMARY">
             <column name="user_id"/>
         </constraint>

app/code/Magento/User/Test/Mftf/ActionGroup/AdminCreateUserWithRoleActionGroup.xml

@@ -26,6 +26,9 @@
         <fillField selector="{{AdminCreateUserSection.passwordTextField}}" userInput="{{user.password}}" stepKey="enterPassword"/>
         <fillField selector="{{AdminCreateUserSection.pwConfirmationTextField}}" userInput="{{user.password}}" stepKey="confirmPassword"/>
         <fillField selector="{{AdminCreateUserSection.currentPasswordField}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}" stepKey="enterCurrentPassword"/>
+        <!-- Generate default value -->
+        <generateDate date="+75 year" format="m/j/Y g:i A" stepKey="generateExpireDate"/>
+        <fillField selector="{{AdminCreateUserSection.expireAtField}}" userInput="{$generateExpireDate}" stepKey="enterExpireAtField"/>
         <scrollToTopOfPage stepKey="scrollToTopOfPage"/>
         <click stepKey="clickUserRole" selector="{{AdminCreateUserSection.userRoleTab}}"/>
         <click stepKey="chooseRole" selector="{{AdminStoreSection.createdRoleInUserPage(role.name)}}"/>

app/etc/di.xml

@@ -1973,4 +1973,5 @@
             <argument name="defaultPageSize" xsi:type="number">20</argument>
         </arguments>
     </type>
+    <preference for="Magento\Framework\Filter\Input\PurifierInterface" type="Magento\Framework\Filter\Input\Purifier"/>
 </config>

composer.json

@@ -41,6 +41,7 @@
         "composer/composer": "^1.9 || ^2.0",
         "elasticsearch/elasticsearch": "~7.17.0",
         "guzzlehttp/guzzle": "^7.4.2",
+        "ezyang/htmlpurifier": "^4.14",
         "laminas/laminas-captcha": "^2.12",
         "laminas/laminas-code": "~4.5.0",
         "laminas/laminas-db": "^2.15.0",