Fix broken json tests in all branches

diff --git a/ext/json/tests/bug41403.phpt b/ext/json/tests/bug41403.phpt
index 6672b148e43b33696aad5f68417c06a4940df34b..ad4d7b00cd667cdd1e58eafe62f61ce87c334c9c 100644 (file)
--- a/ext/json/tests/bug41403.phpt
+++ b/ext/json/tests/bug41403.phpt
@@ -26,15 +26,15 @@ echo "Done\n";
 Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %s on line %d
 array(1) {
   [0]=>
-  float(2,1)
+  float(2.1)
 }
 array(1) {
   [0]=>
-  float(0,15)
+  float(0.15)
 }
 array(1) {
   [0]=>
-  float(123,13452345)
+  float(123.13452345)
 }
 array(2) {
   [0]=>

diff --git a/ext/json/tests/pass001.1_64bit.phpt b/ext/json/tests/pass001.1_64bit.phpt
index d1682a7ea9476dbb10c38e0bb4ab384bcf860d53..a129fea1d76e44519e048db0c1c7adcd039c1e14 100644 (file)
--- a/ext/json/tests/pass001.1_64bit.phpt
+++ b/ext/json/tests/pass001.1_64bit.phpt
@@ -220,8 +220,7 @@ array(14) {
     unicode(1) "\"
     [u"controls"]=>
     unicode(5) "\b\f
-
-       "
+\r      "
     [u"slash"]=>
     unicode(5) "/ & /"
     [u"alpha"]=>
@@ -334,8 +333,7 @@ array(14) {
     [u"quotes"]=>
     unicode(27) "" " %22 0x22 034 ""
     [u"/\"쫾몾ꮘﳞ볚\b\f
-
-       `1~!@#$%^&*()_+-=[]{}|;:',./<>?"]=>
+\r      `1~!@#$%^&*()_+-=[]{}|;:',./<>?"]=>
     unicode(23) "A key can be any string"
   }
   [9]=>
@@ -401,8 +399,7 @@ array(14) {
     unicode(1) "\"
     [u"controls"]=>
     unicode(5) "\b\f
-
-       "
+\r      "
     [u"slash"]=>
     unicode(5) "/ & /"
     [u"alpha"]=>
@@ -515,8 +512,7 @@ array(14) {
     [u"quotes"]=>
     unicode(27) "&#34; " %22 0x22 034 &#x22;"
     [u"/\"쫾몾ꮘﳞ볚\b\f
-
-       `1~!@#$%^&*()_+-=[]{}|;:',./<>?"]=>
+\r      `1~!@#$%^&*()_+-=[]{}|;:',./<>?"]=>
     unicode(23) "A key can be any string"
   }
   [9]=>
@@ -586,8 +582,7 @@ array(14) {
     unicode(1) "\"
     [u"controls"]=>
     unicode(5) "\b\f
-
-       "
+\r      "
     [u"slash"]=>
     unicode(5) "/ & /"
     [u"alpha"]=>
@@ -700,8 +695,7 @@ array(14) {
     [u"quotes"]=>
     unicode(27) "&#34; " %22 0x22 034 &#x22;"
     [u"/\"쫾몾ꮘﳞ볚\b\f
-
-       `1~!@#$%^&*()_+-=[]{}|;:',./<>?"]=>
+\r      `1~!@#$%^&*()_+-=[]{}|;:',./<>?"]=>
     unicode(23) "A key can be any string"
   }
   [9]=>
@@ -767,8 +761,7 @@ array(14) {
     unicode(1) "\"
     [u"controls"]=>
     unicode(5) "\b\f
-
-       "
+\r      "
     [u"slash"]=>
     unicode(5) "/ & /"
     [u"alpha"]=>
@@ -881,8 +874,7 @@ array(14) {
     [u"quotes"]=>
     unicode(27) "&#34; " %22 0x22 034 &#x22;"
     [u"/\"쫾몾ꮘﳞ볚\b\f
-
-       `1~!@#$%^&*()_+-=[]{}|;:',./<>?"]=>
+\r      `1~!@#$%^&*()_+-=[]{}|;:',./<>?"]=>
     unicode(23) "A key can be any string"
   }
   [9]=>

diff --git a/ext/json/tests/pass001.phpt b/ext/json/tests/pass001.phpt
index 51d1e96a1762015e80e417ddc12d87f9c441f940..368de7fb68028db54dcd0a5d2536baf7125f38d0 100644 (file)
--- a/ext/json/tests/pass001.phpt
+++ b/ext/json/tests/pass001.phpt
@@ -202,8 +202,7 @@ array(14) {
     unicode(1) "\"
     [u"controls"]=>
     unicode(5) "\b\f
-
-       "
+\r      "
     [u"slash"]=>
     unicode(5) "/ & /"
     [u"alpha"]=>
@@ -275,8 +274,7 @@ array(14) {
     [u"quotes"]=>
     unicode(27) "" " %22 0x22 034 ""
     [u"/\"쫾몾ꮘﳞ볚\b\f
-
-       `1~!@#$%^&*()_+-=[]{}|;:',./<>?"]=>
+\r      `1~!@#$%^&*()_+-=[]{}|;:',./<>?"]=>
     unicode(23) "A key can be any string"
   }
   [9]=>
@@ -340,8 +338,7 @@ array(14) {
     unicode(1) "\"
     [u"controls"]=>
     unicode(5) "\b\f
-
-       "
+\r      "
     [u"slash"]=>
     unicode(5) "/ & /"
     [u"alpha"]=>
@@ -413,8 +410,7 @@ array(14) {
     [u"quotes"]=>
     unicode(27) "&#34; " %22 0x22 034 &#x22;"
     [u"/\"쫾몾ꮘﳞ볚\b\f
-
-       `1~!@#$%^&*()_+-=[]{}|;:',./<>?"]=>
+\r      `1~!@#$%^&*()_+-=[]{}|;:',./<>?"]=>
     unicode(23) "A key can be any string"
   }
   [9]=>
@@ -482,8 +478,7 @@ array(14) {
     unicode(1) "\"
     [u"controls"]=>
     unicode(5) "\b\f
-
-       "
+\r      "
     [u"slash"]=>
     unicode(5) "/ & /"
     [u"alpha"]=>
@@ -555,8 +550,7 @@ array(14) {
     [u"quotes"]=>
     unicode(27) "&#34; " %22 0x22 034 &#x22;"
     [u"/\"쫾몾ꮘﳞ볚\b\f
-
-       `1~!@#$%^&*()_+-=[]{}|;:',./<>?"]=>
+\r      `1~!@#$%^&*()_+-=[]{}|;:',./<>?"]=>
     unicode(23) "A key can be any string"
   }
   [9]=>
@@ -620,8 +614,7 @@ array(14) {
     unicode(1) "\"
     [u"controls"]=>
     unicode(5) "\b\f
-
-       "
+\r      "
     [u"slash"]=>
     unicode(5) "/ & /"
     [u"alpha"]=>
@@ -693,8 +686,7 @@ array(14) {
     [u"quotes"]=>
     unicode(27) "&#34; " %22 0x22 034 &#x22;"
     [u"/\"쫾몾ꮘﳞ볚\b\f
-
-       `1~!@#$%^&*()_+-=[]{}|;:',./<>?"]=>
+\r      `1~!@#$%^&*()_+-=[]{}|;:',./<>?"]=>
     unicode(23) "A key can be any string"
   }
   [9]=>