Merge pull request #325 from magento-api/api-2.0.1patch

Korshenko, Olexii(okorshenko) · Korshenko, Olexii(okorshenko) · commit 0fd2becb365b · 2016-01-19T11:48:15.000-06:00
Api 2.0.1patch-addition
diff --git a/lib/internal/Magento/Framework/Data/Form/FormKey.php b/lib/internal/Magento/Framework/Data/Form/FormKey.php
@@ -52,7 +52,7 @@ public function getFormKey()
         if (!$this->isPresent()) {
             $this->set($this->mathRandom->getRandomString(16));
         }
-        return $this->escaper->escapeHtml($this->session->getData(self::FORM_KEY));
+        return $this->escaper->escapeHtmlAttr($this->session->getData(self::FORM_KEY));
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Form/FormKeyTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Form/FormKeyTest.php
@@ -38,7 +38,7 @@ protected function setUp()
         $methods = ['setData', 'getData'];
         $this->sessionMock = $this->getMock('Magento\Framework\Session\SessionManager', $methods, [], '', false);
         $this->escaperMock = $this->getMock('Magento\Framework\Escaper', [], [], '', false);
-        $this->escaperMock->expects($this->any())->method('escapeHtml')->willReturnArgument(0);
+        $this->escaperMock->expects($this->any())->method('escapeHtmlAttr')->willReturnArgument(0);
         $this->formKey = new FormKey(
             $this->mathRandomMock,
             $this->sessionMock,
diff --git a/lib/internal/Magento/Framework/Escaper.php b/lib/internal/Magento/Framework/Escaper.php
@@ -8,7 +8,7 @@
 /**
  * Magento escape methods
  */
-class Escaper
+class Escaper extends \Zend\Escaper\Escaper
 {
     /**
      * Escape html entities

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public function getFormKey()`
`52`	`52`	`if (!$this->isPresent()) {`
`53`	`53`	`$this->set($this->mathRandom->getRandomString(16));`
`54`	`54`	`}`
`55`		`- return $this->escaper->escapeHtml($this->session->getData(self::FORM_KEY));`
	`55`	`+ return $this->escaper->escapeHtmlAttr($this->session->getData(self::FORM_KEY));`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`/**`
`9`	`9`	`* Magento escape methods`
`10`	`10`	`*/`
`11`		`-class Escaper`
	`11`	`+class Escaper extends \Zend\Escaper\Escaper`
`12`	`12`	`{`
`13`	`13`	`/**`
`14`	`14`	`* Escape html entities`