From f1aeee4b31cc14bbb312d692e5b105c85d20ae80 Mon Sep 17 00:00:00 2001
From: Michail Slabko <mslabko@ebay.com>
Date: Wed, 21 Oct 2015 14:05:48 +0300
Subject: [PATCH] =?UTF-8?q?MAGETWO-44055:=20[GITHUB]=20Admin=20product=20?=
=?UTF-8?q?=C2=ABCustom=20Options=C2=BB=20tab=20controls=20(=C2=ABImport?=
=?UTF-8?q?=20Options=C2=BB,=20=C2=ABAdd=20New=20Option=C2=BB=20buttons)?=
=?UTF-8?q?=20do=20not=20work=20when=20non-English=20locale=20is=20used=20?=
=?UTF-8?q?#1971=20-=20fix=20tests?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/code/Magento/Catalog/Model/CategoryLinkManagement.php | 2 +-
.../Test/Unit/Model/Config/Source/Product/Options/TypeTest.php | 2 +-
.../Catalog/view/adminhtml/templates/catalog/product/edit.phtml | 2 +-
.../adminhtml/templates/product/edit/attribute/search.phtml | 2 +-
.../Model/Product/Option/Type/File/ValidatorFileTest.php | 2 +-
lib/internal/Magento/Framework/View/Element/Html/Select.php | 1 +
.../Framework/View/Test/Unit/Element/Html/SelectTest.php | 2 +-
7 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/app/code/Magento/Catalog/Model/CategoryLinkManagement.php b/app/code/Magento/Catalog/Model/CategoryLinkManagement.php
index f0405be4621..4ff351dc3d7 100644
--- a/app/code/Magento/Catalog/Model/CategoryLinkManagement.php
+++ b/app/code/Magento/Catalog/Model/CategoryLinkManagement.php
@@ -45,7 +45,7 @@ class CategoryLinkManagement implements \Magento\Catalog\Api\CategoryLinkManagem
$links = [];
/** @var \Magento\Catalog\Model\Product $product */
- foreach ($products->getItems() as $productId => $product) {
+ foreach ($products->getItems() as $product) {
/** @var \Magento\Catalog\Api\Data\CategoryProductLinkInterface $link */
$link = $this->productLinkFactory->create();
$link->setSku($product->getSku())
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Config/Source/Product/Options/TypeTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Config/Source/Product/Options/TypeTest.php
index aa686d39ce8..3b3adabdfbc 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Config/Source/Product/Options/TypeTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Config/Source/Product/Options/TypeTest.php
@@ -51,7 +51,7 @@ class TypeTest extends \PHPUnit_Framework_TestCase
];
$expect = [
['value' => '', 'label' => __('-- Please select --')],
- ['label' => 'optionLabel', 'value' => [['label' => 'typeLabel', 'value' => 'typeName']]],
+ ['label' => 'optionLabel', 'optgroup-name' => 'optionLabel', 'value' => [['label' => 'typeLabel', 'value' => 'typeName']]],
];
$this->productOptionConfig->expects($this->any())->method('getAll')->will($this->returnValue($allOptions));
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit.phtml
index d21c1ee5ad8..30048cce246 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit.phtml
@@ -21,7 +21,7 @@
</button>
<ul class="dropdown-menu">
<li><input type="text" id="product-template-suggest" class="search"
- placeholder="<?php echo __('start typing to search template'); ?>"/></li>
+ placeholder="<?php /* @noEscape */ echo __('start typing to search template'); ?>"/></li>
</ul>
</div>
</div>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/product/edit/attribute/search.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/product/edit/attribute/search.phtml
index 4536143416c..8d2cca19f20 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/product/edit/attribute/search.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/product/edit/attribute/search.phtml
@@ -17,7 +17,7 @@
<input data-role="product-attribute-search"
data-group="<?php echo $block->escapeHtml($block->getGroupCode()); ?>"
class="search" type="text"
- placeholder="<?php echo __('start typing to search attribute'); ?>" />
+ placeholder="<?php /* @noEscape */ echo __('start typing to search attribute'); ?>" />
</div>
</div>
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Option/Type/File/ValidatorFileTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Option/Type/File/ValidatorFileTest.php
index a22645bf6b7..b005c52813a 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Option/Type/File/ValidatorFileTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Option/Type/File/ValidatorFileTest.php
@@ -16,7 +16,7 @@ class ValidatorFileTest extends \PHPUnit_Framework_TestCase
protected $model;
/**
- * @var \Magento\Framework\ObjectManager
+ * @var \Magento\Framework\ObjectManagerInterface
*/
protected $objectManager;
diff --git a/lib/internal/Magento/Framework/View/Element/Html/Select.php b/lib/internal/Magento/Framework/View/Element/Html/Select.php
index 1bdbd099cc7..884c11fe919 100644
--- a/lib/internal/Magento/Framework/View/Element/Html/Select.php
+++ b/lib/internal/Magento/Framework/View/Element/Html/Select.php
@@ -125,6 +125,7 @@ class Select extends \Magento\Framework\View\Element\AbstractBlock
* @return string
*
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
protected function _toHtml()
{
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Element/Html/SelectTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Element/Html/SelectTest.php
index d3660f32178..3321d1eeaf8 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Element/Html/SelectTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Element/Html/SelectTest.php
@@ -127,7 +127,7 @@ class SelectTest extends \PHPUnit_Framework_TestCase
. '<option value="testValue" paramKey="paramValue" >testLabel</option>'
. '<option value="selectedValue" selected="selected" paramKey="paramValue" '
. ' paramKey2="paramValue2" >selectedLabel</option>'
- . '<optgroup label="groupLabel">'
+ . '<optgroup label="groupLabel" data-optgroup-name="groupLabel">'
. '<option value="groupElementValue" >GroupElementLabel</option>'
. '<option value="selectedGroupElementValue" selected="selected" >SelectedGroupElementLabel</option>'
. '</optgroup>'
--
GitLab