Merge pull request #271 from humanmade/use-in-class

Ignore "use" within "class" in OrderSniff. This can be followed up by subsequent work to improve this sniff further.

Author: kadamwhite

HM/Sniffs/Layout/OrderSniff.php

@@ -51,6 +51,9 @@ public function process( File $phpcsFile, $stackPtr ) {
 			if ( $next_token['code'] === T_USE && $phpcsFile->findPrevious( T_CLOSURE, $next_pos, null, false, null, true ) !== false ) {
 				continue;
 			}
+			if ( $next_token['code'] === T_USE && $phpcsFile->findPrevious( T_CLASS, $next_pos, null, false, null, true ) !== false ) {
+				continue;
+			}
 
 			// Must be current or higher.
 			$next_type_score = $look_for[ $next_token['code'] ];

tests/fixtures/pass/use-order.php

@@ -2,6 +2,7 @@
 
 use Foo\Bar;
 use Foo\Baz as Zztop;
+use Some_Trait;
 
 require( 'some/file/that/exists.php' );
 
@@ -42,3 +43,7 @@
 $c = function() {
 	return true;
 };
+
+class My_Class {
+	use Some_Trait;
+}