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

Bryant Luk · Bryant Luk · commit 9fde44321308 · 2015-04-20T09:45:31.000-05:00
- Fix for code review comments
diff --git a/app/code/Magento/Quote/Model/Webapi/ParamOverriderCartId.php b/app/code/Magento/Quote/Model/Webapi/ParamOverriderCartId.php
@@ -33,7 +33,8 @@ public function __construct(
         $this->cartManagement = $cartManagement;
     }
 
-    public function getOverridenValue() {
+    public function getOverridenValue()
+    {
         if ($this->userContext->getUserType() === UserContextInterface::USER_TYPE_CUSTOMER) {
             $customerId = $this->userContext->getUserId();
 
diff --git a/app/code/Magento/Quote/etc/di.xml b/app/code/Magento/Quote/etc/di.xml
@@ -38,7 +38,7 @@
 
     <type name="Magento\Webapi\Controller\Rest\ParamsOverrider">
         <arguments>
-            <argument name="paramsOverrider" xsi:type="array">
+            <argument name="paramOverriders" xsi:type="array">
                 <item name="%cart_id%" xsi:type="object">Magento\Quote\Model\Webapi\ParamOverriderCartId</item>
             </argument>
         </arguments>
diff --git a/app/code/Magento/Webapi/Controller/Rest/ParamOverriderCustomerId.php b/app/code/Magento/Webapi/Controller/Rest/ParamOverriderCustomerId.php
@@ -19,11 +19,13 @@ class ParamOverriderCustomerId implements ParamOverriderInterface
      */
     private $userContext;
 
-    public function __construct(UserContextInterface $userContext) {
+    public function __construct(UserContextInterface $userContext)
+    {
         $this->userContext = $userContext;
     }
 
-    public function getOverridenValue() {
+    public function getOverridenValue()
+    {
         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
@@ -17,17 +17,17 @@ class ParamsOverrider
     /**
      * @var ParamOverriderInterface[]
      */
-    private $paramsOverrider;
+    private $paramOverriders;
 
     /**
      * Initialize dependencies
      *
      * @param ParamOverriderInterface[] $paramOverriders
      */
     public function __construct(
-        array $paramsOverrider = []
+        array $paramOverriders = []
     ) {
-        $this->paramsOverrider = $paramsOverrider;
+        $this->paramOverriders = $paramOverriders;
     }
 
     /**
@@ -43,8 +43,8 @@ public function override(array $inputData, array $parameters)
             $arrayKeys = explode('.', $name);
             if ($paramData[Converter::KEY_FORCE] || !$this->isNestedArrayValueSet($inputData, $arrayKeys)) {
                 $paramValue = $paramData[Converter::KEY_VALUE];
-                if (isset($this->paramsOverrider[$paramValue])) {
-                    $value = $this->paramsOverrider[$paramValue]->getOverridenValue();
+                if (isset($this->paramOverrider[$paramValue])) {
+                    $value = $this->paramOverrider[$paramValue]->getOverridenValue();
                 } else {
                     $value = $paramData[Converter::KEY_VALUE];
                 }
diff --git a/app/code/Magento/Webapi/etc/di.xml b/app/code/Magento/Webapi/etc/di.xml
@@ -32,7 +32,7 @@
     </type>
     <type name="Magento\Webapi\Controller\Rest\ParamsOverrider">
         <arguments>
-            <argument name="paramsOverrider" xsi:type="array">
+            <argument name="paramOverriders" xsi:type="array">
                 <item name="%customer_id%" xsi:type="object">Magento\Webapi\Controller\Rest\ParamOverriderCustomerId</item>
             </argument>
         </arguments>

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,8 @@ public function __construct(`
`33`	`33`	`$this->cartManagement = $cartManagement;`
`34`	`34`	`}`
`35`	`35`
`36`		`- public function getOverridenValue() {`
	`36`	`+ public function getOverridenValue()`
	`37`	`+ {`
`37`	`38`	`if ($this->userContext->getUserType() === UserContextInterface::USER_TYPE_CUSTOMER) {`
`38`	`39`	`$customerId = $this->userContext->getUserId();`
`39`	`40`
Original file line number	Diff line number	Diff line change
`@@ -19,11 +19,13 @@ class ParamOverriderCustomerId implements ParamOverriderInterface`
`19`	`19`	`*/`
`20`	`20`	`private $userContext;`
`21`	`21`
`22`		`- public function __construct(UserContextInterface $userContext) {`
	`22`	`+ public function __construct(UserContextInterface $userContext)`
	`23`	`+ {`
`23`	`24`	`$this->userContext = $userContext;`
`24`	`25`	`}`
`25`	`26`
`26`		`- public function getOverridenValue() {`
	`27`	`+ public function getOverridenValue()`
	`28`	`+ {`
`27`	`29`	`if ($this->userContext->getUserType() === UserContextInterface::USER_TYPE_CUSTOMER) {`
`28`	`30`	`return $this->userContext->getUserId();`
`29`	`31`	`}`