From: Rasmus Lerdorf <rasmus@php.net>
Date: Mon, 3 Aug 2009 04:01:57 +0000 (+0000)
Subject: Fix broken json tests in all branches
X-Git-Tag: php-5.4.0alpha1~191^2~2882
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e949665bc95527344be8f45073aba8dcbf43531c;p=php

Fix broken json tests in all branches
---

diff --git a/ext/json/tests/bug41403.phpt b/ext/json/tests/bug41403.phpt
index 6672b148e4..ad4d7b00cd 100644
--- 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 d1682a7ea9..a129fea1d7 100644
--- 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) "
-
-	"
+
	"
     [u"slash"]=>
     unicode(5) "/ & /"
     [u"alpha"]=>
@@ -334,8 +333,7 @@ array(14) {
     [u"quotes"]=>
     unicode(27) "&#34; " %22 0x22 034 &#x22;"
     [u"/\"쫾몾ꮘﳞ볚
-
-	`1~!@#$%^&*()_+-=[]{}|;:',./<>?"]=>
+
	`1~!@#$%^&*()_+-=[]{}|;:',./<>?"]=>
     unicode(23) "A key can be any string"
   }
   [9]=>
@@ -401,8 +399,7 @@ array(14) {
     unicode(1) "\"
     [u"controls"]=>
     unicode(5) "
-
-	"
+
	"
     [u"slash"]=>
     unicode(5) "/ & /"
     [u"alpha"]=>
@@ -515,8 +512,7 @@ array(14) {
     [u"quotes"]=>
     unicode(27) "&#34; " %22 0x22 034 &#x22;"
     [u"/\"쫾몾ꮘﳞ볚
-
-	`1~!@#$%^&*()_+-=[]{}|;:',./<>?"]=>
+
	`1~!@#$%^&*()_+-=[]{}|;:',./<>?"]=>
     unicode(23) "A key can be any string"
   }
   [9]=>
@@ -586,8 +582,7 @@ array(14) {
     unicode(1) "\"
     [u"controls"]=>
     unicode(5) "
-
-	"
+
	"
     [u"slash"]=>
     unicode(5) "/ & /"
     [u"alpha"]=>
@@ -700,8 +695,7 @@ array(14) {
     [u"quotes"]=>
     unicode(27) "&#34; " %22 0x22 034 &#x22;"
     [u"/\"쫾몾ꮘﳞ볚
-
-	`1~!@#$%^&*()_+-=[]{}|;:',./<>?"]=>
+
	`1~!@#$%^&*()_+-=[]{}|;:',./<>?"]=>
     unicode(23) "A key can be any string"
   }
   [9]=>
@@ -767,8 +761,7 @@ array(14) {
     unicode(1) "\"
     [u"controls"]=>
     unicode(5) "
-
-	"
+
	"
     [u"slash"]=>
     unicode(5) "/ & /"
     [u"alpha"]=>
@@ -881,8 +874,7 @@ array(14) {
     [u"quotes"]=>
     unicode(27) "&#34; " %22 0x22 034 &#x22;"
     [u"/\"쫾몾ꮘﳞ볚
-
-	`1~!@#$%^&*()_+-=[]{}|;:',./<>?"]=>
+
	`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 51d1e96a17..368de7fb68 100644
--- a/ext/json/tests/pass001.phpt
+++ b/ext/json/tests/pass001.phpt
@@ -202,8 +202,7 @@ array(14) {
     unicode(1) "\"
     [u"controls"]=>
     unicode(5) "
-
-	"
+
	"
     [u"slash"]=>
     unicode(5) "/ & /"
     [u"alpha"]=>
@@ -275,8 +274,7 @@ array(14) {
     [u"quotes"]=>
     unicode(27) "&#34; " %22 0x22 034 &#x22;"
     [u"/\"쫾몾ꮘﳞ볚
-
-	`1~!@#$%^&*()_+-=[]{}|;:',./<>?"]=>
+
	`1~!@#$%^&*()_+-=[]{}|;:',./<>?"]=>
     unicode(23) "A key can be any string"
   }
   [9]=>
@@ -340,8 +338,7 @@ array(14) {
     unicode(1) "\"
     [u"controls"]=>
     unicode(5) "
-
-	"
+
	"
     [u"slash"]=>
     unicode(5) "/ & /"
     [u"alpha"]=>
@@ -413,8 +410,7 @@ array(14) {
     [u"quotes"]=>
     unicode(27) "&#34; " %22 0x22 034 &#x22;"
     [u"/\"쫾몾ꮘﳞ볚
-
-	`1~!@#$%^&*()_+-=[]{}|;:',./<>?"]=>
+
	`1~!@#$%^&*()_+-=[]{}|;:',./<>?"]=>
     unicode(23) "A key can be any string"
   }
   [9]=>
@@ -482,8 +478,7 @@ array(14) {
     unicode(1) "\"
     [u"controls"]=>
     unicode(5) "
-
-	"
+
	"
     [u"slash"]=>
     unicode(5) "/ & /"
     [u"alpha"]=>
@@ -555,8 +550,7 @@ array(14) {
     [u"quotes"]=>
     unicode(27) "&#34; " %22 0x22 034 &#x22;"
     [u"/\"쫾몾ꮘﳞ볚
-
-	`1~!@#$%^&*()_+-=[]{}|;:',./<>?"]=>
+
	`1~!@#$%^&*()_+-=[]{}|;:',./<>?"]=>
     unicode(23) "A key can be any string"
   }
   [9]=>
@@ -620,8 +614,7 @@ array(14) {
     unicode(1) "\"
     [u"controls"]=>
     unicode(5) "
-
-	"
+
	"
     [u"slash"]=>
     unicode(5) "/ & /"
     [u"alpha"]=>
@@ -693,8 +686,7 @@ array(14) {
     [u"quotes"]=>
     unicode(27) "&#34; " %22 0x22 034 &#x22;"
     [u"/\"쫾몾ꮘﳞ볚
-
-	`1~!@#$%^&*()_+-=[]{}|;:',./<>?"]=>
+
	`1~!@#$%^&*()_+-=[]{}|;:',./<>?"]=>
     unicode(23) "A key can be any string"
   }
   [9]=>