Merge branch '2.4-develop' of github.com:magento/magento2ce into MC-33884

Author: svera

app/code/Magento/Analytics/Test/Mftf/Data/UserRoleData.xml

@@ -149,7 +149,6 @@
             <item>Magento_Backend::custom</item>
             <item>Magento_Backend::tools</item>
             <item>Magento_Backend::cache</item>
-            <item>Magento_Backend::setup_wizard</item>
             <item>Magento_Backup::backup</item>
             <item>Magento_Backup::rollback</item>
             <item>Magento_Indexer::index</item>

app/code/Magento/Backend/Model/Setup/MenuBuilder.php

@@ -53,7 +53,6 @@
                                 <resource id="Magento_Backend::flush_static_files" title="Flush Static Files" translate="title" sortOrder="30" />
                             </resource>
                         </resource>
-                        <resource id="Magento_Backend::setup_wizard" title="Web Setup Wizard" translate="title" sortOrder="20" />
                     </resource>
                     <resource id="Magento_Backend::system_other_settings" title="Other Settings" translate="title"  sortOrder="80" />
                 </resource>

app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminNavigateToSetupWizardPageActionGroup.xml

@@ -138,9 +138,6 @@
             <argument name="isIncludesAvailable" xsi:type="boolean">false</argument>
         </arguments>
     </type>
-    <type name="Magento\Backend\Model\Menu\Builder">
-        <plugin name="SetupMenuBuilder" type="Magento\Backend\Model\Setup\MenuBuilder" />
-    </type>
     <type name="Magento\Config\Model\Config\Structure\ElementVisibility\ConcealInProduction">
         <arguments>
             <argument name="configs" xsi:type="array">

app/code/Magento/Backend/Test/Mftf/Page/AdminSetupWizardPage.xml

@@ -27,6 +27,5 @@
         <add id="Magento_Backend::stores_attributes" title="Attributes" translate="title" module="Magento_Backend" sortOrder="40" parent="Magento_Backend::stores" resource="Magento_Backend::stores_attributes"/>
         <add id="Magento_Backend::other_settings" title="Other Settings" translate="title" module="Magento_Backend" sortOrder="50" parent="Magento_Backend::stores" resource="Magento_Backend::stores_other_settings"/>
         <add id="Magento_Backend::system_other_settings" title="Other Settings" translate="title" module="Magento_Backend" sortOrder="80" parent="Magento_Backend::system" resource="Magento_Backend::system_other_settings"/>
-        <add id="Magento_Backend::setup_wizard" action="adminhtml/backendapp/redirect/app/setup" title="Web Setup Wizard" translate="title" module="Magento_Backend" sortOrder="80" parent="Magento_Backend::system_tools" resource="Magento_Backend::setup_wizard"/>
     </menu>
 </config>

app/code/Magento/Backend/Test/Mftf/Test/AdminRedirectToAdminPanelOnLogoClickFromWizardPageTest.xml

@@ -153,20 +153,6 @@
             </argument>
         </arguments>
     </type>
-    <virtualType name="Magento\Setup\BackendApp" type="Magento\Backend\App\BackendApp">
-        <arguments>
-            <argument name="cookiePath" xsi:type="string">setup</argument>
-            <argument name="startupPage" xsi:type="string">setup</argument>
-            <argument name="aclResourceName" xsi:type="string">Magento_Backend::setup_wizard</argument>
-        </arguments>
-    </virtualType>
-    <type name="Magento\Backend\App\BackendAppList">
-        <arguments>
-            <argument name="backendApps" xsi:type="array">
-                <item name="setup" xsi:type="object">Magento\Setup\BackendApp</item>
-            </argument>
-        </arguments>
-    </type>
     <type name="Magento\Framework\App\Response\HeaderManager">
         <arguments>
             <argument name="headerProviderList" xsi:type="array">

app/code/Magento/Backend/Test/Unit/Model/MenuBuilderTest.php

@@ -312,7 +312,6 @@ Attributes,Attributes
 "Connect Manager","Connect Manager"
 "Package Extensions","Package Extensions"
 Tools,Tools
-"Web Setup Wizard","Web Setup Wizard"
 Currency,Currency
 Communications,Communications
 Services,Services

app/code/Magento/Backend/etc/acl.xml

@@ -68,14 +68,6 @@
                     <item name="command" xsi:type="string">{magentoRoot}bin/magento cron:run | grep -v "Ran jobs by schedule" >> {magentoLog}magento.cron.log</item>
                     <item name="optional" xsi:type="boolean">false</item>
                 </item>
-                <item name="cronUpdate" xsi:type="array">
-                    <item name="command" xsi:type="string">{magentoRoot}update/cron.php >> {magentoLog}update.cron.log</item>
-                    <item name="optional" xsi:type="boolean">true</item>
-                </item>
-                <item name="cronSetup" xsi:type="array">
-                    <item name="command" xsi:type="string">{magentoRoot}bin/magento setup:cron:run >> {magentoLog}setup.cron.log</item>
-                    <item name="optional" xsi:type="boolean">true</item>
-                </item>
             </argument>
         </arguments>
     </type>

app/code/Magento/Backend/etc/adminhtml/di.xml

@@ -51,7 +51,7 @@ To deploy sample data from the GitHub repository:
 
 ## Install Sample Data
 
-Once the sample data is deployed, it will be installed automatically when you install or upgrade your Magento instance either by using the Magento Setup Wizard or from the command line.
+Once the sample data is deployed, it will be installed automatically when you install or upgrade your Magento instance by using the command line.
 
 ## Uninstall Sample Data
 
@@ -74,4 +74,4 @@ The deleted sample data entities will be restored. Those entities, which were ch
 
 ## Documentation
 
-You can find the more detailed description of sample data manipulation procedures at <https://devdocs.magento.com/guides/v2.3/install-gde/install/cli/install-cli-sample-data.html>.
+You can find the more detailed description of sample data manipulation procedures at <https://devdocs.magento.com/guides/v2.4/install-gde/install/cli/install-cli-sample-data.html>.

app/code/Magento/Backend/etc/adminhtml/menu.xml

@@ -86,7 +86,6 @@
             <item>Magento_Backend::main_actions</item>
             <item>Magento_Backend::mass_actions</item>
             <item>Magento_Backend::additional_cache_management</item>
-            <item>Magento_Backend::setup_wizard</item>
             <item>Magento_Backup::backup</item>
             <item>Magento_Indexer::index</item>
             <item>Magento_Indexer::changeMode</item>