MM-4941: [EQP][Sniffs Consolidation] Create new GitHub repo and move MEQP2 sniffs

- Code review fixes

Author: lenaorobei

Magento/Sniffs/CodeAnalysis/EmptyBlockSniff.php

@@ -20,10 +20,7 @@ public function register()
         return array_merge(
             parent::register(),
             [
-                T_CLASS,
-                T_ABSTRACT,
                 T_FUNCTION,
-                T_INTERFACE,
                 T_TRAIT
             ]
         );

Magento/Sniffs/Performance/EmptyCheckSniff.php

@@ -25,7 +25,6 @@ class EmptyCheckSniff implements Sniff
      *
      * @var array
      */
-
     protected $map = [
         'count' => [
             // phpcs:ignore Generic.Files.LineLength.TooLong
@@ -34,12 +33,11 @@ class EmptyCheckSniff implements Sniff
         ],
         'strlen' => [
             // phpcs:ignore Generic.Files.LineLength.TooLong
-            'message' => 'strlen(...) function should not be used to check if string is empty. Consider replace with (=/!)== ""',
+            'message' => 'strlen(...) function should not be used to check if string is empty. Consider replace with (... === "") or (... !== "")',
             'code' => 'FoundStrlen'
         ],
     ];
 
-
     /**
      * All tokens from current file.
      *

Magento/Sniffs/Templates/ThisInTemplateSniff.php

@@ -3,6 +3,7 @@
  * Copyright © Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Sniffs\Templates;
 
 use PHP_CodeSniffer\Sniffs\Sniff;
@@ -34,15 +35,6 @@ class ThisInTemplateSniff implements Sniff
      */
     protected $warningCode = 'FoundThis';
 
-    /**
-     * List of methods, allowed to called via $this.
-     *
-     * @var array
-     */
-    protected $allowedMethods = [
-        'helper',
-    ];
-
     /**
      * @inheritdoc
      */
@@ -58,15 +50,7 @@ public function process(File $phpcsFile, $stackPtr)
     {
         $tokens = $phpcsFile->getTokens();
         if ($tokens[$stackPtr]['content'] === '$this') {
-            $endOfStatementPtr = $phpcsFile->findEndOfStatement($stackPtr);
-            $functionPtr = $phpcsFile->findNext(T_STRING, $stackPtr, $endOfStatementPtr);
-            if ($functionPtr !== false) {
-                if (!in_array($tokens[$functionPtr]['content'], $this->allowedMethods)) {
-                    $phpcsFile->addWarning($this->warningMessage, $stackPtr, $this->warningCode, [], $this->severity);
-                }
-            } else {
-                $phpcsFile->addWarning($this->warningMessage, $stackPtr, $this->warningCode, [], $this->severity);
-            }
+            $phpcsFile->addWarning($this->warningMessage, $stackPtr, $this->warningCode, [], $this->severity);
         }
     }
 }

Magento/Tests/CodeAnalysis/EmptyBlockUnitTest.inc

@@ -71,34 +71,6 @@ try {
 
 if (true) {} elseif (false) {}
 
-class EmptyBlockTestInc { /*Empty class block*/ }
+function emptyFunction () { /*Empty function block*/ }
 
-class EmptyBlockTestIncTrue
-{
-    public $field;
-}
-
-abstract class EmptyBlockTestIncAbstract { /*Empty class block*/ }
-
-abstract class EmptyBlockTestIncTrueAbstract
-{
-    public $field;
-}
-
-function emptyBlock () { /*Empty function block*/ }
-
-function emptyBlockT () { return true; }
-
-interface EmptyBlockInterface { /*Empty interface block*/ }
-
-interface EmptyBlockInterfaceTrue {
-    public function test();
-}
-
-trait EmptyBlockTrait { /*Empty trait block*/ }
-
-trait EmptyBlockTraitTrue {
-    function test() {
-        return true;
-    }
-}
+function nonEmptyFunction () { return true; }

Magento/Tests/CodeAnalysis/EmptyBlockUnitTest.php

@@ -32,10 +32,6 @@ public function getErrorList()
             68 => 1,
             72 => 2,
             74 => 1,
-            81 => 1,
-            88 => 1,
-            92 => 1,
-            98 => 1,
         ];
     }
 

Magento/Tests/Exceptions/NamespaceUnitTest.inc

@@ -54,3 +54,9 @@ class TestNamespace
         }
     }
 }
+
+try {
+    doSomethind();
+} catch (\Exception $e) {
+    logException($e->getMessage());
+}

Magento/Tests/Security/IncludeFileUnitTest.php

@@ -13,8 +13,8 @@
 class IncludeFileUnitTest extends AbstractSniffUnitTest
 {
     /**
-    * @inheritdoc
-    */
+     * @inheritdoc
+     */
     public function getErrorList()
     {
         return [];

Magento/Tests/Strings/RegExUnitTest.inc

@@ -1,6 +1,6 @@
 <?php
 
-$input = "Bet you want a BMW.";
+$input = "Test Input.";
 echo preg_replace(
     "/([a-z]*)/Xe",
     "strtoupper('\\1')",
@@ -13,7 +13,7 @@ echo preg_replace(
     'get_input'
 );
 
-$html = preg_replace('(<h([1-6])>(.*?)</h\1>)sex', '"<h$1>" . strtoupper("$2") . "</h$1>"', $html);
+$html = preg_replace('(<h([1-6])>(.*?)</h\1>)xes', '"<h$1>" . strtoupper("$2") . "</h$1>"', $html);
 
 $a = preg_replace(
     '#<h([1-6])>(.*?)</h\1>#e',

Magento/Tests/Templates/ThisInTemplateUnitTest.php

@@ -28,6 +28,7 @@ public function getWarningList()
         return [
             3 => 2,
             4 => 1,
+            5 => 1,
         ];
     }
 }

Magento/ruleset.xml

@@ -12,7 +12,7 @@
     <rule ref="Magento.Templates.ThisInTemplate">
         <include-pattern>*.phtml</include-pattern>
     </rule>
-    <rule ref="Magento.Templates.XssTemplate">
+    <rule ref="Magento.Security.XssTemplate">
         <include-pattern>*.phtml</include-pattern>
     </rule>
     <rule ref="Generic.Arrays.DisallowLongArraySyntax">
@@ -77,6 +77,7 @@
     <rule ref="PSR2">
         <severity>8</severity>
         <type>warning</type>
+        <exclude name="Squiz.WhiteSpace.ControlStructureSpacing.NoLineAfterClose"/>
     </rule>
     <rule ref="PSR1.Classes.ClassDeclaration">
         <severity>10</severity>