Merge pull request #127 from ongr-io/master

2.1.2 Release request

.gitignore

@@ -1,6 +1,3 @@
-/.idea
 /vendor
 /composer.lock
-
 /phpunit.xml
-/Tests/Build

.travis.yml

@@ -3,10 +3,16 @@ php:
   - 5.4
   - 5.5
   - 5.6
+  - 7.0
+  - hhvm
+
+matrix:
+  allow_failures:
+    - php: hhvm
+    - php: 7.0
+
 before_script:
-  - $TRAVIS_BUILD_DIR/travis.sh
-  - cd $TRAVIS_BUILD_DIR/../Ongr/
-  - composer self-update
-  - composer update --prefer-source
+  - composer install
+
 script:
-  - vendor/bin/phpunit Tests/AllTests.php
+  - vendor/bin/phpunit

Ongr/Sniffs/Commenting/DocCommentAlignmentSniff.php

@@ -0,0 +1,170 @@
+<?php
+/**
+ * Ongr_Sniffs_Commenting_EmptyCatchCommentSniff.
+ *
+ * PHP version 5
+ *
+ * @category  PHP
+ * @package   PHP_CodeSniffer
+ * @author    Greg Sherwood <[email protected]>
+ * @author    Marc McIntyre <[email protected]>
+ * @copyright 2006-2014 Squiz Pty Ltd (ABN 77 084 670 600)
+ * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @link      http://pear.php.net/package/PHP_CodeSniffer
+ */
+
+/**
+ * Ongr_Sniffs_Commenting_DocCommentAlignmentSniff.
+ *
+ * Tests that the stars in a doc comment align correctly.
+ *
+ * @category  PHP
+ * @package   PHP_CodeSniffer
+ * @author    Greg Sherwood <[email protected]>
+ * @author    Marc McIntyre <[email protected]>
+ * @copyright 2006-2014 Squiz Pty Ltd (ABN 77 084 670 600)
+ * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @version   Release: @package_version@
+ * @link      http://pear.php.net/package/PHP_CodeSniffer
+ */
+class Ongr_Sniffs_Commenting_DocCommentAlignmentSniff implements PHP_CodeSniffer_Sniff
+{
+
+    /**
+     * A list of tokenizers this sniff supports.
+     *
+     * @var array
+     */
+    public $supportedTokenizers = array(
+                                   'PHP',
+                                   'JS',
+                                  );
+
+
+    /**
+     * Returns an array of tokens this test wants to listen for.
+     *
+     * @return array
+     */
+    public function register()
+    {
+        return array(T_DOC_COMMENT_OPEN_TAG);
+
+    }//end register()
+
+
+    /**
+     * Processes this test, when one of its tokens is encountered.
+     *
+     * @param PHP_CodeSniffer_File $phpcsFile The file being scanned.
+     * @param int                  $stackPtr  The position of the current token
+     *                                         in the stack passed in $tokens.
+     *
+     * @return void
+     */
+    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+    {
+        $tokens = $phpcsFile->getTokens();
+
+        // We are only interested in function/class/interface doc block comments.
+        $ignore = PHP_CodeSniffer_Tokens::$emptyTokens;
+        if ($phpcsFile->tokenizerType === 'JS') {
+            $ignore[] = T_EQUAL;
+            $ignore[] = T_STRING;
+            $ignore[] = T_OBJECT_OPERATOR;
+        }
+
+        $nextToken = $phpcsFile->findNext($ignore, ($stackPtr + 1), null, true);
+        $ignore    = array(
+                      T_CLASS     => true,
+                      T_INTERFACE => true,
+                      T_FUNCTION  => true,
+                      T_PUBLIC    => true,
+                      T_PRIVATE   => true,
+                      T_PROTECTED => true,
+                      T_STATIC    => true,
+                      T_ABSTRACT  => true,
+                      T_PROPERTY  => true,
+                      T_OBJECT    => true,
+                      T_PROTOTYPE => true,
+                     );
+
+        if (isset($ignore[$tokens[$nextToken]['code']]) === false) {
+            // Could be a file comment.
+            $prevToken = $phpcsFile->findPrevious(PHP_CodeSniffer_Tokens::$emptyTokens, ($stackPtr - 1), null, true);
+            if ($tokens[$prevToken]['code'] !== T_OPEN_TAG) {
+                return;
+            }
+        }
+
+        // There must be one space after each star (unless it is an empty comment line)
+        // and all the stars must be aligned correctly.
+        $requiredColumn = ($tokens[$stackPtr]['column'] + 1);
+        $endComment     = $tokens[$stackPtr]['comment_closer'];
+        for ($i = ($stackPtr + 1); $i <= $endComment; $i++) {
+            if ($tokens[$i]['code'] !== T_DOC_COMMENT_STAR
+                && $tokens[$i]['code'] !== T_DOC_COMMENT_CLOSE_TAG
+            ) {
+                continue;
+            }
+
+            if ($tokens[$i]['code'] === T_DOC_COMMENT_CLOSE_TAG) {
+                // Can't process the close tag if it is not the first thing on the line.
+                $prev = $phpcsFile->findPrevious(T_DOC_COMMENT_WHITESPACE, ($i - 1), $stackPtr, true);
+                if ($tokens[$prev]['line'] === $tokens[$i]['line']) {
+                    continue;
+                }
+            }
+
+            if ($tokens[$i]['column'] !== $requiredColumn) {
+                $error = 'Expected %s space(s) before asterisk; %s found';
+                $data  = array(
+                          ($requiredColumn - 1),
+                          ($tokens[$i]['column'] - 1),
+                         );
+                $fix   = $phpcsFile->addFixableError($error, $i, 'SpaceBeforeStar', $data);
+                if ($fix === true) {
+                    $padding = str_repeat(' ', ($requiredColumn - 1));
+                    if ($tokens[$i]['column'] === 1) {
+                        $phpcsFile->fixer->addContentBefore($i, $padding);
+                    } else {
+                        $phpcsFile->fixer->replaceToken(($i - 1), $padding);
+                    }
+                }
+            }
+
+            if ($tokens[$i]['code'] !== T_DOC_COMMENT_STAR) {
+                continue;
+            }
+
+            if ($tokens[($i + 2)]['line'] !== $tokens[$i]['line']) {
+                // Line is empty.
+                continue;
+            }
+            //ONGR get last character on previous line.
+            $lastVarEnding = substr($tokens[$i - 3]['content'], -1);
+            if ($tokens[($i + 1)]['code'] !== T_DOC_COMMENT_WHITESPACE) {
+                $error = 'Expected 1 space after asterisk; 0 found';
+                $fix   = $phpcsFile->addFixableError($error, $i, 'NoSpaceAfterStar');
+                if ($fix === true) {
+                    $phpcsFile->fixer->addContent($i, ' ');
+                }
+            } else if ($tokens[($i + 2)]['code'] === T_DOC_COMMENT_TAG
+                && $tokens[($i + 1)]['content'] !== ' '
+                //ONGR we allow more spaces after asterisk if tags represented as in array.
+                && $lastVarEnding !== '{'
+                && $lastVarEnding !== ','
+            ) {
+                $error = 'Expected 1 space after asterisk; %s found   1 '.$lastVarEnding;
+                $data  = array(strlen($tokens[($i + 1)]['content']));
+                $fix   = $phpcsFile->addFixableError($error, $i, 'SpaceAfterStar', $data);
+                if ($fix === true) {
+                    $phpcsFile->fixer->replaceToken(($i + 1), ' ');
+                }
+            }
+        }//end for
+
+    }//end process()
+
+
+}//end class

