Skip to content

Commit d564872

Browse files
thomas-kl1thomas-kl1
committed
cleanup default di.xml
1 parent 2e45de7 commit d564872

File tree

10 files changed

+163
-176
lines changed

10 files changed

+163
-176
lines changed

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@
1515
<preference for="Magento\Backend\Block\Widget\Button\ToolbarInterface" type="Magento\Backend\Block\Widget\Button\Toolbar" />
1616
<preference for="Magento\Backend\Service\V1\ModuleServiceInterface" type="Magento\Backend\Service\V1\ModuleService" />
1717
<type name="Magento\Backend\Block\Widget\Button\ButtonList" shared="false" />
18+
<type name="Magento\Backend\App\Area\FrontNameResolver">
19+
<arguments>
20+
<argument name="defaultFrontName" xsi:type="init_parameter">Magento\Backend\Setup\ConfigOptionsList::CONFIG_PATH_BACKEND_FRONTNAME</argument>
21+
</arguments>
22+
</type>
1823
<type name="Magento\Framework\App\AreaList">
1924
<arguments>
2025
<argument name="areas" xsi:type="array">
@@ -25,6 +30,11 @@
2530
</argument>
2631
</arguments>
2732
</type>
33+
<type name="Magento\Framework\App\Request\Http">
34+
<arguments>
35+
<argument name="pathInfoProcessor" xsi:type="object">Magento\Backend\App\Request\PathInfoProcessor\Proxy</argument>
36+
</arguments>
37+
</type>
2838
<type name="Magento\Backend\Model\Menu\Config">
2939
<arguments>
3040
<argument name="menuDirector" xsi:type="object">Magento\Backend\Model\Menu\Director\Director</argument>

‎app/code/Magento/Catalog/etc/di.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -92,12 +92,6 @@
9292
<type name="Magento\Framework\Mview\View\StateInterface">
9393
<plugin name="setStatusForMview" type="Magento\Catalog\Model\Indexer\Category\Product\Plugin\MviewState" />
9494
</type>
95-
<type name="Magento\Catalog\Model\Indexer\Category\Product\Plugin\MviewState">
96-
<arguments>
97-
<argument name="state" xsi:type="object" shared="false">Magento\Framework\Mview\View\StateInterface</argument>
98-
<argument name="changelog" xsi:type="object" shared="false">Magento\Framework\Mview\View\ChangelogInterface</argument>
99-
</arguments>
100-
</type>
10195
<type name="Magento\Catalog\Model\Indexer\Product\Full">
10296
<arguments>
10397
<argument name="indexerList" xsi:type="array">

‎app/code/Magento/Config/etc/di.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,11 @@
2121
</argument>
2222
</arguments>
2323
</virtualType>
24+
<type name="Magento\Framework\App\Config\MetadataConfigTypeProcessor">
25+
<arguments>
26+
<argument name="configSource" xsi:type="object">Magento\Config\App\Config\Source\EnvironmentConfigSource</argument>
27+
</arguments>
28+
</type>
2429
<type name="Magento\Config\Model\Config\Structure\Reader">
2530
<arguments>
2631
<argument name="compiler" xsi:type="object">Magento\Framework\View\TemplateEngine\Xhtml\ConfigCompiler</argument>

‎app/code/Magento/Directory/etc/di.xml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,11 @@
2121
</argument>
2222
</arguments>
2323
</type>
24-
24+
<type name="Magento\Framework\Locale\Resolver">
25+
<arguments>
26+
<argument name="defaultLocalePath" xsi:type="const">Magento\Directory\Helper\Data::XML_PATH_DEFAULT_LOCALE</argument>
27+
</arguments>
28+
</type>
2529
<virtualType name="DirectoryHelperDataProxy" type="Magento\Directory\Helper\Data\Proxy">
2630
<arguments>
2731
<argument name="instanceName" xsi:type="string">Magento\Directory\Helper\Data</argument>

