MAGETWO-60442: Add optional SerializerInterface dependency to child classes of...
MAGETWO-60442: Add optional SerializerInterface dependency to child classes of \Magento\Framework\Config\Data Merging with remote tracking branch, conflicts: lib/internal/Magento/Framework/ObjectManager/Config/Compiled.php
Showing
- app/code/Magento/Catalog/Model/Product/Image.php 1 addition, 2 deletionsapp/code/Magento/Catalog/Model/Product/Image.php
- app/code/Magento/Catalog/Test/Unit/Model/Product/ImageTest.php 2 additions, 2 deletions...ode/Magento/Catalog/Test/Unit/Model/Product/ImageTest.php
- app/code/Magento/Customer/Controller/Adminhtml/Index/Save.php 1 addition, 5 deletions...code/Magento/Customer/Controller/Adminhtml/Index/Save.php
- app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/SaveTest.php 32 additions, 86 deletions...ustomer/Test/Unit/Controller/Adminhtml/Index/SaveTest.php
- app/code/Magento/Customer/Test/Unit/Model/AccountManagementTest.php 3 additions, 3 deletions...agento/Customer/Test/Unit/Model/AccountManagementTest.php
- app/code/Magento/PageCache/Model/Config.php 11 additions, 5 deletionsapp/code/Magento/PageCache/Model/Config.php
- lib/internal/Magento/Framework/ObjectManager/Config/Compiled.php 12 additions, 4 deletions...ernal/Magento/Framework/ObjectManager/Config/Compiled.php
- lib/internal/Magento/Framework/Test/Unit/ObjectManager/Config/CompiledTest.php 91 additions, 0 deletions...Framework/Test/Unit/ObjectManager/Config/CompiledTest.php
Please register or sign in to comment