Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cleanup app/etc/di.xml #30886

Open
wants to merge 4 commits into
base: 2.4-develop
Choose a base branch
from
Open

Cleanup app/etc/di.xml #30886

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d564872
cleanup default di.xml
thomas-kl1 Nov 11, 2020
eee0a86
remove leading backslash
thomas-kl1 Feb 9, 2021
cffca96
move global declaration from module to app/etc/di.xml
thomas-kl1 Feb 9, 2021
48b8084
Merge branch '2.4-develop' into patch-5
thomas-kl1 Nov 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 10 additions & 16 deletions app/code/Magento/Backend/etc/di.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@
<preference for="Magento\Backend\Block\Widget\Button\ToolbarInterface" type="Magento\Backend\Block\Widget\Button\Toolbar" />
<preference for="Magento\Backend\Service\V1\ModuleServiceInterface" type="Magento\Backend\Service\V1\ModuleService" />
<type name="Magento\Backend\Block\Widget\Button\ButtonList" shared="false" />
<type name="Magento\Backend\App\Area\FrontNameResolver">
<arguments>
<argument name="defaultFrontName" xsi:type="init_parameter">Magento\Backend\Setup\ConfigOptionsList::CONFIG_PATH_BACKEND_FRONTNAME</argument>
</arguments>
</type>
<type name="Magento\Framework\App\AreaList">
<arguments>
<argument name="areas" xsi:type="array">
Expand All @@ -25,6 +30,11 @@
</argument>
</arguments>
</type>
<type name="Magento\Framework\App\Request\Http">
<arguments>
<argument name="pathInfoProcessor" xsi:type="object">Magento\Backend\App\Request\PathInfoProcessor\Proxy</argument>
</arguments>
</type>
<type name="Magento\Backend\Model\Menu\Config">
<arguments>
<argument name="menuDirector" xsi:type="object">Magento\Backend\Model\Menu\Director\Director</argument>
Expand Down Expand Up @@ -67,22 +77,6 @@
</arguments>
</type>
<preference for="Magento\Framework\Authorization\PolicyInterface" type="Magento\Framework\Authorization\Policy\Acl"/>
<preference for="Magento\Framework\Acl\AclResource\ProviderInterface" type="Magento\Framework\Acl\AclResource\Provider"/>
<type name="Magento\Framework\Acl\AclResource\Config\Reader\Filesystem">
<arguments>
<argument name="converter" xsi:type="object">Magento\Framework\Acl\AclResource\Config\Converter\Dom</argument>
</arguments>
</type>
<type name="Magento\Framework\Acl\AclResource\Provider">
<arguments>
<argument name="configReader" xsi:type="object">Magento\Framework\Acl\AclResource\Config\Reader\Filesystem</argument>
</arguments>
</type>
<type name="Magento\Framework\Acl\Builder">
<arguments>
<argument name="resourceLoader" xsi:type="object">Magento\Framework\Acl\Loader\ResourceLoader</argument>
</arguments>
</type>
<type name="Magento\Framework\Acl\RootResource">
<arguments>
<argument name="identifier" xsi:type="string">Magento_Backend::all</argument>
Expand Down
16 changes: 3 additions & 13 deletions app/code/Magento/Catalog/etc/di.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,7 @@
<preference for="Magento\Catalog\Model\Attribute\LockValidatorInterface" type="Magento\Catalog\Model\Attribute\LockValidatorComposite" />
<preference for="Magento\Catalog\Model\Entity\Product\Attribute\Group\AttributeMapperInterface" type="Magento\Catalog\Model\Entity\Product\Attribute\Group\AttributeMapper" />
<preference for="Magento\Catalog\Block\Product\ReviewRendererInterface" type="Magento\Catalog\Block\Product\ReviewRenderer\DefaultProvider" />
<preference for="Magento\Framework\Pricing\PriceInfoInterface" type="Magento\Framework\Pricing\PriceInfo\Base" />
<preference for="Magento\Framework\Pricing\PriceCurrencyInterface" type="Magento\Directory\Model\PriceCurrency" />
<preference for="Magento\Framework\Pricing\Adjustment\CalculatorInterface" type="Magento\Framework\Pricing\Adjustment\Calculator" />
<preference for="Magento\Catalog\Api\Data\CategoryInterface" type="Magento\Catalog\Model\Category" />
<preference for="Magento\Catalog\Api\CategoryManagementInterface" type="Magento\Catalog\Model\CategoryManagement" />
<preference for="Magento\Catalog\Api\CategoryRepositoryInterface" type="Magento\Catalog\Model\CategoryRepository" />
Expand Down Expand Up @@ -69,7 +67,6 @@
<preference for="Magento\Catalog\Api\Data\ProductRender\ImageInterface" type="Magento\Catalog\Model\ProductRender\Image" />
<preference for="Magento\Catalog\Api\Data\ProductRender\PriceInfoInterface" type="Magento\Catalog\Model\ProductRender\PriceInfo" />
<preference for="Magento\Catalog\Api\Data\ProductRender\FormattedPriceInfoInterface" type="Magento\Catalog\Model\ProductRender\FormattedPriceInfo" />
<preference for="Magento\Framework\Indexer\BatchProviderInterface" type="Magento\Framework\Indexer\BatchProvider" />
<preference for="Magento\Catalog\Model\Indexer\Product\Price\UpdateIndexInterface" type="Magento\Catalog\Model\Indexer\Product\Price\InvalidateIndex" />
<preference for="Magento\Catalog\Model\Product\Gallery\ImagesConfigFactoryInterface" type="Magento\Catalog\Model\Product\Gallery\ImagesConfigFactory" />
<preference for="Magento\Catalog\Model\Product\Configuration\Item\ItemResolverInterface" type="Magento\Catalog\Model\Product\Configuration\Item\ItemResolverComposite" />
Expand All @@ -92,12 +89,6 @@
<type name="Magento\Framework\Mview\View\StateInterface">
<plugin name="setStatusForMview" type="Magento\Catalog\Model\Indexer\Category\Product\Plugin\MviewState" />
</type>
<type name="Magento\Catalog\Model\Indexer\Category\Product\Plugin\MviewState">
<arguments>
<argument name="state" xsi:type="object" shared="false">Magento\Framework\Mview\View\StateInterface</argument>
<argument name="changelog" xsi:type="object" shared="false">Magento\Framework\Mview\View\ChangelogInterface</argument>
</arguments>
</type>
<type name="Magento\Catalog\Model\Indexer\Product\Full">
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why we need remove this ?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good catch, it shouldn't, didn't seen the shared="false" at first place. I need to investigate the reason to have shared="false"

