diff --git a/app/code/Magento/Quote/Model/Webapi/ParamOverriderCartId.php b/app/code/Magento/Quote/Model/Webapi/ParamOverriderCartId.php index 8bb62f55c5246e5409c7fc39c50b50fe4db1ae2d..3f5b280d505d2762e48b42c4715f1cdf74aa04a0 100644 --- a/app/code/Magento/Quote/Model/Webapi/ParamOverriderCartId.php +++ b/app/code/Magento/Quote/Model/Webapi/ParamOverriderCartId.php @@ -43,7 +43,7 @@ class ParamOverriderCartId implements ParamOverriderInterface /** * {@inheritDoc} */ - public function getOverridenValue() + public function getOverriddenValue() { try { if ($this->userContext->getUserType() === UserContextInterface::USER_TYPE_CUSTOMER) { diff --git a/app/code/Magento/Quote/Test/Unit/Model/Webapi/ParamOverriderCartIdTest.php b/app/code/Magento/Quote/Test/Unit/Model/Webapi/ParamOverriderCartIdTest.php index f5021057eef71a10a64c220e73cdc686d2762895..06945b656e687af0ad6629739534dfda4077c32b 100644 --- a/app/code/Magento/Quote/Test/Unit/Model/Webapi/ParamOverriderCartIdTest.php +++ b/app/code/Magento/Quote/Test/Unit/Model/Webapi/ParamOverriderCartIdTest.php @@ -64,7 +64,7 @@ class ParamOverriderCartIdTest extends \PHPUnit_Framework_TestCase ->method('getId') ->will($this->returnValue($retValue)); - $this->assertSame($retValue, $this->model->getOverridenValue()); + $this->assertSame($retValue, $this->model->getOverriddenValue()); } public function testGetOverridenValueIsCustomerAndCartDoesNotExist() @@ -83,7 +83,7 @@ class ParamOverriderCartIdTest extends \PHPUnit_Framework_TestCase ->with($customerId) ->will($this->throwException(new NoSuchEntityException())); - $this->assertNull($this->model->getOverridenValue()); + $this->assertNull($this->model->getOverriddenValue()); } public function testGetOverridenValueIsCustomerAndCartIsNull() @@ -102,7 +102,7 @@ class ParamOverriderCartIdTest extends \PHPUnit_Framework_TestCase ->with($customerId) ->will($this->returnValue(null)); - $this->assertNull($this->model->getOverridenValue()); + $this->assertNull($this->model->getOverriddenValue()); } public function testGetOverridenValueIsNotCustomer() @@ -111,6 +111,6 @@ class ParamOverriderCartIdTest extends \PHPUnit_Framework_TestCase ->method('getUserType') ->will($this->returnValue(UserContextInterface::USER_TYPE_ADMIN)); - $this->assertNull($this->model->getOverridenValue()); + $this->assertNull($this->model->getOverriddenValue()); } } diff --git a/app/code/Magento/Webapi/Controller/Rest/ParamOverriderCustomerId.php b/app/code/Magento/Webapi/Controller/Rest/ParamOverriderCustomerId.php index e8fee7eeea43bb31fdd5c12eff7c1973842ff76a..09a27569293993b92a68d8cdde5dab7d67e450e8 100644 --- a/app/code/Magento/Webapi/Controller/Rest/ParamOverriderCustomerId.php +++ b/app/code/Magento/Webapi/Controller/Rest/ParamOverriderCustomerId.php @@ -32,7 +32,7 @@ class ParamOverriderCustomerId implements ParamOverriderInterface /** * {@inheritDoc} */ - public function getOverridenValue() + public function getOverriddenValue() { if ($this->userContext->getUserType() === UserContextInterface::USER_TYPE_CUSTOMER) { return $this->userContext->getUserId(); diff --git a/app/code/Magento/Webapi/Controller/Rest/ParamsOverrider.php b/app/code/Magento/Webapi/Controller/Rest/ParamsOverrider.php index 5a998602fc9c5ec942d6e8e69aa7176efe62f7f6..f7b4f4605a7a62cdf3246fd6ad5fc1e8de279061 100644 --- a/app/code/Magento/Webapi/Controller/Rest/ParamsOverrider.php +++ b/app/code/Magento/Webapi/Controller/Rest/ParamsOverrider.php @@ -44,7 +44,7 @@ class ParamsOverrider if ($paramData[Converter::KEY_FORCE] || !$this->isNestedArrayValueSet($inputData, $arrayKeys)) { $paramValue = $paramData[Converter::KEY_VALUE]; if (isset($this->paramOverriders[$paramValue])) { - $value = $this->paramOverriders[$paramValue]->getOverridenValue(); + $value = $this->paramOverriders[$paramValue]->getOverriddenValue(); } else { $value = $paramData[Converter::KEY_VALUE]; } diff --git a/app/code/Magento/Webapi/Test/Unit/Controller/Rest/ParamOverriderCustomerIdTest.php b/app/code/Magento/Webapi/Test/Unit/Controller/Rest/ParamOverriderCustomerIdTest.php index 94d9ff013295ea890a5b61b8e6cc38df04e153d1..8e46dccd6e2affd877e85cb28a55a2632d905c1b 100644 --- a/app/code/Magento/Webapi/Test/Unit/Controller/Rest/ParamOverriderCustomerIdTest.php +++ b/app/code/Magento/Webapi/Test/Unit/Controller/Rest/ParamOverriderCustomerIdTest.php @@ -45,7 +45,7 @@ class ParamOverriderCustomerIdTest extends \PHPUnit_Framework_TestCase ->method('getUserId') ->will($this->returnValue($retValue)); - $this->assertSame($retValue, $this->model->getOverridenValue()); + $this->assertSame($retValue, $this->model->getOverriddenValue()); } public function testGetOverridenValueIsNotCustomer() @@ -54,6 +54,6 @@ class ParamOverriderCustomerIdTest extends \PHPUnit_Framework_TestCase ->method('getUserType') ->will($this->returnValue(UserContextInterface::USER_TYPE_ADMIN)); - $this->assertNull($this->model->getOverridenValue()); + $this->assertNull($this->model->getOverriddenValue()); } } diff --git a/lib/internal/Magento/Framework/Webapi/Rest/Request/ParamOverriderInterface.php b/lib/internal/Magento/Framework/Webapi/Rest/Request/ParamOverriderInterface.php index 0403973a58ffccabb10ab11e496ee91c542b20e7..92d748e923eb148cadd2b8a2af7a8628116f2630 100644 --- a/lib/internal/Magento/Framework/Webapi/Rest/Request/ParamOverriderInterface.php +++ b/lib/internal/Magento/Framework/Webapi/Rest/Request/ParamOverriderInterface.php @@ -29,9 +29,9 @@ namespace Magento\Framework\Webapi\Rest\Request; interface ParamOverriderInterface { /** - * Returns the overriden value to use. + * Returns the overridden value to use. * * @return string|int|null */ - public function getOverridenValue(); + public function getOverriddenValue(); }