Skip to content

Commit 056acee

Browse files
author
Stanislav Idolov
authored
ENGCOM-2338: [Forwardport] Fixing a Mistype Error #16413
2 parents 2ec5a2d + 0438095 commit 056acee

File tree

6 files changed

+43
-4
lines changed

6 files changed

+43
-4
lines changed

app/code/Magento/Dhl/Model/Carrier.php

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1263,8 +1263,20 @@ protected function _doShipmentRequest(\Magento\Framework\DataObject $request)
12631263
*
12641264
* @param \Magento\Framework\DataObject $request
12651265
* @return $this|\Magento\Framework\DataObject|boolean
1266+
* @deprecated
12661267
*/
12671268
public function proccessAdditionalValidation(\Magento\Framework\DataObject $request)
1269+
{
1270+
return $this->processAdditionalValidation($request);
1271+
}
1272+
1273+
/**
1274+
* Processing additional validation to check is carrier applicable.
1275+
*
1276+
* @param \Magento\Framework\DataObject $request
1277+
* @return $this|\Magento\Framework\DataObject|boolean
1278+
*/
1279+
public function processAdditionalValidation(\Magento\Framework\DataObject $request)
12681280
{
12691281
//Skip by item validation if there is no items in request
12701282
if (!count($this->getAllItems($request))) {

app/code/Magento/Shipping/Model/Carrier/AbstractCarrier.php

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -329,11 +329,24 @@ public function checkAvailableShipCountries(\Magento\Framework\DataObject $reque
329329
* @return $this|bool|\Magento\Framework\DataObject
330330
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
331331
*/
332-
public function proccessAdditionalValidation(\Magento\Framework\DataObject $request)
332+
public function processAdditionalValidation(\Magento\Framework\DataObject $request)
333333
{
334334
return $this;
335335
}
336336

337+
/**
338+
* Processing additional validation to check is carrier applicable.
339+
*
340+
* @param \Magento\Framework\DataObject $request
341+
* @return $this|bool|\Magento\Framework\DataObject
342+
* @deprecated
343+
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
344+
*/
345+
public function proccessAdditionalValidation(\Magento\Framework\DataObject $request)
346+
{
347+
return $this->processAdditionalValidation($request);
348+
}
349+
337350
/**
338351
* Determine whether current carrier enabled for activity
339352
*

app/code/Magento/Shipping/Model/Carrier/AbstractCarrierInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public function checkAvailableShipCountries(\Magento\Framework\DataObject $reque
9090
* @return $this|\Magento\Framework\DataObject|boolean
9191
* @api
9292
*/
93-
public function proccessAdditionalValidation(\Magento\Framework\DataObject $request);
93+
public function processAdditionalValidation(\Magento\Framework\DataObject $request);
9494

9595
/**
9696
* Determine whether current carrier enabled for activity

app/code/Magento/Shipping/Model/Carrier/AbstractCarrierOnline.php

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -302,10 +302,24 @@ public function getAllItems(RateRequest $request)
302302
*
303303
* @param \Magento\Framework\DataObject $request
304304
* @return $this|bool|\Magento\Framework\DataObject
305+
* @deprecated
305306
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
306307
* @SuppressWarnings(PHPMD.NPathComplexity)
307308
*/
308309
public function proccessAdditionalValidation(\Magento\Framework\DataObject $request)
310+
{
311+
return $this->processAdditionalValidation($request);
312+
}
313+
314+
/**
315+
* Processing additional validation to check if carrier applicable.
316+
*
317+
* @param \Magento\Framework\DataObject $request
318+
* @return $this|bool|\Magento\Framework\DataObject
319+
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
320+
* @SuppressWarnings(PHPMD.NPathComplexity)
321+
*/
322+
public function processAdditionalValidation(\Magento\Framework\DataObject $request)
309323
{
310324
//Skip by item validation if there is no items in request
311325
if (!count($this->getAllItems($request))) {

app/code/Magento/Shipping/Model/Shipping.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ public function collectCarrierRates($carrierCode, $request)
259259
$carrier->setActiveFlag($this->_availabilityConfigField);
260260
$result = $carrier->checkAvailableShipCountries($request);
261261
if (false !== $result && !$result instanceof \Magento\Quote\Model\Quote\Address\RateResult\Error) {
262-
$result = $carrier->proccessAdditionalValidation($request);
262+
$result = $carrier->processAdditionalValidation($request);
263263
}
264264
/*
265265
* Result will be false if the admin set not to show the shipping module

app/code/Magento/Shipping/Test/Unit/Model/Carrier/AbstractCarrierOnlineTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ public function testComposePackages()
100100
$this->stockItemData->expects($this->atLeastOnce())->method('getIsDecimalDivided')
101101
->will($this->returnValue(true));
102102

103-
$this->carrier->proccessAdditionalValidation($request);
103+
$this->carrier->processAdditionalValidation($request);
104104
}
105105

106106
public function testParseXml()

0 commit comments

Comments
 (0)