Merge branch '2.1-develop' into 2.1.15-develop

Author: Dmytro Voskoboinikov

app/code/Magento/Captcha/Test/Unit/Observer/CaptchaStringResolverTest.php

@@ -0,0 +1,68 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Captcha\Test\Unit\Observer;
+
+use Magento\Captcha\Helper\Data as CaptchaDataHelper;
+use Magento\Captcha\Observer\CaptchaStringResolver;
+use Magento\Framework\App\Request\Http as HttpRequest;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+
+class CaptchaStringResolverTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var ObjectManager
+     */
+    private $objectManagerHelper;
+
+    /**
+     * @var CaptchaStringResolver
+     */
+    private $captchaStringResolver;
+
+    /**
+     * @var HttpRequest|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $requestMock;
+
+    protected function setUp()
+    {
+        $this->objectManagerHelper = new ObjectManager($this);
+        $this->requestMock = $this->getMock(HttpRequest::class, [], [], '', false);
+        $this->captchaStringResolver = $this->objectManagerHelper->getObject(CaptchaStringResolver::class);
+    }
+
+    public function testResolveWithFormIdSet()
+    {
+        $formId = 'contact_us';
+        $captchaValue = 'some-value';
+
+        $this->requestMock->expects($this->once())
+            ->method('getPost')
+            ->with(CaptchaDataHelper::INPUT_NAME_FIELD_VALUE)
+            ->willReturn([$formId => $captchaValue]);
+
+        self::assertEquals(
+            $this->captchaStringResolver->resolve($this->requestMock, $formId),
+            $captchaValue
+        );
+    }
+
+    public function testResolveWithNoFormIdInRequest()
+    {
+        $formId = 'contact_us';
+
+        $this->requestMock->expects($this->once())
+            ->method('getPost')
+            ->with(CaptchaDataHelper::INPUT_NAME_FIELD_VALUE)
+            ->willReturn([]);
+
+        self::assertEquals(
+            $this->captchaStringResolver->resolve($this->requestMock, $formId),
+            ''
+        );
+    }
+}

app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php

@@ -325,7 +325,7 @@ public function getBreadcrumbsJavascript($path, $javascriptVarName)
      *
      * @param Node|array $node
      * @param int $level
-     * @return string
+     * @return array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */

app/code/Magento/Catalog/Block/Adminhtml/Category/Widget/Chooser.php

@@ -144,7 +144,7 @@ function (node, e) {
      *
      * @param \Magento\Framework\Data\Tree\Node|array $node
      * @param int $level
-     * @return string
+     * @return array
      */
     protected function _getNodeJson($node, $level = 0)
     {

app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Fieldset/Element.php

@@ -21,7 +21,7 @@ class Element extends \Magento\Backend\Block\Widget\Form\Renderer\Fieldset\Eleme
     /**
      * Retrieve data object related with form
      *
-     * @return \Magento\Catalog\Model\Product || \Magento\Catalog\Model\Category
+     * @return \Magento\Catalog\Model\Product|\Magento\Catalog\Model\Category
      */
     public function getDataObject()
     {

app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Grid.php

@@ -101,8 +101,7 @@ protected function _prepareColumns()
                 'type' => 'options',
                 'options' => ['1' => __('Yes'), '0' => __('No')],
                 'align' => 'center'
-            ],
-            'is_user_defined'
+            ]
         );
 
         $this->_eventManager->dispatch('product_attribute_grid_build', ['grid' => $this]);

app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Attributes/Search.php

@@ -81,7 +81,7 @@ public function getSelectorOptions()
      *
      * @param string $labelPart
      * @param int $templateId
-     * @return \Magento\Catalog\Model\ResourceModel\Product\Attribute\Collection
+     * @return array
      */
     public function getSuggestedAttributes($labelPart, $templateId = null)
     {

app/code/Magento/Catalog/Block/Adminhtml/Rss/Grid/Link.php

@@ -69,7 +69,7 @@ public function isRssAllowed()
     }
 
     /**
-     * @return string
+     * @return array
      */
     protected function getLinkParams()
     {

app/code/Magento/Catalog/Block/Category/Rss/Link.php

@@ -60,7 +60,7 @@ public function getLabel()
     }
 
     /**
-     * @return string
+     * @return array
      */
     protected function getLinkParams()
     {

app/code/Magento/Catalog/Block/Product/AbstractProduct.php

@@ -186,7 +186,7 @@ public function getAddToCompareUrl()
      * Gets minimal sales quantity
      *
      * @param \Magento\Catalog\Model\Product $product
-     * @return int|null
+     * @return float|null
      */
     public function getMinimalQty($product)
     {

app/code/Magento/Catalog/Block/Product/View/Options/AbstractOptions.php

@@ -174,7 +174,7 @@ public function getPrice($price, $includingTax = null)
      * Returns price converted to current currency rate
      *
      * @param float $price
-     * @return float
+     * @return float|string
      */
     public function getCurrencyPrice($price)
     {