Merge remote-tracking branch 'main-ce/develop' into MAGETWO-36096
Conflicts: dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
Showing
- app/code/Magento/CacheInvalidate/Model/Observer.php 99 additions, 0 deletionsapp/code/Magento/CacheInvalidate/Model/Observer.php
- app/code/Magento/CacheInvalidate/README.md 2 additions, 0 deletionsapp/code/Magento/CacheInvalidate/README.md
- app/code/Magento/CacheInvalidate/Test/Unit/Model/ObserverTest.php 138 additions, 0 deletions.../Magento/CacheInvalidate/Test/Unit/Model/ObserverTest.php
- app/code/Magento/CacheInvalidate/composer.json 24 additions, 0 deletionsapp/code/Magento/CacheInvalidate/composer.json
- app/code/Magento/CacheInvalidate/etc/events.xml 51 additions, 0 deletionsapp/code/Magento/CacheInvalidate/etc/events.xml
- app/code/Magento/CacheInvalidate/etc/module.xml 14 additions, 0 deletionsapp/code/Magento/CacheInvalidate/etc/module.xml
- app/code/Magento/Checkout/Block/Cart/Shipping.php 3 additions, 3 deletionsapp/code/Magento/Checkout/Block/Cart/Shipping.php
- app/code/Magento/Checkout/composer.json 1 addition, 0 deletionsapp/code/Magento/Checkout/composer.json
- app/code/Magento/Dhl/Model/Carrier.php 5 additions, 5 deletionsapp/code/Magento/Dhl/Model/Carrier.php
- app/code/Magento/Fedex/Model/Carrier.php 2 additions, 2 deletionsapp/code/Magento/Fedex/Model/Carrier.php
- app/code/Magento/Log/Test/Unit/Model/VisitorTest.php 12 additions, 2 deletionsapp/code/Magento/Log/Test/Unit/Model/VisitorTest.php
- app/code/Magento/OfflineShipping/Model/Carrier/Flatrate.php 2 additions, 2 deletionsapp/code/Magento/OfflineShipping/Model/Carrier/Flatrate.php
- app/code/Magento/OfflineShipping/Model/Carrier/Freeshipping.php 2 additions, 2 deletions...de/Magento/OfflineShipping/Model/Carrier/Freeshipping.php
- app/code/Magento/OfflineShipping/Model/Carrier/Pickup.php 2 additions, 2 deletionsapp/code/Magento/OfflineShipping/Model/Carrier/Pickup.php
- app/code/Magento/OfflineShipping/Model/Carrier/Tablerate.php 2 additions, 2 deletionsapp/code/Magento/OfflineShipping/Model/Carrier/Tablerate.php
- app/code/Magento/Payment/Model/Cart.php 18 additions, 1 deletionapp/code/Magento/Payment/Model/Cart.php
- app/code/Magento/Payment/Model/Cart/SalesModel/Factory.php 1 addition, 1 deletionapp/code/Magento/Payment/Model/Cart/SalesModel/Factory.php
- app/code/Magento/Payment/Model/Cart/SalesModel/SalesModelInterface.php 8 additions, 1 deletion...nto/Payment/Model/Cart/SalesModel/SalesModelInterface.php
- app/code/Magento/Payment/Model/Checks/PaymentMethodChecksInterface.php 6 additions, 0 deletions...nto/Payment/Model/Checks/PaymentMethodChecksInterface.php
- app/code/Magento/Payment/Model/Config.php 6 additions, 0 deletionsapp/code/Magento/Payment/Model/Config.php
Please register or sign in to comment