<arguments>
<argument name="indexerList" xsi:type="array">
Expand Down Expand Up @@ -256,7 +247,7 @@
</type>
<type name="Magento\Store\Model\ResourceModel\Website">
<plugin name="invalidatePriceIndexerOnWebsite" type="Magento\Catalog\Model\Indexer\Product\Price\Plugin\Website"/>
<plugin name="categoryProductWebsiteAfterDelete" type="\Magento\Catalog\Model\Indexer\Category\Product\Plugin\Website"/>
<plugin name="categoryProductWebsiteAfterDelete" type="Magento\Catalog\Model\Indexer\Category\Product\Plugin\Website"/>
</type>
<type name="Magento\Store\Model\ResourceModel\Store">
<plugin name="storeViewResourceAroundSave" type="Magento\Catalog\Model\Indexer\Category\Flat\Plugin\StoreView"/>
Expand Down Expand Up @@ -363,8 +354,6 @@
</argument>
</arguments>
</type>
<type name="Magento\Framework\Pricing\Adjustment\Collection">
</type>
<type name="Magento\Catalog\Model\Product\ReservedAttributeList">
<arguments>
<argument name="productModel" xsi:type="string">\Magento\Catalog\Model\Product</argument>
Expand Down Expand Up @@ -1104,6 +1093,7 @@
</argument>
</arguments>
</type>
<!-- ToDo: Should be a virtual type of Magento\Framework\Data\CollectionModifier -->
<type name="Magento\Framework\Data\CollectionModifier">
<arguments>
<argument name="conditions" xsi:type="array">
Expand Down Expand Up @@ -1142,7 +1132,7 @@
<argument name="priceTableResolver" xsi:type="object">Magento\Catalog\Model\Indexer\Product\Price\PriceTableResolver\Proxy</argument>
<argument name="storeManager" xsi:type="object">Magento\Store\Model\StoreManagerInterface\Proxy</argument>
<argument name="context" xsi:type="object">Magento\Framework\App\Http\Context\Proxy</argument>
<!-- Unccomment after fix issue with Proxy generation -->
<!-- ToDo: Unccomment after fix issue with Proxy generation -->
<!--<argument name="dimensionModeConfiguration" xsi:type="object">-->
<!--Magento\Catalog\Model\Indexer\Product\Price\DimensionModeConfiguration\Proxy-->
<!--</argument>-->
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Catalog/etc/frontend/di.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@
<plugin name="catalog_app_action_dispatch_controller_context_plugin"
type="Magento\Catalog\Plugin\Framework\App\Action\ContextPlugin" />
</type>
<type name="\Magento\PageCache\Model\PageCacheTagsPreprocessorComposite">
<type name="Magento\PageCache\Model\PageCacheTagsPreprocessorComposite">
<arguments>
<argument name="preprocessors" xsi:type="array">
<item name="catalog_product_view" xsi:type="array">
Expand Down
4 changes: 2 additions & 2 deletions app/code/Magento/CatalogGraphQl/etc/di.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,11 +97,11 @@
<plugin name="productAttributesDynamicFields" type="Magento\CatalogGraphQl\Plugin\Search\Request\ConfigReader" />
</type>

