MAGETWO-99282: Eliminate @escapeNotVerified in Magento_Catalog module

Author: Joan He

app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/Column/Filter/TextTest.php

@@ -8,6 +8,9 @@
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
+/**
+ * Unit test for \Magento\Backend\Block\Widget\Grid\Column\Filter\Text
+ */
 class TextTest extends \PHPUnit\Framework\TestCase
 {
     /** @var \Magento\Backend\Block\Widget\Grid\Column\Filter\Text*/
@@ -65,7 +68,11 @@ public function testGetHtml()
         $this->escaper->expects($this->any())->method('escapeHtml')->willReturn('escapedHtml');
         $this->escaper->expects($this->once())
             ->method('escapeHtmlAttr')
-            ->willReturnCallback(function($string) {return $string;});
+            ->willReturnCallback(
+                function ($string) {
+                    return $string;
+                }
+            );
         $column->expects($this->any())->method('getId')->willReturn('id');
         $column->expects($this->once())->method('getHtmlId')->willReturn('htmlId');
 

lib/internal/Magento/Framework/View/Test/Unit/Element/AbstractBlockTest.php

@@ -119,7 +119,11 @@ public function testGetUiId($expectedResult, $nameInLayout, $methodArguments)
     {
         $this->escaperMock->expects($this->once())
             ->method('escapeHtmlAttr')
-            ->willReturnCallback(function($string) {return $string;});
+            ->willReturnCallback(
+                function ($string) {
+                    return $string;
+                }
+            );
         $this->block->setNameInLayout($nameInLayout);
         $this->assertEquals($expectedResult, call_user_func_array([$this->block, 'getUiId'], $methodArguments));
     }
@@ -166,10 +170,12 @@ public function testGetVar()
 
         $config->expects($this->any())
             ->method('getVarValue')
-            ->willReturnMap([
-                ['Magento_Theme', 'v1', 'one'],
-                [$module, 'v2', 'two']
-            ]);
+            ->willReturnMap(
+                [
+                    ['Magento_Theme', 'v1', 'one'],
+                    [$module, 'v2', 'two']
+                ]
+            );
 
         $configManager = $this->createMock(ConfigInterface::class);
         $configManager->expects($this->exactly(2))->method('getViewConfig')->willReturn($config);

lib/internal/Magento/Framework/View/Test/Unit/Element/MessagesTest.php

@@ -13,10 +13,11 @@
 use Magento\Framework\Message\Manager;
 use Magento\Framework\View\Element\Message\InterpretationStrategyInterface;
 use \Magento\Framework\View\Element\Messages;
-
-use Magento\Framework\Message\ManagerInterface;
 use Magento\Framework\Message\MessageInterface;
 
+/**
+ * Unit test for \Magento\Framework\View\Element\Messages
+ */
 class MessagesTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -330,7 +331,11 @@ public function testGetGroupedHtml()
 
         $this->escaperMock->expects($this->any())
             ->method('escapeHtmlAttr')
-            ->willReturnCallback(function($string) {return $string;});
+            ->willReturnCallback(
+                function ($string) {
+                    return $string;
+                }
+            );
 
         $this->assertEquals($resultHtml, $this->messages->getGroupedHtml());
     }