MAGETWO-62134: Create data converter that can process nested serialized data

Igor Melnikov · Igor Melnikov · commit 078ad97ab7d1 · 2016-12-28T13:52:35.000-06:00
Resolving code review feedback
diff --git a/app/code/Magento/Tax/Model/Quote/GrandTotalDetailsPlugin.php b/app/code/Magento/Tax/Model/Quote/GrandTotalDetailsPlugin.php
@@ -14,34 +14,36 @@ class GrandTotalDetailsPlugin
     /**
      * @var \Magento\Tax\Api\Data\GrandTotalDetailsInterfaceFactory
      */
-    protected $detailsFactory;
+    private $detailsFactory;
 
     /**
      * @var \Magento\Tax\Api\Data\GrandTotalRatesInterfaceFactory
      */
-    protected $ratesFactory;
+    private $ratesFactory;
 
     /**
      * @var TotalSegmentExtensionFactory
      */
-    protected $totalSegmentExtensionFactory;
+    private $totalSegmentExtensionFactory;
 
     /**
      * @var \Magento\Tax\Model\Config
      */
-    protected $taxConfig;
+    private $taxConfig;
 
     /**
      * @var string
      */
-    protected $code;
+    private $code;
 
     /**
      * @var Json
      */
     private $serializer;
 
     /**
+     * Constructor
+     *
      * @param \Magento\Tax\Api\Data\GrandTotalDetailsInterfaceFactory $detailsFactory
      * @param \Magento\Tax\Api\Data\GrandTotalRatesInterfaceFactory $ratesFactory
      * @param TotalSegmentExtensionFactory $totalSegmentExtensionFactory
@@ -53,14 +55,14 @@ public function __construct(
         \Magento\Tax\Api\Data\GrandTotalRatesInterfaceFactory $ratesFactory,
         TotalSegmentExtensionFactory $totalSegmentExtensionFactory,
         \Magento\Tax\Model\Config $taxConfig,
-        Json $serializer = null
+        Json $serializer
     ) {
         $this->detailsFactory = $detailsFactory;
         $this->ratesFactory = $ratesFactory;
         $this->totalSegmentExtensionFactory = $totalSegmentExtensionFactory;
         $this->taxConfig = $taxConfig;
+        $this->serializer = $serializer;
         $this->code = 'tax';
-        $this->serializer = $serializer ?: ObjectManager::getInstance()->get(Json::class);
     }
 
     /**
@@ -83,7 +85,6 @@ protected function getRatesData($rates)
      * @param \Magento\Quote\Model\Cart\TotalsConverter $subject
      * @param \Magento\Quote\Api\Data\TotalSegmentInterface[] $totalSegments
      * @param \Magento\Quote\Model\Quote\Address\Total[] $addressTotals
-     *
      * @return \Magento\Quote\Api\Data\TotalSegmentInterface[]
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
diff --git a/dev/tests/integration/testsuite/Magento/GroupedProduct/Model/Product/Type/GroupedTest.php b/dev/tests/integration/testsuite/Magento/GroupedProduct/Model/Product/Type/GroupedTest.php
@@ -82,10 +82,9 @@ private function assertProductInfo($product)
     }
 
     /**
+     * @magentoDataFixture Magento/GroupedProduct/_files/product_grouped.php
      * @magentoAppIsolation enabled
      * @magentoDbIsolation disabled
-     * @covers \Magento\GroupedProduct\Model\Product\Type\Grouped::_prepareProduct()
-     * @magentoDataFixture Magento/GroupedProduct/_files/product_grouped.php
      */
     public function testPrepareProduct()
     {
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/AdminOrder/CreateTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/AdminOrder/CreateTest.php
@@ -508,9 +508,9 @@ public function testCreateOrderExistingCustomer()
     }
 
     /**
-     * @magentoAppIsolation enabled
      * @magentoDataFixture Magento/Sales/_files/quote.php
      * @magentoDataFixture Magento/Customer/_files/customer.php
+     * @magentoAppIsolation enabled
      */
     public function testGetCustomerCartExistingCart()
     {
@@ -535,10 +535,9 @@ public function testGetCustomerCartExistingCart()
     }
 
     /**
-     * @covers \Magento\Sales\Model\AdminOrder\Create::moveQuoteItem()
-     * @magentoAppIsolation enabled
      * @magentoDataFixture Magento/Sales/_files/quote.php
      * @magentoDataFixture Magento/Customer/_files/customer.php
+     * @magentoAppIsolation enabled
      */
     public function testMoveQuoteItemToCart()
     {
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/Order/ItemTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/Order/ItemTest.php
@@ -12,10 +12,9 @@
 class ItemTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @covers \Magento\Sales\Model\Order\Item::getProductOptions
-     * @dataProvider getProductOptionsDataProvider
      * @param string $options
      * @param array $expectedData
+     * @dataProvider getProductOptionsDataProvider
      */
     public function testGetProductOptions($options, $expectedData)
     {
diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/Model/ItemTest.php b/dev/tests/integration/testsuite/Magento/Wishlist/Model/ItemTest.php
@@ -31,11 +31,9 @@ public function setUp()
     }
 
     /**
+     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
      * @magentoAppIsolation enabled
      * @magentoDbIsolation enabled
-     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
-     * @covers \Magento\Wishlist\Model\Item::getBuyRequest()
-     * @covers \Magento\Wishlist\Model\Item::mergeBuyRequest()
      */
     public function testBuyRequest()
     {
@@ -64,9 +62,6 @@ public function testBuyRequest()
         );
     }
 
