Merge branch 'master' into report-memory-improvements

Conflicts:
	CodeSniffer.php

Author: gsherwood

CodeSniffer/File.php

@@ -2848,12 +2848,21 @@ public function findExtendedClassName($stackPtr)
             return false;
         }
 
-        $stringIndex = $this->findNext(T_STRING, $extendsIndex, $classCloserIndex);
-        if (false === $stringIndex) {
+        $find = array(
+                 T_NS_SEPARATOR,
+                 T_STRING,
+                 T_WHITESPACE,
+                );
+
+        $end  = $this->findNext($find, ($extendsIndex + 1), $classCloserIndex, true);
+        $name = $this->getTokensAsString(($extendsIndex + 1), ($end - $extendsIndex - 1));
+        $name = trim($name);
+
+        if ($name === '') {
             return false;
         }
 
-        return $this->_tokens[$stringIndex]['content'];
+        return $name;
 
     }//end findExtendedClassName()
 

CodeSniffer/Standards/Generic/Sniffs/Functions/CallTimePassByReferenceSniff.php

@@ -126,6 +126,7 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
                 switch ($tokens[$tokenBefore]['code']) {
                 case T_VARIABLE:
                 case T_CLOSE_PARENTHESIS:
+                case T_LNUMBER:
                     // In these cases T_BITWISE_AND represents
                     // the bitwise and operator.
                     continue;

CodeSniffer/Standards/Generic/Tests/Functions/CallTimePassByReferenceUnitTest.inc

@@ -17,4 +17,6 @@ myclass::myfunc($myvar);
 
 while(testfunc($var1, &$var2, $var3, &$var4) === false) {
 }
+
+sprintf("0%o", 0777 & $p);
 ?>

CodeSniffer/Standards/Generic/Tests/NamingConventions/ConstructorNameUnitTest.inc

@@ -28,4 +28,12 @@ class MyClass
     }
 
 }
-?>
+
+class MyClass extends \MyNamespace\SomeClass
+{
+    function __construct() {
+        something::MyNamespace();
+    }
+
+}
+?>

CodeSniffer/Standards/Squiz/Sniffs/Commenting/BlockCommentSniff.php

@@ -216,7 +216,9 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
 
         // Check that the lines before and after this comment are blank.
         $contentBefore = $phpcsFile->findPrevious(T_WHITESPACE, ($stackPtr - 1), null, true);
-        if (isset($tokens[$contentBefore]['scope_closer']) === true) {
+        if (isset($tokens[$contentBefore]['scope_closer']) === true
+            && $tokens[$contentBefore]['scope_opener'] === $contentBefore
+        ) {
             if (($tokens[$stackPtr]['line'] - $tokens[$contentBefore]['line']) !== 1) {
                 $error = 'Empty line not required before block comment';
                 $phpcsFile->addError($error, $stackPtr, 'HasEmptyLineBefore');

package.xml

@@ -58,11 +58,14 @@ http://pear.php.net/dtd/package-2.0.xsd">
     -- This allows you to create wrapper scripts for PHPCS more easily
   - PSR2 MethodDeclarationSniff no longer generates a notice for methods named "_"
     -- Thanks to Bart S for the patch
+  - Squiz BlockCommentSniff no longer reports that a blank line between a scope closer and block comment is invalid
   - Generic DuplicateClassNameSniff no longer reports an invalid error if multiple PHP open tags exist in a file
   - Generic DuplicateClassNameSniff no longer reports duplicate errors if multiple PHP open tags exist in a file
   - Fixed bug #19819 : Freeze with syntax error in use statement
   - Fixed bug #19820 : Wrong message level in Generic_Sniffs_CodeAnalysis_EmptyStatementSniff
   - Fixed bug #19859 : CodeSniffer::setIgnorePatterns API changed
+  - Fixed bug #19871 : findExtendedClassName doesn't return FQCN on namespaced classes
+  - Fixed bug #19879 : bitwise and operator interpreted as reference by value
  </notes>
  <contents>
   <dir name="/">