Skip to content

Commit ea61cba

Browse files
author
Stanislav Idolov
authored
ENGCOM-2297: Fixing a Mistype Error #16414
2 parents a305b70 + 7f52542 commit ea61cba

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
@@ -330,11 +330,24 @@ public function checkAvailableShipCountries(\Magento\Framework\DataObject $reque
330330
* @return $this|bool|\Magento\Framework\DataObject
331331
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
332332
*/
333-
public function proccessAdditionalValidation(\Magento\Framework\DataObject $request)
333+
public function processAdditionalValidation(\Magento\Framework\DataObject $request)
334334
{
335335
return $this;
336336
}
337337

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

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
@@ -301,10 +301,24 @@ public function getAllItems(RateRequest $request)
301301
*
302302
* @param \Magento\Framework\DataObject $request
303303
* @return $this|bool|\Magento\Framework\DataObject
304+
* @deprecated
304305
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
305306
* @SuppressWarnings(PHPMD.NPathComplexity)
306307
*/
307308
public function proccessAdditionalValidation(\Magento\Framework\DataObject $request)
309+
{
310+
return $this->processAdditionalValidation($request);
311+
}
312+
313+
/**
314+
* Processing additional validation to check if carrier applicable.
315+
*
316+
* @param \Magento\Framework\DataObject $request
317+
* @return $this|bool|\Magento\Framework\DataObject
318+
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
319+
* @SuppressWarnings(PHPMD.NPathComplexity)
320+
*/
321+
public function processAdditionalValidation(\Magento\Framework\DataObject $request)
308322
{
309323
//Skip by item validation if there is no items in request
310324
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
@@ -99,7 +99,7 @@ public function testComposePackages()
9999
$this->stockItemData->expects($this->atLeastOnce())->method('getIsDecimalDivided')
100100
->will($this->returnValue(true));
101101

102-
$this->carrier->proccessAdditionalValidation($request);
102+
$this->carrier->processAdditionalValidation($request);
103103
}
104104

105105
public function testParseXml()

0 commit comments

Comments
 (0)