-    /**
-     * @covers \Magento\Wishlist\Model\Item::setBuyRequest()
-     */
     public function testSetBuyRequest()
     {
         $buyRequest = $this->objectManager->create(

Original file line number	Diff line number	Diff line change
`@@ -82,10 +82,9 @@ private function assertProductInfo($product)`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`/**`
	`85`	`+ * @magentoDataFixture Magento/GroupedProduct/_files/product_grouped.php`
`85`	`86`	`* @magentoAppIsolation enabled`
`86`	`87`	`* @magentoDbIsolation disabled`
`87`		`- * @covers \Magento\GroupedProduct\Model\Product\Type\Grouped::_prepareProduct()`
`88`		`- * @magentoDataFixture Magento/GroupedProduct/_files/product_grouped.php`
`89`	`88`	`*/`
`90`	`89`	`public function testPrepareProduct()`
`91`	`90`	`{`
Original file line number	Diff line number	Diff line change
`@@ -508,9 +508,9 @@ public function testCreateOrderExistingCustomer()`
`508`	`508`	`}`
`509`	`509`
`510`	`510`	`/**`
`511`		`- * @magentoAppIsolation enabled`
`512`	`511`	`* @magentoDataFixture Magento/Sales/_files/quote.php`
`513`	`512`	`* @magentoDataFixture Magento/Customer/_files/customer.php`
	`513`	`+ * @magentoAppIsolation enabled`
`514`	`514`	`*/`
`515`	`515`	`public function testGetCustomerCartExistingCart()`
`516`	`516`	`{`
`@@ -535,10 +535,9 @@ public function testGetCustomerCartExistingCart()`
`535`	`535`	`}`
`536`	`536`
`537`	`537`	`/**`
`538`		`- * @covers \Magento\Sales\Model\AdminOrder\Create::moveQuoteItem()`
`539`		`- * @magentoAppIsolation enabled`
`540`	`538`	`* @magentoDataFixture Magento/Sales/_files/quote.php`
`541`	`539`	`* @magentoDataFixture Magento/Customer/_files/customer.php`
	`540`	`+ * @magentoAppIsolation enabled`
`542`	`541`	`*/`
`543`	`542`	`public function testMoveQuoteItemToCart()`
`544`	`543`	`{`
Original file line number	Diff line number	Diff line change
`@@ -12,10 +12,9 @@`
`12`	`12`	`class ItemTest extends \PHPUnit_Framework_TestCase`
`13`	`13`	`{`
`14`	`14`	`/**`
`15`		`- * @covers \Magento\Sales\Model\Order\Item::getProductOptions`
`16`		`- * @dataProvider getProductOptionsDataProvider`
`17`	`15`	`* @param string $options`
`18`	`16`	`* @param array $expectedData`
	`17`	`+ * @dataProvider getProductOptionsDataProvider`
`19`	`18`	`*/`
`20`	`19`	`public function testGetProductOptions($options, $expectedData)`
`21`	`20`	`{`
Original file line number	Diff line number	Diff line change
`@@ -31,11 +31,9 @@ public function setUp()`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`/**`
	`34`	`+ * @magentoDataFixture Magento/Catalog/_files/product_simple.php`
`34`	`35`	`* @magentoAppIsolation enabled`
`35`	`36`	`* @magentoDbIsolation enabled`
`36`		`- * @magentoDataFixture Magento/Catalog/_files/product_simple.php`
`37`		`- * @covers \Magento\Wishlist\Model\Item::getBuyRequest()`
`38`		`- * @covers \Magento\Wishlist\Model\Item::mergeBuyRequest()`
`39`	`37`	`*/`
`40`	`38`	`public function testBuyRequest()`
`41`	`39`	`{`
`@@ -64,9 +62,6 @@ public function testBuyRequest()`
`64`	`62`	`);`
`65`	`63`	`}`
`66`	`64`
`67`		`- /**`
`68`		`- * @covers \Magento\Wishlist\Model\Item::setBuyRequest()`
`69`		`- */`
`70`	`65`	`public function testSetBuyRequest()`
`71`	`66`	`{`
`72`	`67`	`$buyRequest = $this->objectManager->create(`