‎app/code/Magento/Eav/etc/di.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<preference for="Magento\Eav\Api\Data\AttributeSetSearchResultsInterface" type="Magento\Eav\Model\AttributeSetSearchResults" />
2929
<preference for="Magento\Eav\Api\Data\AttributeGroupSearchResultsInterface" type="Magento\Eav\Model\AttributeGroupSearchResults" />
3030
<preference for="Magento\Framework\Webapi\CustomAttributeTypeLocatorInterface" type="Magento\Eav\Model\TypeLocator" />
31-
31+
<preference for="Magento\Framework\Webapi\CustomAttribute\ServiceTypeListInterface" type="Magento\Eav\Model\TypeLocator\ComplexType"/>
3232
<type name="Magento\Eav\Model\Entity\Attribute\Config">
3333
<arguments>
3434
<argument name="reader" xsi:type="object">Magento\Eav\Model\Entity\Attribute\Config\Reader\Proxy</argument>

‎app/code/Magento/MediaStorage/etc/di.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@
66
*/
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
9+
<type name="Magento\Framework\App\StaticResource">
10+
<arguments>
11+
<argument name="response" xsi:type="object" shared="false">Magento\MediaStorage\Model\File\Storage\Response</argument>
12+
</arguments>
13+
</type>
914
<type name="Magento\MediaStorage\Helper\File\Storage">
1015
<arguments>
1116
<argument name="storage" xsi:type="object">Magento\MediaStorage\Model\File\Storage\Proxy</argument>

‎app/code/Magento/Store/etc/di.xml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@
9797
<argument name="session" xsi:type="object" shared="false">Magento\Framework\Session\Generic\Proxy</argument>
9898
<argument name="isCustomEntryPoint" xsi:type="init_parameter">Magento\Store\Model\Store::CUSTOM_ENTRY_POINT_PARAM</argument>
9999
<argument name="url" xsi:type="object" shared="false">Magento\Framework\UrlInterface</argument>
100+
<argument name="currencyInstalled" xsi:type="string">system/currency/installed</argument>
100101
</arguments>
101102
</type>
102103
<type name="Magento\Store\Model\StoreManager">
@@ -202,6 +203,21 @@
202203
</argument>
203204
</arguments>
204205
</type>
206+
<type name="Magento\Framework\View\Layout\Reader\Block">
207+
<arguments>
208+
<argument name="scopeType" xsi:type="const">Magento\Store\Model\ScopeInterface::SCOPE_STORE</argument>
209+
</arguments>
210+
</type>
211+
<type name="Magento\Framework\View\Layout\ConfigCondition">
212+
<arguments>
213+
<argument name="scopeType" xsi:type="const">Magento\Store\Model\ScopeInterface::SCOPE_STORE</argument>
214+
</arguments>
215+
</type>
216+
<type name="Magento\Framework\Session\Validator">
217+
<arguments>
218+
<argument name="scopeType" xsi:type="const">Magento\Store\Model\ScopeInterface::SCOPE_STORE</argument>
219+
</arguments>
220+
</type>
205221
<type name="Magento\Framework\App\Router\NoRouteHandlerList">
206222
<arguments>
207223
<argument name="handlerClassesList" xsi:type="array">

