Merge "Improve coverage for AbuseFilterTokenizer"

includes/AFComputedVariable.php

@@ -209,7 +209,6 @@ class AFComputedVariable {
 				if ( $article->getContentModel() === CONTENT_MODEL_WIKITEXT ) {
 					$textVar = $parameters['text-var'];
 
-					// XXX: Use prepareContentForEdit. But we need a Content object for that.
 					$new_text = $vars->getVar( $textVar )->toString();
 					$content = ContentHandler::makeContent( $new_text, $article->getTitle() );
 					$editInfo = $article->prepareContentForEdit( $content );

includes/parser/AbuseFilterTokenizer.php

@@ -259,6 +259,7 @@ class AbuseFilterTokenizer {
 				$offset += 2;
 
 			} else {
+				// Should never happen
 				$token .= $code[$offset];
 				$offset++;
 			}

tests/parserTests/string.t

@@ -1 +1,6 @@
-"a\tb" = "a	b" & "a\qb" = "a\qb"
+"a\tb" === "a	b" &
+"a\qb" === "a\qb" &
+"a\"b" === 'a"b' &
+"a\rb" !== "a\r\nb" &
+"\x66\x6f\x6f" === "foo" &
+"some\xstring" === "somexstring"