Merge branch 'develop' of github.com:magento-commerce/magento-coding-standard into development-config-for-tests

Author: sivaschenko

Magento2/Sniffs/Legacy/PhtmlTemplateSniff.php

@@ -13,23 +13,7 @@
 class PhtmlTemplateSniff implements Sniff
 {
     private const WARNING_CODE_TEXT_JAVASCRIPT = 'TextJavascriptTypeFound';
-    private const WARNING_CODE_THIS_USAGE = 'ThisUsageObsolete';
     private const WARNING_CODE_PROTECTED_PRIVATE_BLOCK_ACCESS = 'ProtectedPrivateBlockAccess';
-
-    private const OBSOLETE_REGEX = [
-        'FoundJQueryUI' => [
-            'pattern' => '/(["\'])jquery\/ui\1/',
-            'message' => 'Please do not use "jquery/ui" library in templates. Use needed jquery ui widget instead'
-        ],
-        'FoundDataMageInit' => [
-            'pattern' => '/data-mage-init=(?:\'|")(?!\s*{\s*"[^"]+")/',
-            'message' => 'Please do not initialize JS component in php. Do it in template'
-        ],
-        'FoundXMagentoInit' => [
-            'pattern' => '@x-magento-init.>(?!\s*+{\s*"[^"]+"\s*:\s*{\s*"[\w/-]+")@i',
-            'message' => 'Please do not initialize JS component in php. Do it in template'
-        ],
-    ];
 
     /**
      * @inheritdoc
@@ -51,18 +35,9 @@ public function process(File $phpcsFile, $stackPtr)
         $tokens = $phpcsFile->getTokens();
         if ($tokens[$stackPtr]['code'] === T_OBJECT_OPERATOR) {
             $this->checkBlockVariable($phpcsFile, $stackPtr, $tokens);
-            $this->checkThisVariable($phpcsFile, $stackPtr, $tokens);
         }
         if ($tokens[$stackPtr]['code'] === T_INLINE_HTML || $tokens[$stackPtr]['code'] === T_HEREDOC) {
             $this->checkHtml($phpcsFile, $stackPtr);
-            
-            $file = $phpcsFile->getFilename();
-
-            if (strpos($file, '/view/frontend/templates/') !== false
-                || strpos($file, '/view/base/templates/') !== false
-            ) {
-                $this->checkHtmlSpecificFiles($phpcsFile, $stackPtr);
-            }
         }
     }
 
@@ -90,30 +65,6 @@ private function checkBlockVariable(File $phpcsFile, int $stackPtr, array $token
         }
     }
 
-    /**
-     * Check access to members and methods of Block class through $this
-     *
-     * @param File $phpcsFile
-     * @param int $stackPtr
-     * @param array $tokens
-     */
-    private function checkThisVariable(File $phpcsFile, int $stackPtr, array $tokens): void
-    {
-        $varPos = $phpcsFile->findPrevious(T_VARIABLE, $stackPtr - 1);
-        if ($tokens[$varPos]['content'] !== '$this') {
-            return;
-        }
-        $stringPos = $phpcsFile->findNext(T_STRING, $stackPtr + 1);
-        if (strpos($tokens[$stringPos]['content'], 'helper') === false) {
-            $phpcsFile->addWarning(
-                'Access to members and methods of Block class through $this is ' .
-                'obsolete in phtml templates. Use only $block instead of $this.',
-                $stringPos,
-                self::WARNING_CODE_THIS_USAGE
-            );
-        }
-    }
-
     /**
      * Check use of "text/javascript" type
      *
@@ -132,25 +83,4 @@ private function checkHtml(File $phpcsFile, int $stackPtr): void
             );
         }
     }
-
-    /**
-     * Check of some obsoletes uses in specific files
-     *
-     * @param File $phpcsFile
-     * @param int $stackPtr
-     */
-    private function checkHtmlSpecificFiles(File $phpcsFile, int $stackPtr): void
-    {
-        $content = $phpcsFile->getTokensAsString($stackPtr, 1);
-        
-        foreach (self::OBSOLETE_REGEX as $code => $data) {
-            if (preg_match($data['pattern'], $content)) {
-                $phpcsFile->addWarning(
-                    $data['message'],
-                    $stackPtr,
-                    $code
-                );
-            }
-        }
-    }
 }

