Merged changelog

Author: gsherwood

CodeSniffer.conf

@@ -0,0 +1,4 @@
+<?php
+ $phpCodeSnifferConfig = array (
+)
+?>

CodeSniffer.sample.conf

@@ -616,7 +616,7 @@ private function _parse($contents=null)
         $contents = str_replace($this->eolChar, '', $contents);
         $contents = str_replace("\n", '\n', $contents);
         $contents = str_replace("\r", '\r', $contents);
-        if (preg_match('/(\\\\.)+/', $contents) === 1) {
+        if (strpos($contents, '\\') !== false) {
             $error = 'File has mixed line endings; this may cause incorrect results';
             $this->addWarning($error, 0, 'Internal.LineEndings.Mixed');
         }

CodeSniffer/File.php

@@ -150,13 +150,16 @@ protected function getDeclarationNameWithNamespace(array $tokens, $stackPtr)
      */
     protected function getNamespaceOfScope(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
     {
-        $namespaceDeclaration      = $phpcsFile->findPrevious(T_NAMESPACE, $stackPtr);
-        $endOfNamespaceDeclaration = $phpcsFile->findNext(T_SEMICOLON, $namespaceDeclaration);
-
-        $namespace = $this->getDeclarationNameWithNamespace(
-            $phpcsFile->getTokens(),
-            ($endOfNamespaceDeclaration - 1)
-        );
+        $namespace = '\\';
+        $namespaceDeclaration = $phpcsFile->findPrevious(T_NAMESPACE, $stackPtr);
+
+        if ($namespaceDeclaration !== false) {
+            $endOfNamespaceDeclaration = $phpcsFile->findNext(T_SEMICOLON, $namespaceDeclaration);
+            $namespace = $this->getDeclarationNameWithNamespace(
+                $phpcsFile->getTokens(),
+                ($endOfNamespaceDeclaration - 1)
+            );
+        }
 
         return $namespace;
 

CodeSniffer/Standards/Squiz/Sniffs/Classes/SelfMemberReferenceSniff.php

@@ -58,6 +58,7 @@ protected function getPatterns()
                 'if (...) {EOL',
                 'foreach (...) {EOL',
                 '} else if (...) {EOL',
+                '} elseif (...) {EOL',
                 '} else {EOL',
                );
 

CodeSniffer/Standards/Squiz/Sniffs/ControlStructures/ControlSignatureSniff.php

@@ -136,7 +136,7 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
             // a minus value or returning one.
             $prev = $phpcsFile->findPrevious(T_WHITESPACE, ($stackPtr - 1), null, true);
             if ($tokens[$prev]['code'] === T_RETURN) {
-                // Just returning a negative value; eg. return -1.
+                // Just returning a negative value; eg. (return -1).
                 return;
             }
 
@@ -150,6 +150,11 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
                 return;
             }
 
+            if (in_array($tokens[$prev]['code'], PHP_CodeSniffer_Tokens::$assignmentTokens) === true) {
+                // Just trying to assign a negative value; eg. ($var = -1).
+                return;
+            }
+
             // A list of tokens that indicate that the token is not
             // part of an arithmetic operation.
             $invalidTokens = array(
@@ -159,24 +164,14 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
                               T_DOUBLE_ARROW,
                               T_COLON,
                               T_INLINE_THEN,
+                              T_INLINE_ELSE,
                               T_CASE,
                              );
 
             if (in_array($tokens[$prev]['code'], $invalidTokens) === true) {
                 // Just trying to use a negative value; eg. myFunction($var, -2).
                 return;
             }
-
-            $number = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + 1), null, true);
-            if (in_array($tokens[$number]['code'], array(T_LNUMBER, T_VARIABLE)) === true) {
-                $semi = $phpcsFile->findNext(T_WHITESPACE, ($number + 1), null, true);
-                if ($tokens[$semi]['code'] === T_SEMICOLON) {
-                    if ($prev !== false && (in_array($tokens[$prev]['code'], PHP_CodeSniffer_Tokens::$assignmentTokens) === true)) {
-                        // This is a negative assignment.
-                        return;
-                    }
-                }
-            }
         }//end if
 
         $operator = $tokens[$stackPtr]['content'];

CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/OperatorSpacingSniff.php

@@ -64,6 +64,14 @@ class MyClass {
 
 MyClass::walk();
 
+class Controller
+{
+    public function Action()
+    {
+        Doctrine\Common\Util\Debug::dump();
+    }
+}
+
 namespace TYPO3\CMS\Reports;
 
 class Status {

CodeSniffer/Standards/Squiz/Tests/Classes/SelfMemberReferenceUnitTest.inc

@@ -152,4 +152,10 @@ try { $code = 'this'; } catch (Exception $e) {
 do { echo $i;
 } while ($i > 0);
 
-?>
+if ($a) {
+
+}
+elseif ($b) {
+
+}
+?>

CodeSniffer/Standards/Squiz/Tests/ControlStructures/ControlSignatureUnitTest.inc

@@ -72,6 +72,7 @@ public function getErrorList($testFile='ControlSignatureUnitTest.inc')
                     139 => 1,
                     148 => 1,
                     152 => 1,
+                    158 => 1,
                    );
         break;
         case 'ControlSignatureUnitTest.js':

CodeSniffer/Standards/Squiz/Tests/ControlStructures/ControlSignatureUnitTest.php

@@ -105,11 +105,22 @@ $boo = -$foo;
 function foo($boo = -1) {}
 $foo = array('boo' => -1);
 $x = $test ? -1 : 1;
+$y = $test ? 1 : -1;
 
 $closureWithDefaultParamter = function (array $testArray=array()) {};
 
 switch ($foo) {
 	case -1:
 		break;
 }
+
+$y = 1 * -1;
+$y = -1 * 1;
+$y = -1 * $var;
+$y = 10 / -2;
+$y = -10 / 2;
+$y = (-10 / 2);
+$y = (-10 / $var);
+$y = 10 + -2;
+$y = -10 + 2;
 ?>