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

Resolving code review feedback

Author: Igor Melnikov

app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/AbstractItems.php

@@ -9,7 +9,8 @@
 use Magento\Framework\Serialize\Serializer\Json;
 
 /**
- * Sales Order Pdf Items renderer
+ * Order pdf items renderer
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 abstract class AbstractItems extends \Magento\Sales\Model\Order\Pdf\Items\AbstractItems
@@ -22,10 +23,12 @@ abstract class AbstractItems extends \Magento\Sales\Model\Order\Pdf\Items\Abstra
     private $serializer;
 
     /**
+     * Constructor
+     *
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Tax\Helper\Data $taxData
-     * @param \Magento\Framework\Filesystem $filesystem ,
+     * @param \Magento\Framework\Filesystem $filesystem
      * @param \Magento\Framework\Filter\FilterManager $filterManager
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
@@ -43,8 +46,7 @@ public function __construct(
         array $data = [],
         Json $serializer = null
     ) {
-        $this->serializer = $serializer;
-
+        $this->serializer = $serializer ?: \Magento\Framework\App\ObjectManager::getInstance()->get(Json::class);
         parent::__construct(
             $context,
             $registry,
@@ -202,7 +204,7 @@ public function getSelectionAttributes($item)
             $options = $item->getOrderItem()->getProductOptions();
         }
         if (isset($options['bundle_selection_attributes'])) {
-            return $this->getSerializer()->unserialize($options['bundle_selection_attributes']);
+            return $this->serializer->unserialize($options['bundle_selection_attributes']);
         }
         return null;
     }
@@ -287,19 +289,4 @@ public function canShowPriceInfo($item)
         }
         return false;
     }
-
-    /**
-     * The getter function to get serializer
-     *
-     * @return Json
-     *
-     * @deprecated
-     */
-    private function getSerializer()
-    {
-        if ($this->serializer === null) {
-            $this->serializer = \Magento\Framework\App\ObjectManager::getInstance()->get(Json::class);
-        }
-        return $this->serializer;
-    }
 }

app/code/Magento/Catalog/Test/Unit/Helper/Product/ConfigurationTest.php

@@ -8,7 +8,7 @@
 class ConfigurationTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var \Magento\Framework\Serialize\Serializer\Json | \PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\Serialize\Serializer\Json|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $serializer;
 

app/code/Magento/Quote/Model/Quote/Address/Total.php

@@ -25,7 +25,9 @@ class Total extends \Magento\Framework\DataObject
     private $serializer;
 
     /**
-     * @param array $data [optional]
+     * Constructor
+     *
+     * @param array $data
      * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
      */
     public function __construct(

app/code/Magento/Tax/Helper/Data.php

@@ -3,9 +3,6 @@
  * Copyright © 2016 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 namespace Magento\Tax\Helper;
 
 use Magento\Framework\Pricing\PriceCurrencyInterface;
@@ -22,9 +19,11 @@
 use Magento\Framework\App\ObjectManager;
 
 /**
- * Catalog data helper
+ * Tax helper
+ *
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @codingStandardsIgnoreFile
  */
 class Data extends \Magento\Framework\App\Helper\AbstractHelper
 {
@@ -80,9 +79,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
     protected $_localeResolver;
 
     /**
-     * \Magento\Catalog\Helper\Data
-     *
-     * @var CatalogHelper
+     * @var \Magento\Catalog\Helper\Data
      */
     protected $catalogHelper;
 
@@ -102,17 +99,19 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
     private $serializer;
 
     /**
-     * @param \Magento\Framework\App\Helper\Context                         $context
-     * @param \Magento\Framework\Json\Helper\Data                           $jsonHelper
-     * @param Config                                                        $taxConfig
-     * @param \Magento\Store\Model\StoreManagerInterface                    $storeManager
-     * @param \Magento\Framework\Locale\FormatInterface                     $localeFormat
+     * Constructor
+     *
+     * @param \Magento\Framework\App\Helper\Context $context
+     * @param \Magento\Framework\Json\Helper\Data $jsonHelper
+     * @param Config $taxConfig
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+     * @param \Magento\Framework\Locale\FormatInterface $localeFormat
      * @param \Magento\Tax\Model\ResourceModel\Sales\Order\Tax\CollectionFactory $orderTaxCollectionFactory
-     * @param \Magento\Framework\Locale\ResolverInterface                   $localeResolver
-     * @param \Magento\Catalog\Helper\Data                                  $catalogHelper
-     * @param OrderTaxManagementInterface                                   $orderTaxManagement
-     * @param PriceCurrencyInterface                                        $priceCurrency
-     * @param Json                                           $serializer
+     * @param \Magento\Framework\Locale\ResolverInterface $localeResolver
+     * @param \Magento\Catalog\Helper\Data $catalogHelper
+     * @param OrderTaxManagementInterface $orderTaxManagement
+     * @param PriceCurrencyInterface $priceCurrency
+     * @param Json $serializer
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(