From b23dc2f758a76ef03c922e0336e475ebef6049a0 Mon Sep 17 00:00:00 2001 From: Platonides Date: Tue, 22 Nov 2011 18:10:25 +0000 Subject: [PATCH] Follow-up r103915: We need to increment $end before the strcspn. Adjusting the tests, since it is now adding the newline after the number. --- includes/libs/JavaScriptMinifier.php | 3 ++- tests/phpunit/includes/libs/JavaScriptMinifierTest.php | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/includes/libs/JavaScriptMinifier.php b/includes/libs/JavaScriptMinifier.php index 94e89d3166..d34473f363 100644 --- a/includes/libs/JavaScriptMinifier.php +++ b/includes/libs/JavaScriptMinifier.php @@ -511,6 +511,7 @@ class JavaScriptMinifier { if ( $exponent > 1 ) { return self::parseError($s, $end, 'Number with several E' ); } + $end++; // + sign is optional; - sign is required. $end += strspn( $s, '-+', $end ); @@ -518,7 +519,7 @@ class JavaScriptMinifier { if ( !$len ) { return self::parseError($s, $pos, 'No decimal digits after e, how many zeroes should be added?' ); } - $end += $len + 1; + $end += $len; } } elseif( isset( $opChars[$ch] ) ) { // Punctuation character. Search for the longest matching operator. diff --git a/tests/phpunit/includes/libs/JavaScriptMinifierTest.php b/tests/phpunit/includes/libs/JavaScriptMinifierTest.php index c78b41292a..5952e43284 100644 --- a/tests/phpunit/includes/libs/JavaScriptMinifierTest.php +++ b/tests/phpunit/includes/libs/JavaScriptMinifierTest.php @@ -114,7 +114,7 @@ class JavaScriptMinifierTest extends MediaWikiTestCase { $suffix = ',shortVarName=0;'; $input = $prefix . $num . $suffix; - $expected = $prefix . "\n" . $num . $suffix; + $expected = $prefix . $num . "\n" . $suffix; $minified = JavaScriptMinifier::minify( $input ); -- 2.20.1