Update CodeSniffer config to fix incorrect indentation errors

Requires PHP_ CodeSniffer 2.0

qa-tests/phpcs/ruleset.xml

@@ -12,11 +12,19 @@
 
 	<rule ref="PSR2">
 		<exclude name="Generic.WhiteSpace.DisallowTabIndent"/>
-		<exclude name="Generic.WhiteSpace.ScopeIndent"/>
+
 		<exclude name="Squiz.ControlStructures.ControlSignature"/>
 		<exclude name="Generic.ControlStructures.InlineControlStructure"/>
 		<exclude name="PSR2.Methods.FunctionCallSignature"/>
 	</rule>
 
+	<arg name="tab-width" value="4"/>
 	<rule ref="Generic.WhiteSpace.DisallowSpaceIndent"/>
+	<rule ref="Generic.WhiteSpace.ScopeIndent">
+		<properties>
+			<property name="indent" value="4"/>
+			<property name="tabIndent" value="true"/>
+		</properties>
+	</rule>
+
 </ruleset>