MAGETWO-55814: East team cadenece 3 PR

fixed static tests

Author: Sergey Shvets

app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Validate.php

@@ -90,13 +90,8 @@ public function execute()
             }
         }
 
-        $options = $this->getRequest()->getParam("option");
-        if (is_array($options)) {
-            if (!$this->isUniqueAdminValues($options['value'], $options['delete'])) {
-                $this->setMessageToResponse($response, [__("The value of Admin must be unique.")]);
-                $response->setError(true);
-            };
-        }
+        $this->checkUniqueOption($response);
+
         return $this->resultJsonFactory->create()->setJsonData($response->toJson());
     }
 
@@ -133,4 +128,18 @@ private function setMessageToResponse($response, $messages)
         }
         return $response->setData($messageKey, $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'])) {
+            $this->setMessageToResponse($response, [__("The value of Admin must be unique.")]);
+            $response->setError(true);
+        }
+        return $this;
+    }
 }

app/code/Magento/Swatches/Test/Unit/Controller/Adminhtml/Product/Attribute/Plugin/ValidateTest.php

@@ -53,6 +53,10 @@ public function testAfterExecute(array $dataRequest, $isError)
         $controller->afterExecute($subject, $response);
     }
 
+    /**
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     * @return array
+     */
     public function providerData()
     {
         return [