Skip to content

Commit 7fdb6c8

Browse files
committed
Merge branch '2.4-develop' of github.com:magento-techdivision/magento2ce into MC-14884
MC-14884: MySQL Upgrade - v8 Merge mainline
2 parents 3f5a6de + 1d7a0c3 commit 7fdb6c8

File tree

418 files changed

+957
-29903
lines changed

Some content is hidden

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

418 files changed

+957
-29903
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 & 51 deletions
This file was deleted.

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

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

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

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

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

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

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

Lines changed: 0 additions & 50 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" 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
@@ -138,9 +138,6 @@
138138
<argument name="isIncludesAvailable" xsi:type="boolean">false</argument>
139139
</arguments>
140140
</type>
141-
<type name="Magento\Backend\Model\Menu\Builder">
142-
<plugin name="SetupMenuBuilder" type="Magento\Backend\Model\Setup\MenuBuilder" />
143-
</type>
144141
<type name="Magento\Config\Model\Config\Structure\ElementVisibility\ConcealInProduction">
145142
<arguments>
146143
<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" 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">

0 commit comments

Comments
 (0)