Merge branch 'feature/unittests' into develop

Author: louisl

CodeIgniter4/Sniffs/Arrays/ArrayDeclarationSniff.php

@@ -403,7 +403,7 @@ public function processMultiLineArray($phpcsFile, $stackPtr, $arrayStart, $array
         // If this is the first argument in a function ensure the bracket to be right after the parenthesis. eg "array_combine([".
         if ($tokens[$prevNonWhitespaceToken]['code'] === T_OPEN_PARENTHESIS && $tokens[$stackPtr]['code'] === T_OPEN_SHORT_ARRAY) {
             if ($tokens[$stackPtr]['line'] > $tokens[$prevNonWhitespaceToken]['line']) {
-                $error = 'Array open bracket should be after function open parenthesis "(["';
+                $error = 'Array openening bracket should be after function open parenthesis "(["';
                 $data  = array();
                 $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'ShortArrayOpenWrongLine', $data);
                 if ($fix === true) {
@@ -417,11 +417,31 @@ public function processMultiLineArray($phpcsFile, $stackPtr, $arrayStart, $array
             }
         }
 
-        // Check the closing bracket is on a new line.
+        // Get content before closing array bracket/brace.
         $lastContent = $phpcsFile->findPrevious(T_WHITESPACE, ($arrayEnd - 1), $arrayStart, true);
+
+        // Check for ) after last Array end.
+        $afterCloser = $phpcsFile->findNext(T_WHITESPACE, ($arrayEnd + 1), null, true);
+        if ($tokens[$afterCloser]['code'] === T_CLOSE_PARENTHESIS) {
+            if ($tokens[$afterCloser]['column'] !== ($tokens[$arrayEnd]['column'] + 1)) {
+                $error = 'Closing parenthesis should be after array closing bracket "])"';
+                $data  = array();
+                $fix   = $phpcsFile->addFixableError($error, $afterCloser, 'CloseBracketAfterArrayBracket');
+                if ($fix === true) {
+                    $phpcsFile->fixer->beginChangeset();
+                    for ($i = ($arrayEnd + 1); $i < $afterCloser; $i++) {
+                        $phpcsFile->fixer->replaceToken($i, '');
+                    }
+
+                    $phpcsFile->fixer->endChangeset();
+                }
+            }
+        }
+
+        // Check the closing bracket is on a new line.
         if ($tokens[$lastContent]['line'] === $tokens[$arrayEnd]['line']) {
             $error = 'Closing parenthesis of array declaration must be on a new line';
-            $fix   = $phpcsFile->addFixableError($error, $arrayEnd, 'CloseBraceNewLine');
+            $fix   = $phpcsFile->addFixableError($error, $arrayEnd, 'CloseArrayBraceNewLine');
             if ($fix === true) {
                 $phpcsFile->fixer->addNewlineBefore($arrayEnd);
             }
@@ -442,7 +462,7 @@ public function processMultiLineArray($phpcsFile, $stackPtr, $arrayStart, $array
                       ($found / $this->tabWidth),
                      );
 
-            $fix = $phpcsFile->addFixableError($error, $arrayEnd, 'CloseBraceNotAligned', $data);
+            $fix = $phpcsFile->addFixableError($error, $arrayEnd, 'CloseArrayBraceNotAligned', $data);
             if ($fix === true) {
                 if ($found === 0) {
                     $phpcsFile->fixer->addContent(($arrayEnd - 1), str_repeat(' ', $expected));

CodeIgniter4/Tests/Arrays/ArrayDeclarationUnitTest.inc.fixed

@@ -182,8 +182,7 @@ class MyClass {
 		$message->setCustomProperty('user_info', [
             'id'   => $id,
             'name' => 'Test message',
-        ]
-		);
+        ]);
 
 		$users = [
 			[

CodeIgniter4/Tests/Arrays/ArrayDeclarationUnitTest.php

@@ -96,6 +96,7 @@ public function getErrorList()
                 117 => 1,
                 118 => 1,
                 119 => 1,
+                120 => 1,
                );
 
     }//end getErrorList()

CodeIgniter4/Tests/Operators/BooleanAndUnitTest.inc

@@ -0,0 +1,7 @@
+<?php
+
+if ($a AND $b === $c) {} // Fail
+if ($a === $b AND $c) {} // Fail
+if ($a === $b AND $a === $c) {} // Fail
+if ($a === $b && $a === $c) {} // Fail
+if ($a === 1 and $a === 2 AND $a === 3) {} // Fail 2 errors

CodeIgniter4/Tests/Operators/BooleanAndUnitTest.inc.fixed

@@ -0,0 +1,7 @@
+<?php
+
+if ($a && $b === $c) {} // Fail
+if ($a === $b && $c) {} // Fail
+if ($a === $b && $a === $c) {} // Fail
+if ($a === $b && $a === $c) {} // Fail
+if ($a === 1 && $a === 2 && $a === 3) {} // Fail 2 errors

CodeIgniter4/Tests/Operators/BooleanAndUnitTest.php

@@ -0,0 +1,54 @@
+<?php
+/**
+ * Boolean And Unit Test
+ *
+ * @package   CodeIgniter4-Standard
+ * @author    Louis Linehan <louis.linehan@gmail.com>
+ * @copyright 2017 Louis Linehan
+ * @license   https://github.com/louisl/CodeIgniter4-Standard/blob/master/LICENSE MIT License
+ */
+
+namespace CodeIgniter4\Tests\Operators;
+
+use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
+
+class BooleanAndUnitTest extends AbstractSniffUnitTest
+{
+
+
+    /**
+     * Returns the lines where errors should occur.
+     *
+     * The key of the array should represent the line number and the value
+     * should represent the number of errors that should occur on that line.
+     *
+     * @return array<int, int>
+     */
+    public function getErrorList()
+    {
+        return array(
+                3 => 1,
+                4 => 1,
+                5 => 1,
+                7 => 2,
+               );
+
+    }//end getErrorList()
+
+
+    /**
+     * Returns the lines where warnings should occur.
+     *
+     * The key of the array should represent the line number and the value
+     * should represent the number of warnings that should occur on that line.
+     *
+     * @return array<int, int>
+     */
+    public function getWarningList()
+    {
+        return array();
+
+    }//end getWarningList()
+
+
+}//end class

CodeIgniter4/Tests/Operators/BooleanOrUnitTest.inc

@@ -1,5 +1,6 @@
 <?php
 
-if ($a === $b or $a === $c) {} // Fail
-if ($a === $b || $a === $c) {} // Pass
-if ($a === 1 or $a === 2 or $a === 3) {} // Fail 2 errors
+if ($a OR $b === $c) {} // Fail
+if ($a === $b OR $c) {} // Fail
+if ($a === $b OR $a === $c) {} // Fail
+if ($a === 1 or $a === 2 OR $a === 3) {} // Fail 2 errors

CodeIgniter4/Tests/Operators/BooleanOrUnitTest.inc.fixed

@@ -0,0 +1,6 @@
+<?php
+
+if ($a || $b === $c) {} // Fail
+if ($a === $b || $c) {} // Fail
+if ($a === $b || $a === $c) {} // Fail
+if ($a === 1 || $a === 2 || $a === 3) {} // Fail 2 errors

CodeIgniter4/Tests/Operators/BooleanOrUnitTest.php

@@ -28,8 +28,9 @@ public function getErrorList()
     {
         return array(
                 3 => 1,
-                4 => 0,
-                5 => 2,
+                4 => 1,
+                5 => 1,
+                6 => 2,
                );
 
     }//end getErrorList()