Skip to content

Commit 9e9c219

Browse files
committed
MC-40729: Disable Web Setup wizard
- Backported changes from magento2ce/pull/5710
1 parent 9b2862d commit 9e9c219

File tree

184 files changed

+91
-18184
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

184 files changed

+91
-18184
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,6 @@
149149
<item>Magento_Backend::custom</item>
150150
<item>Magento_Backend::tools</item>
151151
<item>Magento_Backend::cache</item>
152-
<item>Magento_Backend::setup_wizard</item>
153152
<item>Magento_Backup::backup</item>
154153
<item>Magento_Backup::rollback</item>
155154
<item>Magento_Indexer::index</item>

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

Lines changed: 0 additions & 52 deletions
This file was deleted.

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@
5353
<resource id="Magento_Backend::flush_static_files" title="Flush Static Files" translate="title" sortOrder="30" />
5454
</resource>
5555
</resource>
56-
<resource id="Magento_Backend::setup_wizard" title="Web Setup Wizard (Deprecated)" translate="title" sortOrder="20" />
5756
</resource>
5857
<resource id="Magento_Backend::system_other_settings" title="Other Settings" translate="title" sortOrder="80" />
5958
</resource>

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,9 +137,6 @@
137137
<argument name="isIncludesAvailable" xsi:type="boolean">false</argument>
138138
</arguments>
139139
</type>
140-
<type name="Magento\Backend\Model\Menu\Builder">
141-
<plugin name="SetupMenuBuilder" type="Magento\Backend\Model\Setup\MenuBuilder" />
142-
</type>
143140
<type name="Magento\Config\Model\Config\Structure\ElementVisibility\ConcealInProduction">
144141
<arguments>
145142
<argument name="configs" xsi:type="array">

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,5 @@
2727
<add id="Magento_Backend::stores_attributes" title="Attributes" translate="title" module="Magento_Backend" sortOrder="40" parent="Magento_Backend::stores" resource="Magento_Backend::stores_attributes"/>
2828
<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"/>
2929
<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"/>
30-
<add id="Magento_Backend::setup_wizard" action="adminhtml/backendapp/redirect/app/setup" title="Web Setup Wizard (Deprecated)" translate="title" module="Magento_Backend" sortOrder="80" parent="Magento_Backend::system_tools" resource="Magento_Backend::setup_wizard"/>
3130
</menu>
3231
</config>

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

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -153,20 +153,6 @@
153153
</argument>
154154
</arguments>
155155
</type>
156-
<virtualType name="Magento\Setup\BackendApp" type="Magento\Backend\App\BackendApp">
157-
<arguments>
158-
<argument name="cookiePath" xsi:type="string">setup</argument>
159-
<argument name="startupPage" xsi:type="string">setup</argument>
160-
<argument name="aclResourceName" xsi:type="string">Magento_Backend::setup_wizard</argument>
161-
</arguments>
162-
</virtualType>
163-
<type name="Magento\Backend\App\BackendAppList">
164-
<arguments>
165-
<argument name="backendApps" xsi:type="array">
166-
<item name="setup" xsi:type="object">Magento\Setup\BackendApp</item>
167-
</argument>
168-
</arguments>
169-
</type>
170156
<type name="Magento\Framework\App\Response\HeaderManager">
171157
<arguments>
172158
<argument name="headerProviderList" xsi:type="array">

app/code/Magento/Backend/i18n/en_US.csv

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,6 @@ Attributes,Attributes
312312
"Connect Manager","Connect Manager"
313313
"Package Extensions","Package Extensions"
314314
Tools,Tools
315-
"Web Setup Wizard (Deprecated)","Web Setup Wizard (Deprecated)"
316315
Currency,Currency
317316
Communications,Communications
318317
Services,Services

app/code/Magento/Cron/etc/di.xml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -68,14 +68,6 @@
6868
<item name="command" xsi:type="string">{magentoRoot}bin/magento cron:run | grep -v "Ran jobs by schedule" >> {magentoLog}magento.cron.log</item>
6969
<item name="optional" xsi:type="boolean">false</item>
7070
</item>
71-
<item name="cronUpdate" xsi:type="array">
72-
<item name="command" xsi:type="string">{magentoRoot}update/cron.php >> {magentoLog}update.cron.log</item>
73-
<item name="optional" xsi:type="boolean">true</item>
74-
</item>
75-
<item name="cronSetup" xsi:type="array">
76-
<item name="command" xsi:type="string">{magentoRoot}bin/magento setup:cron:run >> {magentoLog}setup.cron.log</item>
77-
<item name="optional" xsi:type="boolean">true</item>
78-
</item>
7971
</argument>
8072
</arguments>
8173
</type>

app/code/Magento/SampleData/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ To deploy sample data from the GitHub repository:
5151

5252
## Install Sample Data
5353

54-
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.
54+
Once the sample data is deployed, it will be installed automatically when you install or upgrade your Magento instance by using the command line.
5555

5656
## Uninstall Sample Data
5757

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@
7979
<item>Magento_Backend::main_actions</item>
8080
<item>Magento_Backend::mass_actions</item>
8181
<item>Magento_Backend::additional_cache_management</item>
82-
<item>Magento_Backend::setup_wizard</item>
8382
<item>Magento_Backup::backup</item>
8483
<item>Magento_Indexer::index</item>
8584
<item>Magento_Indexer::changeMode</item>

0 commit comments

Comments
 (0)