Combined

.github/workflows/php.yml

@@ -7,8 +7,7 @@ on:
     branches: [ master, develop ]
 
 jobs:
-  build:
-
+  php:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
@@ -41,10 +40,6 @@ jobs:
 
     - name: Install dependencies
       run: npm install
-    - name: Run ESLint
-      run: npm run eslint -- eslint/rules Magento2 --ignore-pattern 'Magento2/Tests/Eslint/*Test.js'
-    - name: Run JSCS
-      run: npm run jscs eslint/rules Magento2
 
     - name: Validate composer
       run: composer validate
@@ -59,4 +54,24 @@ jobs:
       run: vendor/bin/phpunit
 
     - name: Run code style suite
-      run: vendor/bin/phpcs --standard=Magento2 Magento2/Helpers/ Magento2/Sniffs
+      run: vendor/bin/phpcs --standard=Magento2 Magento2/Helpers Magento2/Sniffs Magento2Framework/Sniffs
+
+    - name: Run framework suite
+      run: vendor/bin/phpcs --standard=Magento2Framework Magento2/Helpers Magento2/Sniffs Magento2Framework/Sniffs
+  js:
+    runs-on: ubuntu-latest
+    name: Javascript tests
+
+    steps:
+      - name: Setup node
+        uses: actions/setup-node@v2
+        with:
+          node-version: '16'
+
+      - uses: actions/checkout@v2
+
+      - name: Install dependencies
+        run: npm install
+
+      - name: Run ESLint
+        run: npm run eslint -- eslint/rules

Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php

