Re-enable PHPCS, update ruleset

.travis.yml

@@ -23,8 +23,8 @@ before_script:
   - cp qa-tests/phpunit-qa-config.php qa-config.php
 
 script:
-  # PHP_CodeSniffer (turned off for now)
-  #- php phpcs.phar --report=emacs --extensions=php --standard=qa-tests/phpcs/ruleset.xml .
+  # PHP_CodeSniffer
+  - php phpcs.phar --report=emacs --extensions=php --standard=qa-tests/phpcs/ruleset.xml .
   # PHP Copy/Paste Detector
   - php phpcpd.phar --exclude vendor .
   # PHPUnit

qa-tests/phpcs/ruleset.xml

@@ -9,16 +9,23 @@
 	<exclude-pattern>qa-plugin/facebook-login/base_facebook.php</exclude-pattern>
 
 	<rule ref="PSR1">
+		<exclude name="PSR1.Files.SideEffects.FoundWithSymbols"/>
+		<exclude name="Generic.Formatting.DisallowMultipleStatements.SameLine"/>
+		<exclude name="Squiz.WhiteSpace.ScopeClosingBrace.ContentBefore"/>
+		<exclude name="PSR1.Classes.ClassDeclaration.MultipleClasses"/>
 		<exclude name="PSR1.Classes.ClassDeclaration.MissingNamespace"/>
+		<exclude name="Squiz.Classes.ValidClassName.NotCamelCaps"/>
+		<exclude name="PSR1.Methods.CamelCapsMethodName.NotCamelCaps"/>
 	</rule>
 
 	<rule ref="PSR2">
 		<exclude name="Generic.WhiteSpace.DisallowTabIndent"/>
 		<exclude name="Generic.Files.LineLength.TooLong"/>
-
-		<exclude name="Squiz.ControlStructures.ControlSignature"/>
 		<exclude name="Generic.ControlStructures.InlineControlStructure"/>
+		<exclude name="Squiz.ControlStructures.ControlSignature"/> <!-- doesn't work without above rule -->
+		<exclude name="Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose"/>
 		<exclude name="PSR2.Methods.FunctionCallSignature"/>
+		<exclude name="Squiz.Functions.MultiLineFunctionDeclaration"/>
 	</rule>
 
 	<arg name="tab-width" value="4"/>