Follow-up r103915: We need to increment $end before the strcspn.

Adjusting the tests, since it is now adding the newline after the number.

diff --git a/includes/libs/JavaScriptMinifier.php b/includes/libs/JavaScriptMinifier.php
index 94e89d3..d34473f 100644 (file)
--- 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 c78b412..5952e43 100644 (file)
--- 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 );