[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Thu Jul 2 01:33:29 2009 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.3451r2=1.3452diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.3451 php-src/ChangeLog:1.3452 --- php-src/ChangeLog:1.3451Wed Jul 1 01:33:56 2009 +++ php-src/ChangeLog Thu Jul 2 01:33:27 2009 @@ -1,3 +1,617 @@ +2009-07-01 Stanislav Malyshev s...@zend.com + +* ext/intl/locale/locale_methods.c + ext/intl/locale/locale_methods.c: + typo + +2009-07-01 Kalle Sommer Nielsen kalle@gmail.com + +* ext/standard/tests/misc/time_nanosleep_error4.phpt: + Fix test on Windows + +2009-07-01 Stanislav Malyshev s...@zend.com + +* ext/intl/doc/collator_api.php + ext/intl/doc/collator_api.php + ext/intl/doc/common_api.php + ext/intl/doc/common_api.php + ext/intl/doc/datefmt_api.php + ext/intl/doc/datefmt_api.php + ext/intl/doc/formatter_api.php + ext/intl/doc/formatter_api.php + ext/intl/doc/grapheme_api.php + ext/intl/doc/locale_api.php + ext/intl/doc/locale_api.php: + update API files + +* ext/intl/locale/locale_methods.c + ext/intl/locale/locale_methods.c: + fix proto + +2009-07-01 Kalle Sommer Nielsen kalle@gmail.com + +* (PHP_5_2) + NEWS: + BFN #45280 + +* (PHP_5_2) + ext/com_dotnet/tests/bug45280.phpt + ext/reflection/php_reflection.c: + Fixed #45280 (Reflection of instantiated COM classes causes PHP to crash) + (Paul Richards, Kalle) + +* (PHP_5_3) + ext/com_dotnet/tests/bug45280.phpt + ext/reflection/php_reflection.c: + MFH: Fixed #45280 (Reflection of instantiated COM classes causes PHP to + crash) (Paul Richards, Kalle) + +* ext/com_dotnet/tests/bug45280.phpt + ext/com_dotnet/tests/bug45280.phpt + ext/com_dotnet/tests/bug45280.phpt + ext/reflection/php_reflection.c: +1.1.4; + Fixed #45280 (Reflection of instantiated COM classes causes PHP to crash) + (Paul Richards, Kalle) + +* (PHP_5_3) + ext/reflection/php_reflection.c: + MFH: Fixed memory leak if zero parameters are passed, Thanks Felipe + +* ext/reflection/php_reflection.c: + Fixed memory leak if zero parameters are passed, Thanks Felipe + +* (PHP_5_3) + NEWS: + BFN #48757 + +* (PHP_5_3) + ext/reflection/php_reflection.c + ext/reflection/tests/bug48757.phpt: + MFH: Fixed bug #48757 (ReflectionFunction::invoke() parameter issues) + +* ext/reflection/php_reflection.c + ext/reflection/tests/bug48757.phpt + ext/reflection/tests/bug48757.phpt: + Fixed bug #48757 (ReflectionFunction::invoke() parameter issues) + +2009-07-01 Ulf Wendel ulf.wen...@phpdoc.de + +* (PHP_5_3) + ext/mysql/tests/001.phpt + ext/mysql/tests/002.phpt + ext/mysql/tests/003.phpt + ext/mysql/tests/mysql_connect.phpt + ext/mysql/tests/mysql_escape_string.phpt + ext/mysql/tests/mysql_fetch_array.phpt + ext/mysql/tests/mysql_fetch_assoc.phpt + ext/mysql/tests/mysql_fetch_field.phpt + ext/mysql/tests/mysql_fetch_object.phpt + ext/mysql/tests/mysql_fetch_row.phpt + ext/mysql/tests/mysql_field_name.phpt + ext/mysql/tests/mysql_field_seek.phpt + ext/mysql/tests/mysql_field_table.phpt + ext/mysql/tests/mysql_field_type.phpt + ext/mysql/tests/mysql_pconn_max_links.phpt + ext/mysql/tests/mysql_phpinfo.phpt + ext/mysql/tests/mysql_query.phpt + ext/mysql/tests/mysql_query_load_data_openbasedir.phpt + ext/mysql/tests/mysql_real_escape_string.phpt + ext/mysql/tests/mysql_result.phpt + ext/mysql/tests/mysql_select_db.phpt + ext/mysql/tests/mysql_set_charset.phpt + ext/mysql/tests/mysql_tablename.phpt + ext/mysql/tests/mysql_trace_mode.phpt + ext/mysql/tests/mysql_unbuffered_query.phpt: + MFH - Changing tests to run with both PHP 6 and PHP 5.3 to make future MFH + easier. Basically three changes over all files: a) + s/unicode(/%unicode|string% b) s/[u/[%u|b% c) + s/unicode.semantics/version_compare + +* ext/mysql/tests/001.phpt + ext/mysql/tests/002.phpt + ext/mysql/tests/003.phpt + ext/mysql/tests/mysql_escape_string.phpt + ext/mysql/tests/mysql_fetch_array.phpt + ext/mysql/tests/mysql_fetch_assoc.phpt + ext/mysql/tests/mysql_fetch_field.phpt + ext/mysql/tests/mysql_fetch_object.phpt + ext/mysql/tests/mysql_fetch_row.phpt + ext/mysql/tests/mysql_field_name.phpt + ext/mysql/tests/mysql_field_seek.phpt + ext/mysql/tests/mysql_field_table.phpt + ext/mysql/tests/mysql_field_type.phpt + ext/mysql/tests/mysql_pconn_max_links.phpt + ext/mysql/tests/mysql_query.phpt + ext/mysql/tests/mysql_query_load_data_openbasedir.phpt + ext/mysql/tests/mysql_real_escape_string.phpt +
[PHP-CVS] cvs: php-src /ext/gd/tests bug43073.phpt bug48555.phpt
felipe Wed Jul 1 12:02:45 2009 UTC
Modified files:
/php-src/ext/gd/tests bug43073.phpt bug48555.phpt
Log:
- Fixed tests
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/tests/bug43073.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/gd/tests/bug43073.phpt
diff -u php-src/ext/gd/tests/bug43073.phpt:1.1
php-src/ext/gd/tests/bug43073.phpt:1.2
--- php-src/ext/gd/tests/bug43073.phpt:1.1 Wed Mar 25 16:15:18 2009
+++ php-src/ext/gd/tests/bug43073.phpt Wed Jul 1 12:02:45 2009
@@ -3,6 +3,7 @@
--SKIPIF--
?php
if(!extension_loaded('gd')){ die('skip gd extension not available'); }
+ if(!function_exists('imagettftext')) die('skip imagettftext() not
available');
?
--FILE--
?php
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/tests/bug48555.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/gd/tests/bug48555.phpt
diff -u php-src/ext/gd/tests/bug48555.phpt:1.1
php-src/ext/gd/tests/bug48555.phpt:1.2
--- php-src/ext/gd/tests/bug48555.phpt:1.1 Sun Jun 21 05:59:25 2009
+++ php-src/ext/gd/tests/bug48555.phpt Wed Jul 1 12:02:45 2009
@@ -3,6 +3,7 @@
--SKIPIF--
?php
if(!extension_loaded('gd')){ die('skip gd extension not available'); }
+ if(!function_exists('imageftbbox')) die('skip imageftbbox() not
available');
?
--FILE--
?php
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/gd gd.c
felipe Wed Jul 1 12:04:05 2009 UTC
Modified files:
/php-src/ext/gd gd.c
Log:
- Fixed memory leak
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.418r2=1.419diff_format=u
Index: php-src/ext/gd/gd.c
diff -u php-src/ext/gd/gd.c:1.418 php-src/ext/gd/gd.c:1.419
--- php-src/ext/gd/gd.c:1.418 Fri Jun 19 22:12:20 2009
+++ php-src/ext/gd/gd.c Wed Jul 1 12:04:05 2009
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: gd.c,v 1.418 2009/06/19 22:12:20 kalle Exp $ */
+/* $Id: gd.c,v 1.419 2009/07/01 12:04:05 felipe Exp $ */
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -3347,7 +3347,12 @@
}
}
- ZEND_FETCH_RESOURCE(im, gdImagePtr, IM, -1, Image, le_gd);
+ if (!ZEND_FETCH_RESOURCE_NO_RETURN(im, gdImagePtr, IM, -1, Image,
le_gd)) {
+ if (str_type == IS_UNICODE) {
+ efree(str.s);
+ RETURN_FALSE;
+ }
+ }
font = php_find_gd_font(size TSRMLS_CC);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/gd gd.c
felipe Wed Jul 1 12:06:27 2009 UTC
Modified files:
/php-src/ext/gd gd.c
Log:
- Fixed previous fix
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.419r2=1.420diff_format=u
Index: php-src/ext/gd/gd.c
diff -u php-src/ext/gd/gd.c:1.419 php-src/ext/gd/gd.c:1.420
--- php-src/ext/gd/gd.c:1.419 Wed Jul 1 12:04:05 2009
+++ php-src/ext/gd/gd.c Wed Jul 1 12:06:27 2009
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: gd.c,v 1.419 2009/07/01 12:04:05 felipe Exp $ */
+/* $Id: gd.c,v 1.420 2009/07/01 12:06:27 felipe Exp $ */
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -3350,8 +3350,8 @@
if (!ZEND_FETCH_RESOURCE_NO_RETURN(im, gdImagePtr, IM, -1, Image,
le_gd)) {
if (str_type == IS_UNICODE) {
efree(str.s);
- RETURN_FALSE;
}
+ RETURN_FALSE;
}
font = php_find_gd_font(size TSRMLS_CC);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/gd/tests bug48555.phpt
felipe Wed Jul 1 12:15:00 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/gd/tests bug48555.phpt
Log:
- Fix test
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/tests/bug48555.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/ext/gd/tests/bug48555.phpt
diff -u php-src/ext/gd/tests/bug48555.phpt:1.1.2.2
php-src/ext/gd/tests/bug48555.phpt:1.1.2.3
--- php-src/ext/gd/tests/bug48555.phpt:1.1.2.2 Sun Jun 21 06:09:46 2009
+++ php-src/ext/gd/tests/bug48555.phpt Wed Jul 1 12:15:00 2009
@@ -3,6 +3,7 @@
--SKIPIF--
?php
if(!extension_loaded('gd')){ die('skip gd extension not available'); }
+ if(!function_exists('imageftbbox')) die('skip imageftbbox() not
available');
?
--FILE--
?php
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/gd/tests bug48555.phpt
felipe Wed Jul 1 12:20:08 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/gd/tests bug48555.phpt
Log:
- Fix test
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/tests/bug48555.phpt?r1=1.1.4.2r2=1.1.4.3diff_format=u
Index: php-src/ext/gd/tests/bug48555.phpt
diff -u php-src/ext/gd/tests/bug48555.phpt:1.1.4.2
php-src/ext/gd/tests/bug48555.phpt:1.1.4.3
--- php-src/ext/gd/tests/bug48555.phpt:1.1.4.2 Mon Jun 22 15:50:18 2009
+++ php-src/ext/gd/tests/bug48555.phpt Wed Jul 1 12:20:08 2009
@@ -3,6 +3,7 @@
--SKIPIF--
?php
if(!extension_loaded('gd')){ die('skip gd extension not available'); }
+ if(!function_exists('imageftbbox')) die('skip imageftbbox() not
available');
?
--FILE--
?php
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mysqli/tests mysqli_get_cache_stats.phpt mysqli_get_cache_stats_free_buffered.phpt mysqli_get_cache_stats_off.phpt mysqli_get_client_stats_off.phpt mysqli_get_client_stats_
uw Wed Jul 1 12:51:40 2009 UTC
Added files:
/php-src/ext/mysqli/tests mysqli_get_cache_stats_off.phpt
mysqli_get_connection_stats_off.phpt
Modified files:
/php-src/ext/mysqli/tests mysqli_get_cache_stats_free_buffered.phpt
mysqli_get_cache_stats.phpt
mysqli_get_client_stats_off.phpt
mysqli_get_client_stats_skipped.phpt
mysqli_get_connection_stats.phpt
Log:
Adding XFAIL for some tests which expect the zval cache of mysqlnd to be on.
It has been disabled for the PHP 5.3.0 release. Adding INI sections to ensure
that statistics are collected. Adding tests that check if statistics collection
can be disabled
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_get_cache_stats_free_buffered.phpt?r1=1.3r2=1.4diff_format=u
Index: php-src/ext/mysqli/tests/mysqli_get_cache_stats_free_buffered.phpt
diff -u php-src/ext/mysqli/tests/mysqli_get_cache_stats_free_buffered.phpt:1.3
php-src/ext/mysqli/tests/mysqli_get_cache_stats_free_buffered.phpt:1.4
--- php-src/ext/mysqli/tests/mysqli_get_cache_stats_free_buffered.phpt:1.3
Thu May 28 14:11:40 2009
+++ php-src/ext/mysqli/tests/mysqli_get_cache_stats_free_buffered.phpt Wed Jul
1 12:51:40 2009
@@ -1,5 +1,10 @@
--TEST--
mysqli_get_cache_stats() - freeing for buffered result sets
+--XFAIL--
+zval caching has been temporarily disabled for the 5.3.0 release
+--INI--
+mysqlnd.collect_statistics=1
+mysqlnd.collect_memory_statistics=1
--SKIPIF--
?PHP
require_once('skipif.inc');
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_get_cache_stats.phpt?r1=1.4r2=1.5diff_format=u
Index: php-src/ext/mysqli/tests/mysqli_get_cache_stats.phpt
diff -u php-src/ext/mysqli/tests/mysqli_get_cache_stats.phpt:1.4
php-src/ext/mysqli/tests/mysqli_get_cache_stats.phpt:1.5
--- php-src/ext/mysqli/tests/mysqli_get_cache_stats.phpt:1.4Thu May 28
14:11:40 2009
+++ php-src/ext/mysqli/tests/mysqli_get_cache_stats.phptWed Jul 1
12:51:40 2009
@@ -1,5 +1,10 @@
--TEST--
mysqli_get_cache_stats()
+--XFAIL--
+zval caching has been temporarily disabled for the 5.3.0 release
+--INI--
+mysqlnd.collect_statistics=1
+mysqlnd.collect_memory_statistics=1
--SKIPIF--
?PHP
require_once('skipif.inc');
@@ -22,9 +27,9 @@
var_dump($info);
- if ($info['size'] !== $info['free_items'])
+ if ($info[size] !== $info['free_items'])
printf([003] Unused cache should have size (%d) == free_items
(%d)\n,
- $info['size'], $info['free_items']);
+ $info[size], $info['free_items']);
require_once('table.inc');
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_get_client_stats_off.phpt?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/mysqli/tests/mysqli_get_client_stats_off.phpt
diff -u php-src/ext/mysqli/tests/mysqli_get_client_stats_off.phpt:1.2
php-src/ext/mysqli/tests/mysqli_get_client_stats_off.phpt:1.3
--- php-src/ext/mysqli/tests/mysqli_get_client_stats_off.phpt:1.2 Wed Oct
10 10:46:06 2007
+++ php-src/ext/mysqli/tests/mysqli_get_client_stats_off.phpt Wed Jul 1
12:51:40 2009
@@ -15,19 +15,25 @@
--FILE--
?php
$before = mysqli_get_client_stats();
+ if (!is_array($before) || empty($before)) {
+ printf([001] Expecting non-empty array, got %s.\n,
gettype($before));
+ var_dump($before);
+ }
+
// connect and table inc connect to mysql and create tables
require_once('connect.inc');
require_once('table.inc');
$after = mysqli_get_client_stats();
- if (!is_array($before) || empty($before)) {
- printf([001] Expecting non-empty array, got %s.\n,
gettype($before));
+ if ($before !== $after) {
+ printf([002] Statistics have changed\n);
var_dump($before);
+ var_dump($after);
}
foreach ($after as $k = $v)
if ($v != 0) {
- printf([002] Field %s should not have any other value
but 0, got %s.\n,
+ printf([003] Field %s should not have any other value
but 0, got %s.\n,
$k, $v);
}
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_get_client_stats_skipped.phpt?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/mysqli/tests/mysqli_get_client_stats_skipped.phpt
diff -u php-src/ext/mysqli/tests/mysqli_get_client_stats_skipped.phpt:1.2
php-src/ext/mysqli/tests/mysqli_get_client_stats_skipped.phpt:1.3
--- php-src/ext/mysqli/tests/mysqli_get_client_stats_skipped.phpt:1.2 Wed Oct
10 10:46:06 2007
+++ php-src/ext/mysqli/tests/mysqli_get_client_stats_skipped.phpt Wed Jul
1 12:51:40 2009
@@ -1,5 +1,8 @@
--TEST--
mysqli_get_client_stats() - skipped rows
+--INI--
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysqli/tests mysqli_get_cache_stats.phpt mysqli_get_cache_stats_free_buffered.phpt mysqli_get_cache_stats_off.phpt mysqli_get_client_stats_off.phpt mysqli_get_clie
uw Wed Jul 1 12:52:59 2009 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/mysqli/tests mysqli_get_cache_stats_off.phpt
mysqli_get_connection_stats_off.phpt
Modified files:
/php-src/ext/mysqli/tests mysqli_get_cache_stats_free_buffered.phpt
mysqli_get_cache_stats.phpt
mysqli_get_client_stats_off.phpt
mysqli_get_client_stats_skipped.phpt
mysqli_get_connection_stats.phpt
Log:
MFH - Adding XFAIL for some tests which expect the zval cache of mysqlnd to
be on. It has been disabled for the PHP 5.3.0 release. Adding INI sections to
ensure that statistics are collected. Adding tests that check if statistics
collection can be disabled
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_get_cache_stats_free_buffered.phpt?r1=1.2.2.3r2=1.2.2.4diff_format=u
Index: php-src/ext/mysqli/tests/mysqli_get_cache_stats_free_buffered.phpt
diff -u
php-src/ext/mysqli/tests/mysqli_get_cache_stats_free_buffered.phpt:1.2.2.3
php-src/ext/mysqli/tests/mysqli_get_cache_stats_free_buffered.phpt:1.2.2.4
--- php-src/ext/mysqli/tests/mysqli_get_cache_stats_free_buffered.phpt:1.2.2.3
Thu May 28 14:33:42 2009
+++ php-src/ext/mysqli/tests/mysqli_get_cache_stats_free_buffered.phpt Wed Jul
1 12:52:58 2009
@@ -1,5 +1,10 @@
--TEST--
mysqli_get_cache_stats() - freeing for buffered result sets
+--XFAIL--
+zval caching has been temporarily disabled for the 5.3.0 release
+--INI--
+mysqlnd.collect_statistics=1
+mysqlnd.collect_memory_statistics=1
--SKIPIF--
?PHP
require_once('skipif.inc');
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_get_cache_stats.phpt?r1=1.2.2.3r2=1.2.2.4diff_format=u
Index: php-src/ext/mysqli/tests/mysqli_get_cache_stats.phpt
diff -u php-src/ext/mysqli/tests/mysqli_get_cache_stats.phpt:1.2.2.3
php-src/ext/mysqli/tests/mysqli_get_cache_stats.phpt:1.2.2.4
--- php-src/ext/mysqli/tests/mysqli_get_cache_stats.phpt:1.2.2.3Thu May
28 14:33:42 2009
+++ php-src/ext/mysqli/tests/mysqli_get_cache_stats.phptWed Jul 1
12:52:58 2009
@@ -1,5 +1,10 @@
--TEST--
mysqli_get_cache_stats()
+--XFAIL--
+zval caching has been temporarily disabled for the 5.3.0 release
+--INI--
+mysqlnd.collect_statistics=1
+mysqlnd.collect_memory_statistics=1
--SKIPIF--
?PHP
require_once('skipif.inc');
@@ -22,9 +27,9 @@
var_dump($info);
- if ($info['size'] !== $info['free_items'])
+ if ($info[size] !== $info['free_items'])
printf([003] Unused cache should have size (%d) == free_items
(%d)\n,
- $info['size'], $info['free_items']);
+ $info[size], $info['free_items']);
require_once('table.inc');
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_get_client_stats_off.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u
Index: php-src/ext/mysqli/tests/mysqli_get_client_stats_off.phpt
diff -u php-src/ext/mysqli/tests/mysqli_get_client_stats_off.phpt:1.1.2.1
php-src/ext/mysqli/tests/mysqli_get_client_stats_off.phpt:1.1.2.2
--- php-src/ext/mysqli/tests/mysqli_get_client_stats_off.phpt:1.1.2.1 Wed Oct
10 10:16:00 2007
+++ php-src/ext/mysqli/tests/mysqli_get_client_stats_off.phpt Wed Jul 1
12:52:58 2009
@@ -15,19 +15,25 @@
--FILE--
?php
$before = mysqli_get_client_stats();
+ if (!is_array($before) || empty($before)) {
+ printf([001] Expecting non-empty array, got %s.\n,
gettype($before));
+ var_dump($before);
+ }
+
// connect and table inc connect to mysql and create tables
require_once('connect.inc');
require_once('table.inc');
$after = mysqli_get_client_stats();
- if (!is_array($before) || empty($before)) {
- printf([001] Expecting non-empty array, got %s.\n,
gettype($before));
+ if ($before !== $after) {
+ printf([002] Statistics have changed\n);
var_dump($before);
+ var_dump($after);
}
foreach ($after as $k = $v)
if ($v != 0) {
- printf([002] Field %s should not have any other value
but 0, got %s.\n,
+ printf([003] Field %s should not have any other value
but 0, got %s.\n,
$k, $v);
}
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_get_client_stats_skipped.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u
Index: php-src/ext/mysqli/tests/mysqli_get_client_stats_skipped.phpt
diff -u php-src/ext/mysqli/tests/mysqli_get_client_stats_skipped.phpt:1.1.2.1
php-src/ext/mysqli/tests/mysqli_get_client_stats_skipped.phpt:1.1.2.2
--- php-src/ext/mysqli/tests/mysqli_get_client_stats_skipped.phpt:1.1.2.1
Wed Oct 10 10:16:00 2007
+++ php-src/ext/mysqli/tests/mysqli_get_client_stats_skipped.phpt Wed
[PHP-CVS] cvs: php-src /ext/mysqlnd mysqlnd_wireprotocol.c
johannesWed Jul 1 14:13:07 2009 UTC Modified files: /php-src/ext/mysqlndmysqlnd_wireprotocol.c Log: MFB52: Fix include path http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_wireprotocol.c?r1=1.34r2=1.35diff_format=u Index: php-src/ext/mysqlnd/mysqlnd_wireprotocol.c diff -u php-src/ext/mysqlnd/mysqlnd_wireprotocol.c:1.34 php-src/ext/mysqlnd/mysqlnd_wireprotocol.c:1.35 --- php-src/ext/mysqlnd/mysqlnd_wireprotocol.c:1.34 Sun Jun 28 12:41:51 2009 +++ php-src/ext/mysqlnd/mysqlnd_wireprotocol.c Wed Jul 1 14:13:07 2009 @@ -25,7 +25,7 @@ #include mysqlnd_statistics.h #include mysqlnd_palloc.h #include mysqlnd_debug.h -#include mysqlnd/mysqlnd_block_alloc.h +#include mysqlnd_block_alloc.h #include ext/standard/sha1.h #include php_network.h #include zend_ini.h -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/mysqlnd mysqlnd_wireprotocol.c
On Wed, 2009-07-01 at 14:13 +, Johannes Schlüter wrote: johannes Wed Jul 1 14:13:07 2009 UTC Modified files: /php-src/ext/mysqlnd mysqlnd_wireprotocol.c Log: MFB52: Fix include path 5.3 is the one where this was fixed, 5.2 doesn't have this file ... johannes -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: win-installer /Bitmaps bannrbmp.bmp dlgbmp.bmp
jmertic Wed Jul 1 15:02:59 2009 UTC Modified files: /win-installer/Bitmaps bannrbmp.bmp dlgbmp.bmp Log: Bug #48616 - Change graphic to match the current one used on the PHP for Windows site, being less version centric. http://cvs.php.net/viewvc.cgi/win-installer/Bitmaps/bannrbmp.bmp?r1=1.1r2=1.2diff_format=u Index: win-installer/Bitmaps/bannrbmp.bmp http://cvs.php.net/viewvc.cgi/win-installer/Bitmaps/dlgbmp.bmp?r1=1.1r2=1.2diff_format=u Index: win-installer/Bitmaps/dlgbmp.bmp -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mysql/tests 001.phpt 002.phpt 003.phpt mysql_escape_string.phpt mysql_fetch_array.phpt mysql_fetch_assoc.phpt mysql_fetch_field.phpt mysql_fetch_object.phpt mysql_fetch_row
uw Wed Jul 1 15:31:33 2009 UTC
Modified files:
/php-src/ext/mysql/tests001.phpt 002.phpt 003.phpt
mysql_escape_string.phpt
mysql_fetch_array.phpt
mysql_fetch_assoc.phpt
mysql_fetch_field.phpt
mysql_fetch_object.phpt
mysql_fetch_row.phpt mysql_field_name.phpt
mysql_field_seek.phpt
mysql_field_table.phpt
mysql_field_type.phpt
mysql_pconn_max_links.phpt
mysql_query_load_data_openbasedir.phpt
mysql_query.phpt
mysql_real_escape_string.phpt
mysql_result.phpt mysql_select_db.phpt
mysql_set_charset.phpt
mysql_tablename.phpt mysql_trace_mode.phpt
mysql_unbuffered_query.phpt
Log:
Changing tests to run with both PHP 6 and PHP 5.3 to make future MFH easier.
Basically three changes over all files: a) s/unicode(/%unicode|string% b)
s/[u/[%u|b% c) s/unicode.semantics/version_compare
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/001.phpt?r1=1.6r2=1.7diff_format=u
Index: php-src/ext/mysql/tests/001.phpt
diff -u php-src/ext/mysql/tests/001.phpt:1.6
php-src/ext/mysql/tests/001.phpt:1.7
--- php-src/ext/mysql/tests/001.phpt:1.6Mon Jan 5 18:22:01 2009
+++ php-src/ext/mysql/tests/001.phptWed Jul 1 15:31:32 2009
@@ -26,5 +26,5 @@
print done!;
?
--EXPECTF--
-unicode(2) 11
+%unicode|string%(2) 11
done!
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/002.phpt?r1=1.4r2=1.5diff_format=u
Index: php-src/ext/mysql/tests/002.phpt
diff -u php-src/ext/mysql/tests/002.phpt:1.4
php-src/ext/mysql/tests/002.phpt:1.5
--- php-src/ext/mysql/tests/002.phpt:1.4Mon Jan 5 18:22:01 2009
+++ php-src/ext/mysql/tests/002.phptWed Jul 1 15:31:32 2009
@@ -39,19 +39,19 @@
bool(true)
resource(%d) of type (mysql result)
array(3) {
- [ucol1]=
- unicode(1) 1
- [ucol2]=
- unicode(3) foo
- [ucol3]=
- unicode(3) bar
+ [%u|b%col1]=
+ %unicode|string%(1) 1
+ [%u|b%col2]=
+ %unicode|string%(3) foo
+ [%u|b%col3]=
+ %unicode|string%(3) bar
}
array(3) {
- [ucol1]=
- unicode(1) 2
- [ucol2]=
- unicode(3) foo
- [ucol3]=
- unicode(3) bar
+ [%u|b%col1]=
+ %unicode|string%(1) 2
+ [%u|b%col2]=
+ %unicode|string%(3) foo
+ [%u|b%col3]=
+ %unicode|string%(3) bar
}
done!
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/003.phpt?r1=1.4r2=1.5diff_format=u
Index: php-src/ext/mysql/tests/003.phpt
diff -u php-src/ext/mysql/tests/003.phpt:1.4
php-src/ext/mysql/tests/003.phpt:1.5
--- php-src/ext/mysql/tests/003.phpt:1.4Mon Jan 5 18:22:01 2009
+++ php-src/ext/mysql/tests/003.phptWed Jul 1 15:31:32 2009
@@ -55,31 +55,31 @@
--EXPECTF--
==stdClass==
object(stdClass)#%d (1) {
- [ua]=
- unicode(3) one
+ [%u|b%a]=
+ %unicode|string%(3) one
}
object(stdClass)#%d (1) {
- [ua]=
- unicode(3) two
+ [%u|b%a]=
+ %unicode|string%(3) two
}
object(stdClass)#%d (1) {
- [ua]=
- unicode(5) three
+ [%u|b%a]=
+ %unicode|string%(5) three
}
==class24==
class24::__construct
object(class24)#%d (1) {
- [ua]=
- unicode(3) one
+ [%u|b%a]=
+ %unicode|string%(3) one
}
class24::__construct
object(class24)#%d (1) {
- [ua]=
- unicode(3) two
+ [%u|b%a]=
+ %unicode|string%(3) two
}
class24::__construct
object(class24)#%d (1) {
- [ua]=
- unicode(5) three
+ [%u|b%a]=
+ %unicode|string%(5) three
}
done!
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_escape_string.phpt?r1=1.3r2=1.4diff_format=u
Index: php-src/ext/mysql/tests/mysql_escape_string.phpt
diff -u php-src/ext/mysql/tests/mysql_escape_string.phpt:1.3
php-src/ext/mysql/tests/mysql_escape_string.phpt:1.4
--- php-src/ext/mysql/tests/mysql_escape_string.phpt:1.3Mon Jan 5
18:22:01 2009
+++ php-src/ext/mysql/tests/mysql_escape_string.phptWed Jul 1 15:31:32 2009
@@ -23,11 +23,11 @@
print done!;
?
--EXPECTF--
-unicode(31) Am I a unicode string in PHP 6?
-unicode(2) \\
-unicode(2) \
-unicode(2) \'
-unicode(2) \n
-unicode(2) \r
-unicode(8) foo\0bar
+%unicode|string%(31) Am I a unicode string in PHP 6?
+%unicode|string%(2) \\
+%unicode|string%(2) \
+%unicode|string%(2) \'
+%unicode|string%(2) \n
+%unicode|string%(2) \r
+%unicode|string%(8) foo\0bar
done!
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_fetch_array.phpt?r1=1.6r2=1.7diff_format=u
Index: php-src/ext/mysql/tests/mysql_fetch_array.phpt
diff -u php-src/ext/mysql/tests/mysql_fetch_array.phpt:1.6
php-src/ext/mysql/tests/mysql_fetch_array.phpt:1.7
--- php-src/ext/mysql/tests/mysql_fetch_array.phpt:1.6 Mon Jan 5 18:22:01 2009
+++
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysql/tests 001.phpt 002.phpt 003.phpt mysql_connect.phpt mysql_escape_string.phpt mysql_fetch_array.phpt mysql_fetch_assoc.phpt mysql_fetch_field.phpt mysql_fetch
uw Wed Jul 1 15:33:33 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysql/tests001.phpt 002.phpt 003.phpt
mysql_connect.phpt
mysql_escape_string.phpt
mysql_fetch_array.phpt
mysql_fetch_assoc.phpt
mysql_fetch_field.phpt
mysql_fetch_object.phpt
mysql_fetch_row.phpt mysql_field_name.phpt
mysql_field_seek.phpt
mysql_field_table.phpt
mysql_field_type.phpt
mysql_pconn_max_links.phpt
mysql_phpinfo.phpt
mysql_query_load_data_openbasedir.phpt
mysql_query.phpt
mysql_real_escape_string.phpt
mysql_result.phpt mysql_select_db.phpt
mysql_set_charset.phpt
mysql_tablename.phpt mysql_trace_mode.phpt
mysql_unbuffered_query.phpt
Log:
MFH - Changing tests to run with both PHP 6 and PHP 5.3 to make future MFH
easier. Basically three changes over all files: a) s/unicode(/%unicode|string%
b) s/[u/[%u|b% c) s/unicode.semantics/version_compare
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/001.phpt?r1=1.3.2.1.4.1r2=1.3.2.1.4.2diff_format=u
Index: php-src/ext/mysql/tests/001.phpt
diff -u php-src/ext/mysql/tests/001.phpt:1.3.2.1.4.1
php-src/ext/mysql/tests/001.phpt:1.3.2.1.4.2
--- php-src/ext/mysql/tests/001.phpt:1.3.2.1.4.1Wed Oct 10 09:47:21 2007
+++ php-src/ext/mysql/tests/001.phptWed Jul 1 15:33:30 2009
@@ -25,9 +25,6 @@
var_dump($test);
print done!;
?
---EXPECT--
-string(2) 11
+--EXPECTF--
+%unicode|string%(2) 11
done!
---UEXPECTF--
-unicode(2) 11
-done!
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/002.phpt?r1=1.1.8.2r2=1.1.8.3diff_format=u
Index: php-src/ext/mysql/tests/002.phpt
diff -u php-src/ext/mysql/tests/002.phpt:1.1.8.2
php-src/ext/mysql/tests/002.phpt:1.1.8.3
--- php-src/ext/mysql/tests/002.phpt:1.1.8.2Fri Oct 12 11:57:18 2007
+++ php-src/ext/mysql/tests/002.phptWed Jul 1 15:33:31 2009
@@ -39,42 +39,19 @@
bool(true)
resource(%d) of type (mysql result)
array(3) {
- [col1]=
- string(1) 1
- [col2]=
- string(3) foo
- [col3]=
- string(3) bar
+ [%u|b%col1]=
+ %unicode|string%(1) 1
+ [%u|b%col2]=
+ %unicode|string%(3) foo
+ [%u|b%col3]=
+ %unicode|string%(3) bar
}
array(3) {
- [col1]=
- string(1) 2
- [col2]=
- string(3) foo
- [col3]=
- string(3) bar
+ [%u|b%col1]=
+ %unicode|string%(1) 2
+ [%u|b%col2]=
+ %unicode|string%(3) foo
+ [%u|b%col3]=
+ %unicode|string%(3) bar
}
done!
---UEXPECTF--
-resource(%d) of type (mysql link)
-bool(true)
-bool(true)
-bool(true)
-resource(%d) of type (mysql result)
-array(3) {
- [ucol1]=
- unicode(1) 1
- [ucol2]=
- unicode(3) foo
- [ucol3]=
- unicode(3) bar
-}
-array(3) {
- [ucol1]=
- unicode(1) 2
- [ucol2]=
- unicode(3) foo
- [ucol3]=
- unicode(3) bar
-}
-done!
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/003.phpt?r1=1.1.8.2r2=1.1.8.3diff_format=u
Index: php-src/ext/mysql/tests/003.phpt
diff -u php-src/ext/mysql/tests/003.phpt:1.1.8.2
php-src/ext/mysql/tests/003.phpt:1.1.8.3
--- php-src/ext/mysql/tests/003.phpt:1.1.8.2Fri Oct 12 11:57:18 2007
+++ php-src/ext/mysql/tests/003.phptWed Jul 1 15:33:31 2009
@@ -55,62 +55,31 @@
--EXPECTF--
==stdClass==
object(stdClass)#%d (1) {
- [a]=
- string(3) one
+ [%u|b%a]=
+ %unicode|string%(3) one
}
object(stdClass)#%d (1) {
- [a]=
- string(3) two
+ [%u|b%a]=
+ %unicode|string%(3) two
}
object(stdClass)#%d (1) {
- [a]=
- string(5) three
+ [%u|b%a]=
+ %unicode|string%(5) three
}
==class24==
class24::__construct
object(class24)#%d (1) {
- [a]=
- string(3) one
+ [%u|b%a]=
+ %unicode|string%(3) one
}
class24::__construct
object(class24)#%d (1) {
- [a]=
- string(3) two
+ [%u|b%a]=
+ %unicode|string%(3) two
}
class24::__construct
object(class24)#%d (1) {
- [a]=
- string(5) three
+ [%u|b%a]=
+ %unicode|string%(5) three
}
done!
---UEXPECTF--
-==stdClass==
-object(stdClass)#%d (1) {
- [ua]=
- unicode(3) one
-}
-object(stdClass)#%d (1) {
- [ua]=
- unicode(3) two
-}
-object(stdClass)#%d (1) {
- [ua]=
- unicode(5) three
-}
-==class24==
-class24::__construct
-object(class24)#%d (1) {
- [ua]=
- unicode(3) one
-}
-class24::__construct
-object(class24)#%d (1) {
- [ua]=
- unicode(3) two
-}
-class24::__construct
-object(class24)#%d (1) {
- [ua]=
- unicode(5) three
-}
-done!
\ No newline at end of file
[PHP-CVS] cvs: php-src /ext/reflection php_reflection.c /ext/reflection/tests bug48757.phpt
kalle Wed Jul 1 17:37:42 2009 UTC
Added files:
/php-src/ext/reflection/tests bug48757.phpt
Modified files:
/php-src/ext/reflection php_reflection.c
Log:
Fixed bug #48757 (ReflectionFunction::invoke() parameter issues)
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/php_reflection.c?r1=1.346r2=1.347diff_format=u
Index: php-src/ext/reflection/php_reflection.c
diff -u php-src/ext/reflection/php_reflection.c:1.346
php-src/ext/reflection/php_reflection.c:1.347
--- php-src/ext/reflection/php_reflection.c:1.346 Tue Jun 16 14:29:18 2009
+++ php-src/ext/reflection/php_reflection.c Wed Jul 1 17:37:42 2009
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: php_reflection.c,v 1.346 2009/06/16 14:29:18 felipe Exp $ */
+/* $Id: php_reflection.c,v 1.347 2009/07/01 17:37:42 kalle Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1763,7 +1763,7 @@
}
/* }}} */
-/* {{{ proto public mixed ReflectionFunction::invoke(mixed* args) U
+/* {{{ proto public mixed ReflectionFunction::invoke([mixed* args]) U
Invokes the function */
ZEND_METHOD(reflection_function, invoke)
{
@@ -1778,7 +1778,7 @@
METHOD_NOTSTATIC(reflection_function_ptr);
GET_REFLECTION_OBJECT_PTR(fptr);
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, +, params,
num_args) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, *, params,
num_args) == FAILURE) {
return;
}
@@ -5249,7 +5249,7 @@
ZEND_ARG_INFO(0, name)
ZEND_END_ARG_INFO()
-ZEND_BEGIN_ARG_INFO(arginfo_reflection_function_invoke, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_reflection_function_invoke, 0, 0, 0)
ZEND_ARG_INFO(0, args)
ZEND_END_ARG_INFO()
@@ -5687,7 +5687,7 @@
php_info_print_table_start();
php_info_print_table_header(2, Reflection, enabled);
- php_info_print_table_row(2, Version, $Revision: 1.346 $);
+ php_info_print_table_row(2, Version, $Revision: 1.347 $);
php_info_print_table_end();
} /* }}} */
@@ -5701,7 +5701,7 @@
NULL,
NULL,
PHP_MINFO(reflection),
- $Revision: 1.346 $,
+ $Revision: 1.347 $,
STANDARD_MODULE_PROPERTIES
}; /* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/bug48757.phpt?view=markuprev=1.1
Index: php-src/ext/reflection/tests/bug48757.phpt
+++ php-src/ext/reflection/tests/bug48757.phpt
--TEST--
Bug #48757 (ReflectionFunction::invoke() parameter issues)
--FILE--
?php
function test() {
echo Hello World\n;
}
function another_test($parameter) {
var_dump($parameter);
}
$func = new ReflectionFunction('test');
$func-invoke();
$func = new ReflectionFunction('another_test');
$func-invoke('testing');
?
--EXPECT--
Hello World
unicode(7) testing
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/reflection php_reflection.c /ext/reflection/tests bug48757.phpt
kalle Wed Jul 1 17:38:04 2009 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/reflection/tests bug48757.phpt
Modified files:
/php-src/ext/reflection php_reflection.c
Log:
MFH: Fixed bug #48757 (ReflectionFunction::invoke() parameter issues)
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/php_reflection.c?r1=1.164.2.33.2.45.2.58r2=1.164.2.33.2.45.2.59diff_format=u
Index: php-src/ext/reflection/php_reflection.c
diff -u php-src/ext/reflection/php_reflection.c:1.164.2.33.2.45.2.58
php-src/ext/reflection/php_reflection.c:1.164.2.33.2.45.2.59
--- php-src/ext/reflection/php_reflection.c:1.164.2.33.2.45.2.58Tue Jun
16 14:33:33 2009
+++ php-src/ext/reflection/php_reflection.c Wed Jul 1 17:38:03 2009
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: php_reflection.c,v 1.164.2.33.2.45.2.58 2009/06/16 14:33:33 felipe Exp
$ */
+/* $Id: php_reflection.c,v 1.164.2.33.2.45.2.59 2009/07/01 17:38:03 kalle Exp
$ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1717,7 +1717,7 @@
}
/* }}} */
-/* {{{ proto public mixed ReflectionFunction::invoke(mixed* args)
+/* {{{ proto public mixed ReflectionFunction::invoke([mixed* args])
Invokes the function */
ZEND_METHOD(reflection_function, invoke)
{
@@ -1732,7 +1732,7 @@
METHOD_NOTSTATIC(reflection_function_ptr);
GET_REFLECTION_OBJECT_PTR(fptr);
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, +, params,
num_args) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, *, params,
num_args) == FAILURE) {
return;
}
@@ -5008,7 +5008,7 @@
ZEND_ARG_INFO(0, name)
ZEND_END_ARG_INFO()
-ZEND_BEGIN_ARG_INFO(arginfo_reflection_function_invoke, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_reflection_function_invoke, 0, 0, 0)
ZEND_ARG_INFO(0, args)
ZEND_END_ARG_INFO()
@@ -5442,7 +5442,7 @@
php_info_print_table_start();
php_info_print_table_header(2, Reflection, enabled);
- php_info_print_table_row(2, Version, $Revision: 1.164.2.33.2.45.2.58
$);
+ php_info_print_table_row(2, Version, $Revision: 1.164.2.33.2.45.2.59
$);
php_info_print_table_end();
} /* }}} */
@@ -5456,7 +5456,7 @@
NULL,
NULL,
PHP_MINFO(reflection),
- $Revision: 1.164.2.33.2.45.2.58 $,
+ $Revision: 1.164.2.33.2.45.2.59 $,
STANDARD_MODULE_PROPERTIES
}; /* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/bug48757.phpt?view=markuprev=1.1
Index: php-src/ext/reflection/tests/bug48757.phpt
+++ php-src/ext/reflection/tests/bug48757.phpt
--TEST--
Bug #48757 (ReflectionFunction::invoke() parameter issues)
--FILE--
?php
function test() {
echo Hello World\n;
}
function another_test($parameter) {
var_dump($parameter);
}
$func = new ReflectionFunction('test');
$func-invoke();
$func = new ReflectionFunction('another_test');
$func-invoke('testing');
?
--EXPECT--
Hello World
unicode(7) testing
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS
kalle Wed Jul 1 17:38:53 2009 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS Log: BFN #48757 http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.660r2=1.2027.2.547.2.965.2.661diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.660 php-src/NEWS:1.2027.2.547.2.965.2.661 --- php-src/NEWS:1.2027.2.547.2.965.2.660 Tue Jun 30 17:14:37 2009 +++ php-src/NEWSWed Jul 1 17:38:52 2009 @@ -5,6 +5,7 @@ - Fixed spl_autoload_unregister/spl_autoad_functions wrt. Closures and Functors. (Christian Seiler) +- Fixed bug #48757 (ReflectionFunction::invoke() parameter issues). (Kalle) - Fixed bug #48681 (openssl signature verification for tar archives broken). (Greg) - Fixed bug #47351 (Memory leak in DateTime). (Derick, Tobias John) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/reflection php_reflection.c
kalle Wed Jul 1 17:42:48 2009 UTC
Modified files:
/php-src/ext/reflection php_reflection.c
Log:
Fixed memory leak if zero parameters are passed, Thanks Felipe
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/php_reflection.c?r1=1.347r2=1.348diff_format=u
Index: php-src/ext/reflection/php_reflection.c
diff -u php-src/ext/reflection/php_reflection.c:1.347
php-src/ext/reflection/php_reflection.c:1.348
--- php-src/ext/reflection/php_reflection.c:1.347 Wed Jul 1 17:37:42 2009
+++ php-src/ext/reflection/php_reflection.c Wed Jul 1 17:42:48 2009
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: php_reflection.c,v 1.347 2009/07/01 17:37:42 kalle Exp $ */
+/* $Id: php_reflection.c,v 1.348 2009/07/01 17:42:48 kalle Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1800,7 +1800,9 @@
result = zend_call_function(fci, fcc TSRMLS_CC);
- efree(params);
+ if (num_args) {
+ efree(params);
+ }
if (result == FAILURE) {
zend_throw_exception_ex(reflection_exception_ptr, 0 TSRMLS_CC,
@@ -5687,7 +5689,7 @@
php_info_print_table_start();
php_info_print_table_header(2, Reflection, enabled);
- php_info_print_table_row(2, Version, $Revision: 1.347 $);
+ php_info_print_table_row(2, Version, $Revision: 1.348 $);
php_info_print_table_end();
} /* }}} */
@@ -5701,7 +5703,7 @@
NULL,
NULL,
PHP_MINFO(reflection),
- $Revision: 1.347 $,
+ $Revision: 1.348 $,
STANDARD_MODULE_PROPERTIES
}; /* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/reflection php_reflection.c
kalle Wed Jul 1 17:43:16 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/reflection php_reflection.c
Log:
MFH: Fixed memory leak if zero parameters are passed, Thanks Felipe
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/php_reflection.c?r1=1.164.2.33.2.45.2.59r2=1.164.2.33.2.45.2.60diff_format=u
Index: php-src/ext/reflection/php_reflection.c
diff -u php-src/ext/reflection/php_reflection.c:1.164.2.33.2.45.2.59
php-src/ext/reflection/php_reflection.c:1.164.2.33.2.45.2.60
--- php-src/ext/reflection/php_reflection.c:1.164.2.33.2.45.2.59Wed Jul
1 17:38:03 2009
+++ php-src/ext/reflection/php_reflection.c Wed Jul 1 17:43:16 2009
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: php_reflection.c,v 1.164.2.33.2.45.2.59 2009/07/01 17:38:03 kalle Exp
$ */
+/* $Id: php_reflection.c,v 1.164.2.33.2.45.2.60 2009/07/01 17:43:16 kalle Exp
$ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1754,7 +1754,9 @@
result = zend_call_function(fci, fcc TSRMLS_CC);
- efree(params);
+ if (num_args) {
+ efree(params);
+ }
if (result == FAILURE) {
zend_throw_exception_ex(reflection_exception_ptr, 0 TSRMLS_CC,
@@ -5442,7 +5444,7 @@
php_info_print_table_start();
php_info_print_table_header(2, Reflection, enabled);
- php_info_print_table_row(2, Version, $Revision: 1.164.2.33.2.45.2.59
$);
+ php_info_print_table_row(2, Version, $Revision: 1.164.2.33.2.45.2.60
$);
php_info_print_table_end();
} /* }}} */
@@ -5456,7 +5458,7 @@
NULL,
NULL,
PHP_MINFO(reflection),
- $Revision: 1.164.2.33.2.45.2.59 $,
+ $Revision: 1.164.2.33.2.45.2.60 $,
STANDARD_MODULE_PROPERTIES
}; /* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/com_dotnet/tests bug45280.phpt /ext/reflection php_reflection.c
kalle Wed Jul 1 18:44:16 2009 UTC
Added files:
/php-src/ext/com_dotnet/tests bug45280.phpt
Modified files:
/php-src/ext/reflection php_reflection.c
Log:
Fixed #45280 (Reflection of instantiated COM classes causes PHP to crash)
(Paul Richards, Kalle)
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/php_reflection.c?r1=1.348r2=1.349diff_format=u
Index: php-src/ext/reflection/php_reflection.c
diff -u php-src/ext/reflection/php_reflection.c:1.348
php-src/ext/reflection/php_reflection.c:1.349
--- php-src/ext/reflection/php_reflection.c:1.348 Wed Jul 1 17:42:48 2009
+++ php-src/ext/reflection/php_reflection.c Wed Jul 1 18:44:16 2009
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: php_reflection.c,v 1.348 2009/07/01 17:42:48 kalle Exp $ */
+/* $Id: php_reflection.c,v 1.349 2009/07/01 18:44:16 kalle Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -531,23 +531,25 @@
string_init(dyn);
count = 0;
- zend_hash_internal_pointer_reset_ex(properties, pos);
+ if (properties zend_hash_num_elements(properties)) {
+ zend_hash_internal_pointer_reset_ex(properties, pos);
- while (zend_hash_get_current_data_ex(properties, (void **)
prop, pos) == SUCCESS) {
- zstr prop_name;
- uint prop_name_size;
- zend_uchar prop_type;
- ulong index;
-
- if ((prop_type =
zend_hash_get_current_key_ex(properties, prop_name, prop_name_size, index,
0, pos)) == HASH_KEY_IS_UNICODE) {
- if (prop_name_size prop_name.u[0]) { /* skip
all private and protected properties */
- if
(!zend_u_hash_exists(ce-properties_info, prop_type, prop_name,
prop_name_size)) {
- count++;
- _property_string(dyn, NULL,
prop_name, sub_indent.string TSRMLS_CC);
+ while (zend_hash_get_current_data_ex(properties, (void
**) prop, pos) == SUCCESS) {
+ zstr prop_name;
+ uint prop_name_size;
+ zend_uchar prop_type;
+ ulong index;
+
+ if ((prop_type =
zend_hash_get_current_key_ex(properties, prop_name, prop_name_size, index,
0, pos)) == HASH_KEY_IS_UNICODE) {
+ if (prop_name_size prop_name.u[0]) {
/* skip all private and protected properties */
+ if
(!zend_u_hash_exists(ce-properties_info, prop_type, prop_name,
prop_name_size)) {
+ count++;
+ _property_string(dyn,
NULL, prop_name, sub_indent.string TSRMLS_CC);
+ }
}
}
+ zend_hash_move_forward_ex(properties, pos);
}
- zend_hash_move_forward_ex(properties, pos);
}
string_printf(str, \n%s - Dynamic properties [%d] {\n,
indent, count);
@@ -5689,7 +5691,7 @@
php_info_print_table_start();
php_info_print_table_header(2, Reflection, enabled);
- php_info_print_table_row(2, Version, $Revision: 1.348 $);
+ php_info_print_table_row(2, Version, $Revision: 1.349 $);
php_info_print_table_end();
} /* }}} */
@@ -5703,7 +5705,7 @@
NULL,
NULL,
PHP_MINFO(reflection),
- $Revision: 1.348 $,
+ $Revision: 1.349 $,
STANDARD_MODULE_PROPERTIES
}; /* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/com_dotnet/tests/bug45280.phpt?view=markuprev=1.1
Index: php-src/ext/com_dotnet/tests/bug45280.phpt
+++ php-src/ext/com_dotnet/tests/bug45280.phpt
--TEST--
Bug #45280 (Reflection of instantiated COM classes causes PHP to crash)
--SKIPIF--
?php
if (!extension_loaded(reflection)){ echo skip, no reflection support
present; }
if (!extension_loaded(com_dotnet)){ echo skip COM/.Net support not present;
}
?
--FILE--
?php
$dict = new COM(Scripting.Dictionary);
ob_start();
ReflectionObject::export($dict);
ob_get_clean();
echo 'done';
?
--EXPECT--
done
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/com_dotnet/tests bug45280.phpt /ext/reflection php_reflection.c
kalle Wed Jul 1 18:44:56 2009 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/com_dotnet/tests bug45280.phpt
Modified files:
/php-src/ext/reflection php_reflection.c
Log:
MFH: Fixed #45280 (Reflection of instantiated COM classes causes PHP to
crash) (Paul Richards, Kalle)
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/php_reflection.c?r1=1.164.2.33.2.45.2.60r2=1.164.2.33.2.45.2.61diff_format=u
Index: php-src/ext/reflection/php_reflection.c
diff -u php-src/ext/reflection/php_reflection.c:1.164.2.33.2.45.2.60
php-src/ext/reflection/php_reflection.c:1.164.2.33.2.45.2.61
--- php-src/ext/reflection/php_reflection.c:1.164.2.33.2.45.2.60Wed Jul
1 17:43:16 2009
+++ php-src/ext/reflection/php_reflection.c Wed Jul 1 18:44:56 2009
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: php_reflection.c,v 1.164.2.33.2.45.2.60 2009/07/01 17:43:16 kalle Exp
$ */
+/* $Id: php_reflection.c,v 1.164.2.33.2.45.2.61 2009/07/01 18:44:56 kalle Exp
$ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -533,23 +533,25 @@
string_init(dyn);
count = 0;
- zend_hash_internal_pointer_reset_ex(properties, pos);
+ if (properties zend_hash_num_elements(properties)) {
+ zend_hash_internal_pointer_reset_ex(properties, pos);
- while (zend_hash_get_current_data_ex(properties, (void **)
prop, pos) == SUCCESS) {
- char *prop_name;
- uint prop_name_size;
- ulong index;
-
- if (zend_hash_get_current_key_ex(properties,
prop_name, prop_name_size, index, 1, pos) == HASH_KEY_IS_STRING) {
- if (prop_name_size prop_name[0]) { /* skip
all private and protected properties */
- if
(!zend_hash_quick_exists(ce-properties_info, prop_name, prop_name_size,
zend_get_hash_value(prop_name, prop_name_size))) {
- count++;
- _property_string(dyn, NULL,
prop_name, sub_indent.string TSRMLS_CC);
+ while (zend_hash_get_current_data_ex(properties, (void
**) prop, pos) == SUCCESS) {
+ char *prop_name;
+ uint prop_name_size;
+ ulong index;
+
+ if (zend_hash_get_current_key_ex(properties,
prop_name, prop_name_size, index, 1, pos) == HASH_KEY_IS_STRING) {
+ if (prop_name_size prop_name[0]) {
/* skip all private and protected properties */
+ if
(!zend_hash_quick_exists(ce-properties_info, prop_name, prop_name_size,
zend_get_hash_value(prop_name, prop_name_size))) {
+ count++;
+ _property_string(dyn,
NULL, prop_name, sub_indent.string TSRMLS_CC);
+ }
}
+ efree(prop_name);
}
- efree(prop_name);
+ zend_hash_move_forward_ex(properties, pos);
}
- zend_hash_move_forward_ex(properties, pos);
}
string_printf(str, \n%s - Dynamic properties [%d] {\n,
indent, count);
@@ -5444,7 +5446,7 @@
php_info_print_table_start();
php_info_print_table_header(2, Reflection, enabled);
- php_info_print_table_row(2, Version, $Revision: 1.164.2.33.2.45.2.60
$);
+ php_info_print_table_row(2, Version, $Revision: 1.164.2.33.2.45.2.61
$);
php_info_print_table_end();
} /* }}} */
@@ -5458,7 +5460,7 @@
NULL,
NULL,
PHP_MINFO(reflection),
- $Revision: 1.164.2.33.2.45.2.60 $,
+ $Revision: 1.164.2.33.2.45.2.61 $,
STANDARD_MODULE_PROPERTIES
}; /* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/com_dotnet/tests/bug45280.phpt?view=markuprev=1.1
Index: php-src/ext/com_dotnet/tests/bug45280.phpt
+++ php-src/ext/com_dotnet/tests/bug45280.phpt
--TEST--
Bug #45280 (Reflection of instantiated COM classes causes PHP to crash)
--SKIPIF--
?php
if (!extension_loaded(reflection)){ echo skip, no reflection support
present; }
if (!extension_loaded(com_dotnet)){ echo skip COM/.Net support not present;
}
?
--FILE--
?php
$dict = new COM(Scripting.Dictionary);
ob_start();
ReflectionObject::export($dict);
ob_get_clean();
echo 'done';
?
--EXPECT--
done
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/com_dotnet/tests bug45280.phpt /ext/reflection php_reflection.c
kalle Wed Jul 1 18:45:32 2009 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/com_dotnet/tests bug45280.phpt
Modified files:
/php-src/ext/reflection php_reflection.c
Log:
Fixed #45280 (Reflection of instantiated COM classes causes PHP to crash)
(Paul Richards, Kalle)
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/php_reflection.c?r1=1.164.2.33.2.57r2=1.164.2.33.2.58diff_format=u
Index: php-src/ext/reflection/php_reflection.c
diff -u php-src/ext/reflection/php_reflection.c:1.164.2.33.2.57
php-src/ext/reflection/php_reflection.c:1.164.2.33.2.58
--- php-src/ext/reflection/php_reflection.c:1.164.2.33.2.57 Thu May 21
16:05:11 2009
+++ php-src/ext/reflection/php_reflection.c Wed Jul 1 18:45:32 2009
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: php_reflection.c,v 1.164.2.33.2.57 2009/05/21 16:05:11 lbarnaud Exp $
*/
+/* $Id: php_reflection.c,v 1.164.2.33.2.58 2009/07/01 18:45:32 kalle Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -481,23 +481,25 @@
string_init(dyn);
count = 0;
- zend_hash_internal_pointer_reset_ex(properties, pos);
+ if (properties zend_hash_num_elements(properties)) {
+ zend_hash_internal_pointer_reset_ex(properties, pos);
- while (zend_hash_get_current_data_ex(properties, (void **)
prop, pos) == SUCCESS) {
- char *prop_name;
- uint prop_name_size;
- ulong index;
-
- if (zend_hash_get_current_key_ex(properties,
prop_name, prop_name_size, index, 1, pos) == HASH_KEY_IS_STRING) {
- if (prop_name_size prop_name[0]) { /* skip
all private and protected properties */
- if
(!zend_hash_quick_exists(ce-properties_info, prop_name, prop_name_size,
zend_get_hash_value(prop_name, prop_name_size))) {
+ while (zend_hash_get_current_data_ex(properties, (void
**) prop, pos) == SUCCESS) {
+ char *prop_name;
+ uint prop_name_size;
+ ulong index;
+
+ if (zend_hash_get_current_key_ex(properties,
prop_name, prop_name_size, index, 1, pos) == HASH_KEY_IS_STRING) {
+ if (prop_name_size prop_name[0]) {
/* skip all private and protected properties */
+ if
(!zend_hash_quick_exists(ce-properties_info, prop_name, prop_name_size,
zend_get_hash_value(prop_name, prop_name_size))) {
count++;
- _property_string(dyn, NULL,
prop_name, sub_indent.string TSRMLS_CC);
+ _property_string(dyn,
NULL, prop_name, sub_indent.string TSRMLS_CC);
+ }
}
+ efree(prop_name);
}
- efree(prop_name);
+ zend_hash_move_forward_ex(properties, pos);
}
- zend_hash_move_forward_ex(properties, pos);
}
string_printf(str, \n%s - Dynamic properties [%d] {\n,
indent, count);
@@ -4952,7 +4954,7 @@
php_info_print_table_start();
php_info_print_table_header(2, Reflection, enabled);
- php_info_print_table_row(2, Version, $Id: php_reflection.c,v
1.164.2.33.2.57 2009/05/21 16:05:11 lbarnaud Exp $);
+ php_info_print_table_row(2, Version, $Id: php_reflection.c,v
1.164.2.33.2.58 2009/07/01 18:45:32 kalle Exp $);
php_info_print_table_end();
} /* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/com_dotnet/tests/bug45280.phpt?view=markuprev=1.1
Index: php-src/ext/com_dotnet/tests/bug45280.phpt
+++ php-src/ext/com_dotnet/tests/bug45280.phpt
--TEST--
Bug #45280 (Reflection of instantiated COM classes causes PHP to crash)
--SKIPIF--
?php
if (!extension_loaded(reflection)){ echo skip, no reflection support
present; }
if (!extension_loaded(com_dotnet)){ echo skip COM/.Net support not present;
}
?
--FILE--
?php
$dict = new COM(Scripting.Dictionary);
ob_start();
ReflectionObject::export($dict);
ob_get_clean();
echo 'done';
?
--EXPECT--
done
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS
kalle Wed Jul 1 18:46:53 2009 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: BFN #45280 http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1575r2=1.2027.2.547.2.1576diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.1575 php-src/NEWS:1.2027.2.547.2.1576 --- php-src/NEWS:1.2027.2.547.2.1575Tue Jun 30 16:18:34 2009 +++ php-src/NEWSWed Jul 1 18:46:53 2009 @@ -1,4 +1,4 @@ -PHPNEWS +PHP NEWS ||| ?? ??? 2009, PHP 5.2.11 - Fixed regression in cURL extension that prevented flush of data to output @@ -23,6 +23,8 @@ - Fixed bug #48276 (date(Y) on big endian machines produces the wrong result). (Scott) - Fixed bug #47351 (Memory leak in DateTime). (Derick, Tobias John) +- Fixed bug #45280 (Reflection of instantiated COM classes causes PHP to crash) + (Paul Richards, Kalle) 17 Jun 2009, PHP 5.2.10 - Updated timezone database to version 2009.9 (2009i) (Derick) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: phpruntests /src/testcase rtPhpTest.php
zoe Wed Jul 1 20:15:41 2009 UTC
Modified files:
/phpruntests/src/testcase rtPhpTest.php
Log:
Changes to deal with parsing tests that contain section key words inside teh
section
http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/rtPhpTest.php?r1=1.11r2=1.12diff_format=u
Index: phpruntests/src/testcase/rtPhpTest.php
diff -u phpruntests/src/testcase/rtPhpTest.php:1.11
phpruntests/src/testcase/rtPhpTest.php:1.12
--- phpruntests/src/testcase/rtPhpTest.php:1.11 Tue Jun 2 19:12:07 2009
+++ phpruntests/src/testcase/rtPhpTest.php Wed Jul 1 20:15:41 2009
@@ -40,29 +40,40 @@
*/
public function parse()
{
-for ($i=0; $icount($this-contents); $i++) {
-//Create an array of section objects
-if ($this-isSectionKey($this-contents[$i])) {
-$sectionKey = $this-contents[$i];
-
-$tempArray = array();
-for ($j=$i+1; $jcount($this-contents); $j++) {
-
-if ($this-isSectionKey($this-contents[$j]) ||
stripos($this-contents[$j], ===done===) !== false) {
-if(stripos($this-contents[$j], ===done===) !==
false) {
-$tempArray[] = trim($this-contents[$j]);
+
+for ($sectionCount = 0; $sectionCount count ($this-sectionHeadings)
-1 ; $sectionCount++) {
+
+$sectionKey = $this-sectionHeadings[$sectionCount];
+$nextSectionKey = $this-sectionHeadings[$sectionCount + 1];
+$tempArray = array();
+
+$contentPointer = 0;
+for ($i=0; $icount($this-contents); $i++) {
+if($this-contents[$i] == $sectionKey) {
+for ($j=$i+1; $jcount($this-contents); $j++) {
+if ($this-contents[$j] == $nextSectionKey ||
stripos($this-contents[$j], ===done===) !== false) {
+if(stripos($this-contents[$j], ===done===) !==
false) {
+$tempArray[] = trim($this-contents[$j]);
+}
+
+$testSection = rtSection::getInstance($sectionKey,
$tempArray);
+$this-sections[$sectionKey] = $testSection;
+$contentPointer = $j;
+break;
}
-$testSection = rtSection::getInstance($sectionKey,
$tempArray);
-$this-sections[$sectionKey] = $testSection;
-break;
+$tempArray[] = $this-contents[$j];
}
-$tempArray[] = $this-contents[$j];
}
}
}
-$testSection = rtSection::getInstance($sectionKey, $tempArray);
-$this-sections[$sectionKey] = $testSection;
+
+$tempArray = array();
+for ($k = $contentPointer +1; $k count($this-contents); $k++) {
+$tempArray[] = $this-contents[$k];
+}
+$testSection = rtSection::getInstance($nextSectionKey, $tempArray);
+$this-sections[$nextSectionKey] = $testSection;
//Identify the file and expect section types
@@ -71,23 +82,23 @@
$this-fileSection-setExecutableFileName($this-getName());
}
-
+
/**
* Initialises the configuration for this test. Uses the configuration
sections from teh test case
- *
+ *
* @param rtRunTEstsConfiuration $runConfiguration
- *
+ *
*/
public function init(rtRuntestsConfiguration $runConfiguration)
{
$this-testConfiguration = new rtTestConfiguration($runConfiguration,
$this-sections, $this-sectionHeadings, $this-fileSection);
}
-
+
/**
* Executes the test case
- *
+ *
* @param rtRunTEstsConfiuration $runConfiguration
*/
public function executeTest(rtRuntestsConfiguration $runConfiguration)
@@ -119,7 +130,7 @@
/**
* Test the output against the expect section
- *
+ *
*/
public function compareOutput()
{
@@ -132,10 +143,10 @@
}
}
-
+
/**
* Test the expected headers against actual headers. Only relevant for CGI
tests.
- *
+ *
*/
public function compareHeaders()
{
@@ -148,10 +159,10 @@
}
}
-
+
/**
* Identify a section heading
- *
+ *
*/
private function isSectionKey($line)
{
@@ -180,7 +191,7 @@
}
}
-
+
/**
* Sets the test's expect section
*/
@@ -223,9 +234,9 @@
{
return $this-sections[$sectionKey];
}
-
+
/*
- * Return the object containing all test status
+ * Return the object containing all test status
*/
public function getStatus()
{
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit:
[PHP-CVS] cvs: phpruntests /src/testcase rtPhpTestFile.php
zoe Wed Jul 1 20:16:12 2009 UTC
Modified files:
/phpruntests/src/testcase rtPhpTestFile.php
Log:
Changes to deal with parsing tests that contain section key words inside teh
section
http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/rtPhpTestFile.php?r1=1.5r2=1.6diff_format=u
Index: phpruntests/src/testcase/rtPhpTestFile.php
diff -u phpruntests/src/testcase/rtPhpTestFile.php:1.5
phpruntests/src/testcase/rtPhpTestFile.php:1.6
--- phpruntests/src/testcase/rtPhpTestFile.php:1.5 Tue Jun 30 13:34:56 2009
+++ phpruntests/src/testcase/rtPhpTestFile.php Wed Jul 1 20:16:12 2009
@@ -48,7 +48,7 @@
for ($i=0; $icount($this-testContents); $i++) {
//This is not nice but there are a huge number of tests with
random spacs at the end of the section header
//and empty sections.
-if (preg_match(/--([A-Z]+(_[A-Z]+|))--/,
$this-testContents[$i], $matches)) {
+if (preg_match(/^\s*--([A-Z]+(_[A-Z]+|))--/,
$this-testContents[$i], $matches)) {
//look ahead to next section unless this is the last test
section.
//if the EXPECT section is empty (missing) it will be
caught by preconditions.
//If the next line is also a section heading than skip
adding it to the test case or headings.
@@ -63,6 +63,7 @@
}
}
$this-testContents = $tempArray;
+
}
public function arePreConditionsMet()
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/intl/locale locale_methods.c
stasWed Jul 1 20:17:31 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/intl/localelocale_methods.c
Log:
fix proto
http://cvs.php.net/viewvc.cgi/php-src/ext/intl/locale/locale_methods.c?r1=1.1.2.7r2=1.1.2.8diff_format=u
Index: php-src/ext/intl/locale/locale_methods.c
diff -u php-src/ext/intl/locale/locale_methods.c:1.1.2.7
php-src/ext/intl/locale/locale_methods.c:1.1.2.8
--- php-src/ext/intl/locale/locale_methods.c:1.1.2.7Sun Aug 3 11:33:45 2008
+++ php-src/ext/intl/locale/locale_methods.cWed Jul 1 20:17:31 2009
@@ -14,7 +14,7 @@
+--+
*/
-/* $Id: locale_methods.c,v 1.1.2.7 2008/08/03 11:33:45 jani Exp $ */
+/* $Id: locale_methods.c,v 1.1.2.8 2009/07/01 20:17:31 stas Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1221,11 +1221,11 @@
}
/* }}} */
-/* {{{ proto static boolean Locale::filterMatches(string $langtag, string
$locale)
+/* {{{ proto static boolean Locale::filterMatches(string $langtag, string
$locale, bool canonicalize)
* Checks if a $langtag filter matches with $locale according to RFC 4647's
basic filtering algorithm
*/
/* }}} */
-/* {{{ proto boolean locale_filter_matches(string $langtag, string $locale)
+/* {{{ proto boolean locale_filter_matches(string $langtag, string $locale,
bool canonicalize)
* Checks if a $langtag filter matches with $locale according to RFC 4647's
basic filtering algorithm
*/
PHP_FUNCTION(locale_filter_matches)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: phpruntests /src/testgroup rtPhpTestGroup.php
zoe Wed Jul 1 20:17:35 2009 UTC
Modified files:
/phpruntests/src/testgroup rtPhpTestGroup.php
Log:
fix to deal with directories that have no runnable tests
http://cvs.php.net/viewvc.cgi/phpruntests/src/testgroup/rtPhpTestGroup.php?r1=1.12r2=1.13diff_format=u
Index: phpruntests/src/testgroup/rtPhpTestGroup.php
diff -u phpruntests/src/testgroup/rtPhpTestGroup.php:1.12
phpruntests/src/testgroup/rtPhpTestGroup.php:1.13
--- phpruntests/src/testgroup/rtPhpTestGroup.php:1.12 Mon Jun 29 22:00:13 2009
+++ phpruntests/src/testgroup/rtPhpTestGroup.phpWed Jul 1 20:17:35 2009
@@ -25,12 +25,12 @@
}
public function init(rtRuntestsConfiguration $runConfiguration)
-{
+{
$this-testFiles = rtUtil::getTestList($this-testDirectory);
foreach ($this-testFiles as $testFileName) {
-//testFiles is a list of file namnes relative to the current
working directory
+//testFiles is a list of file names relative to the current
working directory
if (!file_exists($testFileName)) {
echo rtText::get('invalidTestFileName', array($testFileName));
@@ -60,6 +60,9 @@
public function runGroup(rtRuntestsConfiguration $runConfiguration)
{
+if (count($this-testCases) == 0) {
+return;
+}
foreach ($this-testCases as $testCase) {
$testCase-executeTest($runConfiguration);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/intl/locale locale_methods.c
stasWed Jul 1 20:18:04 2009 UTC
Modified files:
/php-src/ext/intl/localelocale_methods.c
Log:
fix proto
http://cvs.php.net/viewvc.cgi/php-src/ext/intl/locale/locale_methods.c?r1=1.10r2=1.11diff_format=u
Index: php-src/ext/intl/locale/locale_methods.c
diff -u php-src/ext/intl/locale/locale_methods.c:1.10
php-src/ext/intl/locale/locale_methods.c:1.11
--- php-src/ext/intl/locale/locale_methods.c:1.10 Tue Mar 10 23:39:26 2009
+++ php-src/ext/intl/locale/locale_methods.cWed Jul 1 20:18:03 2009
@@ -14,7 +14,7 @@
+--+
*/
-/* $Id: locale_methods.c,v 1.10 2009/03/10 23:39:26 helly Exp $ */
+/* $Id: locale_methods.c,v 1.11 2009/07/01 20:18:03 stas Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1221,11 +1221,11 @@
}
/* }}} */
-/* {{{ proto static boolean Locale::filterMatches(string $langtag, string
$locale)
+/* {{{ proto static boolean Locale::filterMatches(string $langtag, string
$locale, bool canonicalize)
* Checks if a $langtag filter matches with $locale according to RFC 4647's
basic filtering algorithm
*/
/* }}} */
-/* {{{ proto boolean locale_filter_matches(string $langtag, string $locale)
+/* {{{ proto boolean locale_filter_matches(string $langtag, string $locale,
bool canonicalize)
* Checks if a $langtag filter matches with $locale according to RFC 4647's
basic filtering algorithm
*/
PHP_FUNCTION(locale_filter_matches)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/intl/doc collator_api.php common_api.php datefmt_api.php formatter_api.php locale_api.php
stasWed Jul 1 20:25:38 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/intl/doc collator_api.php common_api.php
datefmt_api.php formatter_api.php
locale_api.php
Log:
update API files
http://cvs.php.net/viewvc.cgi/php-src/ext/intl/doc/collator_api.php?r1=1.1.2.1r2=1.1.2.2diff_format=u
Index: php-src/ext/intl/doc/collator_api.php
diff -u php-src/ext/intl/doc/collator_api.php:1.1.2.1
php-src/ext/intl/doc/collator_api.php:1.1.2.2
--- php-src/ext/intl/doc/collator_api.php:1.1.2.1 Mon Jul 7 22:51:03 2008
+++ php-src/ext/intl/doc/collator_api.php Wed Jul 1 20:25:38 2009
@@ -395,4 +395,3 @@
* Collator API function call.
*/
function collator_get_error_message( $coll ) {}
-?
http://cvs.php.net/viewvc.cgi/php-src/ext/intl/doc/common_api.php?r1=1.1.2.1r2=1.1.2.2diff_format=u
Index: php-src/ext/intl/doc/common_api.php
diff -u php-src/ext/intl/doc/common_api.php:1.1.2.1
php-src/ext/intl/doc/common_api.php:1.1.2.2
--- php-src/ext/intl/doc/common_api.php:1.1.2.1 Mon Jul 7 22:51:03 2008
+++ php-src/ext/intl/doc/common_api.php Wed Jul 1 20:25:38 2009
@@ -54,5 +54,3 @@
* @return stringError code name.
*/
function intl_error_name($code) {}
-
-?
http://cvs.php.net/viewvc.cgi/php-src/ext/intl/doc/datefmt_api.php?r1=1.1.2.1r2=1.1.2.2diff_format=u
Index: php-src/ext/intl/doc/datefmt_api.php
diff -u php-src/ext/intl/doc/datefmt_api.php:1.1.2.1
php-src/ext/intl/doc/datefmt_api.php:1.1.2.2
--- php-src/ext/intl/doc/datefmt_api.php:1.1.2.1Mon Jul 7 22:51:03 2008
+++ php-src/ext/intl/doc/datefmt_api.phpWed Jul 1 20:25:38 2009
@@ -434,6 +434,3 @@
* @return string Description of the last error.
*/
function datefmt_get_error_message($fmt) {}
-
-
-?
http://cvs.php.net/viewvc.cgi/php-src/ext/intl/doc/formatter_api.php?r1=1.1.2.1r2=1.1.2.2diff_format=u
Index: php-src/ext/intl/doc/formatter_api.php
diff -u php-src/ext/intl/doc/formatter_api.php:1.1.2.1
php-src/ext/intl/doc/formatter_api.php:1.1.2.2
--- php-src/ext/intl/doc/formatter_api.php:1.1.2.1 Mon Jul 7 22:51:03 2008
+++ php-src/ext/intl/doc/formatter_api.php Wed Jul 1 20:25:38 2009
@@ -498,5 +498,3 @@
* @return string Description of the last occured error.
*/
function numfmt_get_error_message($formatter) {}
-
-?
http://cvs.php.net/viewvc.cgi/php-src/ext/intl/doc/locale_api.php?r1=1.1.2.1r2=1.1.2.2diff_format=u
Index: php-src/ext/intl/doc/locale_api.php
diff -u php-src/ext/intl/doc/locale_api.php:1.1.2.1
php-src/ext/intl/doc/locale_api.php:1.1.2.2
--- php-src/ext/intl/doc/locale_api.php:1.1.2.1 Mon Jul 7 22:51:03 2008
+++ php-src/ext/intl/doc/locale_api.php Wed Jul 1 20:25:38 2009
@@ -42,7 +42,7 @@
* The following static members are used with the getLocale methods of
* the various locale affected classes, such as numfmt.
*/
- const DEFAULT_LOCALE= default_locale;
+ const DEFAULT_LOCALE= null;
/**
* identifiers for the actual locale, valid locale
@@ -59,13 +59,13 @@
/**
* Valid locale tag and subtag values
*/
- LANG_TAG= language;
- EXTLANG_TAG = extlang;
- SCRIPT_TAG = script;
- REGION_TAG = region;
- VARIANT_TAG = variant;
- GRANDFATHERED_LANG_TAG = grandfathered;
- PRIVATE_TAG = private;
+ const LANG_TAG = language;
+ const EXTLANG_TAG = extlang;
+ const SCRIPT_TAG= script;
+ const REGION_TAG= region;
+ const VARIANT_TAG = variant;
+ const GRANDFATHERED_LANG_TAG= grandfathered;
+ const PRIVATE_TAG = private;
#
@@ -206,9 +206,10 @@
*
* @param string $langtagthe language tag to
check
* @param string $locale the language range to
check against
+* @param bool$canonicalize Canonicalize parameters?
* @return boolean 'true' if $locale
matches $langtag 'false' otherwise
*/
- public static function filterMatches($langtag, $locale) {}
+ public static function filterMatches($langtag, $locale, $canonicalize)
{}
/**
* Searchs the items in $langtag for the best match to the language
@@ -263,7 +264,7 @@
*
* @return string the current runtime locale
*/
- public static function locale_get_default() {}
+function
[PHP-CVS] cvs: php-src /ext/intl/doc collator_api.php common_api.php datefmt_api.php formatter_api.php grapheme_api.php locale_api.php
stasWed Jul 1 20:26:13 2009 UTC
Modified files:
/php-src/ext/intl/doc collator_api.php common_api.php
datefmt_api.php formatter_api.php
grapheme_api.php locale_api.php
Log:
update API files
http://cvs.php.net/viewvc.cgi/php-src/ext/intl/doc/collator_api.php?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/intl/doc/collator_api.php
diff -u php-src/ext/intl/doc/collator_api.php:1.2
php-src/ext/intl/doc/collator_api.php:1.3
--- php-src/ext/intl/doc/collator_api.php:1.2 Mon Jul 7 23:42:29 2008
+++ php-src/ext/intl/doc/collator_api.php Wed Jul 1 20:26:13 2009
@@ -395,4 +395,3 @@
* Collator API function call.
*/
function collator_get_error_message( $coll ) {}
-?
http://cvs.php.net/viewvc.cgi/php-src/ext/intl/doc/common_api.php?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/intl/doc/common_api.php
diff -u php-src/ext/intl/doc/common_api.php:1.2
php-src/ext/intl/doc/common_api.php:1.3
--- php-src/ext/intl/doc/common_api.php:1.2 Mon Jul 7 23:42:29 2008
+++ php-src/ext/intl/doc/common_api.php Wed Jul 1 20:26:13 2009
@@ -54,5 +54,3 @@
* @return stringError code name.
*/
function intl_error_name($code) {}
-
-?
http://cvs.php.net/viewvc.cgi/php-src/ext/intl/doc/datefmt_api.php?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/intl/doc/datefmt_api.php
diff -u php-src/ext/intl/doc/datefmt_api.php:1.2
php-src/ext/intl/doc/datefmt_api.php:1.3
--- php-src/ext/intl/doc/datefmt_api.php:1.2Mon Jul 7 23:42:29 2008
+++ php-src/ext/intl/doc/datefmt_api.phpWed Jul 1 20:26:13 2009
@@ -434,6 +434,3 @@
* @return string Description of the last error.
*/
function datefmt_get_error_message($fmt) {}
-
-
-?
http://cvs.php.net/viewvc.cgi/php-src/ext/intl/doc/formatter_api.php?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/intl/doc/formatter_api.php
diff -u php-src/ext/intl/doc/formatter_api.php:1.2
php-src/ext/intl/doc/formatter_api.php:1.3
--- php-src/ext/intl/doc/formatter_api.php:1.2 Mon Jul 7 23:42:29 2008
+++ php-src/ext/intl/doc/formatter_api.php Wed Jul 1 20:26:13 2009
@@ -498,5 +498,3 @@
* @return string Description of the last occured error.
*/
function numfmt_get_error_message($formatter) {}
-
-?
http://cvs.php.net/viewvc.cgi/php-src/ext/intl/doc/grapheme_api.php?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/intl/doc/grapheme_api.php
diff -u php-src/ext/intl/doc/grapheme_api.php:1.2
php-src/ext/intl/doc/grapheme_api.php:1.3
--- php-src/ext/intl/doc/grapheme_api.php:1.2 Mon Jul 7 23:42:29 2008
+++ php-src/ext/intl/doc/grapheme_api.php Wed Jul 1 20:26:13 2009
@@ -8,11 +8,11 @@
*
*/
/** Extract the given number of whole grapheme clusters from the
string: */
- const GRAPHEME_EXTR_COUNT = 0;
+ define('GRAPHEME_EXTR_COUNT', 0);
/** Extract as many whole grapheme clusters as will fit into the given
number of bytes: */
- const GRAPHEME_EXTR_MAXBYTES= 1;
+ define('GRAPHEME_EXTR_MAXBYTES', 1);
/** Extract whole grapheme clusters up to a maximum number of UTF-8
characters: */
- const GRAPHEME_EXTR_MAXCHARS= 2;
+ define('GRAPHEME_EXTR_MAXCHARS', 2);
#
@@ -125,7 +125,7 @@
* @return string A string starting at offset $start containing
no more than $size grapheme clusters
and ending on a default grapheme cluster
boundary.
*/
- public function grapheme_extract($haystack, $size, $extract_type =
GRAPHEME_EXTR_COUNT, $start = 0, $next) {}
+ function grapheme_extract($haystack, $size, $extract_type =
GRAPHEME_EXTR_COUNT, $start = 0, $next) {}
?
http://cvs.php.net/viewvc.cgi/php-src/ext/intl/doc/locale_api.php?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/intl/doc/locale_api.php
diff -u php-src/ext/intl/doc/locale_api.php:1.2
php-src/ext/intl/doc/locale_api.php:1.3
--- php-src/ext/intl/doc/locale_api.php:1.2 Mon Jul 7 23:42:29 2008
+++ php-src/ext/intl/doc/locale_api.php Wed Jul 1 20:26:13 2009
@@ -42,7 +42,7 @@
* The following static members are used with the getLocale methods of
* the various locale affected classes, such as numfmt.
*/
- const DEFAULT_LOCALE= default_locale;
+ const DEFAULT_LOCALE= null;
/**
* identifiers for the actual locale, valid locale
@@ -59,13 +59,13 @@
/**
* Valid locale tag and subtag values
*/
- LANG_TAG= language;
- EXTLANG_TAG = extlang;
- SCRIPT_TAG = script;
- REGION_TAG = region;
- VARIANT_TAG = variant;
- GRANDFATHERED_LANG_TAG =
[PHP-CVS] cvs: php-src /ext/standard/tests/misc time_nanosleep_error4.phpt
kalle Wed Jul 1 20:26:37 2009 UTC
Modified files:
/php-src/ext/standard/tests/misctime_nanosleep_error4.phpt
Log:
Fix test on Windows
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/misc/time_nanosleep_error4.phpt?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/standard/tests/misc/time_nanosleep_error4.phpt
diff -u php-src/ext/standard/tests/misc/time_nanosleep_error4.phpt:1.2
php-src/ext/standard/tests/misc/time_nanosleep_error4.phpt:1.3
--- php-src/ext/standard/tests/misc/time_nanosleep_error4.phpt:1.2 Tue Jun
16 19:49:04 2009
+++ php-src/ext/standard/tests/misc/time_nanosleep_error4.phpt Wed Jul 1
20:26:37 2009
@@ -1,8 +1,8 @@
---TEST--
+--TEST--
time_nanosleep â Delay for a number of seconds and nanoseconds
--SKIPIF--
?php
-if (substr(strtoupper(PHP_OS, 'WIN'))) die(skip Test is not valid for
Windows);
+if (strpos(strtoupper(PHP_OS), 'WIN') !== false) die(skip Test is not valid
for Windows);
if (!function_exists('time_nanosleep')) die(skip);
?
--CREDITS--
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard/tests/misc time_nanosleep_error4.phpt
kalle Wed Jul 1 20:27:11 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard/tests/misctime_nanosleep_error4.phpt
Log:
MFH: Fix test on Windows
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/misc/time_nanosleep_error4.phpt?r1=1.1.2.3r2=1.1.2.4diff_format=u
Index: php-src/ext/standard/tests/misc/time_nanosleep_error4.phpt
diff -u php-src/ext/standard/tests/misc/time_nanosleep_error4.phpt:1.1.2.3
php-src/ext/standard/tests/misc/time_nanosleep_error4.phpt:1.1.2.4
--- php-src/ext/standard/tests/misc/time_nanosleep_error4.phpt:1.1.2.3 Tue Jun
16 19:49:55 2009
+++ php-src/ext/standard/tests/misc/time_nanosleep_error4.phpt Wed Jul 1
20:27:11 2009
@@ -1,8 +1,8 @@
---TEST--
+--TEST--
time_nanosleep â Delay for a number of seconds and nanoseconds
--SKIPIF--
?php
-if (substr(strtoupper(PHP_OS, 'WIN'))) die(skip Test is not valid for
Windows);
+if (strpos(strtoupper(PHP_OS), 'WIN') !== false) die(skip Test is not valid
for Windows);
if (!function_exists('time_nanosleep')) die(skip);
?
--CREDITS--
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/intl/locale locale_methods.c
stasWed Jul 1 20:27:13 2009 UTC
Modified files:
/php-src/ext/intl/localelocale_methods.c
Log:
typo
http://cvs.php.net/viewvc.cgi/php-src/ext/intl/locale/locale_methods.c?r1=1.11r2=1.12diff_format=u
Index: php-src/ext/intl/locale/locale_methods.c
diff -u php-src/ext/intl/locale/locale_methods.c:1.11
php-src/ext/intl/locale/locale_methods.c:1.12
--- php-src/ext/intl/locale/locale_methods.c:1.11 Wed Jul 1 20:18:03 2009
+++ php-src/ext/intl/locale/locale_methods.cWed Jul 1 20:27:13 2009
@@ -14,7 +14,7 @@
+--+
*/
-/* $Id: locale_methods.c,v 1.11 2009/07/01 20:18:03 stas Exp $ */
+/* $Id: locale_methods.c,v 1.12 2009/07/01 20:27:13 stas Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1221,11 +1221,11 @@
}
/* }}} */
-/* {{{ proto static boolean Locale::filterMatches(string $langtag, string
$locale, bool canonicalize)
+/* {{{ proto static boolean Locale::filterMatches(string $langtag, string
$locale, bool $canonicalize)
* Checks if a $langtag filter matches with $locale according to RFC 4647's
basic filtering algorithm
*/
/* }}} */
-/* {{{ proto boolean locale_filter_matches(string $langtag, string $locale,
bool canonicalize)
+/* {{{ proto boolean locale_filter_matches(string $langtag, string $locale,
bool $canonicalize)
* Checks if a $langtag filter matches with $locale according to RFC 4647's
basic filtering algorithm
*/
PHP_FUNCTION(locale_filter_matches)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/intl/locale locale_methods.c
stasWed Jul 1 20:31:26 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/intl/localelocale_methods.c
Log:
typo
http://cvs.php.net/viewvc.cgi/php-src/ext/intl/locale/locale_methods.c?r1=1.1.2.8r2=1.1.2.9diff_format=u
Index: php-src/ext/intl/locale/locale_methods.c
diff -u php-src/ext/intl/locale/locale_methods.c:1.1.2.8
php-src/ext/intl/locale/locale_methods.c:1.1.2.9
--- php-src/ext/intl/locale/locale_methods.c:1.1.2.8Wed Jul 1 20:17:31 2009
+++ php-src/ext/intl/locale/locale_methods.cWed Jul 1 20:31:26 2009
@@ -14,7 +14,7 @@
+--+
*/
-/* $Id: locale_methods.c,v 1.1.2.8 2009/07/01 20:17:31 stas Exp $ */
+/* $Id: locale_methods.c,v 1.1.2.9 2009/07/01 20:31:26 stas Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1221,11 +1221,11 @@
}
/* }}} */
-/* {{{ proto static boolean Locale::filterMatches(string $langtag, string
$locale, bool canonicalize)
+/* {{{ proto static boolean Locale::filterMatches(string $langtag, string
$locale, bool $canonicalize)
* Checks if a $langtag filter matches with $locale according to RFC 4647's
basic filtering algorithm
*/
/* }}} */
-/* {{{ proto boolean locale_filter_matches(string $langtag, string $locale,
bool canonicalize)
+/* {{{ proto boolean locale_filter_matches(string $langtag, string $locale,
bool $canonicalize)
* Checks if a $langtag filter matches with $locale according to RFC 4647's
basic filtering algorithm
*/
PHP_FUNCTION(locale_filter_matches)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/standard/tests/misc time_nanosleep_error4.phpt
kalle Wed Jul 1 20:26:37 2009 UTC Modified files: /php-src/ext/standard/tests/misc time_nanosleep_error4.phpt Log: Fix test on Windows http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/misc/time_nanosleep_error4.phpt?r1=1.2r2=1.3diff_format=u Index: php-src/ext/standard/tests/misc/time_nanosleep_error4.phpt diff -u php-src/ext/standard/tests/misc/time_nanosleep_error4.phpt:1.2 php-src/ext/standard/tests/misc/time_nanosleep_error4.phpt:1.3 --- php-src/ext/standard/tests/misc/time_nanosleep_error4.phpt:1.2 Tue Jun 16 19:49:04 2009 +++ php-src/ext/standard/tests/misc/time_nanosleep_error4.phpt Wed Jul 1 20:26:37 2009 @@ -1,8 +1,8 @@ ---TEST-- +--TEST-- what out for the BOM here and in the other commit you did today. Nuno -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/dom/tests DOMDocument_createEntityReference_basic.phpt DOMDocument_saveHTMLFile_basic.phpt DOMDocument_saveHTMLFile_error1.phpt DOMDocument_saveHTMLFile_error2.phpt DOMDocu
felipe Thu Jul 2 00:01:20 2009 UTC
Added files:
/php-src/ext/dom/tests DOMDocument_createEntityReference_basic.phpt
DOMDocument_saveHTMLFile_basic.phpt
DOMDocument_saveHTMLFile_error1.phpt
DOMDocument_saveHTMLFile_error2.phpt
DOMDocument_saveHTMLFile_formatOutput.phpt
DOMDocument_saveHTMLFile_invalid_filename.phpt
DOMDocument_saveHTML_basic.phpt
DOMDocument_saveHTML_error1.phpt
DOMDocument_saveHTML_error2.phpt
DOMDocument_validate_basic.phpt
DOMDocument_validate_error1.phpt
DOMDocument_validate_error2.phpt
DOMDocument_validate_external_dtd.phpt
Log:
- New tests (NorwayUG testfest)
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMDocument_createEntityReference_basic.phpt?view=markuprev=1.1
Index: php-src/ext/dom/tests/DOMDocument_createEntityReference_basic.phpt
+++ php-src/ext/dom/tests/DOMDocument_createEntityReference_basic.phpt
--TEST--
DOMDocument::createEntityReference() should create a new entity reference node
--CREDITS--
Knut Urdalen k...@php.net
#PHPTestFest2009 Norway 2009-06-09 \o/
--SKIPIF--
?php
require_once dirname(__FILE__) .'/skipif.inc';
?
--FILE--
?php
$dom = new DOMDocument('1.0');
$ref = $dom-createEntityReference('nbsp');
$dom-appendChild($ref);
echo $dom-saveXML();
?
--EXPECTF--
?xml version=1.0?
nbsp;
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMDocument_saveHTMLFile_basic.phpt?view=markuprev=1.1
Index: php-src/ext/dom/tests/DOMDocument_saveHTMLFile_basic.phpt
+++ php-src/ext/dom/tests/DOMDocument_saveHTMLFile_basic.phpt
--TEST--
DOMDocument::saveHTMLFile() should dump the internal document into a file using
HTML formatting
--CREDITS--
Knut Urdalen k...@php.net
#PHPTestFest2009 Norway 2009-06-09 \o/
--SKIPIF--
?php
require_once dirname(__FILE__) .'/skipif.inc';
?
--FILE--
?php
$filename = dirname(__FILE__)./tmp_savehtmlfile.time()..html;
$doc = new DOMDocument('1.0');
$root = $doc-createElement('html');
$root = $doc-appendChild($root);
$head = $doc-createElement('head');
$head = $root-appendChild($head);
$title = $doc-createElement('title');
$title = $head-appendChild($title);
$text = $doc-createTextNode('This is the title');
$text = $title-appendChild($text);
$bytes = $doc-saveHTMLFile($filename);
var_dump($bytes);
echo file_get_contents($filename);
unlink($filename);
?
--EXPECTF--
int(126)
htmlheadmeta http-equiv=Content-Type content=text/html;
charset=UTF-8titleThis is the title/title/head/html
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMDocument_saveHTMLFile_error1.phpt?view=markuprev=1.1
Index: php-src/ext/dom/tests/DOMDocument_saveHTMLFile_error1.phpt
+++ php-src/ext/dom/tests/DOMDocument_saveHTMLFile_error1.phpt
--TEST--
DOMDocument::saveHTMLFile() should fail if no parameter is given
--CREDITS--
Knut Urdalen k...@php.net
#PHPTestFest2009 Norway 2009-06-09 \o/
--SKIPIF--
?php
require_once('skipif.inc');
?
--FILE--
?php
$doc = new DOMDocument('1.0');
$root = $doc-createElement('html');
$root = $doc-appendChild($root);
$head = $doc-createElement('head');
$head = $root-appendChild($head);
$title = $doc-createElement('title');
$title = $head-appendChild($title);
$text = $doc-createTextNode('This is the title');
$text = $title-appendChild($text);
$doc-saveHTMLFile();
?
--EXPECTF--
Warning: DOMDocument::saveHTMLFile() expects exactly 1 parameter, 0 given in %s
on line %d
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMDocument_saveHTMLFile_error2.phpt?view=markuprev=1.1
Index: php-src/ext/dom/tests/DOMDocument_saveHTMLFile_error2.phpt
+++ php-src/ext/dom/tests/DOMDocument_saveHTMLFile_error2.phpt
--TEST--
DOMDocument::saveHTMLFile() should fail if called statically
--CREDITS--
Knut Urdalen k...@php.net
#PHPTestFest2009 Norway 2009-06-09 \o/
--SKIPIF--
?php
require_once dirname(__FILE__) .'/skipif.inc';
?
--FILE--
?php
DOMDocument::saveHTMLFile();
?
--EXPECTF--
Fatal error: Non-static method DOMDocument::saveHTMLFile() cannot be called
statically in %s on line %d
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMDocument_saveHTMLFile_formatOutput.phpt?view=markuprev=1.1
Index: php-src/ext/dom/tests/DOMDocument_saveHTMLFile_formatOutput.phpt
+++ php-src/ext/dom/tests/DOMDocument_saveHTMLFile_formatOutput.phpt
--TEST--
DOMDocument::saveHTMLFile() should format output on demand
--CREDITS--
Knut Urdalen k...@php.net
#PHPTestFest2009 Norway 2009-06-09 \o/
--SKIPIF--
?php
require_once dirname(__FILE__) .'/skipif.inc';
?
--FILE--
?php
$filename = dirname(__FILE__)./tmp_savehtmlfile.time()..html;
$doc = new DOMDocument('1.0');
$doc-formatOutput = true;
$root = $doc-createElement('html');
$root =
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/dom/tests DOMDocument_createEntityReference_basic.phpt DOMDocument_saveHTMLFile_basic.phpt DOMDocument_saveHTMLFile_error1.phpt DOMDocument_saveHTMLFile_error2.php
felipe Thu Jul 2 00:04:52 2009 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/dom/tests DOMDocument_createEntityReference_basic.phpt
DOMDocument_saveHTMLFile_basic.phpt
DOMDocument_saveHTMLFile_error1.phpt
DOMDocument_saveHTMLFile_error2.phpt
DOMDocument_saveHTMLFile_formatOutput.phpt
DOMDocument_saveHTMLFile_invalid_filename.phpt
DOMDocument_saveHTML_basic.phpt
DOMDocument_saveHTML_error1.phpt
DOMDocument_saveHTML_error2.phpt
DOMDocument_validate_basic.phpt
DOMDocument_validate_error1.phpt
DOMDocument_validate_error2.phpt
DOMDocument_validate_external_dtd.phpt
Log:
- MFH: New tests (NorwayUG testfest)
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMDocument_createEntityReference_basic.phpt?view=markuprev=1.1
Index: php-src/ext/dom/tests/DOMDocument_createEntityReference_basic.phpt
+++ php-src/ext/dom/tests/DOMDocument_createEntityReference_basic.phpt
--TEST--
DOMDocument::createEntityReference() should create a new entity reference node
--CREDITS--
Knut Urdalen k...@php.net
#PHPTestFest2009 Norway 2009-06-09 \o/
--SKIPIF--
?php
require_once dirname(__FILE__) .'/skipif.inc';
?
--FILE--
?php
$dom = new DOMDocument('1.0');
$ref = $dom-createEntityReference('nbsp');
$dom-appendChild($ref);
echo $dom-saveXML();
?
--EXPECTF--
?xml version=1.0?
nbsp;
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMDocument_saveHTMLFile_basic.phpt?view=markuprev=1.1
Index: php-src/ext/dom/tests/DOMDocument_saveHTMLFile_basic.phpt
+++ php-src/ext/dom/tests/DOMDocument_saveHTMLFile_basic.phpt
--TEST--
DOMDocument::saveHTMLFile() should dump the internal document into a file using
HTML formatting
--CREDITS--
Knut Urdalen k...@php.net
#PHPTestFest2009 Norway 2009-06-09 \o/
--SKIPIF--
?php
require_once dirname(__FILE__) .'/skipif.inc';
?
--FILE--
?php
$filename = dirname(__FILE__)./tmp_savehtmlfile.time()..html;
$doc = new DOMDocument('1.0');
$root = $doc-createElement('html');
$root = $doc-appendChild($root);
$head = $doc-createElement('head');
$head = $root-appendChild($head);
$title = $doc-createElement('title');
$title = $head-appendChild($title);
$text = $doc-createTextNode('This is the title');
$text = $title-appendChild($text);
$bytes = $doc-saveHTMLFile($filename);
var_dump($bytes);
echo file_get_contents($filename);
unlink($filename);
?
--EXPECTF--
int(126)
htmlheadmeta http-equiv=Content-Type content=text/html;
charset=UTF-8titleThis is the title/title/head/html
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMDocument_saveHTMLFile_error1.phpt?view=markuprev=1.1
Index: php-src/ext/dom/tests/DOMDocument_saveHTMLFile_error1.phpt
+++ php-src/ext/dom/tests/DOMDocument_saveHTMLFile_error1.phpt
--TEST--
DOMDocument::saveHTMLFile() should fail if no parameter is given
--CREDITS--
Knut Urdalen k...@php.net
#PHPTestFest2009 Norway 2009-06-09 \o/
--SKIPIF--
?php
require_once('skipif.inc');
?
--FILE--
?php
$doc = new DOMDocument('1.0');
$root = $doc-createElement('html');
$root = $doc-appendChild($root);
$head = $doc-createElement('head');
$head = $root-appendChild($head);
$title = $doc-createElement('title');
$title = $head-appendChild($title);
$text = $doc-createTextNode('This is the title');
$text = $title-appendChild($text);
$doc-saveHTMLFile();
?
--EXPECTF--
Warning: DOMDocument::saveHTMLFile() expects exactly 1 parameter, 0 given in %s
on line %d
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMDocument_saveHTMLFile_error2.phpt?view=markuprev=1.1
Index: php-src/ext/dom/tests/DOMDocument_saveHTMLFile_error2.phpt
+++ php-src/ext/dom/tests/DOMDocument_saveHTMLFile_error2.phpt
--TEST--
DOMDocument::saveHTMLFile() should fail if called statically
--CREDITS--
Knut Urdalen k...@php.net
#PHPTestFest2009 Norway 2009-06-09 \o/
--SKIPIF--
?php
require_once dirname(__FILE__) .'/skipif.inc';
?
--FILE--
?php
DOMDocument::saveHTMLFile();
?
--EXPECTF--
Fatal error: Non-static method DOMDocument::saveHTMLFile() cannot be called
statically in %s on line %d
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMDocument_saveHTMLFile_formatOutput.phpt?view=markuprev=1.1
Index: php-src/ext/dom/tests/DOMDocument_saveHTMLFile_formatOutput.phpt
+++ php-src/ext/dom/tests/DOMDocument_saveHTMLFile_formatOutput.phpt
--TEST--
DOMDocument::saveHTMLFile() should format output on demand
--CREDITS--
Knut Urdalen k...@php.net
#PHPTestFest2009 Norway 2009-06-09 \o/
--SKIPIF--
?php
require_once dirname(__FILE__) .'/skipif.inc';
?
--FILE--
?php
$filename = dirname(__FILE__)./tmp_savehtmlfile.time()..html;
$doc = new DOMDocument('1.0');
$doc-formatOutput = true;
$root =
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/dom/tests DOMDocument_createEntityReference_basic.phpt DOMDocument_saveHTMLFile_basic.phpt DOMDocument_saveHTMLFile_error1.phpt DOMDocument_saveHTMLFile_error2.php
felipe Thu Jul 2 00:07:09 2009 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/dom/tests DOMDocument_createEntityReference_basic.phpt
DOMDocument_saveHTMLFile_basic.phpt
DOMDocument_saveHTMLFile_error1.phpt
DOMDocument_saveHTMLFile_error2.phpt
DOMDocument_saveHTMLFile_formatOutput.phpt
DOMDocument_saveHTMLFile_invalid_filename.phpt
DOMDocument_saveHTML_basic.phpt
DOMDocument_saveHTML_error1.phpt
DOMDocument_saveHTML_error2.phpt
DOMDocument_validate_basic.phpt
DOMDocument_validate_error1.phpt
DOMDocument_validate_error2.phpt
DOMDocument_validate_external_dtd.phpt
Log:
- MFH: New tests (NorwayUG testfest)
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMDocument_createEntityReference_basic.phpt?view=markuprev=1.1
Index: php-src/ext/dom/tests/DOMDocument_createEntityReference_basic.phpt
+++ php-src/ext/dom/tests/DOMDocument_createEntityReference_basic.phpt
--TEST--
DOMDocument::createEntityReference() should create a new entity reference node
--CREDITS--
Knut Urdalen k...@php.net
#PHPTestFest2009 Norway 2009-06-09 \o/
--SKIPIF--
?php
require_once dirname(__FILE__) .'/skipif.inc';
?
--FILE--
?php
$dom = new DOMDocument('1.0');
$ref = $dom-createEntityReference('nbsp');
$dom-appendChild($ref);
echo $dom-saveXML();
?
--EXPECTF--
?xml version=1.0?
nbsp;
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMDocument_saveHTMLFile_basic.phpt?view=markuprev=1.1
Index: php-src/ext/dom/tests/DOMDocument_saveHTMLFile_basic.phpt
+++ php-src/ext/dom/tests/DOMDocument_saveHTMLFile_basic.phpt
--TEST--
DOMDocument::saveHTMLFile() should dump the internal document into a file using
HTML formatting
--CREDITS--
Knut Urdalen k...@php.net
#PHPTestFest2009 Norway 2009-06-09 \o/
--SKIPIF--
?php
require_once dirname(__FILE__) .'/skipif.inc';
?
--FILE--
?php
$filename = dirname(__FILE__)./tmp_savehtmlfile.time()..html;
$doc = new DOMDocument('1.0');
$root = $doc-createElement('html');
$root = $doc-appendChild($root);
$head = $doc-createElement('head');
$head = $root-appendChild($head);
$title = $doc-createElement('title');
$title = $head-appendChild($title);
$text = $doc-createTextNode('This is the title');
$text = $title-appendChild($text);
$bytes = $doc-saveHTMLFile($filename);
var_dump($bytes);
echo file_get_contents($filename);
unlink($filename);
?
--EXPECTF--
int(126)
htmlheadmeta http-equiv=Content-Type content=text/html;
charset=UTF-8titleThis is the title/title/head/html
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMDocument_saveHTMLFile_error1.phpt?view=markuprev=1.1
Index: php-src/ext/dom/tests/DOMDocument_saveHTMLFile_error1.phpt
+++ php-src/ext/dom/tests/DOMDocument_saveHTMLFile_error1.phpt
--TEST--
DOMDocument::saveHTMLFile() should fail if no parameter is given
--CREDITS--
Knut Urdalen k...@php.net
#PHPTestFest2009 Norway 2009-06-09 \o/
--SKIPIF--
?php
require_once('skipif.inc');
?
--FILE--
?php
$doc = new DOMDocument('1.0');
$root = $doc-createElement('html');
$root = $doc-appendChild($root);
$head = $doc-createElement('head');
$head = $root-appendChild($head);
$title = $doc-createElement('title');
$title = $head-appendChild($title);
$text = $doc-createTextNode('This is the title');
$text = $title-appendChild($text);
$doc-saveHTMLFile();
?
--EXPECTF--
Warning: DOMDocument::saveHTMLFile() expects exactly 1 parameter, 0 given in %s
on line %d
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMDocument_saveHTMLFile_error2.phpt?view=markuprev=1.1
Index: php-src/ext/dom/tests/DOMDocument_saveHTMLFile_error2.phpt
+++ php-src/ext/dom/tests/DOMDocument_saveHTMLFile_error2.phpt
--TEST--
DOMDocument::saveHTMLFile() should fail if called statically
--CREDITS--
Knut Urdalen k...@php.net
#PHPTestFest2009 Norway 2009-06-09 \o/
--SKIPIF--
?php
require_once dirname(__FILE__) .'/skipif.inc';
?
--FILE--
?php
DOMDocument::saveHTMLFile();
?
--EXPECTF--
Fatal error: Non-static method DOMDocument::saveHTMLFile() cannot be called
statically in %s on line %d
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMDocument_saveHTMLFile_formatOutput.phpt?view=markuprev=1.1
Index: php-src/ext/dom/tests/DOMDocument_saveHTMLFile_formatOutput.phpt
+++ php-src/ext/dom/tests/DOMDocument_saveHTMLFile_formatOutput.phpt
--TEST--
DOMDocument::saveHTMLFile() should format output on demand
--CREDITS--
Knut Urdalen k...@php.net
#PHPTestFest2009 Norway 2009-06-09 \o/
--SKIPIF--
?php
require_once dirname(__FILE__) .'/skipif.inc';
?
--FILE--
?php
$filename = dirname(__FILE__)./tmp_savehtmlfile.time()..html;
$doc = new DOMDocument('1.0');
$doc-formatOutput = true;
$root =
[PHP-CVS] cvs: php-src /ext/intl/locale locale_methods.c
stasThu Jul 2 00:47:11 2009 UTC
Modified files:
/php-src/ext/intl/localelocale_methods.c
Log:
cleanup Locale::lookup
http://cvs.php.net/viewvc.cgi/php-src/ext/intl/locale/locale_methods.c?r1=1.12r2=1.13diff_format=u
Index: php-src/ext/intl/locale/locale_methods.c
diff -u php-src/ext/intl/locale/locale_methods.c:1.12
php-src/ext/intl/locale/locale_methods.c:1.13
--- php-src/ext/intl/locale/locale_methods.c:1.12 Wed Jul 1 20:27:13 2009
+++ php-src/ext/intl/locale/locale_methods.cThu Jul 2 00:47:11 2009
@@ -14,7 +14,7 @@
+--+
*/
-/* $Id: locale_methods.c,v 1.12 2009/07/01 20:27:13 stas Exp $ */
+/* $Id: locale_methods.c,v 1.13 2009/07/02 00:47:11 stas Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -145,16 +145,16 @@
static int getStrrtokenPos(char* str, int savedPos)
{
int result =-1;
- int i=0;
+ int i;
- for( i=savedPos; i=0 ;i--){
- if( isIDSeparator(*(str+i)) ){
+ for(i=savedPos; i=0; i--) {
+ if(isIDSeparator(*(str+i)) ){
/* delimiter found; check for singleton */
- if( isIDSeparator(*(str+i-2)) ){
+ if(i=2 isIDSeparator(*(str+i-2)) ){
/* a singleton; so send the position of token
before the singleton */
- result = i-3;
+ result = i-2;
} else {
- result = i-1;
+ result = i;
}
break;
}
@@ -512,25 +512,6 @@
RETURN_FALSE;
}
}
-
-/*
- int singletonPos= 0;
- //Handle singletons
- if( (strcmp(tag_name , LOC_LANG_TAG)==0)
isIDPrefix(loc_name) ){
- //return mod_loc_name;
- } else {
- singletonPos = getSingletonPos( loc_name );
- if( singletonPos == 0){
- //singleton at start of script, region
, variant etc.
- //or invalid singleton at start of
language
- RETURN_FALSE;
- }else if(singletonPos 0){
- //singleton at some position except at start
- //strip off the singleton and rest of the
loc_name
- mod_loc_name = estrndup( loc_name ,
singletonPos-1);
- }
- }
-*/
} /* end of if != LOC_CANONICAL_TAG */
if( mod_loc_name==NULL ){
@@ -1187,7 +1168,7 @@
/* }}} */
/*{{{
-* Converts to lower case and also replaces all hyphuns with the underscore
+* Converts to lower case and also replaces all hyphens with the underscore
*/
static int strToMatch(char* str ,char *retstr)
{
@@ -1196,7 +1177,7 @@
int result = 0;
int len = 0;
-if( (!str) || strlen(str) ==0){
+if( (!str) || str[0] == '\0'){
return result;
} else {
anchor = retstr;
@@ -1221,11 +1202,11 @@
}
/* }}} */
-/* {{{ proto static boolean Locale::filterMatches(string $langtag, string
$locale, bool $canonicalize)
+/* {{{ proto static boolean Locale::filterMatches(string $langtag, string
$locale[, bool $canonicalize])
* Checks if a $langtag filter matches with $locale according to RFC 4647's
basic filtering algorithm
*/
/* }}} */
-/* {{{ proto boolean locale_filter_matches(string $langtag, string $locale,
bool $canonicalize)
+/* {{{ proto boolean locale_filter_matches(string $langtag, string $locale[,
bool $canonicalize])
* Checks if a $langtag filter matches with $locale according to RFC 4647's
basic filtering algorithm
*/
PHP_FUNCTION(locale_filter_matches)
@@ -1250,7 +1231,7 @@
intl_error_reset( NULL TSRMLS_CC );
- if(zend_parse_parameters( ZEND_NUM_ARGS() TSRMLS_CC, ssb,
+ if(zend_parse_parameters( ZEND_NUM_ARGS() TSRMLS_CC, ss|b,
lang_tag, lang_tag_len , loc_range , loc_range_len ,
boolCanonical) == FAILURE)
{
@@ -1396,38 +1377,36 @@
{
int i=0;
for( i=0; i arr_size; i++ ){
- if( arr[i] ){
- efree( arr[i]);
+ if( arr[i*2] ){
+ efree( arr[i*2]);
}
}
-
+ efree(arr);
}
+#define LOOKUP_CLEAN_RETURN(value) array_cleanup(cur_arr, cur_arr_len);
return (value)
/* {{{
* returns the lookup result to lookup_loc_range_src_php
* internal function
*/
-static char* lookup_loc_range(char* loc_range, HashTable* hash_arr , int
isCanonical TSRMLS_DC)
+static char*
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/intl/locale locale_methods.c /ext/intl/tests locale_lookup.phpt
stasThu Jul 2 00:43:26 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/intl/localelocale_methods.c
/php-src/ext/intl/tests locale_lookup.phpt
Log:
cleanup Locale::lookup
http://cvs.php.net/viewvc.cgi/php-src/ext/intl/locale/locale_methods.c?r1=1.1.2.9r2=1.1.2.10diff_format=u
Index: php-src/ext/intl/locale/locale_methods.c
diff -u php-src/ext/intl/locale/locale_methods.c:1.1.2.9
php-src/ext/intl/locale/locale_methods.c:1.1.2.10
--- php-src/ext/intl/locale/locale_methods.c:1.1.2.9Wed Jul 1 20:31:26 2009
+++ php-src/ext/intl/locale/locale_methods.cThu Jul 2 00:43:26 2009
@@ -14,7 +14,7 @@
+--+
*/
-/* $Id: locale_methods.c,v 1.1.2.9 2009/07/01 20:31:26 stas Exp $ */
+/* $Id: locale_methods.c,v 1.1.2.10 2009/07/02 00:43:26 stas Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -145,16 +145,16 @@
static int getStrrtokenPos(char* str, int savedPos)
{
int result =-1;
- int i=0;
+ int i;
- for( i=savedPos; i=0 ;i--){
- if( isIDSeparator(*(str+i)) ){
+ for(i=savedPos; i=0; i--) {
+ if(isIDSeparator(*(str+i)) ){
/* delimiter found; check for singleton */
- if( isIDSeparator(*(str+i-2)) ){
+ if(i=2 isIDSeparator(*(str+i-2)) ){
/* a singleton; so send the position of token
before the singleton */
- result = i-3;
+ result = i-2;
} else {
- result = i-1;
+ result = i;
}
break;
}
@@ -512,25 +512,6 @@
RETURN_FALSE;
}
}
-
-/*
- int singletonPos= 0;
- //Handle singletons
- if( (strcmp(tag_name , LOC_LANG_TAG)==0)
isIDPrefix(loc_name) ){
- //return mod_loc_name;
- } else {
- singletonPos = getSingletonPos( loc_name );
- if( singletonPos == 0){
- //singleton at start of script, region
, variant etc.
- //or invalid singleton at start of
language
- RETURN_FALSE;
- }else if(singletonPos 0){
- //singleton at some position except at start
- //strip off the singleton and rest of the
loc_name
- mod_loc_name = estrndup( loc_name ,
singletonPos-1);
- }
- }
-*/
} /* end of if != LOC_CANONICAL_TAG */
if( mod_loc_name==NULL ){
@@ -1187,7 +1168,7 @@
/* }}} */
/*{{{
-* Converts to lower case and also replaces all hyphuns with the underscore
+* Converts to lower case and also replaces all hyphens with the underscore
*/
static int strToMatch(char* str ,char *retstr)
{
@@ -1196,7 +1177,7 @@
int result = 0;
int len = 0;
-if( (!str) || strlen(str) ==0){
+if( (!str) || str[0] == '\0'){
return result;
} else {
anchor = retstr;
@@ -1221,11 +1202,11 @@
}
/* }}} */
-/* {{{ proto static boolean Locale::filterMatches(string $langtag, string
$locale, bool $canonicalize)
+/* {{{ proto static boolean Locale::filterMatches(string $langtag, string
$locale[, bool $canonicalize])
* Checks if a $langtag filter matches with $locale according to RFC 4647's
basic filtering algorithm
*/
/* }}} */
-/* {{{ proto boolean locale_filter_matches(string $langtag, string $locale,
bool $canonicalize)
+/* {{{ proto boolean locale_filter_matches(string $langtag, string $locale[,
bool $canonicalize])
* Checks if a $langtag filter matches with $locale according to RFC 4647's
basic filtering algorithm
*/
PHP_FUNCTION(locale_filter_matches)
@@ -1250,7 +1231,7 @@
intl_error_reset( NULL TSRMLS_CC );
- if(zend_parse_parameters( ZEND_NUM_ARGS() TSRMLS_CC, ssb,
+ if(zend_parse_parameters( ZEND_NUM_ARGS() TSRMLS_CC, ss|b,
lang_tag, lang_tag_len , loc_range , loc_range_len ,
boolCanonical) == FAILURE)
{
@@ -1396,38 +1377,36 @@
{
int i=0;
for( i=0; i arr_size; i++ ){
- if( arr[i] ){
- efree( arr[i]);
+ if( arr[i*2] ){
+ efree( arr[i*2]);
}
}
-
+ efree(arr);
}
+#define LOOKUP_CLEAN_RETURN(value) array_cleanup(cur_arr, cur_arr_len);
return (value)
/* {{{
* returns the lookup result to lookup_loc_range_src_php
* internal function
*/
-static char* lookup_loc_range(char*
