Merge branch 'fix/SquizMethodScopeTrait' of https://github.com/donatj/PHP_CodeSniffer

Author: gsherwood

CodeSniffer/Standards/Squiz/Sniffs/Scope/MethodScopeSniff.php

@@ -38,7 +38,7 @@ class Squiz_Sniffs_Scope_MethodScopeSniff extends PHP_CodeSniffer_Standards_Abst
      */
     public function __construct()
     {
-        parent::__construct(array(T_CLASS, T_INTERFACE), array(T_FUNCTION));
+        parent::__construct(array(T_CLASS, T_INTERFACE, T_TRAIT), array(T_FUNCTION));
 
     }//end __construct()
 

CodeSniffer/Standards/Squiz/Tests/Scope/MethodScopeUnitTest.inc

@@ -25,3 +25,10 @@ class Closure_Test {
 function test() {
     $foo = function() { echo 'foo'; };
 }
+
+trait Trait_Test {
+	function func1() {}
+	public function func1() {}
+	private function func1() {}
+	protected function func1() {}
+}

CodeSniffer/Standards/Squiz/Tests/Scope/MethodScopeUnitTest.php

@@ -44,6 +44,7 @@ public function getErrorList()
     {
         return array(
                 6 => 1,
+                30 => 1,
                );
 
     }//end getErrorList()