MAGETWO-36189: Customer-facing resources in Sales & Checkout APIs - "/mine" APIs

Bryant Luk · Bryant Luk · commit 912c613d74a2 · 2015-04-21T18:10:21.000-05:00
- Fix misspelling of overriden to overridden
diff --git a/app/code/Magento/Quote/Model/Webapi/ParamOverriderCartId.php b/app/code/Magento/Quote/Model/Webapi/ParamOverriderCartId.php
@@ -43,7 +43,7 @@ public function __construct(
     /**
      * {@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
@@ -64,7 +64,7 @@ public function testGetOverridenValueIsCustomerAndCartExists()
             ->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 @@ public function testGetOverridenValueIsCustomerAndCartDoesNotExist()
             ->with($customerId)
             ->will($this->throwException(new NoSuchEntityException()));
 
-        $this->assertNull($this->model->getOverridenValue());
+        $this->assertNull($this->model->getOverriddenValue());
     }
 
     public function testGetOverridenValueIsCustomerAndCartIsNull()
@@ -102,7 +102,7 @@ public function testGetOverridenValueIsCustomerAndCartIsNull()
             ->with($customerId)
             ->will($this->returnValue(null));
 
-        $this->assertNull($this->model->getOverridenValue());
+        $this->assertNull($this->model->getOverriddenValue());
     }
 
     public function testGetOverridenValueIsNotCustomer()
@@ -111,6 +111,6 @@ public function testGetOverridenValueIsNotCustomer()
             ->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
@@ -32,7 +32,7 @@ public function __construct(UserContextInterface $userContext)
     /**
      * {@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
@@ -44,7 +44,7 @@ public function override(array $inputData, array $parameters)
             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
@@ -45,7 +45,7 @@ public function testGetOverridenValueIsCustomer()
             ->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 @@ public function testGetOverridenValueIsNotCustomer()
             ->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
@@ -29,9 +29,9 @@
 interface ParamOverriderInterface
 {
     /**
-     * Returns the overriden value to use.
+     * Returns the overridden value to use.
      *
      * @return string|int|null
      */
-    public function getOverridenValue();
+    public function getOverriddenValue();
 }

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public function __construct(`
`43`	`43`	`/**`
`44`	`44`	`* {@inheritDoc}`
`45`	`45`	`*/`
`46`		`- public function getOverridenValue()`
	`46`	`+ public function getOverriddenValue()`
`47`	`47`	`{`
`48`	`48`	`try {`
`49`	`49`	`if ($this->userContext->getUserType() === UserContextInterface::USER_TYPE_CUSTOMER) {`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ public function testGetOverridenValueIsCustomerAndCartExists()`
`64`	`64`	`->method('getId')`
`65`	`65`	`->will($this->returnValue($retValue));`
`66`	`66`
`67`		`- $this->assertSame($retValue, $this->model->getOverridenValue());`
	`67`	`+ $this->assertSame($retValue, $this->model->getOverriddenValue());`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`public function testGetOverridenValueIsCustomerAndCartDoesNotExist()`
`@@ -83,7 +83,7 @@ public function testGetOverridenValueIsCustomerAndCartDoesNotExist()`
`83`	`83`	`->with($customerId)`
`84`	`84`	`->will($this->throwException(new NoSuchEntityException()));`
`85`	`85`
`86`		`- $this->assertNull($this->model->getOverridenValue());`
	`86`	`+ $this->assertNull($this->model->getOverriddenValue());`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`public function testGetOverridenValueIsCustomerAndCartIsNull()`
`@@ -102,7 +102,7 @@ public function testGetOverridenValueIsCustomerAndCartIsNull()`
`102`	`102`	`->with($customerId)`
`103`	`103`	`->will($this->returnValue(null));`
`104`	`104`
`105`		`- $this->assertNull($this->model->getOverridenValue());`
	`105`	`+ $this->assertNull($this->model->getOverriddenValue());`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`public function testGetOverridenValueIsNotCustomer()`
`@@ -111,6 +111,6 @@ public function testGetOverridenValueIsNotCustomer()`
`111`	`111`	`->method('getUserType')`
`112`	`112`	`->will($this->returnValue(UserContextInterface::USER_TYPE_ADMIN));`
`113`	`113`
`114`		`- $this->assertNull($this->model->getOverridenValue());`
	`114`	`+ $this->assertNull($this->model->getOverriddenValue());`
`115`	`115`	`}`
`116`	`116`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public function __construct(UserContextInterface $userContext)`
`32`	`32`	`/**`
`33`	`33`	`* {@inheritDoc}`
`34`	`34`	`*/`
`35`		`- public function getOverridenValue()`
	`35`	`+ public function getOverriddenValue()`
`36`	`36`	`{`
`37`	`37`	`if ($this->userContext->getUserType() === UserContextInterface::USER_TYPE_CUSTOMER) {`
`38`	`38`	`return $this->userContext->getUserId();`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public function override(array $inputData, array $parameters)`
`44`	`44`	`if ($paramData[Converter::KEY_FORCE] \|\| !$this->isNestedArrayValueSet($inputData, $arrayKeys)) {`
`45`	`45`	`$paramValue = $paramData[Converter::KEY_VALUE];`
`46`	`46`	`if (isset($this->paramOverriders[$paramValue])) {`
`47`		`- $value = $this->paramOverriders[$paramValue]->getOverridenValue();`
	`47`	`+ $value = $this->paramOverriders[$paramValue]->getOverriddenValue();`
`48`	`48`	`} else {`
`49`	`49`	`$value = $paramData[Converter::KEY_VALUE];`
`50`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public function testGetOverridenValueIsCustomer()`
`45`	`45`	`->method('getUserId')`
`46`	`46`	`->will($this->returnValue($retValue));`
`47`	`47`
`48`		`- $this->assertSame($retValue, $this->model->getOverridenValue());`
	`48`	`+ $this->assertSame($retValue, $this->model->getOverriddenValue());`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`public function testGetOverridenValueIsNotCustomer()`
`@@ -54,6 +54,6 @@ public function testGetOverridenValueIsNotCustomer()`
`54`	`54`	`->method('getUserType')`
`55`	`55`	`->will($this->returnValue(UserContextInterface::USER_TYPE_ADMIN));`
`56`	`56`
`57`		`- $this->assertNull($this->model->getOverridenValue());`
	`57`	`+ $this->assertNull($this->model->getOverriddenValue());`
`58`	`58`	`}`
`59`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,9 +29,9 @@`
`29`	`29`	`interface ParamOverriderInterface`
`30`	`30`	`{`
`31`	`31`	`/**`
`32`		`- * Returns the overriden value to use.`
	`32`	`+ * Returns the overridden value to use.`
`33`	`33`	`*`
`34`	`34`	`* @return string\|int\|null`
`35`	`35`	`*/`
`36`		`- public function getOverridenValue();`
	`36`	`+ public function getOverriddenValue();`
`37`	`37`	`}`