Skip to content

Commit bff0cce

Browse files
author
Ébano Penha Andrello Lopes
committed
3.4.0: Magento 2 validation fixes
1 parent 3c960cd commit bff0cce

File tree

5 files changed

+49
-12
lines changed

5 files changed

+49
-12
lines changed

Helper/FulfillmentHelper.php

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
use Signifyd\Connect\Logger\Logger;
1111
use Signifyd\Core\SignifydModel;
1212
use Magento\Sales\Model\ResourceModel\Order as OrderResourceModel;
13+
use Magento\Framework\Serialize\SerializerInterface;
1314

1415
class FulfillmentHelper
1516
{
@@ -48,14 +49,31 @@ class FulfillmentHelper
4849
*/
4950
protected $configHelper;
5051

52+
/**
53+
* @var SerializerInterface
54+
*/
55+
protected $serializer;
56+
57+
/**
58+
* FulfillmentHelper constructor.
59+
* @param CasedataFactory $casedataFactory
60+
* @param FulfillmentFactory $fulfillmentFactory
61+
* @param CasedataResourceModel $casedataResourceModel
62+
* @param FulfillmentResourceModel $fulfillmentResourceModel
63+
* @param OrderResourceModel $orderResourceModel
64+
* @param Logger $logger
65+
* @param ConfigHelper $configHelper
66+
* @param SerializerInterface $serializer
67+
*/
5168
public function __construct(
5269
CasedataFactory $casedataFactory,
5370
FulfillmentFactory $fulfillmentFactory,
5471
CasedataResourceModel $casedataResourceModel,
5572
FulfillmentResourceModel $fulfillmentResourceModel,
5673
OrderResourceModel $orderResourceModel,
5774
Logger $logger,
58-
ConfigHelper $configHelper
75+
ConfigHelper $configHelper,
76+
SerializerInterface $serializer
5977
) {
6078
$this->casedataFactory = $casedataFactory;
6179
$this->fulfillmentFactory = $fulfillmentFactory;
@@ -66,6 +84,7 @@ public function __construct(
6684

6785
$this->logger = $logger;
6886
$this->configHelper = $configHelper;
87+
$this->serializer = $serializer;
6988
}
7089

7190
public function postFulfillmentToSignifyd(\Magento\Sales\Model\Order\Shipment $shipment)
@@ -156,11 +175,11 @@ public function prepareFulfillmentToDatabase(\Signifyd\Models\Fulfillment $fulfi
156175
$fulfillment->setData('created_at', $fulfillmentData->createdAt);
157176
$fulfillment->setData('delivery_email', $fulfillmentData->deliveryEmail);
158177
$fulfillment->setData('fulfillment_status', $fulfillmentData->fulfillmentStatus);
159-
$fulfillment->setData('tracking_numbers', serialize($fulfillmentData->trackingNumbers));
160-
$fulfillment->setData('tracking_urls', serialize($fulfillmentData->trackingUrls));
161-
$fulfillment->setData('products', serialize($fulfillmentData->products));
178+
$fulfillment->setData('tracking_numbers', $this->serializer->serialize($fulfillmentData->trackingNumbers));
179+
$fulfillment->setData('tracking_urls', $this->serializer->serialize($fulfillmentData->trackingUrls));
180+
$fulfillment->setData('products', $this->serializer->serialize($fulfillmentData->products));
162181
$fulfillment->setData('shipment_status', $fulfillmentData->shipmentStatus);
163-
$fulfillment->setData('delivery_address', serialize($fulfillmentData->deliveryAddress));
182+
$fulfillment->setData('delivery_address', $this->serializer->serialize($fulfillmentData->deliveryAddress));
164183
$fulfillment->setData('recipient_name', $fulfillmentData->recipientName);
165184
$fulfillment->setData('confirmation_name', $fulfillmentData->confirmationName);
166185
$fulfillment->setData('confirmation_phone', $fulfillmentData->confirmationPhone);

Model/Casedata.php

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
use Magento\Framework\ObjectManagerInterface;
1515
use Magento\Sales\Model\Order;
1616
use Signifyd\Connect\Logger\Logger;
17+
use Magento\Framework\Serialize\SerializerInterface;
1718

1819
/**
1920
* ORM model declaration for case data
@@ -67,13 +68,19 @@ class Casedata extends AbstractModel
6768
*/
6869
protected $logger;
6970

71+
/**
72+
* @var SerializerInterface
73+
*/
74+
protected $serializer;
75+
7076
/**
7177
* Casedata constructor.
7278
* @param Context $context
7379
* @param Registry $registry
7480
* @param \Signifyd\Connect\Helper\ConfigHelper $configHelper
7581
* @param InvoiceService $invoiceService
7682
* @param Logger
83+
* @param SerializerInterface $serializer
7784
*/
7885
public function __construct(
7986
Context $context,
@@ -83,7 +90,8 @@ public function __construct(
8390
InvoiceSender $invoiceSender,
8491
ObjectManagerInterface $objectManager,
8592
\Magento\Sales\Model\OrderFactory $orderFactory,
86-
Logger $logger
93+
Logger $logger,
94+
SerializerInterface $serializer
8795
)
8896
{
8997
$this->configHelper = $configHelper;
@@ -92,6 +100,7 @@ public function __construct(
92100
$this->objectManager = $objectManager;
93101
$this->orderFactory = $orderFactory;
94102
$this->logger = $logger;
103+
$this->serializer = $serializer;
95104

96105
parent::__construct($context, $registry);
97106
}
@@ -516,7 +525,7 @@ public function getEntries($index = null)
516525
$entries = $this->getData('entries_text');
517526

518527
if (!empty($entries)) {
519-
@$entries = unserialize($entries);
528+
$entries = $this->serializer->unserialize($entries);
520529
}
521530

522531
if (!is_array($entries)) {
@@ -539,7 +548,7 @@ public function setEntries($index, $value = null)
539548
$entries[$index] = $value;
540549
}
541550

542-
@$entries = serialize($entries);
551+
$entries = $this->serializer->serialize($entries);
543552
$this->setData('entries_text', $entries);
544553

545554
return $this;

Model/Message/BuiltinConflict.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public function isDisplayed()
7878
*/
7979
public function getIdentity()
8080
{
81-
return md5('SIGNIFYD_CONNECT_BUILTIN_CONFLICT');
81+
return sha1('SIGNIFYD_CONNECT_BUILTIN_CONFLICT');
8282
}
8383
/**
8484
* Retrieve message text

Model/Payment/DataMapper.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public function checkMethod(\Magento\Sales\Api\Data\OrderPaymentInterface $order
8787
* @param \Magento\Sales\Model\Order $order
8888
* @return string
8989
*/
90-
final public function getCode(\Magento\Sales\Model\Order $order)
90+
public function getCode(\Magento\Sales\Model\Order $order)
9191
{
9292
if ($this->getDataCalled) {
9393
return null;
@@ -103,7 +103,7 @@ final public function getCode(\Magento\Sales\Model\Order $order)
103103
* @param \Magento\Sales\Model\Order $order
104104
* @return string
105105
*/
106-
final public function getData(\Magento\Sales\Model\Order $order)
106+
public function getData(\Magento\Sales\Model\Order $order)
107107
{
108108
$this->checkMethod($order->getPayment());
109109
return $this->getPaymentData($order);

Ui/Component/Listing/Columns/CaseLink.php

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
use Magento\Framework\View\Element\UiComponent\ContextInterface;
1010
use Magento\Framework\View\Element\UiComponentFactory;
1111
use Magento\Ui\Component\Listing\Columns\Column;
12+
use Magento\Framework\Serialize\SerializerInterface;
1213

1314
/**
1415
* Class CaseLink
@@ -20,22 +21,30 @@ class CaseLink extends Column
2021
*/
2122
protected $objectManager;
2223

24+
/**
25+
* @var SerializerInterface
26+
*/
27+
protected $serializer;
28+
2329
/**
2430
* CaseLink constructor.
2531
* @param ContextInterface $context
2632
* @param UiComponentFactory $uiComponentFactory
2733
* @param ObjectManagerInterface $objectManager
34+
* @param SerializerInterface $serializer
2835
* @param array $components
2936
* @param array $data
3037
*/
3138
public function __construct(
3239
ContextInterface $context,
3340
UiComponentFactory $uiComponentFactory,
3441
ObjectManagerInterface $objectManager,
42+
SerializerInterface $serializer,
3543
array $components = [],
3644
array $data = []
3745
) {
3846
$this->objectManager = $objectManager;
47+
$this->serializer = $serializer;
3948
parent::__construct($context, $uiComponentFactory, $components, $data);
4049
}
4150

@@ -59,7 +68,7 @@ public function prepareDataSource(array $dataSource)
5968
$entries = $case->getEntriesText();
6069

6170
if (!empty($entries)) {
62-
@$entries = unserialize($entries);
71+
$entries = $this->serializer->unserialize($entries);
6372
if (is_array($entries) && isset($entries['testInvestigation']) && $entries['testInvestigation'] == true) {
6473
$item[$name] = "TEST: {$item[$name]}";
6574
}

0 commit comments

Comments
 (0)