* (bug 25571) Xml::encodeJsVar now passes floats natively instead of converting to...

Added unit test cases for int, float, and strings that look like int or float.

diff --git a/includes/Xml.php b/includes/Xml.php
index b293b18..412f041 100644 (file)
--- a/includes/Xml.php
+++ b/includes/Xml.php
@@ -583,8 +583,8 @@ class Xml {
                        $s = $value ? 'true' : 'false';
                } elseif ( is_null( $value ) ) {
                        $s = 'null';
-               } elseif ( is_int( $value ) ) {
-                       $s = $value;
+               } elseif ( is_int( $value ) || is_float( $value ) ) {
+                       $s = strval($value);
                } elseif ( is_array( $value ) && // Make sure it's not associative.
                                        array_keys($value) === range( 0, count($value) - 1 ) ||
                                        count($value) == 0

diff --git a/tests/phpunit/includes/XmlTest.php b/tests/phpunit/includes/XmlTest.php
index 4086ce6..d9647e5 100644 (file)
--- a/tests/phpunit/includes/XmlTest.php
+++ b/tests/phpunit/includes/XmlTest.php
@@ -248,4 +248,36 @@ class XmlTest extends MediaWikiTestCase {
                        'encodeJsVar() with object'
                );
        }
+
+       function testEncodeJsVarInt() {
+               $this->assertEquals(
+                       '123456',
+                       Xml::encodeJsVar( 123456 ),
+                       'encodeJsVar() with int'
+               );
+       }
+
+       function testEncodeJsVarFloat() {
+               $this->assertEquals(
+                       '1.23456',
+                       Xml::encodeJsVar( 1.23456 ),
+                       'encodeJsVar() with float'
+               );
+       }
+
+       function testEncodeJsVarIntString() {
+               $this->assertEquals(
+                       '"123456"',
+                       Xml::encodeJsVar( '123456' ),
+                       'encodeJsVar() with int-like string'
+               );
+       }
+
+       function testEncodeJsVarFloatString() {
+               $this->assertEquals(
+                       '"1.23456"',
+                       Xml::encodeJsVar( '1.23456' ),
+                       'encodeJsVar() with float-like string'
+               );
+       }
 }