Merge branch 'MAGETWO-53353-refactor-escaper' of github.com:magento-jackalopes/magento2ce into MAGETWO-53353-refactor-escaper

Author: Igor Melnikov

app/code/Magento/Integration/Block/Adminhtml/Widget/Grid/Column/Renderer/Button.php

@@ -87,7 +87,8 @@ protected function _prepareAttributes(DataObject $row)
             if ($attributeValue) {
                 $attributes[] = sprintf(
                     '%s="%s"',
-                    $attributeName, $this->escapeHtmlAttr($attributeValue, false)
+                    $attributeName,
+                    $this->escapeHtmlAttr($attributeValue, false)
                 );
             }
         }

app/code/Magento/Search/Test/Unit/Model/QueryFactoryTest.php

@@ -14,6 +14,11 @@
 use Magento\Framework\Stdlib\StringUtils;
 use Magento\Search\Model\Query;
 
+/**
+ * Class QueryFactoryTest tests Magento\Search\Model\QueryFactory
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class QueryFactoryTest extends \PHPUnit_Framework_TestCase
 {
     /**
@@ -333,7 +338,7 @@ private function mockSetQueryTextNeverExecute($cleanedRawText)
 
     /**
      * @param string $cleanedRawText
-     * @param void
+     * @return void
      */
     private function mockSetQueryTextOnceExecute($cleanedRawText)
     {

lib/internal/Magento/Framework/Escaper.php

@@ -161,7 +161,6 @@ public function escapeQuote($data, $addSlashes = false)
     /**
      * Get escaper
      *
-     * @param void
      * @return \Magento\Framework\ZendEscaper
      * @deprecated
      */

lib/internal/Magento/Framework/Url.php

@@ -1174,7 +1174,6 @@ private function getUrlModifier()
     /**
      * Get escaper
      *
-     * @param void
      * @return Escaper
      * @deprecated
      */

lib/internal/Magento/Framework/Url/RouteParamsResolver.php

@@ -153,7 +153,6 @@ public function getRouteParam($key)
     /**
      * Get escaper
      *
-     * @param void
      * @return \Magento\Framework\Escaper
      * @deprecated
      */