From 912c613d74a25210df0ed75e7d78b0e6bbffd171 Mon Sep 17 00:00:00 2001
From: Bryant Luk <bluk@ebay.com>
Date: Tue, 21 Apr 2015 18:08:17 -0500
Subject: [PATCH] MAGETWO-36189: Customer-facing resources in Sales & Checkout
APIs - "/mine" APIs
- Fix misspelling of overriden to overridden
---
.../Magento/Quote/Model/Webapi/ParamOverriderCartId.php | 2 +-
.../Test/Unit/Model/Webapi/ParamOverriderCartIdTest.php | 8 ++++----
.../Webapi/Controller/Rest/ParamOverriderCustomerId.php | 2 +-
.../Magento/Webapi/Controller/Rest/ParamsOverrider.php | 2 +-
.../Unit/Controller/Rest/ParamOverriderCustomerIdTest.php | 4 ++--
.../Webapi/Rest/Request/ParamOverriderInterface.php | 4 ++--
6 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/app/code/Magento/Quote/Model/Webapi/ParamOverriderCartId.php b/app/code/Magento/Quote/Model/Webapi/ParamOverriderCartId.php
index 8bb62f55c52..3f5b280d505 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 f5021057eef..06945b656e6 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 e8fee7eeea4..09a27569293 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 5a998602fc9..f7b4f4605a7 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 94d9ff01329..8e46dccd6e2 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 0403973a58f..92d748e923e 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();
}
--
GitLab