From d5648728a7fa8d01b27d186e753fddb1619b0121 Mon Sep 17 00:00:00 2001 From: Thomas Klein Date: Wed, 11 Nov 2020 22:45:18 +0100 Subject: [PATCH 1/3] cleanup default di.xml --- app/code/Magento/Backend/etc/di.xml | 10 + app/code/Magento/Catalog/etc/di.xml | 6 - app/code/Magento/Config/etc/di.xml | 5 + app/code/Magento/Directory/etc/di.xml | 6 +- app/code/Magento/Eav/etc/di.xml | 2 +- app/code/Magento/MediaStorage/etc/di.xml | 5 + app/code/Magento/Store/etc/di.xml | 16 ++ app/code/Magento/Theme/etc/di.xml | 11 +- app/code/Magento/WebapiAsync/etc/di.xml | 18 ++ app/etc/di.xml | 260 ++++++++--------------- 10 files changed, 163 insertions(+), 176 deletions(-) diff --git a/app/code/Magento/Backend/etc/di.xml b/app/code/Magento/Backend/etc/di.xml index 0fd778f2e156b..8c3e0c92a9483 100644 --- a/app/code/Magento/Backend/etc/di.xml +++ b/app/code/Magento/Backend/etc/di.xml @@ -15,6 +15,11 @@ + + + Magento\Backend\Setup\ConfigOptionsList::CONFIG_PATH_BACKEND_FRONTNAME + + @@ -25,6 +30,11 @@ + + + Magento\Backend\App\Request\PathInfoProcessor\Proxy + + Magento\Backend\Model\Menu\Director\Director diff --git a/app/code/Magento/Catalog/etc/di.xml b/app/code/Magento/Catalog/etc/di.xml index e817bcbb42d25..aac2cf5dd2467 100644 --- a/app/code/Magento/Catalog/etc/di.xml +++ b/app/code/Magento/Catalog/etc/di.xml @@ -92,12 +92,6 @@ - - - Magento\Framework\Mview\View\StateInterface - Magento\Framework\Mview\View\ChangelogInterface - - diff --git a/app/code/Magento/Config/etc/di.xml b/app/code/Magento/Config/etc/di.xml index c45b31807b70d..827db2bf3e97a 100644 --- a/app/code/Magento/Config/etc/di.xml +++ b/app/code/Magento/Config/etc/di.xml @@ -21,6 +21,11 @@ + + + Magento\Config\App\Config\Source\EnvironmentConfigSource + + Magento\Framework\View\TemplateEngine\Xhtml\ConfigCompiler diff --git a/app/code/Magento/Directory/etc/di.xml b/app/code/Magento/Directory/etc/di.xml index fb2c526ac730b..528423d9aa4b6 100644 --- a/app/code/Magento/Directory/etc/di.xml +++ b/app/code/Magento/Directory/etc/di.xml @@ -21,7 +21,11 @@ - + + + Magento\Directory\Helper\Data::XML_PATH_DEFAULT_LOCALE + + Magento\Directory\Helper\Data diff --git a/app/code/Magento/Eav/etc/di.xml b/app/code/Magento/Eav/etc/di.xml index ed5ff1394234e..45f2d18a43ec6 100644 --- a/app/code/Magento/Eav/etc/di.xml +++ b/app/code/Magento/Eav/etc/di.xml @@ -28,7 +28,7 @@ - + Magento\Eav\Model\Entity\Attribute\Config\Reader\Proxy diff --git a/app/code/Magento/MediaStorage/etc/di.xml b/app/code/Magento/MediaStorage/etc/di.xml index 5cdcbb3b2b9a9..3b7ae94afb8ce 100644 --- a/app/code/Magento/MediaStorage/etc/di.xml +++ b/app/code/Magento/MediaStorage/etc/di.xml @@ -6,6 +6,11 @@ */ --> + + + Magento\MediaStorage\Model\File\Storage\Response + + Magento\MediaStorage\Model\File\Storage\Proxy diff --git a/app/code/Magento/Store/etc/di.xml b/app/code/Magento/Store/etc/di.xml index 984a16eb34965..407d217a44019 100644 --- a/app/code/Magento/Store/etc/di.xml +++ b/app/code/Magento/Store/etc/di.xml @@ -97,6 +97,7 @@ Magento\Framework\Session\Generic\Proxy Magento\Store\Model\Store::CUSTOM_ENTRY_POINT_PARAM Magento\Framework\UrlInterface + system/currency/installed @@ -202,6 +203,21 @@ + + + Magento\Store\Model\ScopeInterface::SCOPE_STORE + + + + + Magento\Store\Model\ScopeInterface::SCOPE_STORE + + + + + Magento\Store\Model\ScopeInterface::SCOPE_STORE + + diff --git a/app/code/Magento/Theme/etc/di.xml b/app/code/Magento/Theme/etc/di.xml index 6ea495e2702ae..ed392b883ebfc 100644 --- a/app/code/Magento/Theme/etc/di.xml +++ b/app/code/Magento/Theme/etc/di.xml @@ -6,11 +6,18 @@ */ --> - + + + + + + + + @@ -20,6 +27,7 @@ + Magento\Framework\App\Cache\Type\Config @@ -63,6 +71,7 @@ + Magento\Store\Model\StoreManagerInterface\Proxy Magento/luma Magento/backend diff --git a/app/code/Magento/WebapiAsync/etc/di.xml b/app/code/Magento/WebapiAsync/etc/di.xml index cfe1a5dbae53f..e804b104e2c73 100644 --- a/app/code/Magento/WebapiAsync/etc/di.xml +++ b/app/code/Magento/WebapiAsync/etc/di.xml @@ -7,6 +7,24 @@ --> + + + + + + Magento\WebapiAsync\Code\Generator\Config\RemoteServiceReader\Communication + 0 + + + + + + + + Magento\WebapiAsync\Code\Generator\Config\RemoteServiceReader\Publisher + + + diff --git a/app/etc/di.xml b/app/etc/di.xml index 4014d16dedea1..725bc2ebbfddd 100644 --- a/app/etc/di.xml +++ b/app/etc/di.xml @@ -18,7 +18,6 @@ - @@ -26,10 +25,6 @@ - - - - @@ -42,14 +37,9 @@ - - + + - - - system/currency/installed - - @@ -75,9 +65,6 @@ - - - @@ -88,7 +75,6 @@ - @@ -96,7 +82,6 @@ - @@ -113,7 +98,6 @@ - @@ -175,12 +159,10 @@ - - @@ -228,7 +210,6 @@ Magento\Framework\Filesystem\Driver\File - Magento\Framework\Communication\Config\Reader\XmlReader\Converter @@ -243,10 +224,6 @@ - - Magento\WebapiAsync\Code\Generator\Config\RemoteServiceReader\Communication - 0 - Magento\Framework\Communication\Config\Reader\XmlReader 10 @@ -295,7 +272,6 @@ - Magento\Backend\App\Request\PathInfoProcessor\Proxy Magento\Framework\App\Route\ConfigInterface\Proxy @@ -373,22 +349,11 @@ Magento\Framework\App\ResourceConnection\Proxy - - - Magento\Backend\Setup\ConfigOptionsList::CONFIG_PATH_BACKEND_FRONTNAME - - Magento\Framework\App\Cache\State::PARAM_BAN_CACHE - - - Magento\Store\Model\StoreManager::PARAM_RUN_CODE - Magento\Store\Model\StoreManager::PARAM_RUN_TYPE - - Magento\Framework\App\Cache\Type\Translate @@ -404,11 +369,6 @@ - - - Magento\Store\Model\StoreManagerInterface\Proxy - - @@ -485,7 +445,7 @@ Magento\Framework\Session\Generic\Proxy - Magento\Store\Model\ScopeInterface::SCOPE_STORE + Magento\Framework\App\ScopeInterface::SCOPE_DEFAULT @@ -586,7 +546,6 @@ blockRenderPool - Magento\Store\Model\ScopeInterface::SCOPE_STORE layoutArgumentReaderInterpreter @@ -595,11 +554,6 @@ blockRenderPool - - - Magento\Store\Model\ScopeInterface::SCOPE_STORE - - @@ -703,12 +657,6 @@ - - - Magento\Indexer\Model\Mview\View\State - Magento\Framework\Mview\View\Changelog - - Magento\Framework\Mview\Config\Data\Proxy @@ -729,7 +677,6 @@ - Magento\MediaStorage\Model\File\Storage\Response developerPublisher @@ -788,20 +735,20 @@ - \Magento\Framework\Api\Code\Generator\ExtensionAttributesInterfaceFactoryGenerator - \Magento\Framework\ObjectManager\Code\Generator\Factory - \Magento\Framework\ObjectManager\Code\Generator\Proxy - \Magento\Framework\Interception\Code\Generator\Interceptor - \Magento\Framework\ObjectManager\Profiler\Code\Generator\Logger - \Magento\Framework\Api\Code\Generator\Mapper - \Magento\Framework\ObjectManager\Code\Generator\Persistor - \Magento\Framework\ObjectManager\Code\Generator\Repository - \Magento\Framework\ObjectManager\Code\Generator\Converter - \Magento\Framework\Api\Code\Generator\SearchResults - \Magento\Framework\Api\Code\Generator\ExtensionAttributesInterfaceGenerator - \Magento\Framework\Api\Code\Generator\ExtensionAttributesGenerator - \Magento\Framework\MessageQueue\Code\Generator\RemoteServiceGenerator - \Magento\Framework\Async\Code\Generator\ProxyDeferredGenerator + Magento\Framework\Api\Code\Generator\ExtensionAttributesInterfaceFactoryGenerator + Magento\Framework\ObjectManager\Code\Generator\Factory + Magento\Framework\ObjectManager\Code\Generator\Proxy + Magento\Framework\Interception\Code\Generator\Interceptor + Magento\Framework\ObjectManager\Profiler\Code\Generator\Logger + Magento\Framework\Api\Code\Generator\Mapper + Magento\Framework\ObjectManager\Code\Generator\Persistor + Magento\Framework\ObjectManager\Code\Generator\Repository + Magento\Framework\ObjectManager\Code\Generator\Converter + Magento\Framework\Api\Code\Generator\SearchResults + Magento\Framework\Api\Code\Generator\ExtensionAttributesInterfaceGenerator + Magento\Framework\Api\Code\Generator\ExtensionAttributesGenerator + Magento\Framework\MessageQueue\Code\Generator\RemoteServiceGenerator + Magento\Framework\Async\Code\Generator\ProxyDeferredGenerator @@ -889,7 +836,6 @@ layoutFileSourceBaseFiltered - layout @@ -905,7 +851,6 @@ layoutFileSourceThemeFiltered - layout/override/base @@ -921,7 +866,6 @@ layoutFileSourceOverrideBaseFiltered - layout/override/theme @@ -975,7 +919,6 @@ pageLayoutFileSourceThemeFiltered - page_layout/override/base @@ -991,7 +934,6 @@ pageLayoutFileSourceOverrideBaseFiltered - page_layout/override/theme @@ -1007,7 +949,6 @@ pageLayoutFileSourceOverrideThemeFiltered - pageLayoutFileSourceBaseSorted @@ -1016,7 +957,6 @@ pageLayoutFileSourceOverrideThemeSorted - @@ -1116,7 +1056,7 @@ - Magento\Store\Model\ScopeInterface::SCOPE_STORE + Magento\Framework\App\ScopeInterface::SCOPE_DEFAULT Shockwave Flash @@ -1185,7 +1125,6 @@ frontend - Magento\Framework\Filesystem\Driver\File @@ -1228,7 +1167,6 @@ Magento\Framework\App\Cache\Type\Config - Magento\Framework\Reflection\ExtensionAttributesProcessor\Proxy @@ -1403,7 +1341,6 @@ - Magento\Directory\Helper\Data::XML_PATH_DEFAULT_LOCALE Magento\Framework\App\ScopeInterface::SCOPE_DEFAULT @@ -1419,7 +1356,7 @@ - \Magento\Framework\View\Element\Message\Renderer\EscapeRenderer::CODE + Magento\Framework\View\Element\Message\Renderer\EscapeRenderer::CODE @@ -1432,11 +1369,6 @@ Magento\Framework\Config\ConfigOptionsListConstants::CONFIG_PATH_DB_LOGGER_INCLUDE_STACKTRACE - - - Magento\Config\App\Config\Source\EnvironmentConfigSource - - Magento\Framework\Message\ExceptionMessageFactory @@ -1452,65 +1384,65 @@ - \Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Table - \Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Real - \Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Real - \Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Real - \Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Integer - \Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Integer - \Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Integer - \Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Integer - \Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Date - \Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Timestamp - \Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Timestamp - \Magento\Framework\Setup\Declaration\Schema\Dto\Factories\LongText - \Magento\Framework\Setup\Declaration\Schema\Dto\Factories\MediumText - \Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Text - \Magento\Framework\Setup\Declaration\Schema\Dto\Factories\StringBinary - \Magento\Framework\Setup\Declaration\Schema\Dto\Factories\StringBinary - \Magento\Framework\Setup\Declaration\Schema\Dto\Factories\StringBinary - \Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Blob - \Magento\Framework\Setup\Declaration\Schema\Dto\Factories\MediumBlob - \Magento\Framework\Setup\Declaration\Schema\Dto\Factories\LongBlob - \Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Boolean - \Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Unique - \Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Primary - \Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Foreign - \Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Index - \Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Json + Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Table + Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Real + Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Real + Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Real + Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Integer + Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Integer + Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Integer + Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Integer + Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Date + Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Timestamp + Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Timestamp + Magento\Framework\Setup\Declaration\Schema\Dto\Factories\LongText + Magento\Framework\Setup\Declaration\Schema\Dto\Factories\MediumText + Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Text + Magento\Framework\Setup\Declaration\Schema\Dto\Factories\StringBinary + Magento\Framework\Setup\Declaration\Schema\Dto\Factories\StringBinary + Magento\Framework\Setup\Declaration\Schema\Dto\Factories\StringBinary + Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Blob + Magento\Framework\Setup\Declaration\Schema\Dto\Factories\MediumBlob + Magento\Framework\Setup\Declaration\Schema\Dto\Factories\LongBlob + Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Boolean + Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Unique + Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Primary + Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Foreign + Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Index + Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Json - \Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Boolean - \Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Integer - \Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Integer - \Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Integer - \Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Integer - \Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Real - \Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Real - \Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Real - \Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Blob - \Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Blob - \Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Blob - \Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Blob - \Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Blob - \Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Blob - \Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Timestamp - \Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Date - \Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Timestamp - \Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\StringBinary - \Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\StringBinary - \Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\StringBinary - \Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\StringBinary - \Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Json - \Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Index - \Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Constraints\Internal - \Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Constraints\Internal - \Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Constraints\Internal - \Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Constraints\ForeignKey + Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Boolean + Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Integer + Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Integer + Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Integer + Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Integer + Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Real + Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Real + Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Real + Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Blob + Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Blob + Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Blob + Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Blob + Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Blob + Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Blob + Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Timestamp + Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Date + Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Timestamp + Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\StringBinary + Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\StringBinary + Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\StringBinary + Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\StringBinary + Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Json + Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Index + Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Constraints\Internal + Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Constraints\Internal + Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Constraints\Internal + Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Constraints\ForeignKey @@ -1624,30 +1556,30 @@ - + schema - + data - + - \Magento\Framework\Setup\Patch\DataPatchReader - \Magento\Framework\Setup\Patch\SchemaPatchReader + Magento\Framework\Setup\Patch\DataPatchReader + Magento\Framework\Setup\Patch\SchemaPatchReader - \Magento\Framework\Setup\Patch\DataPatchReader + Magento\Framework\Setup\Patch\DataPatchReader - \Magento\Framework\Setup\Patch\SchemaPatchReader + Magento\Framework\Setup\Patch\SchemaPatchReader @@ -1708,7 +1640,6 @@ - Magento\WebapiAsync\Code\Generator\Config\RemoteServiceReader\Publisher Magento\Framework\MessageQueue\Publisher\Config\RemoteService\Reader Magento\Framework\MessageQueue\Publisher\Config\Xml\Reader Magento\Framework\MessageQueue\Publisher\Config\Env\Reader @@ -1780,9 +1711,7 @@ CsrfRequestValidator - - Magento\Framework\App\Request\HttpMethodValidator - + Magento\Framework\App\Request\HttpMethodValidator @@ -1790,16 +1719,16 @@ - \Magento\Framework\App\Action\HttpOptionsActionInterface - \Magento\Framework\App\Action\HttpGetActionInterface - \Magento\Framework\App\Action\HttpGetActionInterface - \Magento\Framework\App\Action\HttpPostActionInterface - \Magento\Framework\App\Action\HttpPutActionInterface - \Magento\Framework\App\Action\HttpPatchActionInterface - \Magento\Framework\App\Action\HttpDeleteActionInterface - \Magento\Framework\App\Action\HttpConnectActionInterface - \Magento\Framework\App\Action\HttpPropfindActionInterface - \Magento\Framework\App\Action\HttpTraceActionInterface + Magento\Framework\App\Action\HttpOptionsActionInterface + Magento\Framework\App\Action\HttpGetActionInterface + Magento\Framework\App\Action\HttpGetActionInterface + Magento\Framework\App\Action\HttpPostActionInterface + Magento\Framework\App\Action\HttpPutActionInterface + Magento\Framework\App\Action\HttpPatchActionInterface + Magento\Framework\App\Action\HttpDeleteActionInterface + Magento\Framework\App\Action\HttpConnectActionInterface + Magento\Framework\App\Action\HttpPropfindActionInterface + Magento\Framework\App\Action\HttpTraceActionInterface @@ -1827,12 +1756,9 @@ - - - + + + From eee0a86614f12c7e610eddd9debc86af0a46935b Mon Sep 17 00:00:00 2001 From: Thomas Klein Date: Tue, 9 Feb 2021 10:09:14 +0100 Subject: [PATCH 2/3] remove leading backslash --- app/code/Magento/Catalog/etc/di.xml | 2 +- app/code/Magento/Catalog/etc/frontend/di.xml | 2 +- app/code/Magento/CatalogGraphQl/etc/di.xml | 4 ++-- app/code/Magento/Config/etc/di.xml | 2 +- app/code/Magento/Elasticsearch/etc/di.xml | 12 ++++++------ app/code/Magento/Elasticsearch6/etc/di.xml | 0 app/code/Magento/Elasticsearch7/etc/di.xml | 2 +- app/code/Magento/EncryptionKey/etc/di.xml | 2 +- app/code/Magento/GroupedProductGraphQl/etc/di.xml | 2 +- app/code/Magento/MediaGalleryUi/etc/di.xml | 2 +- app/code/Magento/Msrp/etc/di.xml | 4 ++-- app/code/Magento/MsrpConfigurableProduct/etc/di.xml | 4 ++-- app/code/Magento/MsrpGroupedProduct/etc/di.xml | 6 +++--- app/code/Magento/OfflinePayments/etc/di.xml | 2 +- app/code/Magento/SalesRule/etc/di.xml | 2 +- 15 files changed, 24 insertions(+), 24 deletions(-) create mode 100644 app/code/Magento/Elasticsearch6/etc/di.xml diff --git a/app/code/Magento/Catalog/etc/di.xml b/app/code/Magento/Catalog/etc/di.xml index aac2cf5dd2467..a3c18ea23fdd4 100644 --- a/app/code/Magento/Catalog/etc/di.xml +++ b/app/code/Magento/Catalog/etc/di.xml @@ -250,7 +250,7 @@ - + diff --git a/app/code/Magento/Catalog/etc/frontend/di.xml b/app/code/Magento/Catalog/etc/frontend/di.xml index 9c7c3e04b0772..0b133b132d5c6 100644 --- a/app/code/Magento/Catalog/etc/frontend/di.xml +++ b/app/code/Magento/Catalog/etc/frontend/di.xml @@ -115,7 +115,7 @@ - + diff --git a/app/code/Magento/CatalogGraphQl/etc/di.xml b/app/code/Magento/CatalogGraphQl/etc/di.xml index 8fb575255fed6..bfd7d83bf25b1 100644 --- a/app/code/Magento/CatalogGraphQl/etc/di.xml +++ b/app/code/Magento/CatalogGraphQl/etc/di.xml @@ -97,11 +97,11 @@ - + - + related diff --git a/app/code/Magento/Config/etc/di.xml b/app/code/Magento/Config/etc/di.xml index 827db2bf3e97a..7d6854254ffac 100644 --- a/app/code/Magento/Config/etc/di.xml +++ b/app/code/Magento/Config/etc/di.xml @@ -355,7 +355,7 @@ Magento\Config\Model\Config\Export\ExcludeList - + adminhtmlConfigScope diff --git a/app/code/Magento/Elasticsearch/etc/di.xml b/app/code/Magento/Elasticsearch/etc/di.xml index f5c98932feb18..27d290f63305a 100644 --- a/app/code/Magento/Elasticsearch/etc/di.xml +++ b/app/code/Magento/Elasticsearch/etc/di.xml @@ -373,7 +373,7 @@ - + \Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\NotEavAttribute @@ -428,7 +428,7 @@ - + Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Converter Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex\Converter @@ -437,7 +437,7 @@ elasticsearch5FieldNameResolver - + Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Converter Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex\Converter @@ -453,17 +453,17 @@ Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Converter - + Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Converter - + Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Converter - + Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Converter diff --git a/app/code/Magento/Elasticsearch6/etc/di.xml b/app/code/Magento/Elasticsearch6/etc/di.xml new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/app/code/Magento/Elasticsearch7/etc/di.xml b/app/code/Magento/Elasticsearch7/etc/di.xml index 298d93b21af59..b66c21c5e11b5 100644 --- a/app/code/Magento/Elasticsearch7/etc/di.xml +++ b/app/code/Magento/Elasticsearch7/etc/di.xml @@ -131,7 +131,7 @@ - + \Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\NotEavAttribute diff --git a/app/code/Magento/EncryptionKey/etc/di.xml b/app/code/Magento/EncryptionKey/etc/di.xml index b4e471f4e40ef..7ae8bf4a1d1a8 100644 --- a/app/code/Magento/EncryptionKey/etc/di.xml +++ b/app/code/Magento/EncryptionKey/etc/di.xml @@ -6,7 +6,7 @@ */ --> - + Magento\Config\Model\Config\Structure\Proxy diff --git a/app/code/Magento/GroupedProductGraphQl/etc/di.xml b/app/code/Magento/GroupedProductGraphQl/etc/di.xml index 717bc14826f70..3766ceedac41a 100644 --- a/app/code/Magento/GroupedProductGraphQl/etc/di.xml +++ b/app/code/Magento/GroupedProductGraphQl/etc/di.xml @@ -13,7 +13,7 @@ - + associated diff --git a/app/code/Magento/MediaGalleryUi/etc/di.xml b/app/code/Magento/MediaGalleryUi/etc/di.xml index 964ac92399738..069907f5355f3 100644 --- a/app/code/Magento/MediaGalleryUi/etc/di.xml +++ b/app/code/Magento/MediaGalleryUi/etc/di.xml @@ -7,7 +7,7 @@ --> - + diff --git a/app/code/Magento/Msrp/etc/di.xml b/app/code/Magento/Msrp/etc/di.xml index e617e153fd951..ac6f37c417193 100644 --- a/app/code/Magento/Msrp/etc/di.xml +++ b/app/code/Magento/Msrp/etc/di.xml @@ -6,8 +6,8 @@ */ --> - - + + diff --git a/app/code/Magento/MsrpConfigurableProduct/etc/di.xml b/app/code/Magento/MsrpConfigurableProduct/etc/di.xml index ea33c81ff7cf5..814e226392d64 100644 --- a/app/code/Magento/MsrpConfigurableProduct/etc/di.xml +++ b/app/code/Magento/MsrpConfigurableProduct/etc/di.xml @@ -6,7 +6,7 @@ */ --> - + @@ -16,4 +16,4 @@ - \ No newline at end of file + diff --git a/app/code/Magento/MsrpGroupedProduct/etc/di.xml b/app/code/Magento/MsrpGroupedProduct/etc/di.xml index 4ad62eb56f49f..13f4b18011d7a 100644 --- a/app/code/Magento/MsrpGroupedProduct/etc/di.xml +++ b/app/code/Magento/MsrpGroupedProduct/etc/di.xml @@ -6,7 +6,7 @@ */ --> - + @@ -16,7 +16,7 @@ - - + + diff --git a/app/code/Magento/OfflinePayments/etc/di.xml b/app/code/Magento/OfflinePayments/etc/di.xml index e0a2e250eadcd..cdfaf08d24cd9 100644 --- a/app/code/Magento/OfflinePayments/etc/di.xml +++ b/app/code/Magento/OfflinePayments/etc/di.xml @@ -13,7 +13,7 @@ - + diff --git a/app/code/Magento/SalesRule/etc/di.xml b/app/code/Magento/SalesRule/etc/di.xml index daa74d4cafa09..a7c33c0457521 100644 --- a/app/code/Magento/SalesRule/etc/di.xml +++ b/app/code/Magento/SalesRule/etc/di.xml @@ -192,7 +192,7 @@ - + Date: Tue, 9 Feb 2021 10:54:16 +0100 Subject: [PATCH 3/3] move global declaration from module to app/etc/di.xml --- app/code/Magento/Backend/etc/di.xml | 16 ----- app/code/Magento/Catalog/etc/di.xml | 8 +-- app/code/Magento/Cookie/etc/di.xml | 11 ---- app/code/Magento/Cron/etc/di.xml | 27 +------- app/code/Magento/Email/etc/di.xml | 27 -------- app/code/Magento/Indexer/etc/di.xml | 9 +-- app/code/Magento/ProductVideo/etc/di.xml | 2 + app/code/Magento/Ui/etc/di.xml | 2 + app/etc/di.xml | 78 +++++++++++++++++++++++- 9 files changed, 83 insertions(+), 97 deletions(-) delete mode 100644 app/code/Magento/Cookie/etc/di.xml diff --git a/app/code/Magento/Backend/etc/di.xml b/app/code/Magento/Backend/etc/di.xml index 8c3e0c92a9483..0598a1f8be234 100644 --- a/app/code/Magento/Backend/etc/di.xml +++ b/app/code/Magento/Backend/etc/di.xml @@ -77,22 +77,6 @@ - - - - Magento\Framework\Acl\AclResource\Config\Converter\Dom - - - - - Magento\Framework\Acl\AclResource\Config\Reader\Filesystem - - - - - Magento\Framework\Acl\Loader\ResourceLoader - - Magento_Backend::all diff --git a/app/code/Magento/Catalog/etc/di.xml b/app/code/Magento/Catalog/etc/di.xml index a3c18ea23fdd4..bd9d66e23f256 100644 --- a/app/code/Magento/Catalog/etc/di.xml +++ b/app/code/Magento/Catalog/etc/di.xml @@ -17,9 +17,7 @@ - - @@ -69,7 +67,6 @@ - @@ -357,8 +354,6 @@ - - \Magento\Catalog\Model\Product @@ -1098,6 +1093,7 @@ + @@ -1136,7 +1132,7 @@ Magento\Catalog\Model\Indexer\Product\Price\PriceTableResolver\Proxy Magento\Store\Model\StoreManagerInterface\Proxy Magento\Framework\App\Http\Context\Proxy - + diff --git a/app/code/Magento/Cookie/etc/di.xml b/app/code/Magento/Cookie/etc/di.xml deleted file mode 100644 index 8b53209f51916..0000000000000 --- a/app/code/Magento/Cookie/etc/di.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - diff --git a/app/code/Magento/Cron/etc/di.xml b/app/code/Magento/Cron/etc/di.xml index e7286169359bd..f92a622a4f51e 100644 --- a/app/code/Magento/Cron/etc/di.xml +++ b/app/code/Magento/Cron/etc/di.xml @@ -7,9 +7,7 @@ --> - - - + @@ -49,27 +47,4 @@ - - - - - - - - - - Magento\Framework\App\Shell - - - - - - - {magentoRoot}bin/magento cron:run | grep -v "Ran jobs by schedule" >> {magentoLog}magento.cron.log - false - - - - - diff --git a/app/code/Magento/Email/etc/di.xml b/app/code/Magento/Email/etc/di.xml index 91e0d925f4273..411fd7c5fdee6 100644 --- a/app/code/Magento/Email/etc/di.xml +++ b/app/code/Magento/Email/etc/di.xml @@ -7,9 +7,7 @@ --> - - @@ -75,29 +73,4 @@ - - - - Magento\Framework\Filter\DirectiveProcessor\DependDirective - Magento\Framework\Filter\DirectiveProcessor\IfDirective - Magento\Framework\Filter\DirectiveProcessor\TemplateDirective - Magento\Framework\Filter\DirectiveProcessor\LegacyDirective - - - - - - - Magento\Framework\Filter\DirectiveProcessor\Filter\NewlineToBreakFilter - Magento\Framework\Filter\DirectiveProcessor\Filter\EscapeFilter - - - - - - - Magento\Email\Console\Command\DatabaseTemplateCompatibilityCommand - - - diff --git a/app/code/Magento/Indexer/etc/di.xml b/app/code/Magento/Indexer/etc/di.xml index 482ca591811b7..8c1ea633c163d 100644 --- a/app/code/Magento/Indexer/etc/di.xml +++ b/app/code/Magento/Indexer/etc/di.xml @@ -14,11 +14,6 @@ - - - Magento\Framework\Mview\View - - Magento\Indexer\Model\Config\Data\Proxy @@ -40,8 +35,7 @@ - + @@ -62,7 +56,6 @@ - Magento\Indexer\Model\Indexer diff --git a/app/code/Magento/ProductVideo/etc/di.xml b/app/code/Magento/ProductVideo/etc/di.xml index e5e8bc974b7b5..e4f857208b97b 100644 --- a/app/code/Magento/ProductVideo/etc/di.xml +++ b/app/code/Magento/ProductVideo/etc/di.xml @@ -7,6 +7,8 @@ --> + + diff --git a/app/code/Magento/Ui/etc/di.xml b/app/code/Magento/Ui/etc/di.xml index b0cef3b90d431..aff1819178014 100644 --- a/app/code/Magento/Ui/etc/di.xml +++ b/app/code/Magento/Ui/etc/di.xml @@ -9,6 +9,8 @@ + + diff --git a/app/etc/di.xml b/app/etc/di.xml index 725bc2ebbfddd..ff069d243352c 100644 --- a/app/etc/di.xml +++ b/app/etc/di.xml @@ -98,9 +98,6 @@ - - - @@ -133,6 +130,8 @@ + + @@ -162,6 +161,8 @@ + + @@ -194,6 +195,50 @@ + + + + + + + + + + Magento\Framework\Acl\AclResource\Config\Converter\Dom + + + + + Magento\Framework\Acl\AclResource\Config\Reader\Filesystem + + + + + Magento\Framework\Acl\Loader\ResourceLoader + + + + + + + + + + + + Magento\Framework\App\Shell + + + + + + + {magentoRoot}bin/magento cron:run | grep -v "Ran jobs by schedule" >> {magentoLog}magento.cron.log + false + + + + @@ -1756,6 +1801,8 @@ + + @@ -1764,6 +1811,31 @@ + + + + Magento\Framework\Filter\DirectiveProcessor\DependDirective + Magento\Framework\Filter\DirectiveProcessor\IfDirective + Magento\Framework\Filter\DirectiveProcessor\TemplateDirective + Magento\Framework\Filter\DirectiveProcessor\LegacyDirective + + + + + + + Magento\Framework\Filter\DirectiveProcessor\Filter\NewlineToBreakFilter + Magento\Framework\Filter\DirectiveProcessor\Filter\EscapeFilter + + + + + + + Magento\Email\Console\Command\DatabaseTemplateCompatibilityCommand + + + block_html