Merge remote-tracking branch 'github-magento2ce/MAGETWO-91751' into EPAM-PR-18

Author: nikshostko

app/code/Magento/Widget/Model/Widget.php

@@ -84,6 +84,8 @@ public function __construct(
     }
 
     /**
+     * Get math random
+     *
      * @return \Magento\Framework\Math\Random
      *
      * @deprecated 100.1.0
@@ -315,7 +317,7 @@ public function getWidgetDeclaration($type, $params = [], $asIs = true)
                 }
             }
             if (isset($value)) {
-                $directive .= sprintf(' %s="%s"', $name, $this->escaper->escapeQuote($value));
+                $directive .= sprintf(' %s="%s"', $name, $this->escaper->escapeHtmlAttr($value, false));
             }
         }
 
@@ -339,6 +341,8 @@ public function getWidgetDeclaration($type, $params = [], $asIs = true)
     }
 
     /**
+     * Get widget page varname
+     *
      * @param array $params
      * @return string
      * @throws \Magento\Framework\Exception\LocalizedException

app/code/Magento/Widget/Test/Unit/Model/WidgetTest.php

@@ -32,6 +32,9 @@ class WidgetTest extends \PHPUnit\Framework\TestCase
      */
     private $conditionsHelper;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $this->dataStorageMock = $this->getMockBuilder(\Magento\Widget\Model\Config\Data::class)
@@ -55,6 +58,9 @@ protected function setUp()
         );
     }
 
+    /**
+     * Unit test for getWidget
+     */
     public function testGetWidgets()
     {
         $expected = ['val1', 'val2'];
@@ -65,6 +71,9 @@ public function testGetWidgets()
         $this->assertEquals($expected, $result);
     }
 
+    /**
+     * Unit test for getWidgetsWithFilter
+     */
     public function testGetWidgetsWithFilter()
     {
         $configFile = __DIR__ . '/_files/mappedConfigArrayAll.php';
@@ -78,6 +87,9 @@ public function testGetWidgetsWithFilter()
         $this->assertEquals($expected, $result);
     }
 
+    /**
+     * Unit test for getWidgetsWithUnknownFilter
+     */
     public function testGetWidgetsWithUnknownFilter()
     {
         $configFile = __DIR__ . '/_files/mappedConfigArrayAll.php';
@@ -90,6 +102,9 @@ public function testGetWidgetsWithUnknownFilter()
         $this->assertEquals($expected, $result);
     }
 
+    /**
+     * Unit test for getWidgetByClassType
+     */
     public function testGetWidgetByClassType()
     {
         $widgetOne = ['@' => ['type' => 'type1']];
@@ -101,6 +116,9 @@ public function testGetWidgetByClassType()
         $this->assertNull($this->widget->getWidgetByClassType('type2'));
     }
 
+    /**
+     * Unit test for getConfigAsObject
+     */
     public function testGetConfigAsObject()
     {
         $configFile = __DIR__ . '/_files/mappedConfigArrayAll.php';
@@ -135,6 +153,9 @@ public function testGetConfigAsObject()
         $this->assertSame($supportedContainersExpected, $resultObject->getSupportedContainers());
     }
 
+    /**
+     * Unit test for getConfigAsObjectWidgetNoFound
+     */
     public function testGetConfigAsObjectWidgetNoFound()
     {
         $this->dataStorageMock->expects($this->once())
@@ -146,6 +167,9 @@ public function testGetConfigAsObjectWidgetNoFound()
         $this->assertSame([], $resultObject->getData());
     }
 
+    /**
+     * Unit test for getWidgetDeclaration
+     */
     public function testGetWidgetDeclaration()
     {
         $mathRandomMock = $this->createPartialMock(\Magento\Framework\Math\Random::class, ['getRandomString']);
@@ -175,7 +199,7 @@ public function testGetWidgetDeclaration()
         $this->conditionsHelper->expects($this->once())->method('encode')->with($conditions)
             ->willReturn('encoded-conditions-string');
         $this->escaperMock->expects($this->atLeastOnce())
-            ->method('escapeQuote')
+            ->method('escapeHtmlAttr')
             ->willReturnMap([
                 ['my "widget"', false, 'my "widget"'],
                 ['1', false, '1'],
@@ -203,6 +227,9 @@ public function testGetWidgetDeclaration()
         $this->assertContains('type_name=""}}', $result);
     }
 
+    /**
+     * Unit test for getWidgetDeclarationWithZeroValueParam
+     */
     public function testGetWidgetDeclarationWithZeroValueParam()
     {
         $mathRandomMock = $this->createPartialMock(\Magento\Framework\Math\Random::class, ['getRandomString']);