[PHP-CVS] com php-src: Fixed tests that fail with non-default `serialize_precision` configurations.: ext/standard/tests/general_functions/var_export-locale.phpt ext/standard/tests/general_functions/va
Commit:101c78050032de22832a83630ea136b2752d0fe6
Author:Jeff Welch whatthej...@gmail.com Fri, 8 Nov 2013 13:07:22
-0500
Committer: Yasuo Ohgaki yohg...@php.net Wed, 20 Nov 2013 06:17:23 +0900
Parents: 25c08a839a261f3da77767934d8bed29f9831db3
Branches: PHP-5.4
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=101c78050032de22832a83630ea136b2752d0fe6
Log:
Fixed tests that fail with non-default `serialize_precision` configurations.
See:
* https://bugs.php.net/bug.php?id=64760
* 4dc4302
Changed paths:
M ext/standard/tests/general_functions/var_export-locale.phpt
M ext/standard/tests/general_functions/var_export_basic3.phpt
M ext/standard/tests/general_functions/var_export_basic5.phpt
M tests/lang/bug24640.phpt
Diff:
diff --git a/ext/standard/tests/general_functions/var_export-locale.phpt
b/ext/standard/tests/general_functions/var_export-locale.phpt
index 3cbebe9..b6f87c4 100644
--- a/ext/standard/tests/general_functions/var_export-locale.phpt
+++ b/ext/standard/tests/general_functions/var_export-locale.phpt
@@ -1,7 +1,7 @@
--TEST--
Test var_export() function with locale
--INI--
-precision=14
+serialize_precision=17
--SKIPIF--
?php
if (!setlocale(LC_ALL, german,
de,de_DE,de_DE.ISO8859-1,de_DE.ISO_8859-1,de_DE.UTF-8)) {
diff --git a/ext/standard/tests/general_functions/var_export_basic3.phpt
b/ext/standard/tests/general_functions/var_export_basic3.phpt
index 9e27d90..58c0448 100644
--- a/ext/standard/tests/general_functions/var_export_basic3.phpt
+++ b/ext/standard/tests/general_functions/var_export_basic3.phpt
@@ -1,7 +1,7 @@
--TEST--
Test var_export() function with valid float values
--INI--
-precision=14
+serialize_precision=17
--FILE--
?php
/* Prototype : mixed var_export(mixed var [, bool return])
diff --git a/ext/standard/tests/general_functions/var_export_basic5.phpt
b/ext/standard/tests/general_functions/var_export_basic5.phpt
index 1512fa8..dacb355 100644
--- a/ext/standard/tests/general_functions/var_export_basic5.phpt
+++ b/ext/standard/tests/general_functions/var_export_basic5.phpt
@@ -1,5 +1,7 @@
--TEST--
Test var_export() function with valid arrays
+--INI--
+serialize_precision=17
--FILE--
?php
/* Prototype : mixed var_export(mixed var [, bool return])
diff --git a/tests/lang/bug24640.phpt b/tests/lang/bug24640.phpt
index e41d020..d028891 100644
--- a/tests/lang/bug24640.phpt
+++ b/tests/lang/bug24640.phpt
@@ -2,6 +2,7 @@
Bug #24640 (var_export and var_dump can't output large float)
--INI--
precision=12
+serialize_precision=17
--FILE--
?php
function test($v)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.5' into PHP-5.6: Zend/zend_operators.h
Commit:c694d1df7babdea108c96dde03db81b1e3e26af6 Author:Anatol Belski a...@php.net Wed, 20 Nov 2013 10:12:06 +0100 Parents: bf91f101a6a869d3d93647622449f5c40b95b0d1 18b2b2a0bca38cba7d17ac931362249975b79f65 Branches: PHP-5.6 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c694d1df7babdea108c96dde03db81b1e3e26af6 Log: Merge branch 'PHP-5.5' into PHP-5.6 * PHP-5.5: permanently deactivate that place, not on runtime only Changed paths: MM Zend/zend_operators.h Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Fixed tests that fail with non-default `serialize_precision` configurations.: ext/standard/tests/general_functions/var_export-locale.phpt ext/standard/tests/general_functions/va
Commit:72a8489a12ff803cf7fc03ed911f2d530a8e89c8
Author:Jeff Welch whatthej...@gmail.com Fri, 8 Nov 2013 13:07:22
-0500
Committer: Yasuo Ohgaki yohg...@php.net Wed, 20 Nov 2013 06:17:34 +0900
Parents: 87cabc04ac5081f032c55cdc67d541a92471964e
Branches: PHP-5.5
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=72a8489a12ff803cf7fc03ed911f2d530a8e89c8
Log:
Fixed tests that fail with non-default `serialize_precision` configurations.
See:
* https://bugs.php.net/bug.php?id=64760
* 4dc4302
Changed paths:
M ext/standard/tests/general_functions/var_export-locale.phpt
M ext/standard/tests/general_functions/var_export_basic3.phpt
M ext/standard/tests/general_functions/var_export_basic5.phpt
M tests/lang/bug24640.phpt
Diff:
diff --git a/ext/standard/tests/general_functions/var_export-locale.phpt
b/ext/standard/tests/general_functions/var_export-locale.phpt
index 3cbebe9..b6f87c4 100644
--- a/ext/standard/tests/general_functions/var_export-locale.phpt
+++ b/ext/standard/tests/general_functions/var_export-locale.phpt
@@ -1,7 +1,7 @@
--TEST--
Test var_export() function with locale
--INI--
-precision=14
+serialize_precision=17
--SKIPIF--
?php
if (!setlocale(LC_ALL, german,
de,de_DE,de_DE.ISO8859-1,de_DE.ISO_8859-1,de_DE.UTF-8)) {
diff --git a/ext/standard/tests/general_functions/var_export_basic3.phpt
b/ext/standard/tests/general_functions/var_export_basic3.phpt
index 9e27d90..58c0448 100644
--- a/ext/standard/tests/general_functions/var_export_basic3.phpt
+++ b/ext/standard/tests/general_functions/var_export_basic3.phpt
@@ -1,7 +1,7 @@
--TEST--
Test var_export() function with valid float values
--INI--
-precision=14
+serialize_precision=17
--FILE--
?php
/* Prototype : mixed var_export(mixed var [, bool return])
diff --git a/ext/standard/tests/general_functions/var_export_basic5.phpt
b/ext/standard/tests/general_functions/var_export_basic5.phpt
index 1512fa8..dacb355 100644
--- a/ext/standard/tests/general_functions/var_export_basic5.phpt
+++ b/ext/standard/tests/general_functions/var_export_basic5.phpt
@@ -1,5 +1,7 @@
--TEST--
Test var_export() function with valid arrays
+--INI--
+serialize_precision=17
--FILE--
?php
/* Prototype : mixed var_export(mixed var [, bool return])
diff --git a/tests/lang/bug24640.phpt b/tests/lang/bug24640.phpt
index e41d020..d028891 100644
--- a/tests/lang/bug24640.phpt
+++ b/tests/lang/bug24640.phpt
@@ -2,6 +2,7 @@
Bug #24640 (var_export and var_dump can't output large float)
--INI--
precision=12
+serialize_precision=17
--FILE--
?php
function test($v)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: fixed key length datatype: sapi/cli/php_cli_server.c
Commit:726d803375c082e2e3d517bef5018caf565bc55b
Author:Anatol Belski a...@php.net Tue, 19 Nov 2013 14:51:20 +0100
Parents: e7b54a3aa7b0ce14600838a86f89b170da16efad
Branches: str_size_and_int64
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=726d803375c082e2e3d517bef5018caf565bc55b
Log:
fixed key length datatype
Changed paths:
M sapi/cli/php_cli_server.c
Diff:
diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c
index c24746e..cc133a7 100644
--- a/sapi/cli/php_cli_server.c
+++ b/sapi/cli/php_cli_server.c
@@ -477,7 +477,7 @@ PHP_FUNCTION(apache_request_headers) /* {{{ */
php_cli_server_client *client;
HashTable *headers;
char *key;
- uint key_len;
+ zend_str_size key_len;
char **value_pointer;
HashPosition pos;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Fix WS in serialization_error_002.phpt: ext/standard/tests/serialize/serialization_error_002.phpt
Commit:0d558afc057e5e939d6cab325b2ddf2c170f0103 Author:Yasuo Ohgaki yohg...@php.net Wed, 20 Nov 2013 07:17:53 +0900 Parents: 050dd59c639d2c742042bc884021fc3d0fca0c7b Branches: PHP-5.4 PHP-5.5 PHP-5.6 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=0d558afc057e5e939d6cab325b2ddf2c170f0103 Log: Fix WS in serialization_error_002.phpt Changed paths: M ext/standard/tests/serialize/serialization_error_002.phpt Diff: diff --git a/ext/standard/tests/serialize/serialization_error_002.phpt b/ext/standard/tests/serialize/serialization_error_002.phpt index 6525aaa..6b4f6e3 100644 --- a/ext/standard/tests/serialize/serialization_error_002.phpt +++ b/ext/standard/tests/serialize/serialization_error_002.phpt @@ -3,14 +3,14 @@ Test unserialize(): error is indistinguishable from deserialized boolean --FILE-- ?php /* Prototype : proto string serialize(mixed variable) - * Description: Returns a string representation of variable (which can later be unserialized) + * Description: Returns a string representation of variable (which can later be unserialized) * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ /* Prototype : proto mixed unserialize(string variable_representation) - * Description: Takes a string representation of variable and recreates it + * Description: Takes a string representation of variable and recreates it * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ echo *** Testing unserialize() error/boolean distinction ***\n; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: removed debugbreak: ext/iconv/iconv.c
Commit:5e3d047a074eb22ec97b1bfd87c58cf00d01d18e
Author:Anatol Belski a...@php.net Wed, 20 Nov 2013 17:15:01 +0100
Parents: 7156c5cb393b4a55d9c82b40218fae9b24c1816f
Branches: str_size_and_int64
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=5e3d047a074eb22ec97b1bfd87c58cf00d01d18e
Log:
removed debugbreak
Changed paths:
M ext/iconv/iconv.c
Diff:
diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c
index b706104..a5e6046 100644
--- a/ext/iconv/iconv.c
+++ b/ext/iconv/iconv.c
@@ -2043,7 +2043,7 @@ PHP_FUNCTION(iconv_strpos)
php_iconv_err_t err;
zend_str_size_uint retval;
-__debugbreak();
+
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, SS|iS,
haystk, haystk_len, ndl, ndl_len,
offset, charset, charset_len) == FAILURE) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] com php-src: Implemented FR #65917 (getallheaders() is not supported by the built-in...): NEWS UPGRADING sapi/cgi/cgi_main.c sapi/cli/php_cli_server.c sapi/cli/tests/php_cli_server_019.p
On Tue, Nov 12, 2013 at 12:27 PM, a...@php.net wrote:
Commit:aee271ec0d30c332bed32b5eca1fdff1cb447eab
Author:Andrea Faulds a...@ajf.me Thu, 17 Oct 2013 22:19:09 +
Parents: 1984919ddc3252c0f9b5d5d0beef10bdc4804091
Branches: PHP-5.5
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=aee271ec0d30c332bed32b5eca1fdff1cb447eab
Log:
Implemented FR #65917 (getallheaders() is not supported by the built-in...)
- Implemented apache_request_headers() and getallheaders() alias in CLI server
- Implemented apache_response_headers() in CLI server using FastCGI code
Conflicts:
NEWS
UPGRADING
Bugs:
https://bugs.php.net/65917
Changed paths:
M NEWS
M UPGRADING
M sapi/cgi/cgi_main.c
M sapi/cli/php_cli_server.c
A sapi/cli/tests/php_cli_server_019.phpt
+PHP_FUNCTION(apache_request_headers) /* {{{ */
+{
Please include the standard proto comments.
I'm also confused why its a good idea to add a new function and an
alias for that function..
That seems to just encourage confusion.
-Hannes
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] com php-src: Implemented FR #65917 (getallheaders() is not supported by the built-in...): NEWS UPGRADING sapi/cgi/cgi_main.c sapi/cli/php_cli_server.c sapi/cli/tests/php_cli_server_019.p
Le 20 novembre 2013 à 06:54, Hannes Magnusson hannes.magnus...@gmail.com a écrit : Please include the standard proto comments. Oops, my bad, I'll look into that later. I'm also confused why its a good idea to add a new function and an alias for that function.. That seems to just encourage confusion. It adds neither a new function nor a new alias. The same function name and alias name already exist in other SAPIs. -- Andrea Faulds http://ajf.me/ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: added a test to cover distinction between boolean return value of unserialize function and deserializing serialized boolean: ext/standard/tests/serialize/serialization_error_002
Commit:5824c797ac168e0e6a57c73945bd15b06b91d12c
Author:Aaron Hamid aaron.ha...@gmail.com Sun, 17 Nov 2013
22:59:42 -0500
Parents: 140a42f779b83f5c32656741f9fd26f34edc0b1b
Branches: pull-request/530
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=5824c797ac168e0e6a57c73945bd15b06b91d12c
Log:
added a test to cover distinction between boolean return value of unserialize
function and deserializing serialized boolean
Changed paths:
A ext/standard/tests/serialize/serialization_error_002.phpt
Diff:
diff --git a/ext/standard/tests/serialize/serialization_error_002.phpt
b/ext/standard/tests/serialize/serialization_error_002.phpt
new file mode 100644
index 000..6525aaa
--- /dev/null
+++ b/ext/standard/tests/serialize/serialization_error_002.phpt
@@ -0,0 +1,52 @@
+--TEST--
+Test unserialize(): error is indistinguishable from deserialized boolean
+--FILE--
+?php
+/* Prototype : proto string serialize(mixed variable)
+ * Description: Returns a string representation of variable (which can later
be unserialized)
+ * Source code: ext/standard/var.c
+ * Alias to functions:
+ */
+/* Prototype : proto mixed unserialize(string variable_representation)
+ * Description: Takes a string representation of variable and recreates it
+ * Source code: ext/standard/var.c
+ * Alias to functions:
+ */
+
+echo *** Testing unserialize() error/boolean distinction ***\n;
+
+$garbage = obvious non-serialized data;
+$serialized_false = serialize(false);
+
+var_dump($serialized_false);
+
+$deserialized_garbage = unserialize($garbage);
+var_dump($deserialized_garbage);
+
+$deserialized_false = unserialize($serialized_false);
+var_dump($deserialized_false);
+
+echo unserialize error and deserialized false are identical? . (bool)
($deserialized_false == $deserialized_garbage) . \n;
+
+// candidate safe idiom for determining whether data is serialized
+function isSerialized($str) {
+return ($str == serialize(false) || @unserialize($str) !== false);
+}
+
+// Test unserialize error idiom
+var_dump(isSerialized($garbage));
+var_dump(isSerialized($serialized_false));
+
+echo Done;
+?
+--EXPECTF--
+*** Testing unserialize() error/boolean distinction ***
+string(4) b:0;
+
+Notice: unserialize(): Error at offset 0 of 27 bytes in
%s/serialization_error_002.php on line 20
+bool(false)
+bool(false)
+unserialize error and deserialized false are identical? 1
+bool(false)
+bool(true)
+Done
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: datatype fixes for iconv: ext/iconv/iconv.c main/SAPI.c main/SAPI.h
Commit:7156c5cb393b4a55d9c82b40218fae9b24c1816f
Author:Anatol Belski a...@php.net Wed, 20 Nov 2013 17:11:10 +0100
Parents: 6a60a038593db369f6275b440350a12aaa9649c1
Branches: str_size_and_int64
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=7156c5cb393b4a55d9c82b40218fae9b24c1816f
Log:
datatype fixes for iconv
Changed paths:
M ext/iconv/iconv.c
M main/SAPI.c
M main/SAPI.h
diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c
index 21d775c..b706104 100644
--- a/ext/iconv/iconv.c
+++ b/ext/iconv/iconv.c
@@ -196,15 +196,15 @@ static php_iconv_err_t _php_iconv_appendc(smart_str *d,
const char c, iconv_t cd
static void _php_iconv_show_error(php_iconv_err_t err, const char
*out_charset, const char *in_charset TSRMLS_DC);
-static php_iconv_err_t _php_iconv_strlen(unsigned int *pretval, const char
*str, size_t nbytes, const char *enc);
+static php_iconv_err_t _php_iconv_strlen(zend_str_size_uint *pretval, const
char *str, size_t nbytes, const char *enc);
-static php_iconv_err_t _php_iconv_substr(smart_str *pretval, const char *str,
size_t nbytes, int offset, int len, const char *enc);
+static php_iconv_err_t _php_iconv_substr(smart_str *pretval, const char *str,
size_t nbytes, php_int_t offset, php_int_t len, const char *enc);
-static php_iconv_err_t _php_iconv_strpos(unsigned int *pretval, const char
*haystk, size_t haystk_nbytes, const char *ndl, size_t ndl_nbytes, int offset,
const char *enc);
+static php_iconv_err_t _php_iconv_strpos(zend_str_size_uint *pretval, const
char *haystk, size_t haystk_nbytes, const char *ndl, size_t ndl_nbytes,
php_int_t offset, const char *enc);
-static php_iconv_err_t _php_iconv_mime_encode(smart_str *pretval, const char
*fname, size_t fname_nbytes, const char *fval, size_t fval_nbytes, unsigned int
max_line_len, const char *lfchars, php_iconv_enc_scheme_t enc_scheme, const
char *out_charset, const char *enc);
+static php_iconv_err_t _php_iconv_mime_encode(smart_str *pretval, const char
*fname, size_t fname_nbytes, const char *fval, size_t fval_nbytes,
zend_str_size_uint max_line_len, const char *lfchars, php_iconv_enc_scheme_t
enc_scheme, const char *out_charset, const char *enc);
-static php_iconv_err_t _php_iconv_mime_decode(smart_str *pretval, const char
*str, size_t str_nbytes, const char *enc, const char **next_pos, int mode);
+static php_iconv_err_t _php_iconv_mime_decode(smart_str *pretval, const char
*str, size_t str_nbytes, const char *enc, const char **next_pos, php_int_t
mode);
static php_iconv_err_t php_iconv_stream_filter_register_factory(TSRMLS_D);
static php_iconv_err_t php_iconv_stream_filter_unregister_factory(TSRMLS_D);
@@ -332,7 +332,8 @@ static php_output_handler
*php_iconv_output_handler_init(const char *handler_nam
static int php_iconv_output_handler(void **nothing, php_output_context
*output_context)
{
char *s, *content_type, *mimetype = NULL;
- int output_status, mimetype_len = 0;
+ int output_status;
+ zend_str_size_int mimetype_len = 0;
PHP_OUTPUT_TSRMLS(output_context);
if (output_context-op PHP_OUTPUT_HANDLER_START) {
@@ -353,13 +354,13 @@ static int php_iconv_output_handler(void **nothing,
php_output_context *output_c
}
if (mimetype != NULL !(output_context-op
PHP_OUTPUT_HANDLER_CLEAN)) {
- int len;
+ php_int_t len;
char *p = strstr(ICONVG(output_encoding), //);
if (p) {
- len = spprintf(content_type, 0,
Content-Type:%.*s; charset=%.*s, mimetype_len ? mimetype_len : (int)
strlen(mimetype), mimetype, (int)(p - ICONVG(output_encoding)),
ICONVG(output_encoding));
+ len = spprintf(content_type, 0,
Content-Type:%.*s; charset=%.*s, mimetype_len ? mimetype_len :
(zend_str_size_int) strlen(mimetype), mimetype, (zend_str_size_int)(p -
ICONVG(output_encoding)), ICONVG(output_encoding));
} else {
- len = spprintf(content_type, 0,
Content-Type:%.*s; charset=%s, mimetype_len ? mimetype_len : (int)
strlen(mimetype), mimetype, ICONVG(output_encoding));
+ len = spprintf(content_type, 0,
Content-Type:%.*s; charset=%s, mimetype_len ? mimetype_len :
(zend_str_size_int) strlen(mimetype), mimetype, ICONVG(output_encoding));
}
if (content_type SUCCESS ==
sapi_add_header(content_type, len, 0)) {
SG(sapi_headers).send_default_content_type = 0;
@@ -639,7 +640,7 @@ PHP_ICONV_API php_iconv_err_t php_iconv_string(const char
*in_p, size_t in_len,
/* }}} */
/* {{{ _php_iconv_strlen() */
-static php_iconv_err_t _php_iconv_strlen(unsigned int *pretval, const char
*str, size_t nbytes, const char *enc)
+static php_iconv_err_t _php_iconv_strlen(zend_str_size_uint *pretval, const
char *str,
[PHP-CVS] com php-src: Fixed tests that fail with non-default `serialize_precision` configurations.: ext/standard/tests/general_functions/var_export-locale.phpt ext/standard/tests/general_functions/va
Commit:b4210efe76324c40b0598996399258fd6d0248a6
Author:Jeff Welch whatthej...@gmail.com Fri, 8 Nov 2013 13:07:22
-0500
Committer: Yasuo Ohgaki yohg...@php.net Wed, 20 Nov 2013 06:14:32 +0900
Parents: 8c05e861d659f912d95f1720e985632757c5057b
Branches: PHP-5.6
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=b4210efe76324c40b0598996399258fd6d0248a6
Log:
Fixed tests that fail with non-default `serialize_precision` configurations.
See:
* https://bugs.php.net/bug.php?id=64760
* 4dc4302
Changed paths:
M ext/standard/tests/general_functions/var_export-locale.phpt
M ext/standard/tests/general_functions/var_export_basic3.phpt
M ext/standard/tests/general_functions/var_export_basic5.phpt
M tests/lang/bug24640.phpt
Diff:
diff --git a/ext/standard/tests/general_functions/var_export-locale.phpt
b/ext/standard/tests/general_functions/var_export-locale.phpt
index 3cbebe9..b6f87c4 100644
--- a/ext/standard/tests/general_functions/var_export-locale.phpt
+++ b/ext/standard/tests/general_functions/var_export-locale.phpt
@@ -1,7 +1,7 @@
--TEST--
Test var_export() function with locale
--INI--
-precision=14
+serialize_precision=17
--SKIPIF--
?php
if (!setlocale(LC_ALL, german,
de,de_DE,de_DE.ISO8859-1,de_DE.ISO_8859-1,de_DE.UTF-8)) {
diff --git a/ext/standard/tests/general_functions/var_export_basic3.phpt
b/ext/standard/tests/general_functions/var_export_basic3.phpt
index 9e27d90..58c0448 100644
--- a/ext/standard/tests/general_functions/var_export_basic3.phpt
+++ b/ext/standard/tests/general_functions/var_export_basic3.phpt
@@ -1,7 +1,7 @@
--TEST--
Test var_export() function with valid float values
--INI--
-precision=14
+serialize_precision=17
--FILE--
?php
/* Prototype : mixed var_export(mixed var [, bool return])
diff --git a/ext/standard/tests/general_functions/var_export_basic5.phpt
b/ext/standard/tests/general_functions/var_export_basic5.phpt
index 1512fa8..dacb355 100644
--- a/ext/standard/tests/general_functions/var_export_basic5.phpt
+++ b/ext/standard/tests/general_functions/var_export_basic5.phpt
@@ -1,5 +1,7 @@
--TEST--
Test var_export() function with valid arrays
+--INI--
+serialize_precision=17
--FILE--
?php
/* Prototype : mixed var_export(mixed var [, bool return])
diff --git a/tests/lang/bug24640.phpt b/tests/lang/bug24640.phpt
index e41d020..d028891 100644
--- a/tests/lang/bug24640.phpt
+++ b/tests/lang/bug24640.phpt
@@ -2,6 +2,7 @@
Bug #24640 (var_export and var_dump can't output large float)
--INI--
precision=12
+serialize_precision=17
--FILE--
?php
function test($v)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Fixed tests that fail with non-default `serialize_precision` configurations.: ext/standard/tests/general_functions/var_export-locale.phpt ext/standard/tests/general_functions/va
Commit:b2ca20312d7db29dbd314118dc52068904e1a98e
Author:Jeff Welch whatthej...@gmail.com Fri, 8 Nov 2013 13:07:22
-0500
Committer: Yasuo Ohgaki yohg...@php.net Wed, 20 Nov 2013 06:17:57 +0900
Parents: b41a2755c445f670c4074278e505ba35165208e8
Branches: master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=b2ca20312d7db29dbd314118dc52068904e1a98e
Log:
Fixed tests that fail with non-default `serialize_precision` configurations.
See:
* https://bugs.php.net/bug.php?id=64760
* 4dc4302
Changed paths:
M ext/standard/tests/general_functions/var_export-locale.phpt
M ext/standard/tests/general_functions/var_export_basic3.phpt
M ext/standard/tests/general_functions/var_export_basic5.phpt
M tests/lang/bug24640.phpt
Diff:
diff --git a/ext/standard/tests/general_functions/var_export-locale.phpt
b/ext/standard/tests/general_functions/var_export-locale.phpt
index 3cbebe9..b6f87c4 100644
--- a/ext/standard/tests/general_functions/var_export-locale.phpt
+++ b/ext/standard/tests/general_functions/var_export-locale.phpt
@@ -1,7 +1,7 @@
--TEST--
Test var_export() function with locale
--INI--
-precision=14
+serialize_precision=17
--SKIPIF--
?php
if (!setlocale(LC_ALL, german,
de,de_DE,de_DE.ISO8859-1,de_DE.ISO_8859-1,de_DE.UTF-8)) {
diff --git a/ext/standard/tests/general_functions/var_export_basic3.phpt
b/ext/standard/tests/general_functions/var_export_basic3.phpt
index 9e27d90..58c0448 100644
--- a/ext/standard/tests/general_functions/var_export_basic3.phpt
+++ b/ext/standard/tests/general_functions/var_export_basic3.phpt
@@ -1,7 +1,7 @@
--TEST--
Test var_export() function with valid float values
--INI--
-precision=14
+serialize_precision=17
--FILE--
?php
/* Prototype : mixed var_export(mixed var [, bool return])
diff --git a/ext/standard/tests/general_functions/var_export_basic5.phpt
b/ext/standard/tests/general_functions/var_export_basic5.phpt
index 1512fa8..dacb355 100644
--- a/ext/standard/tests/general_functions/var_export_basic5.phpt
+++ b/ext/standard/tests/general_functions/var_export_basic5.phpt
@@ -1,5 +1,7 @@
--TEST--
Test var_export() function with valid arrays
+--INI--
+serialize_precision=17
--FILE--
?php
/* Prototype : mixed var_export(mixed var [, bool return])
diff --git a/tests/lang/bug24640.phpt b/tests/lang/bug24640.phpt
index e41d020..d028891 100644
--- a/tests/lang/bug24640.phpt
+++ b/tests/lang/bug24640.phpt
@@ -2,6 +2,7 @@
Bug #24640 (var_export and var_dump can't output large float)
--INI--
precision=12
+serialize_precision=17
--FILE--
?php
function test($v)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
