MAGETWO-56964: [Backport] [GitHub] Validate attribute values #4881

Sergey Shvets · Sergey Shvets · commit b91b2a9f81bf · 2016-09-28T14:01:38.000+03:00
fixed CR comments
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Validate.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Validate.php
@@ -149,14 +149,12 @@ private function setMessageToResponse($response, $messages)
     /**
      * @param DataObject $response
      * @param array|null $options
-     * @return $this
      */
     private function checkUniqueOption(DataObject $response, array $options = null)
     {
-        if (is_array($options) and !$this->isUniqueAdminValues($options['value'], $options['delete'])) {
+        if (is_array($options) && !$this->isUniqueAdminValues($options['value'], $options['delete'])) {
             $this->setMessageToResponse($response, [__('The value of Admin must be unique.')]);
             $response->setError(true);
         }
-        return $this;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -149,14 +149,12 @@ private function setMessageToResponse($response, $messages)`
`149`	`149`	`/**`
`150`	`150`	`* @param DataObject $response`
`151`	`151`	`* @param array\|null $options`
`152`		`- * @return $this`
`153`	`152`	`*/`
`154`	`153`	`private function checkUniqueOption(DataObject $response, array $options = null)`
`155`	`154`	`{`
`156`		`- if (is_array($options) and !$this->isUniqueAdminValues($options['value'], $options['delete'])) {`
	`155`	`+ if (is_array($options) && !$this->isUniqueAdminValues($options['value'], $options['delete'])) {`
`157`	`156`	`$this->setMessageToResponse($response, [__('The value of Admin must be unique.')]);`
`158`	`157`	`$response->setError(true);`
`159`	`158`	`}`
`160`		`- return $this;`
`161`	`159`	`}`
`162`	`160`	`}`