Final fixup to r103910 and follow-ups.

Reverts r103931 test change.

diff --git a/includes/libs/JavaScriptMinifier.php b/includes/libs/JavaScriptMinifier.php
index fc815e2..baf9338 100644 (file)
--- a/includes/libs/JavaScriptMinifier.php
+++ b/includes/libs/JavaScriptMinifier.php
@@ -504,7 +504,7 @@ class JavaScriptMinifier {
                                        if ( $decimal > 2 ) {
                                                return self::parseError($s, $end, 'The number has too many decimal points' );
                                        }
-                                       $end += strspn( $s, '0123456789', $end ) + 1;
+                                       $end += strspn( $s, '0123456789', $end + 1 ) + $decimal;
                                }
                                $exponent = strspn( $s, 'eE', $end );
                                if( $exponent ) {

diff --git a/tests/phpunit/includes/libs/JavaScriptMinifierTest.php b/tests/phpunit/includes/libs/JavaScriptMinifierTest.php
index 8303e79..d2bfeed 100644 (file)
--- a/tests/phpunit/includes/libs/JavaScriptMinifierTest.php
+++ b/tests/phpunit/includes/libs/JavaScriptMinifierTest.php
@@ -121,7 +121,7 @@ class JavaScriptMinifierTest extends MediaWikiTestCase {
                $suffix = ',shortVarName=0;';
 
                $input = $prefix . $num . $suffix;
-               $expected = $prefix . $num . "\n" . $suffix;
+               $expected = $prefix . "\n" . $num . $suffix;
 
                $minified = JavaScriptMinifier::minify( $input );