Merge branch 'develop' into 48-RawQuerySniff

Author: lenaorobei

Magento/Sniffs/Classes/AbstractApiSniff.php

@@ -0,0 +1,68 @@
+<?php
+/**
+ * Copyright © Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Sniffs\Classes;
+
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Files\File;
+
+/**
+ * Detects api annotation for an abstract class.
+ */
+class AbstractApiSniff implements Sniff
+{
+
+    /**
+     * String representation of warning.
+     *
+     * @var string
+     */
+    protected $warningMessage = 'Abstract classes MUST NOT be marked as public @api.';
+
+    /**
+     * Warning violation code.
+     *
+     * @var string
+     */
+    protected $warningCode = 'AbstractApi';
+
+    /**
+     * @inheritDoc
+     */
+    public function register()
+    {
+        return [T_CLASS];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        $tokens = $phpcsFile->getTokens();
+        $prev = $phpcsFile->findPrevious(T_WHITESPACE, $stackPtr - 1, null, true);
+        if ($prev !== false && $tokens[$prev]['code'] !== T_ABSTRACT) {
+            return;
+        }
+
+        $commentStartPtr = $phpcsFile->findPrevious(T_DOC_COMMENT_OPEN_TAG, $stackPtr - 1, 0);
+        $commentCloserPtr = $tokens[$commentStartPtr]['comment_closer'];
+
+        for ($i = $commentStartPtr; $i <= $commentCloserPtr; $i++) {
+            $token = $tokens[$i];
+
+            if ($token['code'] !== T_DOC_COMMENT_TAG) {
+                continue;
+            }
+
+            if (strpos($token['content'], '@api') === false) {
+                continue;
+            }
+
+            $phpcsFile->addWarning($this->warningMessage, $i, $this->warningCode);
+        }
+    }
+}

Magento/Sniffs/Exceptions/ThrowCatchSniff.php

@@ -0,0 +1,95 @@
+<?php
+/**
+ * Copyright © Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Sniffs\Exceptions;
+
+use function array_slice;
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Files\File;
+
+/**
+ * Detects exceptions must not be handled in same function
+ */
+class ThrowCatchSniff implements Sniff
+{
+    /**
+     * String representation of warning.
+     *
+     * @var string
+     */
+    protected $warningMessage = 'Exceptions must not be handled in the same function where they are thrown.';
+
+    /**
+     * Warning violation code.
+     *
+     * @var string
+     */
+    protected $warningCode = 'ThrowCatch';
+
+    /**
+     * @inheritDoc
+     */
+    public function register()
+    {
+        return [T_FUNCTION, T_CLOSURE];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        $tokens = $phpcsFile->getTokens();
+        if (!isset($tokens[$stackPtr]['scope_closer'])) {
+            // Probably an interface method no check
+            return;
+        }
+
+        $closeBrace = $tokens[$stackPtr]['scope_closer'];
+        $throwTags = [];
+        $catchTags = [];
+
+        for ($i = $stackPtr; $i < $closeBrace; $i++) {
+            $token = $tokens[$i];
+            if ($token['code'] === T_CATCH) {
+                $catchTags[] = $token;
+            }
+            if ($token['code'] === T_THROW) {
+                $throwTags[] = $i;
+            }
+        }
+
+        if (count($catchTags) === 0 || count($throwTags) === 0) {
+            // No catch or throw found no check
+            return;
+        }
+
+        $catchClassNames = [];
+        $throwClassNames = [];
+
+        // find all relevant classes in catch
+        foreach ($catchTags as $catchTag) {
+            $start = $catchTag['parenthesis_opener'];
+            $end = $catchTag['parenthesis_closer'];
+
+            $match = $phpcsFile->findNext(T_STRING, $start, $end);
+            $catchClassNames[$match] = $tokens[$match]['content'];
+        }
+
+        // find all relevant classes in throws
+        foreach ($throwTags as $throwTag) {
+            $match = $phpcsFile->findNext(T_STRING, $throwTag);
+            $throwClassNames[] = $tokens[$match]['content'];
+        }
+
+        $throwClassNames = array_flip($throwClassNames);
+        foreach ($catchClassNames as $match => $catchClassName) {
+            if (array_key_exists($catchClassName, $throwClassNames)) {
+                $phpcsFile->addWarning($this->warningMessage, $match, $this->warningCode);
+            }
+        }
+    }
+}

Magento/Sniffs/Files/LineLengthSniff.php

@@ -19,6 +19,16 @@ class LineLengthSniff extends FilesLineLengthSniff
      */
     protected $previousLineContent = '';
 
+    /**
+     * @inheritdoc
+     */
+    public $lineLimit = 120;
+
+    /**
+     * @inheritdoc
+     */
+    public $absoluteLineLimit = 120;
+
     /**
      * @inheritdoc
      */

Magento/Tests/Classes/AbstractApiUnitTest.inc

@@ -0,0 +1,41 @@
+<?php
+
+/**
+ * Interface FooInterface
+ * @api
+ */
+interface FooInterface
+{
+    public function execute();
+}
+
+/**
+ * // Rule find: api annotation for this class
+ * @api
+ */
+abstract class Foo implements FooInterface
+{
+
+}
+
+/**
+ * // Rule find: api annotation for this class
+ * @api
+ */
+abstract
+class FooBar implements FooInterface
+{
+
+}
+
+
+/**
+ * Class Bar
+ */
+class Bar extends Foo
+{
+    public function execute()
+    {
+        // TODO: Implement execute() method.
+    }
+}

Magento/Tests/Classes/AbstractApiUnitTest.php

@@ -0,0 +1,34 @@
+<?php
+/**
+ * Copyright © Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Tests\Classes;
+
+use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
+
+/**
+ * Class ObjectInstantiationUnitTest
+ */
+class AbstractApiUnitTest extends AbstractSniffUnitTest
+{
+    /**
+     * @inheritdoc
+     */
+    public function getErrorList()
+    {
+        return [];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getWarningList()
+    {
+        return [
+            14 => 1,
+            23 => 1
+        ];
+    }
+}