<preference type="\Magento\CatalogGraphQl\Model\Resolver\Product\Price\Provider" for="\Magento\CatalogGraphQl\Model\Resolver\Product\Price\ProviderInterface"/>
<preference type="Magento\CatalogGraphQl\Model\Resolver\Product\Price\Provider" for="Magento\CatalogGraphQl\Model\Resolver\Product\Price\ProviderInterface"/>

<preference type="Magento\CatalogGraphQl\Model\Resolver\Products\Query\Search" for="Magento\CatalogGraphQl\Model\Resolver\Products\Query\ProductQueryInterface"/>

<type name="\Magento\CatalogGraphQl\Model\Resolver\Product\BatchProductLinks">
<type name="Magento\CatalogGraphQl\Model\Resolver\Product\BatchProductLinks">
<arguments>
<argument name="linkTypes" xsi:type="array">
<item name="related" xsi:type="string">related</item>
Expand Down
7 changes: 6 additions & 1 deletion app/code/Magento/Config/etc/di.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@
</argument>
</arguments>
</virtualType>
<type name="Magento\Framework\App\Config\MetadataConfigTypeProcessor">
<arguments>
<argument name="configSource" xsi:type="object">Magento\Config\App\Config\Source\EnvironmentConfigSource</argument>
</arguments>
</type>
<type name="Magento\Config\Model\Config\Structure\Reader">
<arguments>
<argument name="compiler" xsi:type="object">Magento\Framework\View\TemplateEngine\Xhtml\ConfigCompiler</argument>
Expand Down Expand Up @@ -350,7 +355,7 @@
<argument name="excludeList" xsi:type="object">Magento\Config\Model\Config\Export\ExcludeList</argument>
</arguments>
</type>
<virtualType name="adminhtmlConfigStructureData" type="\Magento\Config\Model\Config\Structure\Data">
<virtualType name="adminhtmlConfigStructureData" type="Magento\Config\Model\Config\Structure\Data">
<arguments>
<argument name="configScope" xsi:type="object">adminhtmlConfigScope</argument>
</arguments>
Expand Down
11 changes: 0 additions & 11 deletions app/code/Magento/Cookie/etc/di.xml
View file
Open in desktop

This file was deleted.

27 changes: 1 addition & 26 deletions app/code/Magento/Cron/etc/di.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
<preference for="Magento\Cron\Model\ConfigInterface" type="Magento\Cron\Model\Config" />
<preference for="Magento\Framework\Shell\CommandRendererInterface" type="Magento\Framework\Shell\CommandRenderer" />
<preference for="Magento\Framework\Crontab\CrontabManagerInterface" type="Magento\Framework\Crontab\CrontabManager" />
<preference for="Magento\Framework\Crontab\TasksProviderInterface" type="Magento\Framework\Crontab\TasksProvider" />
<preference for="Magento\Cron\Model\DeadlockRetrierInterface" type="Magento\Cron\Model\DeadlockRetrier" />
<type name="Magento\Config\Model\Config\Structure\Converter">
<plugin name="cron_backend_config_structure_converter_plugin" type="Magento\Cron\Model\Backend\Config\Structure\Converter" />
</type>
Expand Down Expand Up @@ -49,27 +47,4 @@
</argument>
</arguments>
</type>
<type name="Magento\Framework\App\AreaList">
<arguments>
<argument name="areas" xsi:type="array">
<item name="crontab" xsi:type="null" />
</argument>
</arguments>
</type>
<type name="Magento\Framework\Crontab\CrontabManagerInterface">
<arguments>
<argument name="shell" xsi:type="object">Magento\Framework\App\Shell</argument>
</arguments>
</type>
<type name="Magento\Framework\Crontab\TasksProviderInterface">
<arguments>
<argument name="tasks" xsi:type="array">
<item name="cronMagento" xsi:type="array">
<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>
</argument>
</arguments>
</type>
<preference for="Magento\Cron\Model\DeadlockRetrierInterface" type="Magento\Cron\Model\DeadlockRetrier" />
</config>
6 changes: 5 additions & 1 deletion app/code/Magento/Directory/etc/di.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,11 @@
</argument>
</arguments>
</type>