Magento2/Sniffs/PHPCompatibility/AbstractPrivateMethodsSniff.php

@@ -56,22 +56,16 @@ public function getWarningList($testFile = '')
     {
         if ($testFile === 'PhtmlTemplateUnitTest.1.phtml' || $testFile === 'PhtmlTemplateUnitTest.2.phtml') {
             return [
-                7 => 1,
                 9 => 1,
-                13 => 1,
                 20 => 1,
-                22 => 1,
                 23 => 1,
-                27 => 1,
-                33 => 1,
-                39 => 1
+                27 => 1
             ];
         }
         if ($testFile === 'PhtmlTemplateUnitTest.3.phtml') {
             return [
                 9 => 1,
                 20 => 1,
-                22 => 1,
                 23 => 1,
                 27 => 1,
             ];

Magento2/Sniffs/PHPCompatibility/NewAttributesSniff.php

@@ -6,10 +6,6 @@
     <arg name="extensions" value="php,phtml,graphqls/GraphQL,less/CSS,html/PHP,xml,js/PHP"/>
 
     <!-- Severity 10 errors: Critical code issues. -->
-    <rule ref="Generic.Functions.CallTimePassByReference">
-        <severity>10</severity>
-        <type>error</type>
-    </rule>
     <rule ref="Generic.PHP.CharacterBeforePHPOpeningTag">
         <severity>10</severity>
         <type>error</type>
@@ -761,9 +757,13 @@
         <exclude-pattern>*Test.php</exclude-pattern>
         <exclude-pattern>*/PHPCSUtils/*</exclude-pattern>
     </rule>
+
     <rule ref="Internal.NoCodeFound">
         <severity>0</severity>
     </rule>
+
+    <!-- PHPCompatibility configuration. -->
+    <config name="testVersion" value="7.4-"/>
     <rule ref="PHPCompatibility">
         <exclude name="PHPCompatibility.Miscellaneous.RemovedAlternativePHPTags.MaybeASPOpenTagFound" />
         <!-- Following sniffs have been updated or renamed in PHPCompatibility 10 -->
@@ -772,26 +772,16 @@
         <!-- Following sniffs have an equivalent in PHPCS -->
         <exclude name="PHPCompatibility.Syntax.ForbiddenCallTimePassByReference" />
         <exclude name="PHPCompatibility.Keywords.ForbiddenNamesAsDeclared" />
-        <!-- Check for cross-version support for stated PHP version and higher. -->
-        <config name="testVersion" value="7.4-"/>
     </rule>
     <!--
      All these rules belong to the unreleased PhpCompatibility 10. Remove them once PHPCompatibility is
      updated to version 10
      -->
-    <rule ref="Magento2.PHPCompatibility.NewAttributes" />
-    <rule ref="Magento2.PHPCompatibility.NewMagicClassConstant" />
-    <rule ref="Magento2.PHPCompatibility.NewNonCapturingCatch" />
-    <rule ref="Magento2.PHPCompatibility.AbstractPrivateMethods" />
     <rule ref="Magento2.PHPCompatibility.ForbiddenFinalPrivateMethods" />
-    <rule ref="Magento2.PHPCompatibility.NewTrailingComma" />
     <rule ref="Magento2.PHPCompatibility.RemovedCallingDestructAfterConstructorExit" />
     <rule ref="Magento2.PHPCompatibility.RemovedOptionalBeforeRequiredParam" />
     <rule ref="Magento2.PHPCompatibility.ChangedIntToBoolParamType" />
     <rule ref="Magento2.PHPCompatibility.RemovedAssertStringAssertion" />
     <rule ref="Magento2.PHPCompatibility.RemovedGetDefinedFunctionsExcludeDisabledFalse" />
     <rule ref="Magento2.PHPCompatibility.RemovedSplAutoloadRegisterThrowFalse" />
-    <rule ref="Magento2.PHPCompatibility.NewInterpolatedStringDereferencing" />
-    <rule ref="Magento2.PHPCompatibility.NewMagicConstantDereferencing" />
-    <rule ref="Magento2.PHPCompatibility.NewNestedStaticAccess" />
 </ruleset>