Merge remote-tracking branch 'origin/MAGETWO-58843-json' into MAGETWO-58446-cache-unserialize
# Conflicts: # lib/internal/Magento/Framework/Json/Json.php
Showing
- app/etc/di.xml 1 addition, 1 deletionapp/etc/di.xml
- lib/internal/Magento/Framework/Json/JsonInterface.php 0 additions, 38 deletionslib/internal/Magento/Framework/Json/JsonInterface.php
- lib/internal/Magento/Framework/Serialize/README.md 5 additions, 0 deletionslib/internal/Magento/Framework/Serialize/README.md
- lib/internal/Magento/Framework/Serialize/Serializer/Json.php 27 additions, 0 deletionslib/internal/Magento/Framework/Serialize/Serializer/Json.php
- lib/internal/Magento/Framework/Serialize/SerializerInterface.php 25 additions, 0 deletions...ernal/Magento/Framework/Serialize/SerializerInterface.php
- lib/internal/Magento/Framework/Serialize/Test/Unit/Serializer/JsonTest.php 45 additions, 0 deletions...nto/Framework/Serialize/Test/Unit/Serializer/JsonTest.php
Please register or sign in to comment