<type name="Magento\Framework\Locale\Resolver">
<arguments>
<argument name="defaultLocalePath" xsi:type="const">Magento\Directory\Helper\Data::XML_PATH_DEFAULT_LOCALE</argument>
</arguments>
</type>
<virtualType name="DirectoryHelperDataProxy" type="Magento\Directory\Helper\Data\Proxy">
<arguments>
<argument name="instanceName" xsi:type="string">Magento\Directory\Helper\Data</argument>
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Eav/etc/di.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<preference for="Magento\Eav\Api\Data\AttributeSetSearchResultsInterface" type="Magento\Eav\Model\AttributeSetSearchResults" />
<preference for="Magento\Eav\Api\Data\AttributeGroupSearchResultsInterface" type="Magento\Eav\Model\AttributeGroupSearchResults" />
<preference for="Magento\Framework\Webapi\CustomAttributeTypeLocatorInterface" type="Magento\Eav\Model\TypeLocator" />

<preference for="Magento\Framework\Webapi\CustomAttribute\ServiceTypeListInterface" type="Magento\Eav\Model\TypeLocator\ComplexType"/>
<type name="Magento\Eav\Model\Entity\Attribute\Config">
<arguments>
<argument name="reader" xsi:type="object">Magento\Eav\Model\Entity\Attribute\Config\Reader\Proxy</argument>
Expand Down
12 changes: 6 additions & 6 deletions app/code/Magento/Elasticsearch/etc/di.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@
</argument>
</arguments>
</type>
<virtualType name="elasticsearch5FieldNameResolver" type="\Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\CompositeResolver">
<virtualType name="elasticsearch5FieldNameResolver" type="Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\CompositeResolver">
<arguments>
<argument name="items" xsi:type="array">
<item name="notEav" xsi:type="object" sortOrder="10">\Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\NotEavAttribute</item>
Expand Down Expand Up @@ -422,7 +422,7 @@
</argument>
</arguments>
</virtualType>
<virtualType name="elasticsearch5StaticFieldProvider" type="\Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\StaticField">
<virtualType name="elasticsearch5StaticFieldProvider" type="Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\StaticField">
<arguments>
<argument name="fieldTypeConverter" xsi:type="object">Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Converter</argument>
<argument name="indexTypeConverter" xsi:type="object">Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex\Converter</argument>
Expand All @@ -431,7 +431,7 @@
<argument name="fieldNameResolver" xsi:type="object">elasticsearch5FieldNameResolver</argument>
</arguments>
</virtualType>
<virtualType name="elasticsearch5DynamicFieldProvider" type="\Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\DynamicField">
<virtualType name="elasticsearch5DynamicFieldProvider" type="Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\DynamicField">
<arguments>
<argument name="fieldTypeConverter" xsi:type="object">Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Converter</argument>
<argument name="indexTypeConverter" xsi:type="object">Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex\Converter</argument>
Expand All @@ -447,17 +447,17 @@
<argument name="fieldTypeConverter" xsi:type="object">Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Converter</argument>
</arguments>
</type>
<virtualType name="elasticsearch5FieldTypeDateTimeResolver" type="\Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver\DateTimeType">
<virtualType name="elasticsearch5FieldTypeDateTimeResolver" type="Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver\DateTimeType">
<arguments>
<argument name="fieldTypeConverter" xsi:type="object">Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Converter</argument>
</arguments>
</virtualType>
<virtualType name="elasticsearch5FieldTypeFloatResolver" type="\Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver\FloatType">
<virtualType name="elasticsearch5FieldTypeFloatResolver" type="Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver\FloatType">
<arguments>
<argument name="fieldTypeConverter" xsi:type="object">Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Converter</argument>
</arguments>
</virtualType>
<virtualType name="elasticsearch5FieldTypeDefaultResolver" type="\Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver\DefaultResolver">
<virtualType name="elasticsearch5FieldTypeDefaultResolver" type="Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver\DefaultResolver">
<arguments>
<argument name="fieldTypeConverter" xsi:type="object">Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Converter</argument>
</arguments>
Expand Down
Empty file added app/code/Magento/Elasticsearch6/etc/di.xml
View file
Open in desktop
Empty file.
2 changes: 1 addition & 1 deletion app/code/Magento/Elasticsearch7/etc/di.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@
</argument>
</arguments>
</type>
<virtualType name="\Magento\Elasticsearch7\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\CompositeResolver" type="\Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\CompositeResolver">
<virtualType name="Magento\Elasticsearch7\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\CompositeResolver" type="Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\CompositeResolver">
<arguments>
<argument name="items" xsi:type="array">
<item name="notEav" xsi:type="object" sortOrder="10">\Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\NotEavAttribute</item>
Expand Down
Loading