Tests/AllSniffs.php → Ongr/Tests/AllSniffs.php

@@ -61,7 +61,7 @@ public static function main()
     public static function suite()
     {
         $suite = new PHPUnit_Framework_TestSuite('PHP CodeSniffer Standards');
-        $baseDir = pathinfo(getcwd(), PATHINFO_DIRNAME);
+        $baseDir = pathinfo(getcwd()."/Ongr", PATHINFO_DIRNAME);
 
         \PHP_CodeSniffer::setConfigData('installed_paths', $baseDir);
         $path = pathinfo(\PHP_CodeSniffer::getInstalledStandardPath('Ongr'), PATHINFO_DIRNAME);

Ongr/Tests/Unit/Commenting/DocCommentAlignmentSniffTest.php

@@ -0,0 +1,39 @@
+<?php
+
+/*
+ * This file is part of the ONGR package.
+ *
+ * (c) NFQ Technologies UAB <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Ongr\Tests\Unit\Commenting;
+
+use Ongr\Tests\AbstractSniffUnitTest;
+
+/**
+ * VariableCommentSniffTest class.
+ */
+class DocCommentAlignmentSniffTest extends AbstractSniffUnitTest
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected function getErrorList()
+    {
+        return [
+            43 => 1,
+            54 => 1,
+        ];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function getWarningList()
+    {
+        return [];
+    }
+}

Ongr/Tests/Unit/Commenting/DocCommentAlignmentSniffTest.phptest

@@ -0,0 +1,57 @@
+<?php
+
+/*
+ * This file is part of the ONGR package.
+ *
+ * (c) NFQ Technologies UAB <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Test;
+
+class DocCommentAlignmentSniffTest
+{
+    /**
+     * @var int
+     *
+     * @ORM\ManyToOne(targetEntity="FooBars")
+     * @ORM\JoinColumns({
+     *     @ORM\JoinColumn(name="BarID", referencedColumnName="Bar")
+     * })
+     */
+    public $foo;
+
+    /**
+     * @var int
+     *
+     * @ORM\ManyToOne(targetEntity="FooBars")
+     * @ORM\JoinColumns({
+     *     @ORM\JoinColumn(name="BarID", referencedColumnName="Bar"),
+     *     @ORM\JoinColumn(name="BarID", referencedColumnName="Bar")
+     * })
+     */
+    public $foo2;
+
+    /**
+     * @var int
+     *
+     * @ORM\ManyToOne(targetEntity="FooBars")
+     * @ORM\JoinColumns({
+     *     @ORM\JoinColumn(name="BarID", referencedColumnName="Bar")
+     *     @ORM\JoinColumn(name="BarID", referencedColumnName="Bar")
+     * })
+     */
+    public $foo3;
+
+    /**
+     * @var int
+     *
+     * @ORM\ManyToOne(targetEntity="FooBars")
+     * @ORM\JoinColumns({
+     * })
+     *     @ORM\JoinColumn(name="BarID", referencedColumnName="Bar")
+     */
+    public $foo4;
+}

