Merge branch 'MAGETWO-55814' of github.com:magento-east/magento2ce into MAGETWO-55814

vzabaznov · vzabaznov · commit 017f2e0794b5 · 2016-07-25T09:58:04.000+03:00
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Validate.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Validate.php
@@ -39,8 +39,7 @@ public function __construct(
         \Magento\Framework\View\Result\PageFactory $resultPageFactory,
         \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory,
         \Magento\Framework\View\LayoutFactory $layoutFactory
-    )
-    {
+    ) {
         parent::__construct($context, $attributeLabelCache, $coreRegistry, $resultPageFactory);
         $this->resultJsonFactory = $resultJsonFactory;
         $this->layoutFactory = $layoutFactory;
@@ -91,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());
     }
 
@@ -109,7 +103,7 @@ public function execute()
      */
     private function isUniqueAdminValues(array $optionsValues, array $deletedOptions)
     {
-        $adminValues = array();
+        $adminValues = [];
         foreach ($optionsValues as $optionKey => $values) {
             if (!(isset($deletedOptions[$optionKey]) and $deletedOptions[$optionKey] === '1')) {
                 $adminValues[] = reset($values);
@@ -134,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;
+    }
 }
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/options.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/options.phtml
@@ -11,17 +11,21 @@
 $stores = $block->getStoresSortedBySortOrder();
 ?>
 <fieldset class="fieldset">
-    <legend class="legend"><span><?php /* @escapeNotVerified */ echo __('Manage Options (Values of Your Attribute)') ?></span></legend>
+    <legend class="legend">
+        <span><?php echo $block->escapeHtml(__('Manage Options (Values of Your Attribute)')); ?></span>
+    </legend>
     <div id="manage-options-panel" data-index="attribute_options_select_container">
         <table class="admin__control-table" data-index="attribute_options_select">
             <thead>
                 <tr id="attribute-options-table">
                     <th class="col-draggable"></th>
-                    <th class="col-default control-table-actions-th"><span><?php /* @escapeNotVerified */ echo __('Is Default') ?></span></th>
+                    <th class="col-default control-table-actions-th">
+                        <span><?php echo $block->escapeHtml(__('Is Default')); ?></span>
+                    </th>
                     <?php
                     foreach ($stores as $_store): ?>
                         <th<?php if ($_store->getId() == \Magento\Store\Model\Store::DEFAULT_STORE_ID): ?> class="_required"<?php endif; ?>>
-                            <span><?php /* @escapeNotVerified */ echo __($_store->getName()) ?></span>
+                            <span><?php echo $block->escapeHtml(__($_store->getName())) ?></span>
                         </th>
                     <?php endforeach;
                     $storetotal = count($stores) + 3;
@@ -32,17 +36,18 @@ $stores = $block->getStoresSortedBySortOrder();
             <tbody data-role="options-container" class="ignore-validate"></tbody>
             <tfoot>
             <tr>
-                <th colspan="<?php /* @escapeNotVerified */ echo $storetotal; ?>" class="validation">
+                <th colspan="<?php echo (int)$storetotal; ?>" class="validation">
                     <input type="hidden" class="required-dropdown-attribute-entry" name="dropdown_attribute_validation"/>
                     <input type="hidden" class="required-dropdown-attribute-unique" name="dropdown_attribute_validation_unique"/>
                 </th>
             </tr>
             <tr>
-                <th colspan="<?php /* @escapeNotVerified */ echo $storetotal; ?>" class="col-actions-add">
+                <th colspan="<?php echo (int) $storetotal; ?>" class="col-actions-add">
                     <?php if (!$block->getReadOnly() && !$block->canManageOptionDefaultOnly()):?>
-                        <button id="add_new_option_button" data-action="add_new_row" title="<?php /* @escapeNotVerified */ echo __('Add Option'); ?>"
-                            type="button" class="action- scalable add">
-                             <span><?php /* @escapeNotVerified */ echo __('Add Option'); ?></span>
+                        <button id="add_new_option_button" data-action="add_new_row"
+                                title="<?php echo $block->escapeHtml(__('Add Option')); ?>"
+                                type="button" class="action- scalable add">
+                            <span><?php echo $block->escapeHtml(__('Add Option')); ?></span>
                         </button>
                     <?php endif; ?>
                 </th>
@@ -55,23 +60,25 @@ $stores = $block->getStoresSortedBySortOrder();
          <tr>
             <td class="col-draggable">
                 <?php if (!$block->getReadOnly() && !$block->canManageOptionDefaultOnly()): ?>
-                    <div data-role="draggable-handle" class="draggable-handle" title="<?php /* @escapeNotVerified */ echo __('Sort Option'); ?>"></div>
+                    <div data-role="draggable-handle" class="draggable-handle"
+                         title="<?php echo $block->escapeHtml(__('Sort Option')); ?>">
+                    </div>
                 <?php endif; ?>
                 <input data-role="order" type="hidden" name="option[order][<%- data.id %>]"  value="<%- data.sort_order %>" <?php if ($block->getReadOnly() || $block->canManageOptionDefaultOnly()): ?> disabled="disabled"<?php endif; ?>/>
             </td>
             <td class="col-default control-table-actions-cell">
                 <input class="input-radio" type="<%- data.intype %>" name="default[]" value="<%- data.id %>" <%- data.checked %><?php if ($block->getReadOnly()):?>disabled="disabled"<?php endif;?>/>
             </td>
             <?php foreach ($stores as $_store): ?>
-            <td class="col-<%- data.id %>"><input name="option[value][<%- data.id %>][<?php /* @escapeNotVerified */ echo $_store->getId() ?>]" value="<%- data.store<?php /* @escapeNotVerified */ echo $_store->getId() ?> %>" class="input-text<?php if ($_store->getId() == \Magento\Store\Model\Store::DEFAULT_STORE_ID): ?> required-option required-unique<?php endif; ?>" type="text" <?php if ($block->getReadOnly() || $block->canManageOptionDefaultOnly()):?> disabled="disabled"<?php endif;?>/></td>
+            <td class="col-<%- data.id %>"><input name="option[value][<%- data.id %>][<?php echo (int) $_store->getId() ?>]" value="<%- data.store<?php /* @noEscape */ echo (int) $_store->getId() ?> %>" class="input-text<?php if ($_store->getId() == \Magento\Store\Model\Store::DEFAULT_STORE_ID): ?> required-option required-unique<?php endif; ?>" type="text" <?php if ($block->getReadOnly() || $block->canManageOptionDefaultOnly()):?> disabled="disabled"<?php endif;?>/></td>
             <?php endforeach; ?>
             <td id="delete_button_container_<%- data.id %>" class="col-delete">
                 <input type="hidden" class="delete-flag" name="option[delete][<%- data.id %>]" value="" />
                 <?php if (!$block->getReadOnly() && !$block->canManageOptionDefaultOnly()):?>
-                    <button id="delete_button_<%- data.id %>" title="<?php /* @escapeNotVerified */ echo __('Delete') ?>" type="button"
+                    <button id="delete_button_<%- data.id %>" title="<?php echo $block->escapeHtml(__('Delete'));?>" type="button"
                         class="action- scalable delete delete-option"
                         >
-                        <span><?php /* @escapeNotVerified */ echo __('Delete') ?></span>
+                        <span><?php echo $block->escapeHtml(__('Delete')) ?></span>
                     </button>
                 <?php endif;?>
             </td>
@@ -94,7 +101,7 @@ $stores = $block->getStoresSortedBySortOrder();
                 },
                 "Magento_Catalog/catalog/product/attribute/unique-validate": {
                     "element": "required-dropdown-attribute-unique",
-                    "message": "<?php echo __("The value of Admin must be unique.") ?>"
+                    "message": "<?php echo $block->escapeHtml(__("The value of Admin must be unique.")); ?>"
                 }
             }
         }
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/catalog/product/attribute/unique-validate.js b/app/code/Magento/Catalog/view/adminhtml/web/catalog/product/attribute/unique-validate.js
@@ -3,8 +3,6 @@
  * See COPYING.txt for license details.
  */
 
