rasmus Mon, 03 Aug 2009 04:01:57 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=286714
Log:
Fix broken json tests in all branches
Changed paths:
UU php/php-src/branches/PHP_5_2/ext/json/tests/pass001.1_64bit.phpt
UU php/php-src/branches/PHP_5_3/ext/json/tests/pass001.1_64bit.phpt
U php/php-src/trunk/ext/json/tests/bug41403.phpt
UU php/php-src/trunk/ext/json/tests/pass001.1_64bit.phpt
UU php/php-src/trunk/ext/json/tests/pass001.phpt
Modified: php/php-src/branches/PHP_5_2/ext/json/tests/pass001.1_64bit.phpt
===================================================================
--- php/php-src/branches/PHP_5_2/ext/json/tests/pass001.1_64bit.phpt
2009-08-03 03:41:52 UTC (rev 286713)
+++ php/php-src/branches/PHP_5_2/ext/json/tests/pass001.1_64bit.phpt
2009-08-03 04:01:57 UTC (rev 286714)
@@ -220,7 +220,7 @@
string(1) "\"
["controls"]=>
string(5) "
-
+
"
["slash"]=>
string(5) "/ & /"
@@ -334,7 +334,7 @@
["quotes"]=>
string(27) "" " %22 0x22 034 ""
["/\"쫾몾ꮘﳞ볚
-
+
`...@#$%^&*()_+-=[]{}|;:',./<>?"]=>
string(23) "A key can be any string"
}
@@ -401,7 +401,7 @@
string(1) "\"
["controls"]=>
string(5) "
-
+
"
["slash"]=>
string(5) "/ & /"
@@ -515,7 +515,7 @@
["quotes"]=>
string(27) "" " %22 0x22 034 ""
["/\"쫾몾ꮘﳞ볚
-
+
`...@#$%^&*()_+-=[]{}|;:',./<>?"]=>
string(23) "A key can be any string"
}
@@ -586,7 +586,7 @@
string(1) "\"
["controls"]=>
string(5) "
-
+
"
["slash"]=>
string(5) "/ & /"
@@ -700,7 +700,7 @@
["quotes"]=>
string(27) "" " %22 0x22 034 ""
["/\"쫾몾ꮘﳞ볚
-
+
`...@#$%^&*()_+-=[]{}|;:',./<>?"]=>
string(23) "A key can be any string"
}
@@ -767,7 +767,7 @@
string(1) "\"
["controls"]=>
string(5) "
-
+
"
["slash"]=>
string(5) "/ & /"
@@ -881,7 +881,7 @@
["quotes"]=>
string(27) "" " %22 0x22 034 ""
["/\"쫾몾ꮘﳞ볚
-
+
`...@#$%^&*()_+-=[]{}|;:',./<>?"]=>
string(23) "A key can be any string"
}
Property changes on:
php/php-src/branches/PHP_5_2/ext/json/tests/pass001.1_64bit.phpt
___________________________________________________________________
Deleted: svn:eol-style
- native
Modified: php/php-src/branches/PHP_5_3/ext/json/tests/pass001.1_64bit.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/json/tests/pass001.1_64bit.phpt
2009-08-03 03:41:52 UTC (rev 286713)
+++ php/php-src/branches/PHP_5_3/ext/json/tests/pass001.1_64bit.phpt
2009-08-03 04:01:57 UTC (rev 286714)
@@ -220,7 +220,7 @@
string(1) "\"
["controls"]=>
string(5) "
-
+
"
["slash"]=>
string(5) "/ & /"
@@ -334,7 +334,7 @@
["quotes"]=>
string(27) "" " %22 0x22 034 ""
["/\"쫾몾ꮘﳞ볚
-
+
`...@#$%^&*()_+-=[]{}|;:',./<>?"]=>
string(23) "A key can be any string"
}
@@ -401,7 +401,7 @@
string(1) "\"
["controls"]=>
string(5) "
-
+
"
["slash"]=>
string(5) "/ & /"
@@ -515,7 +515,7 @@
["quotes"]=>
string(27) "" " %22 0x22 034 ""
["/\"쫾몾ꮘﳞ볚
-
+
`...@#$%^&*()_+-=[]{}|;:',./<>?"]=>
string(23) "A key can be any string"
}
@@ -586,7 +586,7 @@
string(1) "\"
["controls"]=>
string(5) "
-
+
"
["slash"]=>
string(5) "/ & /"
@@ -700,7 +700,7 @@
["quotes"]=>
string(27) "" " %22 0x22 034 ""
["/\"쫾몾ꮘﳞ볚
-
+
`...@#$%^&*()_+-=[]{}|;:',./<>?"]=>
string(23) "A key can be any string"
}
@@ -767,7 +767,7 @@
string(1) "\"
["controls"]=>
string(5) "
-
+
"
["slash"]=>
string(5) "/ & /"
@@ -881,7 +881,7 @@
["quotes"]=>
string(27) "" " %22 0x22 034 ""
["/\"쫾몾ꮘﳞ볚
-
+
`...@#$%^&*()_+-=[]{}|;:',./<>?"]=>
string(23) "A key can be any string"
}
Property changes on:
php/php-src/branches/PHP_5_3/ext/json/tests/pass001.1_64bit.phpt
___________________________________________________________________
Deleted: svn:eol-style
- native
Modified: php/php-src/trunk/ext/json/tests/bug41403.phpt
===================================================================
--- php/php-src/trunk/ext/json/tests/bug41403.phpt 2009-08-03 03:41:52 UTC
(rev 286713)
+++ php/php-src/trunk/ext/json/tests/bug41403.phpt 2009-08-03 04:01:57 UTC
(rev 286714)
@@ -26,15 +26,15 @@
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]=>
Modified: php/php-src/trunk/ext/json/tests/pass001.1_64bit.phpt
===================================================================
--- php/php-src/trunk/ext/json/tests/pass001.1_64bit.phpt 2009-08-03
03:41:52 UTC (rev 286713)
+++ php/php-src/trunk/ext/json/tests/pass001.1_64bit.phpt 2009-08-03
04:01:57 UTC (rev 286714)
@@ -220,7 +220,7 @@
unicode(1) "\"
[u"controls"]=>
unicode(5) "
-
+
"
[u"slash"]=>
unicode(5) "/ & /"
@@ -334,7 +334,7 @@
[u"quotes"]=>
unicode(27) "" " %22 0x22 034 ""
[u"/\"쫾몾ꮘﳞ볚
-
+
`...@#$%^&*()_+-=[]{}|;:',./<>?"]=>
unicode(23) "A key can be any string"
}
@@ -401,7 +401,7 @@
unicode(1) "\"
[u"controls"]=>
unicode(5) "
-
+
"
[u"slash"]=>
unicode(5) "/ & /"
@@ -515,7 +515,7 @@
[u"quotes"]=>
unicode(27) "" " %22 0x22 034 ""
[u"/\"쫾몾ꮘﳞ볚
-
+
`...@#$%^&*()_+-=[]{}|;:',./<>?"]=>
unicode(23) "A key can be any string"
}
@@ -586,7 +586,7 @@
unicode(1) "\"
[u"controls"]=>
unicode(5) "
-
+
"
[u"slash"]=>
unicode(5) "/ & /"
@@ -700,7 +700,7 @@
[u"quotes"]=>
unicode(27) "" " %22 0x22 034 ""
[u"/\"쫾몾ꮘﳞ볚
-
+
`...@#$%^&*()_+-=[]{}|;:',./<>?"]=>
unicode(23) "A key can be any string"
}
@@ -767,7 +767,7 @@
unicode(1) "\"
[u"controls"]=>
unicode(5) "
-
+
"
[u"slash"]=>
unicode(5) "/ & /"
@@ -881,7 +881,7 @@
[u"quotes"]=>
unicode(27) "" " %22 0x22 034 ""
[u"/\"쫾몾ꮘﳞ볚
-
+
`...@#$%^&*()_+-=[]{}|;:',./<>?"]=>
unicode(23) "A key can be any string"
}
Property changes on: php/php-src/trunk/ext/json/tests/pass001.1_64bit.phpt
___________________________________________________________________
Deleted: svn:eol-style
- native
Modified: php/php-src/trunk/ext/json/tests/pass001.phpt
===================================================================
--- php/php-src/trunk/ext/json/tests/pass001.phpt 2009-08-03 03:41:52 UTC
(rev 286713)
+++ php/php-src/trunk/ext/json/tests/pass001.phpt 2009-08-03 04:01:57 UTC
(rev 286714)
@@ -202,7 +202,7 @@
unicode(1) "\"
[u"controls"]=>
unicode(5) "
-
+
"
[u"slash"]=>
unicode(5) "/ & /"
@@ -275,7 +275,7 @@
[u"quotes"]=>
unicode(27) "" " %22 0x22 034 ""
[u"/\"쫾몾ꮘﳞ볚
-
+
`...@#$%^&*()_+-=[]{}|;:',./<>?"]=>
unicode(23) "A key can be any string"
}
@@ -340,7 +340,7 @@
unicode(1) "\"
[u"controls"]=>
unicode(5) "
-
+
"
[u"slash"]=>
unicode(5) "/ & /"
@@ -413,7 +413,7 @@
[u"quotes"]=>
unicode(27) "" " %22 0x22 034 ""
[u"/\"쫾몾ꮘﳞ볚
-
+
`...@#$%^&*()_+-=[]{}|;:',./<>?"]=>
unicode(23) "A key can be any string"
}
@@ -482,7 +482,7 @@
unicode(1) "\"
[u"controls"]=>
unicode(5) "
-
+
"
[u"slash"]=>
unicode(5) "/ & /"
@@ -555,7 +555,7 @@
[u"quotes"]=>
unicode(27) "" " %22 0x22 034 ""
[u"/\"쫾몾ꮘﳞ볚
-
+
`...@#$%^&*()_+-=[]{}|;:',./<>?"]=>
unicode(23) "A key can be any string"
}
@@ -620,7 +620,7 @@
unicode(1) "\"
[u"controls"]=>
unicode(5) "
-
+
"
[u"slash"]=>
unicode(5) "/ & /"
@@ -693,7 +693,7 @@
[u"quotes"]=>
unicode(27) "" " %22 0x22 034 ""
[u"/\"쫾몾ꮘﳞ볚
-
+
`...@#$%^&*()_+-=[]{}|;:',./<>?"]=>
unicode(23) "A key can be any string"
}
Property changes on: php/php-src/trunk/ext/json/tests/pass001.phpt
___________________________________________________________________
Deleted: svn:eol-style
- native
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