ruleset.xml → Ongr/ruleset.xml

@@ -51,6 +51,7 @@
      <exclude name="Squiz.Classes.ClassDeclaration"/>
      <exclude name="Squiz.Commenting.BlockComment"/>
      <exclude name="Squiz.Commenting.ClassComment"/>
+     <exclude name="Squiz.Commenting.DocCommentAlignment"/>
      <exclude name="Squiz.Commenting.FunctionComment"/>
      <exclude name="Squiz.Commenting.FunctionCommentThrowTag"/>
      <exclude name="Squiz.Commenting.InlineComment"/>

README.rst

@@ -109,8 +109,8 @@ Composer:
 
     {
        "require-dev": {
-          "ongr/ongr-strict-standard": "~1.0",
-          "squizlabs/php_codesniffer": "~1"
+          "ongr/ongr-strict-standard": "2.*",
+          "squizlabs/php_codesniffer": "2.*"
        }
     }
 

composer.json

@@ -17,14 +17,13 @@
         }
     ],
     "require": {
-        "php": ">=5.4"
+        "php": ">=5.4",
+        "squizlabs/php_codesniffer": "~2.0"
     },
     "require-dev": {
-        "squizlabs/php_codesniffer": "~2.0",
         "phpunit/phpunit": "~4.2"
     },
-    "target-dir": "Ongr",
     "autoload": {
-        "psr-0": {"Ongr\\": ""}
+        "psr-0": {"": "./"}
     }
 }

phpunit.xml.dist

@@ -13,22 +13,23 @@
 
     <testsuites>
         <testsuite name="ONGR Test Suite">
-            <directory>Tests/AllTests.php</directory>
+            <directory>Ongr/Tests/AllTests.php</directory>
         </testsuite>
     </testsuites>
 
     <filter>
         <whitelist>
             <directory>./</directory>
             <exclude>
-                <directory>./Tests</directory>
+                <directory>./Ongr/Tests</directory>
                 <directory>./vendor</directory>
             </exclude>
         </whitelist>
     </filter>
 
+    <!--Add logging if you need via cli argument-->
     <logging>
-        <log type="coverage-text" target="php://stdout" showOnlySummary="true"/>
+        <!--<log type="coverage-text" target="php://stdout" showOnlySummary="true"/>-->
         <!--<log type="coverage-html" target="Tests/Build/Coverage" title="Coverage" charset="UTF-8" yui="true" highlight="true"/>-->
     </logging>
 </phpunit>