Merge branch 'master' into report-memory-improvements

Conflicts:
	package.xml

Author: gsherwood

CodeSniffer/Standards/PSR2/Sniffs/Namespaces/UseDeclarationSniff.php

@@ -124,7 +124,7 @@ private function _shouldIgnoreUse(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
         }
 
         // Ignore USE keywords for traits.
-        if ($phpcsFile->hasCondition($stackPtr, T_CLASS) === true) {
+        if ($phpcsFile->hasCondition($stackPtr, array(T_CLASS, T_TRAIT)) === true) {
             return true;
         }
 

CodeSniffer/Standards/PSR2/Tests/Namespaces/UseDeclarationUnitTest.1.inc

@@ -24,3 +24,8 @@ class Container extends Component implements IContainer
 {
     use TContainer;
 }
+
+trait HelloWorld
+{
+    use Hello, World;
+}

CodeSniffer/Standards/PSR2/Tests/Namespaces/UseDeclarationUnitTest.php

@@ -36,25 +36,34 @@ class PSR2_Tests_Namespaces_UseDeclarationUnitTest extends AbstractSniffUnitTest
      * 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.
      *
+     * @param string $testFile The name of the file being tested.
+     *
      * @return array(int => int)
      */
     public function getErrorList($testFile='')
     {
         switch ($testFile) {
+        case 'UseDeclarationUnitTest.1.inc':
+            // The trait test will only work in PHP versions where traits exist
+            // and will throw errors in earlier versions.
+            if (version_compare(PHP_VERSION, '5.4.0') < 0) {
+                return array(
+                        30  => 2,
+                       );
+            }
+
+            return array();
         case 'UseDeclarationUnitTest.2.inc':
             return array(
                     5  => 1,
                     10 => 2,
                    );
-            break;
         case 'UseDeclarationUnitTest.3.inc':
             return array(
                     5  => 1,
                    );
-            break;
         default:
             return array();
-            break;
         }//end switch
 
     }//end getErrorList()

package.xml

@@ -67,6 +67,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
   - Squiz.Scope.MethodScope.Missing error message now mentions 'visibility' instead of 'scope modifier'
     -- Thanks to Renat Akhmedyanov for the patch
   - The PSR2 standard no longer throws errors for additional spacing after a type hint
+  - PSR UseDeclarationSniff no longer throws errors for USE statements inside TRAITs
   - Fixed cases where code was incorrectly assigned the T_GOTO_LABEL token when used in a complex CASE condition
   - Fixed bug #20026 : Check for multi-line arrays that should be single-line is slightly wrong
     -- Adds new error message for single-line arrays that end with a comma