‎app/code/Magento/Theme/etc/di.xml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,18 @@
66
*/
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
9-
<preference for="Magento\Framework\View\Design\Theme\ThemeInterface" type="Magento\Theme\Model\Theme" />
9+
<preference for="Magento\Framework\View\DesignInterface" type="Magento\Theme\Model\View\Design\Proxy" />
10+
<preference for="Magento\Framework\View\Design\ThemeInterface" type="Magento\Theme\Model\Theme" />
11+
<preference for="Magento\Framework\View\Design\Theme\ResolverInterface" type="Magento\Theme\Model\Theme\Resolver" />
1012
<preference for="Magento\Framework\View\Design\Theme\FileInterface" type="Magento\Theme\Model\Theme\File" />
1113
<preference for="Magento\Framework\View\Design\Theme\ThemeProviderInterface" type="Magento\Theme\Model\Theme\ThemeProvider" />
1214
<preference for="Magento\Framework\View\Design\Theme\FileProviderInterface" type="Magento\Theme\Model\Theme\FileProvider" />
1315
<preference for="Magento\Framework\View\Design\Theme\Customization\ConfigInterface" type="Magento\Theme\Model\Theme\Customization\Config" />
16+
<preference for="Magento\Framework\View\Design\Theme\Domain\PhysicalInterface" type="Magento\Theme\Model\Theme\Domain\Physical" />
17+
<preference for="Magento\Framework\View\Design\Theme\Domain\VirtualInterface" type="Magento\Theme\Model\Theme\Domain\Virtual" />
18+
<preference for="Magento\Framework\View\Design\Theme\Domain\StagingInterface" type="Magento\Theme\Model\Theme\Domain\Staging" />
19+
<preference for="Magento\Framework\View\Design\Theme\Image\PathInterface" type="Magento\Theme\Model\Theme\Image\Path" />
20+
<preference for="Magento\Framework\View\Design\Theme\Label\ListInterface" type="Magento\Theme\Model\ResourceModel\Theme\Collection" />
1421
<preference for="Magento\Framework\App\DesignInterface" type="Magento\Theme\Model\Design" />
1522
<preference for="Magento\Framework\View\Design\Theme\ListInterface" type="Magento\Theme\Model\Theme\Collection" />
1623
<preference for="Magento\Theme\Api\Data\DesignConfigInterface" type="Magento\Theme\Model\Data\Design\Config"/>
@@ -20,6 +27,7 @@
2027
<preference for="Magento\Theme\Model\Design\Config\MetadataProviderInterface" type="Magento\Theme\Model\Design\Config\MetadataProvider"/>
2128
<preference for="Magento\Theme\Model\Theme\StoreThemesResolverInterface" type="Magento\Theme\Model\Theme\StoreThemesResolver"/>
2229
<preference for="Magento\Theme\CustomerData\MessagesProviderInterface" type="Magento\Theme\CustomerData\MessagesProvider"/>
30+
<preference for="Magento\Framework\View\Page\FaviconInterface" type="Magento\Theme\Model\Favicon\Favicon" />
2331
<type name="Magento\Theme\Model\Config">
2432
<arguments>
2533
<argument name="configCache" xsi:type="object">Magento\Framework\App\Cache\Type\Config</argument>
@@ -63,6 +71,7 @@
6371
<type name="Magento\Theme\Model\Theme\Collection" shared="false" />
6472
<type name="Magento\Theme\Model\View\Design">
6573
<arguments>
74+
<argument name="storeManager" xsi:type="object">Magento\Store\Model\StoreManagerInterface\Proxy</argument>
6675
<argument name="themes" xsi:type="array">
6776
<item name="frontend" xsi:type="string">Magento/luma</item>
6877
<item name="adminhtml" xsi:type="string">Magento/backend</item>

‎app/code/Magento/WebapiAsync/etc/di.xml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,24 @@
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
10+
<preference for="Magento\AsynchronousOperations\Model\ConfigInterface" type="Magento\WebapiAsync\Model\Config\Proxy" />
11+
<type name="Magento\Framework\Communication\Config\CompositeReader">
12+
<arguments>
13+
<argument name="readers" xsi:type="array">
14+
<item name="asyncServiceReader" xsi:type="array">
15+
<item name="reader" xsi:type="object">Magento\WebapiAsync\Code\Generator\Config\RemoteServiceReader\Communication</item>
16+
<item name="sortOrder" xsi:type="string">0</item>
17+
</item>
18+
</argument>
19+
</arguments>
20+
</type>
21+
<type name="Magento\Framework\MessageQueue\Publisher\Config\CompositeReader">
22+
<arguments>
23+
<argument name="readers" xsi:type="array">
24+
<item name="asyncServiceReader" xsi:type="object" sortOrder="0">Magento\WebapiAsync\Code\Generator\Config\RemoteServiceReader\Publisher</item>
25+
</argument>
26+
</arguments>
27+
</type>
1028
<type name="Magento\Webapi\Model\ServiceMetadata">
1129
<plugin name="webapiServiceMetadataAsync" type="Magento\WebapiAsync\Plugin\ServiceMetadata" />
1230
</type>

0 commit comments

Comments
 (0)