@@ -3,29 +3,32 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento2\Sniffs\Commenting;
 
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\AbstractVariableSniff;
-use PHP_CodeSniffer\Util\Tokens;
 use Magento2\Helpers\Commenting\PHPDocFormattingValidator;
 
 /**
  * Class ClassPropertyPHPDocFormattingSniff
  */
 class ClassPropertyPHPDocFormattingSniff extends AbstractVariableSniff
 {
-
     /**
      * @var array
      */
-    private $ignoreTokens = [
+    private const TOKENS_ALLOWED_BETWEEN_PHPDOC_AND_PROPERTY_NAME = [
         T_PUBLIC,
         T_PRIVATE,
         T_PROTECTED,
         T_VAR,
         T_STATIC,
         T_WHITESPACE,
+        T_NS_SEPARATOR,
+        T_STRING,
+        T_COMMENT
     ];
 
     /**
@@ -38,15 +41,9 @@ class ClassPropertyPHPDocFormattingSniff extends AbstractVariableSniff
      */
     public function __construct()
     {
-        $scopes = Tokens::$ooScopeTokens;
         $this->PHPDocFormattingValidator = new PHPDocFormattingValidator();
-        $listen = [
-            T_VARIABLE,
-            T_DOUBLE_QUOTED_STRING,
-            T_HEREDOC,
-        ];
 
-        parent::__construct($scopes, $listen, true);
+        parent::__construct();
     }
 
     /**
@@ -56,111 +53,147 @@ public function processMemberVar(File $phpcsFile, $stackPtr)
     {
         $tokens = $phpcsFile->getTokens();
 
-        $commentEnd = $phpcsFile->findPrevious($this->ignoreTokens, ($stackPtr - 1), null, true);
+        $commentEnd = $phpcsFile->findPrevious(
+            self::TOKENS_ALLOWED_BETWEEN_PHPDOC_AND_PROPERTY_NAME,
+            $stackPtr - 1,
+            null,
+            true
+        );
 
-        if ($commentEnd !== false && $tokens[$commentEnd]['code'] === T_STRING) {
-            $commentEnd = $phpcsFile->findPrevious($this->ignoreTokens, ($commentEnd - 1), null, true);
-        } elseif ($commentEnd === false
-            || ($tokens[$commentEnd]['code'] !== T_DOC_COMMENT_CLOSE_TAG
-                && $tokens[$commentEnd]['code'] !== T_COMMENT)
-        ) {
+        if ($commentEnd === false || $tokens[$commentEnd]['code'] !== T_DOC_COMMENT_CLOSE_TAG) {
             $phpcsFile->addWarning('Missing PHP DocBlock for class property.', $stackPtr, 'Missing');
             return;
         }
 
         $commentStart = $tokens[$commentEnd]['comment_opener'];
-        $foundVar = null;
+        $varAnnotationPosition = null;
         foreach ($tokens[$commentStart]['comment_tags'] as $tag) {
             if ($tokens[$tag]['content'] === '@var') {
-                if ($foundVar !== null) {
-                    $error = 'Only one @var tag is allowed for class property declaration.';
-                    $phpcsFile->addWarning($error, $tag, 'DuplicateVar');
+                if ($varAnnotationPosition !== null) {
+                    $phpcsFile->addWarning(
+                        'Only one @var tag is allowed for class property declaration.',
+                        $tag,
+                        'DuplicateVar'
+                    );
                 } else {
-                    $foundVar = $tag;
+                    $varAnnotationPosition = $tag;
                 }
             }
         }
 
-        if ($foundVar === null) {
-            $error = 'Class properties must have type declaration using @var tag.';
-            $phpcsFile->addWarning($error, $stackPtr, 'MissingVar');
+        if ($varAnnotationPosition === null) {
+            $phpcsFile->addWarning(
+                'Class properties must have type declaration using @var tag.',
+                $stackPtr,
+                'MissingVar'
+            );
             return;
         }
 
-        $string = $phpcsFile->findNext(T_DOC_COMMENT_STRING, $foundVar, $commentEnd);
-        if ($string === false || $tokens[$string]['line'] !== $tokens[$foundVar]['line']) {
-            $error = 'Content missing for @var tag in class property declaration.';
-            $phpcsFile->addWarning($error, $foundVar, 'EmptyVar');
+        $string = $phpcsFile->findNext(T_DOC_COMMENT_STRING, $varAnnotationPosition, $commentEnd);
+        if ($string === false || $tokens[$string]['line'] !== $tokens[$varAnnotationPosition]['line']) {
+            $phpcsFile->addWarning(
+                'Content missing for @var tag in class property declaration.',
+                $varAnnotationPosition,
+                'EmptyVar'
+            );
             return;
         }
 
         // Check if class has already have meaningful description after @var tag
-        $isShortDescriptionAfterVar = $phpcsFile->findNext(
+        $shortDescriptionAfterVarPosition = $phpcsFile->findNext(
             T_DOC_COMMENT_STRING,
-            $foundVar + 4,
+            $varAnnotationPosition + 4,
             $commentEnd,
             false,
             null,
             false
         );
+
         if ($this->PHPDocFormattingValidator->providesMeaning(
-            $isShortDescriptionAfterVar,
+            $shortDescriptionAfterVarPosition,
             $commentStart,
             $tokens
         ) !== true) {
             preg_match(
                 '`^((?:\|?(?:array\([^\)]*\)|[\\\\\[\]]+))*)( .*)?`i',
-                $tokens[($foundVar + 2)]['content'],
+                $tokens[($varAnnotationPosition + 2)]['content'],
                 $varParts
             );
             if ($varParts[1]) {
                 return;
             }
-            $error = 'Short description must be before @var tag.';
-            $phpcsFile->addWarning($error, $isShortDescriptionAfterVar, 'ShortDescriptionAfterVar');
-            return;
+            $phpcsFile->addWarning(
+                'Short description must be before @var tag.',
+                $shortDescriptionAfterVarPosition,
+                'ShortDescriptionAfterVar'
+            );
         }
 
-        // Check if class has already have meaningful description before @var tag
-        $isShortDescriptionPreviousVar = $phpcsFile->findPrevious(
+        $this->processPropertyShortDescription($phpcsFile, $stackPtr, $varAnnotationPosition, $commentStart);
+    }
+
+    /**
+     * Check if class has already have meaningful description before var tag
+     *
+     * @param File $phpcsFile
+     * @param int $propertyNamePosition
+     * @param int $varAnnotationPosition
+     * @param int $commentStart
+     */
+    private function processPropertyShortDescription(
+        File $phpcsFile,
+        int $propertyNamePosition,
+        int $varAnnotationPosition,
+        int $commentStart
+    ): void {
+        $propertyShortDescriptionPosition = $phpcsFile->findPrevious(
             T_DOC_COMMENT_STRING,
-            $foundVar,
+            $varAnnotationPosition,
             $commentStart,
             false,
             null,
             false
         );
 
-        if ($isShortDescriptionPreviousVar === false) {
+        if ($propertyShortDescriptionPosition === false) {
             return;
         }
 
-        $propertyNamePosition = $phpcsFile->findNext(
-            T_VARIABLE,
-            $foundVar,
-            null,
-            false,
-            null,
-            false
-        );
-        if ($propertyNamePosition === false) {
-            return;
-        };
+        $tokens = $phpcsFile->getTokens();
         $propertyName = trim($tokens[$propertyNamePosition]['content'], '$');
-        $shortDescription = strtolower($tokens[$isShortDescriptionPreviousVar]['content']);
+        $shortDescription = strtolower($tokens[$propertyShortDescriptionPosition]['content']);
 
-        if ($shortDescription === strtolower($propertyName)) {
-            $error = 'Short description duplicates class property name.';
-            $phpcsFile->addWarning($error, $isShortDescriptionPreviousVar, 'AlreadyHaveMeaningfulNameVar');
-            return;
+        if ($this->isDuplicate($propertyName, $shortDescription)) {
+            $phpcsFile->addWarning(
+                'Short description duplicates class property name.',
+                $propertyShortDescriptionPosition,
+                'AlreadyHaveMeaningfulNameVar'
+            );
         }
+    }
 
-        $propertyNameParts = array_filter(preg_split('/(?=[A-Z])/', $propertyName));
+    /**
+     * Does short description duplicate the property name
+     *
+     * @param string $propertyName
+     * @param string $shortDescription
+     * @return bool
+     */
+    private function isDuplicate(string $propertyName, string $shortDescription): bool
+    {
+        return $this->clean($propertyName) === $this->clean($shortDescription);
+    }
 
-        if ($shortDescription === strtolower(implode(' ', $propertyNameParts))) {
-            $error = 'Short description duplicates class property name.';
-            $phpcsFile->addWarning($error, $isShortDescriptionPreviousVar, 'AlreadyHaveMeaningfulNameVar');
-        }
+    /**
+     * Return only A-Za-z characters converted to lowercase from the string
+     *
+     * @param string $string
+     * @return string
+     */
+    private function clean(string $string): string
+    {
+        return strtolower(preg_replace('/[^A-Za-z]/', '', $string));
     }
 
     /**

Magento2/Sniffs/Functions/DiscouragedFunctionSniff.php

@@ -229,5 +229,14 @@ class DiscouragedFunctionSniff extends ForbiddenFunctionsSniff
         '^strval$' => '(string) construction',
         '^htmlspecialchars$' => '\Magento\Framework\Escaper->escapeHtml',
         '^getimagesize$' => 'getimagesizefromstring',
+        '^file_exists$' => 'Magento\Framework\Filesystem\DriverInterface::isExists()',
+        '^file_get_contents$' => 'Magento\Framework\Filesystem\DriverInterface::fileGetContents()',
+        '^file_put_contents$' => 'Magento\Framework\Filesystem\DriverInterface::filePutContents()',
+        '^fgetcsv$' => 'Magento\Framework\Filesystem\DriverInterface::fileGetCsv()',
+        '^fputcsv$' => 'Magento\Framework\Filesystem\DriverInterface::filePutCsv()',
+        '^ftell$' => 'Magento\Framework\Filesystem\DriverInterface::fileTell()',
+        '^fseek$' => 'Magento\Framework\Filesystem\DriverInterface::fileSeek()',
+        '^feof$' => 'Magento\Framework\Filesystem\DriverInterface::endOfFile()',
+        '^flock$' => 'Magento\Framework\Filesystem\DriverInterface::fileLock()',
     ];
 }

Magento2/Sniffs/Legacy/AbstractBlockSniff.php

@@ -15,12 +15,8 @@ class AbstractBlockSniff implements Sniff
     private const CHILD_HTML_METHOD = 'getChildHtml';
     private const CHILD_CHILD_HTML_METHOD = 'getChildChildHtml';
 
-    /**
-     * Error violation code.
-     *
-     * @var string
-     */
-    protected $errorCode = 'FoundCountOfParametersIncorrect';
+    private const ERROR_CODE_THIRD_PARAMETER = 'ThirdParameterNotNeeded';
+    private const ERROR_CODE_FOURTH_PARAMETER = 'FourthParameterNotNeeded';
 
     /**
      * @inheritdoc
@@ -52,14 +48,14 @@ public function process(File $phpcsFile, $stackPtr)
             $phpcsFile->addError(
                 '3rd parameter is not needed anymore for getChildHtml()',
                 $stackPtr,
-                $this->errorCode
+                self::ERROR_CODE_THIRD_PARAMETER
             );
         }
         if ($content === self::CHILD_CHILD_HTML_METHOD && $paramsCount >= 4) {
             $phpcsFile->addError(
                 '4th parameter is not needed anymore for getChildChildHtml()',
                 $stackPtr,
-                $this->errorCode
+                self::ERROR_CODE_FOURTH_PARAMETER
             );
         }
     }