-/* global $break $ $$ */
-
 define([
     'jquery',
     'mage/backend/validation'
@@ -14,28 +12,30 @@ define([
     return function (config) {
         var _config = jQuery.extend({
             element: null,
-            message: "",
+            message: '',
             uniqueClass: 'required-unique'
         }, config);
 
-        if (typeof _config.element === "string") {
+        if (typeof _config.element === 'string') {
             jQuery.validator.addMethod(
                 _config.element,
 
                 function (value, element) {
                     var inputs = jQuery(element)
-                            .closest("table")
-                            .find('.' + _config.uniqueClass + ":visible"),
+                            .closest('table')
+                            .find('.' + _config.uniqueClass + ':visible'),
                         valuesHash = {},
                         isValid = true;
 
                     inputs.each(function (el) {
                         var inputValue = inputs[el].value;
-                        if (typeof valuesHash[inputValue] !== "undefined") {
+
+                        if (typeof valuesHash[inputValue] !== 'undefined') {
                             isValid = false;
                         }
                         valuesHash[inputValue] = el;
                     });
+
                     return isValid;
                 },
 
diff --git a/app/code/Magento/Swatches/Controller/Adminhtml/Product/Attribute/Plugin/Validate.php b/app/code/Magento/Swatches/Controller/Adminhtml/Product/Attribute/Plugin/Validate.php
@@ -19,7 +19,7 @@ class Validate
     /**
      * @param Attribute\Validate $subject
      * @param Json $response
-     * @return array
+     * @return \Magento\Framework\Controller\ResultInterface
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function afterExecute(Attribute\Validate $subject, Json $response)
@@ -57,7 +57,7 @@ public function afterExecute(Attribute\Validate $subject, Json $response)
      */
     private function isUniqueAdminValues(array $optionsValues, array $deletedOptions)
     {
-        $adminValues = array();
+        $adminValues = [];
         foreach ($optionsValues as $optionKey => $values) {
             if (!(isset($deletedOptions[$optionKey]) and $deletedOptions[$optionKey] === '1')) {
                 $adminValues[] = reset($values);
diff --git a/app/code/Magento/Swatches/Test/Unit/Controller/Adminhtml/Product/Attribute/Plugin/ValidateTest.php b/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 [
diff --git a/app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/text.phtml b/app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/text.phtml
@@ -88,7 +88,7 @@ $stores = $block->getStoresSortedBySortOrder();
                            value="<%- data.store<?php /* @noEscape */ echo $storeId; ?> %>"
                            class="input-text<?php if ($storeId == \Magento\Store\Model\Store::DEFAULT_STORE_ID): ?> required-option<?php endif; ?>"
                            type="text" <?php if ($block->getReadOnly() || $block->canManageOptionDefaultOnly()):?> disabled="disabled"<?php endif;?>
-                           placeholder="<?php echo __("Description"); ?>" />
+                           placeholder="<?php echo $block->escapeHtml(__("Description")); ?>"/>
                 </td>
             <?php endforeach; ?>
             <td id="delete_button_swatch_container_<%- data.id %>" class="col-delete">
@@ -108,7 +108,7 @@ $stores = $block->getStoresSortedBySortOrder();
                 "Magento_Swatches/js/text": <?php /* @escapeNotVerified */ echo $block->getJsonConfig(); ?> ,
                 "Magento_Catalog/catalog/product/attribute/unique-validate": {
                     "element": "required-text-swatch-unique",
-                    "message": "<?php echo __("The value of Admin must be unique.") ?>"
+                    "message": "<?php echo $block->escapeHtml(__("The value of Admin must be unique.")); ?>"
                 }
             }
         }
diff --git a/app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/visual.phtml b/app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/visual.phtml

Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,10 @@ public function testAfterExecute(array $dataRequest, $isError)`
`53`	`53`	`$controller->afterExecute($subject, $response);`
`54`	`54`	`}`
`55`	`55`
	`56`	`+ /**`
	`57`	`+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)`
	`58`	`+ * @return array`
	`59`	`+ */`
`56`	`60`	`public function providerData()`
`57`	`61`	`{`
`58`	`62`	`return [`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ $stores = $block->getStoresSortedBySortOrder();`
`88`	`88`	`value="<%- data.store<?php /* @noEscape */ echo $storeId; ?> %>"`
`89`	`89`	`class="input-text<?php if ($storeId == \Magento\Store\Model\Store::DEFAULT_STORE_ID): ?> required-option<?php endif; ?>"`
`90`	`90`	`type="text" <?php if ($block->getReadOnly() \|\| $block->canManageOptionDefaultOnly()):?> disabled="disabled"<?php endif;?>`
`91`		`- placeholder="<?php echo __("Description"); ?>" />`
	`91`	`+ placeholder="<?php echo $block->escapeHtml(__("Description")); ?>"/>`
`92`	`92`	`</td>`
`93`	`93`	`<?php endforeach; ?>`
`94`	`94`	`<td id="delete_button_swatch_container_<%- data.id %>" class="col-delete">`
`@@ -108,7 +108,7 @@ $stores = $block->getStoresSortedBySortOrder();`
`108`	`108`	`"Magento_Swatches/js/text": <?php /* @escapeNotVerified */ echo $block->getJsonConfig(); ?> ,`
`109`	`109`	`"Magento_Catalog/catalog/product/attribute/unique-validate": {`
`110`	`110`	`"element": "required-text-swatch-unique",`
`111`		`- "message": "<?php echo __("The value of Admin must be unique.") ?>"`
	`111`	`+ "message": "<?php echo $block->escapeHtml(__("The value of Admin must be unique.")); ?>"`
`112`	`112`	`}`
`113`	`113`	`}`
`114`	`114`	`}`