Fix and enable MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment

Change-Id: I8e3785d27d80c3756f7dfbf0d9d45ada366c490c

.phpcs.xml

@@ -1,8 +1,6 @@
 <?xml version="1.0"?>
 <ruleset>
-	<rule ref="./vendor/mediawiki/mediawiki-codesniffer/MediaWiki">
-		<exclude name="MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment" />
-	</rule>
+	<rule ref="./vendor/mediawiki/mediawiki-codesniffer/MediaWiki" />
 	<file>.</file>
 	<arg name="extensions" value="php" />
 	<arg name="encoding" value="UTF-8" />

includes/SpecialContact.php

@@ -375,7 +375,8 @@ class SpecialContact extends UnlistedSpecialPage {
 			$value = '';
 			// TODO: Support selectandother/HTMLSelectAndOtherField
 			// options, options-messages and options-message
-			if ( isset( $field['options-messages'] ) ) { // Multiple values!
+			if ( isset( $field['options-messages'] ) ) {
+				// Multiple values!
 				if ( is_string( $formData[$name] ) ) {
 					$optionValues = array_flip( $field['options-messages'] );
 					if ( isset( $optionValues[$formData[$name]] ) ) {
@@ -438,7 +439,8 @@ class SpecialContact extends UnlistedSpecialPage {
 		if ( !Hooks::run( 'ContactForm', [ &$contactRecipientAddress, &$replyTo, &$subject,
 			&$text, $this->formType, $formData ] )
 		) {
-			return false; // TODO: Need to do some proper error handling here
+			// TODO: Need to do some proper error handling here
+			return false;
 		}
 
 		wfDebug( __METHOD__ . ': sending mail from ' . $senderAddress->toString() .