From 0068a8b7d16f65dd7eff88b5975acc2b4dfc91e4 Mon Sep 17 00:00:00 2001
From: Igor Melnikov <imelnikov@magento.com>
Date: Wed, 28 Dec 2016 14:15:48 -0600
Subject: [PATCH] MAGETWO-62134: Create data converter that can process nested
serialized data
Resolving code review feedback
---
.../Magento/Bundle/Model/Sales/Order/Pdf/Items/Creditmemo.php | 2 +-
app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Invoice.php | 2 +-
.../Magento/Bundle/Model/Sales/Order/Pdf/Items/Shipment.php | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Creditmemo.php b/app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Creditmemo.php
index c6f643b5afb..b9efefa03eb 100644
--- a/app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Creditmemo.php
+++ b/app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Creditmemo.php
@@ -33,6 +33,7 @@ class Creditmemo extends AbstractItems
* @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
* @param array $data
* @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\Model\Context $context,
@@ -47,7 +48,6 @@ class Creditmemo extends AbstractItems
Json $serializer = null
) {
$this->string = $string;
- $serializer = $serializer ?: ObjectManager::getInstance()->get(Json::class);
parent::__construct(
$context,
$registry,
diff --git a/app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Invoice.php b/app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Invoice.php
index 89c84c623aa..e164ffa394a 100644
--- a/app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Invoice.php
+++ b/app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Invoice.php
@@ -33,6 +33,7 @@ class Invoice extends AbstractItems
* @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
* @param array $data
* @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\Model\Context $context,
@@ -46,7 +47,6 @@ class Invoice extends AbstractItems
array $data = [],
Json $serializer = null
) {
- $serializer = $serializer ?: ObjectManager::getInstance()->get(Json::class);
$this->string = $coreString;
parent::__construct(
$context,
diff --git a/app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Shipment.php b/app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Shipment.php
index 17aaadaf7f9..0df79bd57b1 100644
--- a/app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Shipment.php
+++ b/app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Shipment.php
@@ -31,6 +31,7 @@ class Shipment extends AbstractItems
* @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
* @param array $data
* @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\Model\Context $context,
@@ -45,7 +46,6 @@ class Shipment extends AbstractItems
Json $serializer = null
) {
$this->string = $string;
- $serializer = $serializer ?: ObjectManager::getInstance()->get(Json::class);
parent::__construct(
$context,
$registry,
--
GitLab