* The $statementsOnOwnLine parameter of JavaScriptMinifier::minify was removed.
The corresponding configuration variable ($wgResourceLoaderMinifierStatementsOnOwnLine)
has been deprecated since 1.27 and was removed as well.
+* The $maxLineLength parameter of JavaScriptMinifier::minify was removed.
+ The corresponding configuration variable ($wgResourceLoaderMinifierMaxLineLength)
+ has been deprecated since 1.27 and was removed as well.
* The HtmlFormatter class was removed (deprecated in 1.27). The namespaced
HtmlFormatter\HtmlFormatter class should be used instead.
const STACK_LIMIT = 1000;
/**
- * Returns minified JavaScript code.
- *
- * NOTE: $maxLineLength isn't a strict maximum. Longer lines will be produced when
- * literals (e.g. quoted strings) longer than $maxLineLength are encountered
+ * NOTE: This isn't a strict maximum. Longer lines will be produced when
+ * literals (e.g. quoted strings) longer than this are encountered
* or when required to guard against semicolon insertion.
+ */
+ const MAX_LINE_LENGTH = 1000;
+
+ /**
+ * Returns minified JavaScript code.
*
* @param string $s JavaScript code to minify
- * @param int $maxLineLength Maximum length of a single line, or -1 for no maximum.
* @return String Minified code
*/
- public static function minify( $s, $maxLineLength = 1000 ) {
+ public static function minify( $s ) {
// First we declare a few tables that contain our parsing rules
// $opChars : characters, which can be combined without whitespace in between them
$out .= "\n";
$state = self::STATEMENT;
$lineLength = 0;
- } elseif ( $maxLineLength > 0 && $lineLength + $end - $pos > $maxLineLength &&
+ } elseif ( $lineLength + $end - $pos > self::MAX_LINE_LENGTH &&
!isset( $semicolon[$state][$type] ) && $type !== self::TYPE_INCR_OP ) {
// This line would get too long if we added $token, so add a newline first.
// Only do this if it won't trigger semicolon insertion and if it won't