[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Fri Jan 25 01:31:33 2008 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.2937r2=1.2938diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.2937 php-src/ChangeLog:1.2938 --- php-src/ChangeLog:1.2937Thu Jan 24 01:31:33 2008 +++ php-src/ChangeLog Fri Jan 25 01:31:32 2008 @@ -1,3 +1,150 @@ +2008-01-24 Antony Dovgal [EMAIL PROTECTED] + +* ext/ereg/regex/regerror.c + ext/ereg/regex/regexec.c + ext/ereg/regex/regfree.c: + use local header when building bundled regex engine + +2008-01-24 Dmitry Stogov [EMAIL PROTECTED] + +* win32/build/config.w32: + Fixed win32 build + +* ZendEngine2/zend_API.h + ZendEngine2/zend_builtin_functions.c + ZendEngine2/zend_language_scanner.l + ZendEngine2/zend_vm_def.h + ZendEngine2/zend_vm_execute.h: + Fixed compilation warnings + +* (PHP_5_3) + ZendEngine2/zend_API.h + ZendEngine2/zend_builtin_functions.c + ZendEngine2/zend_interfaces.c + ZendEngine2/zend_vm_def.h + ZendEngine2/zend_vm_execute.h: + Fixed comilation warnings + +2008-01-24 Robert Nicholson [EMAIL PROTECTED] + +* (PHP_5_2) + ext/standard/tests/array/compact_basic.phpt + ext/standard/tests/array/compact_basic.phpt + ext/standard/tests/array/compact_error.phpt + ext/standard/tests/array/compact_error.phpt: + - New tests for compact() + +* ext/standard/tests/array/compact_basic.phpt + ext/standard/tests/array/compact_basic.phpt + ext/standard/tests/array/compact_basic.phpt + ext/standard/tests/array/compact_error.phpt + ext/standard/tests/array/compact_error.phpt + ext/standard/tests/array/compact_error.phpt + ext/standard/tests/array/compact_variation1.phpt: +1.1.4; + - New tests for compact() + +2008-01-24 Rob Richards [EMAIL PROTECTED] + +* ext/oci8/oci8.c + ext/oci8/oci8_lob.c: + fix zts build + +2008-01-24 Dmitry Stogov [EMAIL PROTECTED] + +* ZendEngine2/zend_alloc.c + ZendEngine2/zend_alloc.c: + Increased Zend MM cache size + +* ZendEngine2/zend_gc.c: + Fixed possible GC failure bacause of EG(object_store).object_buckets + reallocation + +* (PHP_5_3) + ZendEngine2/zend_gc.c: + Fixed possible GC failure because of EG(object_store).object_buckets + reallocation + +* ZendEngine2/zend_API.c + ZendEngine2/zend_API.c + ZendEngine2/zend_gc.h + ZendEngine2/zend_gc.h: + Fixed GC bug + +* ZendEngine2/tests/gc_027.phpt + ZendEngine2/tests/gc_027.phpt: + + file gc_027.phpt was initially added on branch PHP_5_3. + +2008-01-24 Derick Rethans [EMAIL PROTECTED] + +* (PHP_5_3) + ZendEngine2/zend.c: + - MFH: Show GC statistics if GC benchmarking is enabled. + +* ZendEngine2/zend.c: + - Show GC statistics if GC benchmarking is enabled. + +2008-01-24 Sara Golemon [EMAIL PROTECTED] + +* ext/dbase/dbase.c: + Fix potential crash when non-array is used optimisticly + +2008-01-24 Dmitry Stogov [EMAIL PROTECTED] + +* ZendEngine2/tests/bug43426.phpt + ZendEngine2/tests/bug43426.phpt: + + file bug43426.phpt was initially added on branch PHP_5_3. + +* (PHP_5_3) + NEWS + ZendEngine2/tests/bug43426.phpt: + Fixed bug #43426 (crash on nested call_user_func() calls) + +2008-01-24 Sara Golemon [EMAIL PROTECTED] + +* ZendEngine2/zend_builtin_functions.c: + Flag unicode safe functions + +2008-01-24 Dmitry Stogov [EMAIL PROTECTED] + +* (PHP_5_3) + NEWS + ZendEngine2/zend_API.c + ZendEngine2/zend_API.c + ZendEngine2/zend_builtin_functions.c + ZendEngine2/zend_builtin_functions.c + ZendEngine2/zend_compile.h + ZendEngine2/zend_compile.h + ZendEngine2/zend_execute.c + ZendEngine2/zend_execute.c + ZendEngine2/zend_execute.h + ZendEngine2/zend_execute.h + ZendEngine2/zend_execute_API.c + ZendEngine2/zend_execute_API.c + ZendEngine2/zend_globals.h + ZendEngine2/zend_globals.h + ZendEngine2/zend_vm_def.h + ZendEngine2/zend_vm_def.h + ZendEngine2/zend_vm_execute.h + ZendEngine2/zend_vm_execute.h + ZendEngine2/zend_vm_execute.skl + ZendEngine2/zend_vm_execute.skl + ZendEngine2/zend_vm_gen.php + ZendEngine2/zend_vm_gen.php + ZendEngine2/tests/bug41209.phpt + ZendEngine2/tests/bug41209.phpt: + Changed EG(argument_stack) implementation. + +* (PHP_5_2) + ZendEngine2/zend_execute.c + ZendEngine2/zend_vm_def.h + ZendEngine2/zend_vm_execute.h + ZendEngine2/tests/bug41919.phpt + ZendEngine2/tests/bug41919.phpt: + Fixed error message + 2008-01-23 Ilia Alshanetsky [EMAIL PROTECTED] * (PHP_5_3)
[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Fri Jan 25 01:31:35 2008 UTC Modified files: /ZendEngine2ChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/ZendEngine2/ChangeLog?r1=1.1226r2=1.1227diff_format=u Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.1226 ZendEngine2/ChangeLog:1.1227 --- ZendEngine2/ChangeLog:1.1226Thu Jan 24 01:31:35 2008 +++ ZendEngine2/ChangeLog Fri Jan 25 01:31:35 2008 @@ -1,3 +1,104 @@ +2008-01-24 Dmitry Stogov [EMAIL PROTECTED] + +* zend_API.h + zend_builtin_functions.c + zend_language_scanner.l + zend_vm_def.h + zend_vm_execute.h: + Fixed compilation warnings + +* (PHP_5_3) + zend_API.h + zend_builtin_functions.c + zend_interfaces.c + zend_vm_def.h + zend_vm_execute.h: + Fixed comilation warnings + +* zend_alloc.c + zend_alloc.c: + Increased Zend MM cache size + +* zend_gc.c: + Fixed possible GC failure bacause of EG(object_store).object_buckets + reallocation + +* (PHP_5_3) + zend_gc.c: + Fixed possible GC failure because of EG(object_store).object_buckets + reallocation + +* zend_API.c + zend_API.c + zend_gc.h + zend_gc.h: + Fixed GC bug + +* tests/gc_027.phpt + tests/gc_027.phpt: + + file gc_027.phpt was initially added on branch PHP_5_3. + +2008-01-24 Derick Rethans [EMAIL PROTECTED] + +* (PHP_5_3) + zend.c: + - MFH: Show GC statistics if GC benchmarking is enabled. + +* zend.c: + - Show GC statistics if GC benchmarking is enabled. + +2008-01-24 Dmitry Stogov [EMAIL PROTECTED] + +* tests/bug43426.phpt: + Fixed bug #43426 (crash on nested call_user_func() calls) + +* tests/bug43426.phpt + tests/bug43426.phpt: + + file bug43426.phpt was initially added on branch PHP_5_3. + +2008-01-24 Sara Golemon [EMAIL PROTECTED] + +* zend_builtin_functions.c: + Flag unicode safe functions + +2008-01-24 Dmitry Stogov [EMAIL PROTECTED] + +* zend_API.c + zend_API.c + zend_builtin_functions.c + zend_builtin_functions.c + zend_compile.h + zend_compile.h + zend_execute.c + zend_execute.c + zend_execute.h + zend_execute.h + zend_execute_API.c + zend_execute_API.c + zend_globals.h + zend_globals.h + zend_vm_def.h + zend_vm_def.h + zend_vm_execute.h + zend_vm_execute.h + zend_vm_execute.skl + zend_vm_execute.skl + zend_vm_gen.php + zend_vm_gen.php + tests/bug41209.phpt + tests/bug41209.phpt: + Changed EG(argument_stack) implementation. + +* (PHP_5_2) + zend_execute.c + zend_vm_def.h + zend_vm_execute.h + tests/bug41919.phpt + tests/bug41919.phpt: + Fixed error message + 2008-01-23 Stanislav Malyshev [EMAIL PROTECTED] * (PHP_5_3) @@ -20889,7 +20990,7 @@ 2003-06-10 Jani Taskinen [EMAIL PROTECTED] * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.1226 2008/01/24 01:31:35 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.1227 2008/01/25 01:31:35 changelog Exp $ tag 2003-06-10 James Cox [EMAIL PROTECTED] @@ -22613,7 +22714,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.1226 2008/01/24 01:31:35 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.1227 2008/01/25 01:31:35 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky [EMAIL PROTECTED]
[PHP-CVS] cvs: php-src /ext/dbase dbase.c
pollita Thu Jan 24 10:27:59 2008 UTC
Modified files:
/php-src/ext/dbase dbase.c
Log:
Fix potential crash when non-array is used optimisticly
http://cvs.php.net/viewvc.cgi/php-src/ext/dbase/dbase.c?r1=1.90r2=1.91diff_format=u
Index: php-src/ext/dbase/dbase.c
diff -u php-src/ext/dbase/dbase.c:1.90 php-src/ext/dbase/dbase.c:1.91
--- php-src/ext/dbase/dbase.c:1.90 Mon Dec 31 07:12:08 2007
+++ php-src/ext/dbase/dbase.c Thu Jan 24 10:27:59 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: dbase.c,v 1.90 2007/12/31 07:12:08 sebastian Exp $ */
+/* $Id: dbase.c,v 1.91 2008/01/24 10:27:59 pollita Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -270,6 +270,11 @@
}
convert_to_long_ex(dbh_id);
+ if (Z_TYPE_PP(fields) != IS_ARRAY) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Argument two must
be of type 'Array');
+ RETURN_FALSE;
+ }
+
dbh = zend_list_find(Z_LVAL_PP(dbh_id), dbh_type);
if (!dbh || dbh_type != DBase_GLOBAL(le_dbhead)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to find
database for identifier %ld, Z_LVAL_PP(dbh_id));
@@ -337,6 +342,11 @@
convert_to_long_ex(dbh_id);
convert_to_long_ex(recnum);
+ if (Z_TYPE_PP(fields) != IS_ARRAY) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Argument two must
be of type 'Array');
+ RETURN_FALSE;
+ }
+
dbh = zend_list_find(Z_LVAL_PP(dbh_id), dbh_type);
if (!dbh || dbh_type != DBase_GLOBAL(le_dbhead)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to find
database for identifier %ld, Z_LVAL_PP(dbh_id));
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/oci8 oci8.c oci8_lob.c
rrichards Thu Jan 24 14:08:45 2008 UTC
Modified files:
/php-src/ext/oci8 oci8.c oci8_lob.c
Log:
fix zts build
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8.c?r1=1.341r2=1.342diff_format=u
Index: php-src/ext/oci8/oci8.c
diff -u php-src/ext/oci8/oci8.c:1.341 php-src/ext/oci8/oci8.c:1.342
--- php-src/ext/oci8/oci8.c:1.341 Fri Jan 18 16:03:23 2008
+++ php-src/ext/oci8/oci8.c Thu Jan 24 14:08:45 2008
@@ -26,7 +26,7 @@
+--+
*/
-/* $Id: oci8.c,v 1.341 2008/01/18 16:03:23 sixd Exp $ */
+/* $Id: oci8.c,v 1.342 2008/01/24 14:08:45 rrichards Exp $ */
/* TODO
*
* file://localhost/www/docs/oci10/ociaahan.htm#423823 - implement lob_empty()
with OCI_ATTR_LOBEMPTY
@@ -674,7 +674,7 @@
php_info_print_table_start();
php_info_print_table_row(2, OCI8 Support, enabled);
php_info_print_table_row(2, Version, 1.2.2);
- php_info_print_table_row(2, Revision, $Revision: 1.341 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.342 $);
snprintf(buf, sizeof(buf), %ld, OCI_G(num_persistent));
php_info_print_table_row(2, Active Persistent Connections, buf);
@@ -1682,7 +1682,7 @@
lob_fetch_status = php_oci_lob_read(descriptor, -1, 0,
lob_buffer, lob_length TSRMLS_CC);
lob_fetch_status |= (php_oci_lob_get_type(descriptor,
lob_type TSRMLS_CC) 0);
#ifdef HAVE_OCI8_TEMP_LOB
- php_oci_temp_lob_close(descriptor);
+ php_oci_temp_lob_close(descriptor TSRMLS_CC);
#endif
if (lob_fetch_status) {
ZVAL_FALSE(value);
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8_lob.c?r1=1.32r2=1.33diff_format=u
Index: php-src/ext/oci8/oci8_lob.c
diff -u php-src/ext/oci8/oci8_lob.c:1.32 php-src/ext/oci8/oci8_lob.c:1.33
--- php-src/ext/oci8/oci8_lob.c:1.32Tue Jan 15 20:47:50 2008
+++ php-src/ext/oci8/oci8_lob.c Thu Jan 24 14:08:45 2008
@@ -25,7 +25,7 @@
+--+
*/
-/* $Id: oci8_lob.c,v 1.32 2008/01/15 20:47:50 sixd Exp $ */
+/* $Id: oci8_lob.c,v 1.33 2008/01/24 14:08:45 rrichards Exp $ */
@@ -584,7 +584,7 @@
return 1;
}
- if (php_oci_temp_lob_close(descriptor)) {
+ if (php_oci_temp_lob_close(descriptor TSRMLS_CC)) {
return 1;
}
@@ -681,7 +681,7 @@
#ifdef HAVE_OCI8_TEMP_LOB
if (descriptor-type == OCI_DTYPE_LOB) {
- php_oci_temp_lob_close(descriptor);
+ php_oci_temp_lob_close(descriptor TSRMLS_CC);
}
#endif
--
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/oci8 oci8.c oci8_lob.c
rrichards Thu Jan 24 14:09:36 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/oci8 oci8.c oci8_lob.c
Log:
MFH: fix zts build
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8.c?r1=1.269.2.16.2.38.2.5r2=1.269.2.16.2.38.2.6diff_format=u
Index: php-src/ext/oci8/oci8.c
diff -u php-src/ext/oci8/oci8.c:1.269.2.16.2.38.2.5
php-src/ext/oci8/oci8.c:1.269.2.16.2.38.2.6
--- php-src/ext/oci8/oci8.c:1.269.2.16.2.38.2.5 Fri Jan 18 16:03:51 2008
+++ php-src/ext/oci8/oci8.c Thu Jan 24 14:09:36 2008
@@ -26,7 +26,7 @@
+--+
*/
-/* $Id: oci8.c,v 1.269.2.16.2.38.2.5 2008/01/18 16:03:51 sixd Exp $ */
+/* $Id: oci8.c,v 1.269.2.16.2.38.2.6 2008/01/24 14:09:36 rrichards Exp $ */
/* TODO
*
* file://localhost/www/docs/oci10/ociaahan.htm#423823 - implement lob_empty()
with OCI_ATTR_LOBEMPTY
@@ -674,7 +674,7 @@
php_info_print_table_start();
php_info_print_table_row(2, OCI8 Support, enabled);
php_info_print_table_row(2, Version, 1.2.4);
- php_info_print_table_row(2, Revision, $Revision: 1.269.2.16.2.38.2.5
$);
+ php_info_print_table_row(2, Revision, $Revision: 1.269.2.16.2.38.2.6
$);
snprintf(buf, sizeof(buf), %ld, OCI_G(num_persistent));
php_info_print_table_row(2, Active Persistent Connections, buf);
@@ -1637,7 +1637,7 @@
lob_fetch_status = php_oci_lob_read(descriptor, -1, 0,
lob_buffer, lob_length TSRMLS_CC);
#ifdef HAVE_OCI8_TEMP_LOB
- php_oci_temp_lob_close(descriptor);
+ php_oci_temp_lob_close(descriptor TSRMLS_CC);
#endif
if (lob_fetch_status) {
ZVAL_FALSE(value);
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8_lob.c?r1=1.7.2.6.2.14.2.2r2=1.7.2.6.2.14.2.3diff_format=u
Index: php-src/ext/oci8/oci8_lob.c
diff -u php-src/ext/oci8/oci8_lob.c:1.7.2.6.2.14.2.2
php-src/ext/oci8/oci8_lob.c:1.7.2.6.2.14.2.3
--- php-src/ext/oci8/oci8_lob.c:1.7.2.6.2.14.2.2Tue Jan 15 20:44:31 2008
+++ php-src/ext/oci8/oci8_lob.c Thu Jan 24 14:09:36 2008
@@ -25,7 +25,7 @@
+--+
*/
-/* $Id: oci8_lob.c,v 1.7.2.6.2.14.2.2 2008/01/15 20:44:31 sixd Exp $ */
+/* $Id: oci8_lob.c,v 1.7.2.6.2.14.2.3 2008/01/24 14:09:36 rrichards Exp $ */
@@ -579,7 +579,7 @@
return 1;
}
- if (php_oci_temp_lob_close(descriptor)) {
+ if (php_oci_temp_lob_close(descriptor TSRMLS_CC)) {
return 1;
}
@@ -676,7 +676,7 @@
#ifdef HAVE_OCI8_TEMP_LOB
if (descriptor-type == OCI_DTYPE_LOB) {
- php_oci_temp_lob_close(descriptor);
+ php_oci_temp_lob_close(descriptor TSRMLS_CC);
}
#endif
--
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/oci8 oci8.c oci8_lob.c
rrichards Thu Jan 24 14:10:21 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/oci8 oci8.c oci8_lob.c
Log:
MFH: fix zts build
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8.c?r1=1.269.2.16.2.41r2=1.269.2.16.2.42diff_format=u
Index: php-src/ext/oci8/oci8.c
diff -u php-src/ext/oci8/oci8.c:1.269.2.16.2.41
php-src/ext/oci8/oci8.c:1.269.2.16.2.42
--- php-src/ext/oci8/oci8.c:1.269.2.16.2.41 Fri Jan 18 16:03:35 2008
+++ php-src/ext/oci8/oci8.c Thu Jan 24 14:10:21 2008
@@ -26,7 +26,7 @@
+--+
*/
-/* $Id: oci8.c,v 1.269.2.16.2.41 2008/01/18 16:03:35 sixd Exp $ */
+/* $Id: oci8.c,v 1.269.2.16.2.42 2008/01/24 14:10:21 rrichards Exp $ */
/* TODO
*
* file://localhost/www/docs/oci10/ociaahan.htm#423823 - implement lob_empty()
with OCI_ATTR_LOBEMPTY
@@ -674,7 +674,7 @@
php_info_print_table_start();
php_info_print_table_row(2, OCI8 Support, enabled);
php_info_print_table_row(2, Version, 1.2.4);
- php_info_print_table_row(2, Revision, $Revision: 1.269.2.16.2.41 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.269.2.16.2.42 $);
snprintf(buf, sizeof(buf), %ld, OCI_G(num_persistent));
php_info_print_table_row(2, Active Persistent Connections, buf);
@@ -1637,7 +1637,7 @@
lob_fetch_status = php_oci_lob_read(descriptor, -1, 0,
lob_buffer, lob_length TSRMLS_CC);
#ifdef HAVE_OCI8_TEMP_LOB
- php_oci_temp_lob_close(descriptor);
+ php_oci_temp_lob_close(descriptor TSRMLS_CC);
#endif
if (lob_fetch_status) {
ZVAL_FALSE(value);
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8_lob.c?r1=1.7.2.6.2.16r2=1.7.2.6.2.17diff_format=u
Index: php-src/ext/oci8/oci8_lob.c
diff -u php-src/ext/oci8/oci8_lob.c:1.7.2.6.2.16
php-src/ext/oci8/oci8_lob.c:1.7.2.6.2.17
--- php-src/ext/oci8/oci8_lob.c:1.7.2.6.2.16Tue Jan 15 20:42:13 2008
+++ php-src/ext/oci8/oci8_lob.c Thu Jan 24 14:10:21 2008
@@ -25,7 +25,7 @@
+--+
*/
-/* $Id: oci8_lob.c,v 1.7.2.6.2.16 2008/01/15 20:42:13 sixd Exp $ */
+/* $Id: oci8_lob.c,v 1.7.2.6.2.17 2008/01/24 14:10:21 rrichards Exp $ */
@@ -579,7 +579,7 @@
return 1;
}
- if (php_oci_temp_lob_close(descriptor)) {
+ if (php_oci_temp_lob_close(descriptor TSRMLS_CC)) {
return 1;
}
@@ -675,7 +675,7 @@
#ifdef HAVE_OCI8_TEMP_LOB
if (descriptor-type == OCI_DTYPE_LOB) {
- php_oci_temp_lob_close(descriptor);
+ php_oci_temp_lob_close(descriptor TSRMLS_CC);
}
#endif
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard/tests/array compact_basic.phpt compact_error.phpt compact_variation1.phpt
nicholsrThu Jan 24 14:50:18 2008 UTC
Added files:
/php-src/ext/standard/tests/array compact_error.phpt
compact_variation1.phpt
compact_basic.phpt
Log:
- New tests for compact()
# compact_variation1.phpt will fail until bug #29044 is fixed
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/compact_error.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/array/compact_error.phpt
+++ php-src/ext/standard/tests/array/compact_error.phpt
--TEST--
Test compact() function : error conditions
--FILE--
?php
/* Prototype : proto array compact(mixed var_names [, mixed ...])
* Description: Creates a hash containing variables and their values
* Source code: ext/standard/array.c
* Alias to functions:
*/
/*
* Error -tests test compact with zero arguments.
*/
echo *** Testing compact() : error conditions ***\n;
// Zero arguments
echo \n-- Testing compact() function with Zero arguments --\n;
var_dump( compact() );
echo Done;
?
--EXPECTF--
*** Testing compact() : error conditions ***
-- Testing compact() function with Zero arguments --
Warning: Wrong parameter count for compact() in %s on line %d
NULL
Done
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/compact_variation1.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/array/compact_variation1.phpt
+++ php-src/ext/standard/tests/array/compact_variation1.phpt
--TEST--
Test compact() function : usage variations - arrays containing references.
--FILE--
?php
/* Prototype : proto array compact(mixed var_names [, mixed ...])
* Description: Creates a hash containing variables and their values
* Source code: ext/standard/array.c
* Alias to functions:
*/
/*
* compact variations - arrays with references
*/
echo *** Testing compact() : usage variations - arrays containg references
***\n;
$a=1;
$b=2;
$c=3;
$string=c;
$arr1=array (a,$arr1);
$arr2=array (a,array(array(array(b;
$arr2[1][0][0][]=$arr2;
$arr2[1][0][0][]=$arr2[1];
$arr3=array($string);
var_dump (compact ($arr1));
var_dump (compact ($arr2));
var_dump (compact ($arr3));
echo Done;
?
--EXPECT--
*** Testing compact() : usage variations - arrays containg references ***
array(1) {
[a]=
int(1)
}
array(2) {
[a]=
int(1)
[b]=
int(2)
}
array(1) {
[c]=
int(3)
}
Done
--UEXPECT--
*** Testing compact() : usage variations - arrays containg references ***
array(1) {
[ua]=
int(1)
}
array(2) {
[ua]=
int(1)
[ub]=
int(2)
}
array(1) {
[uc]=
int(3)
}
Done
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/compact_basic.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/array/compact_basic.phpt
+++ php-src/ext/standard/tests/array/compact_basic.phpt
--TEST--
Test compact() function : basic functionality
--FILE--
?php
/* Prototype : proto array compact(mixed var_names [, mixed ...])
* Description: Creates a hash containing variables and their values
* Source code: ext/standard/array.c
* Alias to functions:
*/
/*
* Test basic functionality
*/
echo *** Testing compact() : basic functionality ***\n;
$a=1;
$b=0.2;
$c=true;
$d=array(key=val);
$e=NULL;
$f=string;
// simple array test
var_dump (compact(array(a, b, c, d, e, f)));
// simple parameter test
var_dump (compact(a, b, c, d, e, f));
var_dump (compact(array(keyval=a, b=b, c=1)));
// cases which should not yield any output.
var_dump (compact(array(10, 0.3, true, array(20), NULL)));
var_dump (compact(10, 0.3, true, array(20), NULL));
var_dump (compact(array(g)));
echo Done;
?
--EXPECT--
*** Testing compact() : basic functionality ***
array(6) {
[a]=
int(1)
[b]=
float(0.2)
[c]=
bool(true)
[d]=
array(1) {
[key]=
string(3) val
}
[e]=
NULL
[f]=
string(6) string
}
array(6) {
[a]=
int(1)
[b]=
float(0.2)
[c]=
bool(true)
[d]=
array(1) {
[key]=
string(3) val
}
[e]=
NULL
[f]=
string(6) string
}
array(2) {
[a]=
int(1)
[b]=
float(0.2)
}
array(0) {
}
array(0) {
}
array(0) {
}
Done
--UEXPECT--
*** Testing compact() : basic functionality ***
array(6) {
[ua]=
int(1)
[ub]=
float(0.2)
[uc]=
bool(true)
[ud]=
array(1) {
[ukey]=
unicode(3) val
}
[ue]=
NULL
[uf]=
unicode(6) string
}
array(6) {
[ua]=
int(1)
[ub]=
float(0.2)
[uc]=
bool(true)
[ud]=
array(1) {
[ukey]=
unicode(3) val
}
[ue]=
NULL
[uf]=
unicode(6) string
}
array(2) {
[ua]=
int(1)
[ub]=
float(0.2)
}
array(0) {
}
array(0) {
}
array(0) {
}
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/standard/tests/array compact_basic.phpt compact_error.phpt
nicholsrThu Jan 24 14:52:38 2008 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/standard/tests/array compact_basic.phpt
compact_error.phpt
Log:
- New tests for compact()
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/compact_basic.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/array/compact_basic.phpt
+++ php-src/ext/standard/tests/array/compact_basic.phpt
--TEST--
Test compact() function : basic functionality
--FILE--
?php
/* Prototype : proto array compact(mixed var_names [, mixed ...])
* Description: Creates a hash containing variables and their values
* Source code: ext/standard/array.c
* Alias to functions:
*/
/*
* Test basic functionality
*/
echo *** Testing compact() : basic functionality ***\n;
$a=1;
$b=0.2;
$c=true;
$d=array(key=val);
$e=NULL;
$f=string;
// simple array test
var_dump (compact(array(a, b, c, d, e, f)));
// simple parameter test
var_dump (compact(a, b, c, d, e, f));
var_dump (compact(array(keyval=a, b=b, c=1)));
// cases which should not yield any output.
var_dump (compact(array(10, 0.3, true, array(20), NULL)));
var_dump (compact(10, 0.3, true, array(20), NULL));
var_dump (compact(array(g)));
echo Done;
?
--EXPECT--
*** Testing compact() : basic functionality ***
array(6) {
[a]=
int(1)
[b]=
float(0.2)
[c]=
bool(true)
[d]=
array(1) {
[key]=
string(3) val
}
[e]=
NULL
[f]=
string(6) string
}
array(6) {
[a]=
int(1)
[b]=
float(0.2)
[c]=
bool(true)
[d]=
array(1) {
[key]=
string(3) val
}
[e]=
NULL
[f]=
string(6) string
}
array(2) {
[a]=
int(1)
[b]=
float(0.2)
}
array(0) {
}
array(0) {
}
array(0) {
}
Done
--UEXPECT--
*** Testing compact() : basic functionality ***
array(6) {
[ua]=
int(1)
[ub]=
float(0.2)
[uc]=
bool(true)
[ud]=
array(1) {
[ukey]=
unicode(3) val
}
[ue]=
NULL
[uf]=
unicode(6) string
}
array(6) {
[ua]=
int(1)
[ub]=
float(0.2)
[uc]=
bool(true)
[ud]=
array(1) {
[ukey]=
unicode(3) val
}
[ue]=
NULL
[uf]=
unicode(6) string
}
array(2) {
[ua]=
int(1)
[ub]=
float(0.2)
}
array(0) {
}
array(0) {
}
array(0) {
}
Done
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/compact_error.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/array/compact_error.phpt
+++ php-src/ext/standard/tests/array/compact_error.phpt
--TEST--
Test compact() function : error conditions
--FILE--
?php
/* Prototype : proto array compact(mixed var_names [, mixed ...])
* Description: Creates a hash containing variables and their values
* Source code: ext/standard/array.c
* Alias to functions:
*/
/*
* Error -tests test compact with zero arguments.
*/
echo *** Testing compact() : error conditions ***\n;
// Zero arguments
echo \n-- Testing compact() function with Zero arguments --\n;
var_dump( compact() );
echo Done;
?
--EXPECTF--
*** Testing compact() : error conditions ***
-- Testing compact() function with Zero arguments --
Warning: Wrong parameter count for compact() in %s on line %d
NULL
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/standard/tests/array compact_basic.phpt compact_error.phpt
nicholsrThu Jan 24 14:51:20 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/standard/tests/array compact_basic.phpt
compact_error.phpt
Log:
- New tests for compact()
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/compact_basic.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/array/compact_basic.phpt
+++ php-src/ext/standard/tests/array/compact_basic.phpt
--TEST--
Test compact() function : basic functionality
--FILE--
?php
/* Prototype : proto array compact(mixed var_names [, mixed ...])
* Description: Creates a hash containing variables and their values
* Source code: ext/standard/array.c
* Alias to functions:
*/
/*
* Test basic functionality
*/
echo *** Testing compact() : basic functionality ***\n;
$a=1;
$b=0.2;
$c=true;
$d=array(key=val);
$e=NULL;
$f=string;
// simple array test
var_dump (compact(array(a, b, c, d, e, f)));
// simple parameter test
var_dump (compact(a, b, c, d, e, f));
var_dump (compact(array(keyval=a, b=b, c=1)));
// cases which should not yield any output.
var_dump (compact(array(10, 0.3, true, array(20), NULL)));
var_dump (compact(10, 0.3, true, array(20), NULL));
var_dump (compact(array(g)));
echo Done;
?
--EXPECT--
*** Testing compact() : basic functionality ***
array(6) {
[a]=
int(1)
[b]=
float(0.2)
[c]=
bool(true)
[d]=
array(1) {
[key]=
string(3) val
}
[e]=
NULL
[f]=
string(6) string
}
array(6) {
[a]=
int(1)
[b]=
float(0.2)
[c]=
bool(true)
[d]=
array(1) {
[key]=
string(3) val
}
[e]=
NULL
[f]=
string(6) string
}
array(2) {
[a]=
int(1)
[b]=
float(0.2)
}
array(0) {
}
array(0) {
}
array(0) {
}
Done
--UEXPECT--
*** Testing compact() : basic functionality ***
array(6) {
[ua]=
int(1)
[ub]=
float(0.2)
[uc]=
bool(true)
[ud]=
array(1) {
[ukey]=
unicode(3) val
}
[ue]=
NULL
[uf]=
unicode(6) string
}
array(6) {
[ua]=
int(1)
[ub]=
float(0.2)
[uc]=
bool(true)
[ud]=
array(1) {
[ukey]=
unicode(3) val
}
[ue]=
NULL
[uf]=
unicode(6) string
}
array(2) {
[ua]=
int(1)
[ub]=
float(0.2)
}
array(0) {
}
array(0) {
}
array(0) {
}
Done
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/compact_error.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/array/compact_error.phpt
+++ php-src/ext/standard/tests/array/compact_error.phpt
--TEST--
Test compact() function : error conditions
--FILE--
?php
/* Prototype : proto array compact(mixed var_names [, mixed ...])
* Description: Creates a hash containing variables and their values
* Source code: ext/standard/array.c
* Alias to functions:
*/
/*
* Error -tests test compact with zero arguments.
*/
echo *** Testing compact() : error conditions ***\n;
// Zero arguments
echo \n-- Testing compact() function with Zero arguments --\n;
var_dump( compact() );
echo Done;
?
--EXPECTF--
*** Testing compact() : error conditions ***
-- Testing compact() function with Zero arguments --
Warning: Wrong parameter count for compact() in %s on line %d
NULL
Done
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build config.w32
dmitry Thu Jan 24 18:08:23 2008 UTC Modified files: /php-src/win32/buildconfig.w32 Log: Fixed win32 build http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32?r1=1.69r2=1.70diff_format=u Index: php-src/win32/build/config.w32 diff -u php-src/win32/build/config.w32:1.69 php-src/win32/build/config.w32:1.70 --- php-src/win32/build/config.w32:1.69 Mon Oct 1 12:32:39 2007 +++ php-src/win32/build/config.w32 Thu Jan 24 18:08:23 2008 @@ -1,5 +1,5 @@ // vim:ft=javascript -// $Id: config.w32,v 1.69 2007/10/01 12:32:39 jani Exp $ +// $Id: config.w32,v 1.70 2008/01/24 18:08:23 dmitry Exp $ // Master config file; think of it as a configure.in // equivalent. @@ -319,7 +319,7 @@ zend_sprintf.c zend_ini.c zend_qsort.c zend_ts_hash.c \ zend_stream.c zend_iterators.c zend_interfaces.c zend_objects.c \ zend_object_handlers.c zend_objects_API.c zend_unicode.c zend_strtol.c \ - zend_default_classes.c zend_execute.c zend_strtod.c); + zend_default_classes.c zend_execute.c zend_strtod.c zend_gc.c); ADD_SOURCES(main, main.c snprintf.c spprintf.c fopen_wrappers.c \ php_scandir.c php_ini.c SAPI.c rfc1867.c php_content_types.c strlcpy.c \ -- 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/ereg/regex regerror.c regexec.c regfree.c
tony2001Thu Jan 24 23:02:07 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/ereg/regex regerror.c regexec.c regfree.c Log: MFH http://cvs.php.net/viewvc.cgi/php-src/ext/ereg/regex/regerror.c?r1=1.6.6.2r2=1.6.6.3diff_format=u Index: php-src/ext/ereg/regex/regerror.c diff -u php-src/ext/ereg/regex/regerror.c:1.6.6.2 php-src/ext/ereg/regex/regerror.c:1.6.6.3 --- php-src/ext/ereg/regex/regerror.c:1.6.6.2 Fri Oct 5 15:00:06 2007 +++ php-src/ext/ereg/regex/regerror.c Thu Jan 24 23:02:07 2008 @@ -4,8 +4,8 @@ #include ctype.h #include limits.h #include stdlib.h -#include regex.h +#include regex.h #include utils.h #include regerror.ih http://cvs.php.net/viewvc.cgi/php-src/ext/ereg/regex/regexec.c?r1=1.4.6.2r2=1.4.6.3diff_format=u Index: php-src/ext/ereg/regex/regexec.c diff -u php-src/ext/ereg/regex/regexec.c:1.4.6.2 php-src/ext/ereg/regex/regexec.c:1.4.6.3 --- php-src/ext/ereg/regex/regexec.c:1.4.6.2Fri Oct 5 15:00:07 2007 +++ php-src/ext/ereg/regex/regexec.cThu Jan 24 23:02:07 2008 @@ -11,8 +11,8 @@ #include string.h #include limits.h #include ctype.h -#include regex.h +#include regex.h #include utils.h #include regex2.h http://cvs.php.net/viewvc.cgi/php-src/ext/ereg/regex/regfree.c?r1=1.1.1.1.38.2r2=1.1.1.1.38.3diff_format=u Index: php-src/ext/ereg/regex/regfree.c diff -u php-src/ext/ereg/regex/regfree.c:1.1.1.1.38.2 php-src/ext/ereg/regex/regfree.c:1.1.1.1.38.3 --- php-src/ext/ereg/regex/regfree.c:1.1.1.1.38.2 Fri Oct 5 15:00:07 2007 +++ php-src/ext/ereg/regex/regfree.cThu Jan 24 23:02:07 2008 @@ -1,8 +1,8 @@ #include sys/types.h #include stdio.h #include stdlib.h -#include regex.h +#include regex.h #include utils.h #include regex2.h -- 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) /regex regerror.c regexec.c regfree.c
tony2001Thu Jan 24 23:11:15 2008 UTC Modified files: (Branch: PHP_5_2) /php-src/regex regerror.c regexec.c regfree.c Log: MFH http://cvs.php.net/viewvc.cgi/php-src/regex/regerror.c?r1=1.6r2=1.6.4.1diff_format=u Index: php-src/regex/regerror.c diff -u php-src/regex/regerror.c:1.6 php-src/regex/regerror.c:1.6.4.1 --- php-src/regex/regerror.c:1.6Fri Jul 29 23:31:59 2005 +++ php-src/regex/regerror.cThu Jan 24 23:11:15 2008 @@ -4,8 +4,8 @@ #include ctype.h #include limits.h #include stdlib.h -#include regex.h +#include regex.h #include utils.h #include regerror.ih http://cvs.php.net/viewvc.cgi/php-src/regex/regexec.c?r1=1.4r2=1.4.4.1diff_format=u Index: php-src/regex/regexec.c diff -u php-src/regex/regexec.c:1.4 php-src/regex/regexec.c:1.4.4.1 --- php-src/regex/regexec.c:1.4 Fri Aug 13 14:59:58 2004 +++ php-src/regex/regexec.c Thu Jan 24 23:11:15 2008 @@ -11,8 +11,8 @@ #include string.h #include limits.h #include ctype.h -#include regex.h +#include regex.h #include utils.h #include regex2.h http://cvs.php.net/viewvc.cgi/php-src/regex/regfree.c?r1=1.1.1.1r2=1.1.1.1.36.1diff_format=u Index: php-src/regex/regfree.c diff -u php-src/regex/regfree.c:1.1.1.1 php-src/regex/regfree.c:1.1.1.1.36.1 --- php-src/regex/regfree.c:1.1.1.1 Wed Apr 7 21:05:05 1999 +++ php-src/regex/regfree.c Thu Jan 24 23:11:15 2008 @@ -1,8 +1,8 @@ #include sys/types.h #include stdio.h #include stdlib.h -#include regex.h +#include regex.h #include utils.h #include regex2.h -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard/tests/array array_diff_key_basic.phpt array_diff_key_variation1.phpt array_diff_uassoc_basic.phpt array_diff_ukey_basic.phpt array_intersect_key_basic.phpt array_i
nicholsrFri Jan 25 00:17:34 2008 UTC
Modified files:
/php-src/ext/standard/tests/array array_udiff_basic.phpt
array_uintersect_assoc_basic.phpt
array_diff_uassoc_basic.phpt
array_diff_key_variation1.phpt
array_intersect_uassoc_basic.phpt
array_uintersect_basic.phpt
array_diff_ukey_basic.phpt
array_intersect_ukey_basic.phpt
array_udiff_assoc_basic.phpt
array_intersect_key_basic.phpt
array_udiff_uassoc_basic.phpt
array_uintersect_uassoc_basic.phpt
array_diff_key_basic.phpt
Log:
- add some basic tests for array diff and intersection functions
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_udiff_basic.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/standard/tests/array/array_udiff_basic.phpt
diff -u /dev/null php-src/ext/standard/tests/array/array_udiff_basic.phpt:1.2
--- /dev/null Fri Jan 25 00:17:34 2008
+++ php-src/ext/standard/tests/array/array_udiff_basic.phpt Fri Jan 25
00:17:34 2008
@@ -0,0 +1,49 @@
+--TEST--
+array_udiff():Test return type and value for expected input
+--FILE--
+?php
+/*
+* proto array array_udiff ( array $array1, array $array2 [, array $ ...,
callback $data_compare_func] )
+* Function is implemented in ext/standard/array.c
+*/
+class cr {
+private $priv_member;
+function cr($val) {
+$this-priv_member = $val;
+}
+static function comp_func_cr($a, $b) {
+if ($a-priv_member === $b-priv_member) return 0;
+return ($a-priv_member $b-priv_member) ? 1 : -1;
+}
+}
+$a = array(0.1 = new cr(9), 0.5 = new cr(12), 0 = new cr(23), 1 = new
cr(4), 2 = new cr(-15),);
+$b = array(0.2 = new cr(9), 0.5 = new cr(22), 0 = new cr(3), 1 = new
cr(4), 2 = new cr(-15),);
+$result = array_udiff($a, $b, array(cr, comp_func_cr));
+var_dump($result);
+?
+--EXPECTF--
+array(2) {
+ [0.5]=
+ object(cr)#%d (1) {
+[priv_member:cr:private]=
+int(12)
+ }
+ [0]=
+ object(cr)#%d (1) {
+[priv_member:cr:private]=
+int(23)
+ }
+}
+--UEXPECTF--
+array(2) {
+ [u0.5]=
+ object(cr)#%d (1) {
+[upriv_member:ucr:private]=
+int(12)
+ }
+ [0]=
+ object(cr)#%d (1) {
+[upriv_member:ucr:private]=
+int(23)
+ }
+}
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_uintersect_assoc_basic.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/standard/tests/array/array_uintersect_assoc_basic.phpt
diff -u /dev/null
php-src/ext/standard/tests/array/array_uintersect_assoc_basic.phpt:1.2
--- /dev/null Fri Jan 25 00:17:34 2008
+++ php-src/ext/standard/tests/array/array_uintersect_assoc_basic.phpt Fri Jan
25 00:17:34 2008
@@ -0,0 +1,49 @@
+--TEST--
+array_uintersect_assoc(): Test return type and value for expected input
+--FILE--
+?php
+/*
+* proto array array_uintersect_assoc ( array $array1, array $array2 [, array $
..., callback $data_compare_func] )
+* Function is implemented in ext/standard/array.c
+*/
+class cr {
+private $priv_member;
+function cr($val) {
+$this-priv_member = $val;
+}
+static function comp_func_cr($a, $b) {
+if ($a-priv_member === $b-priv_member) return 0;
+return ($a-priv_member $b-priv_member) ? 1 : -1;
+}
+}
+$a = array(0.1 = new cr(9), 0.5 = new cr(12), 0 = new cr(23), 1 = new
cr(4), 2 = new cr(-15),);
+$b = array(0.2 = new cr(9), 0.5 = new cr(22), 0 = new cr(3), 1 = new
cr(4), 2 = new cr(-15),);
+$result = array_uintersect_assoc($a, $b, array(cr, comp_func_cr));
+var_dump($result);
+?
+--EXPECTF--
+array(2) {
+ [1]=
+ object(cr)#%d (1) {
+[priv_member:cr:private]=
+int(4)
+ }
+ [2]=
+ object(cr)#%d (1) {
+[priv_member:cr:private]=
+int(-15)
+ }
+}
+--UEXPECTF--
+array(2) {
+ [1]=
+ object(cr)#%d (1) {
+[upriv_member:ucr:private]=
+int(4)
+ }
+ [2]=
+ object(cr)#%d (1) {
+[upriv_member:ucr:private]=
+int(-15)
+ }
+}
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_diff_uassoc_basic.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/standard/tests/array/array_diff_uassoc_basic.phpt
diff -u /dev/null
php-src/ext/standard/tests/array/array_diff_uassoc_basic.phpt:1.2
--- /dev/null Fri Jan 25 00:17:34 2008
+++ php-src/ext/standard/tests/array/array_diff_uassoc_basic.phpt Fri Jan
25 00:17:34 2008
@@ -0,0 +1,37 @@
+--TEST--
+array_diff_uassoc(): Basic test
+--FILE--
+?php
+/*
+* array array_diff_uassoc ( array $array1, array $array2 [, array $...,
callback $key_compare_func] )
+*
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard/tests/array array_diff_key_basic.phpt array_diff_key_variation1.phpt array_diff_uassoc_basic.phpt array_diff_ukey_basic.phpt array_intersect_key_basic.php
nicholsrFri Jan 25 00:13:48 2008 UTC Added files: (Branch: PHP_5_3) /php-src/ext/standard/tests/array array_diff_key_basic.phpt array_udiff_basic.phpt array_diff_key_variation1.phpt array_intersect_ukey_basic.phpt array_udiff_uassoc_basic.phpt array_uintersect_uassoc_basic.phpt array_uintersect_assoc_basic.phpt array_diff_uassoc_basic.phpt array_udiff_assoc_basic.phpt array_uintersect_basic.phpt array_intersect_key_basic.phpt array_diff_ukey_basic.phpt array_intersect_uassoc_basic.phpt Log: - add some basic tests for array diff and intersection functions http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_diff_key_basic.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/array/array_diff_key_basic.phpt +++ php-src/ext/standard/tests/array/array_diff_key_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_udiff_basic.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/array/array_udiff_basic.phpt +++ php-src/ext/standard/tests/array/array_udiff_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_diff_key_variation1.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/array/array_diff_key_variation1.phpt +++ php-src/ext/standard/tests/array/array_diff_key_variation1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_intersect_ukey_basic.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/array/array_intersect_ukey_basic.phpt +++ php-src/ext/standard/tests/array/array_intersect_ukey_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_udiff_uassoc_basic.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/array/array_udiff_uassoc_basic.phpt +++ php-src/ext/standard/tests/array/array_udiff_uassoc_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_uintersect_uassoc_basic.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/array/array_uintersect_uassoc_basic.phpt +++ php-src/ext/standard/tests/array/array_uintersect_uassoc_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_uintersect_assoc_basic.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/array/array_uintersect_assoc_basic.phpt +++ php-src/ext/standard/tests/array/array_uintersect_assoc_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_diff_uassoc_basic.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/array/array_diff_uassoc_basic.phpt +++ php-src/ext/standard/tests/array/array_diff_uassoc_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_udiff_assoc_basic.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/array/array_udiff_assoc_basic.phpt +++ php-src/ext/standard/tests/array/array_udiff_assoc_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_uintersect_basic.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/array/array_uintersect_basic.phpt +++ php-src/ext/standard/tests/array/array_uintersect_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_intersect_key_basic.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/array/array_intersect_key_basic.phpt +++ php-src/ext/standard/tests/array/array_intersect_key_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_diff_ukey_basic.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/array/array_diff_ukey_basic.phpt +++ php-src/ext/standard/tests/array/array_diff_ukey_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_intersect_uassoc_basic.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/array/array_intersect_uassoc_basic.phpt +++ php-src/ext/standard/tests/array/array_intersect_uassoc_basic.phpt -- 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/standard/tests/array array_diff_key_basic.phpt array_diff_key_variation1.phpt array_diff_uassoc_basic.phpt array_diff_ukey_basic.phpt array_intersect_key_basic.php
nicholsrFri Jan 25 00:16:14 2008 UTC Added files: (Branch: PHP_5_2) /php-src/ext/standard/tests/array array_udiff_basic.phpt array_uintersect_uassoc_basic.phpt array_diff_ukey_basic.phpt array_intersect_ukey_basic.phpt array_udiff_assoc_basic.phpt array_uintersect_basic.phpt array_uintersect_assoc_basic.phpt array_intersect_key_basic.phpt array_diff_key_variation1.phpt array_diff_key_basic.phpt array_intersect_uassoc_basic.phpt array_diff_uassoc_basic.phpt array_udiff_uassoc_basic.phpt Log: - add some basic tests for array diff and intersection functions http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_udiff_basic.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/array/array_udiff_basic.phpt +++ php-src/ext/standard/tests/array/array_udiff_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_uintersect_uassoc_basic.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/array/array_uintersect_uassoc_basic.phpt +++ php-src/ext/standard/tests/array/array_uintersect_uassoc_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_diff_ukey_basic.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/array/array_diff_ukey_basic.phpt +++ php-src/ext/standard/tests/array/array_diff_ukey_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_intersect_ukey_basic.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/array/array_intersect_ukey_basic.phpt +++ php-src/ext/standard/tests/array/array_intersect_ukey_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_udiff_assoc_basic.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/array/array_udiff_assoc_basic.phpt +++ php-src/ext/standard/tests/array/array_udiff_assoc_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_uintersect_basic.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/array/array_uintersect_basic.phpt +++ php-src/ext/standard/tests/array/array_uintersect_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_uintersect_assoc_basic.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/array/array_uintersect_assoc_basic.phpt +++ php-src/ext/standard/tests/array/array_uintersect_assoc_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_intersect_key_basic.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/array/array_intersect_key_basic.phpt +++ php-src/ext/standard/tests/array/array_intersect_key_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_diff_key_variation1.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/array/array_diff_key_variation1.phpt +++ php-src/ext/standard/tests/array/array_diff_key_variation1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_diff_key_basic.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/array/array_diff_key_basic.phpt +++ php-src/ext/standard/tests/array/array_diff_key_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_intersect_uassoc_basic.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/array/array_intersect_uassoc_basic.phpt +++ php-src/ext/standard/tests/array/array_intersect_uassoc_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_diff_uassoc_basic.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/array/array_diff_uassoc_basic.phpt +++ php-src/ext/standard/tests/array/array_diff_uassoc_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_udiff_uassoc_basic.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/array/array_udiff_uassoc_basic.phpt +++ php-src/ext/standard/tests/array/array_udiff_uassoc_basic.phpt -- 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/standard/tests/array array_shuffle_basic.phpt
nicholsrFri Jan 25 00:30:51 2008 UTC Added files: (Branch: PHP_5_2) /php-src/ext/standard/tests/array array_shuffle_basic.phpt Log: - Add a basic test for array_shuffle() http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_shuffle_basic.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/array/array_shuffle_basic.phpt +++ php-src/ext/standard/tests/array/array_shuffle_basic.phpt -- 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/array array_shuffle_basic.phpt
nicholsrFri Jan 25 00:32:22 2008 UTC Added files: (Branch: PHP_5_3) /php-src/ext/standard/tests/array array_shuffle_basic.phpt Log: - Add a basic test for array_shuffle() http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_shuffle_basic.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/array/array_shuffle_basic.phpt +++ php-src/ext/standard/tests/array/array_shuffle_basic.phpt -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard/tests/array array_shuffle_basic.phpt
nicholsrFri Jan 25 00:33:00 2008 UTC
Modified files:
/php-src/ext/standard/tests/array array_shuffle_basic.phpt
Log:
- Add a basic test for array_shuffle()
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_shuffle_basic.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/standard/tests/array/array_shuffle_basic.phpt
diff -u /dev/null php-src/ext/standard/tests/array/array_shuffle_basic.phpt:1.2
--- /dev/null Fri Jan 25 00:33:00 2008
+++ php-src/ext/standard/tests/array/array_shuffle_basic.phpt Fri Jan 25
00:33:00 2008
@@ -0,0 +1,99 @@
+--TEST--
+array_shuffle(): Test return type and value for expected input
+--FILE--
+?php
+/*
+* proto bool shuffle ( array $array )
+* Function is implemented in ext/standard/array.c
+*/
+$numbers = range(1, 20);
+echo *** testing array_shuffle \n;
+$a = array();
+var_dump(shuffle($a));
+var_dump($a);
+$a = array(1);
+var_dump(shuffle($a));
+var_dump($a);
+$a = array(2 = 1);
+var_dump(shuffle($a));
+var_dump($a);
+$a = array(a = 1);
+var_dump(shuffle($a));
+var_dump($a);
+$a = array(array(1, 2, 3));
+var_dump(shuffle($a));
+var_dump($a);
+$a = array(1, 1, 1, 1);
+var_dump(shuffle($a));
+var_dump($a);
+$arr1 = array(5 = 1, 6 = 2, 7 = 3, 8 = 9);
+$arr2 = array(5 = 1, 6 = 2, 7 = 3, 8 = 9);
+shuffle($arr1);
+echo this should be 0- . count(array_diff($arr1, $arr2)) . \n;
+echo this should be 4- . count(array_intersect($arr1, $arr2)) . \n;
+$bigarray = range(1, 400);
+shuffle($bigarray);
+echo this should be 400- . count($bigarray) . \n;
+echo *** testing pass by reference \n;
+$original = $bigarray;
+shuffle($bigarray);
+$diffarray = array_diff_assoc($original, $bigarray);
+if (count($diffarray) 350) {
+// with 400 entries, the probability that 50 entries or more get the same
+// key- value association should be so close to zero it wont happen in
the lifetime of the
+// universe.
+echo shuffled array seems to be similar to original\n;
+var_dump($original);
+var_dump($bigarray);
+} else {
+echo test passed \n;
+}
+?
+--EXPECT--
+*** testing array_shuffle
+bool(true)
+array(0) {
+}
+bool(true)
+array(1) {
+ [0]=
+ int(1)
+}
+bool(true)
+array(1) {
+ [0]=
+ int(1)
+}
+bool(true)
+array(1) {
+ [0]=
+ int(1)
+}
+bool(true)
+array(1) {
+ [0]=
+ array(3) {
+[0]=
+int(1)
+[1]=
+int(2)
+[2]=
+int(3)
+ }
+}
+bool(true)
+array(4) {
+ [0]=
+ int(1)
+ [1]=
+ int(1)
+ [2]=
+ int(1)
+ [3]=
+ int(1)
+}
+this should be 0-0
+this should be 4-4
+this should be 400-400
+*** testing pass by reference
+test passed
\ No newline at end of file
--
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 string.c
iliaa Fri Jan 25 01:31:11 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard string.c
Log:
Adjust new chr() param handling to address chr() calls
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.445.2.14.2.69.2.12r2=1.445.2.14.2.69.2.13diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.445.2.14.2.69.2.12
php-src/ext/standard/string.c:1.445.2.14.2.69.2.13
--- php-src/ext/standard/string.c:1.445.2.14.2.69.2.12 Tue Jan 22 01:34:24 2008
+++ php-src/ext/standard/string.c Fri Jan 25 01:31:10 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: string.c,v 1.445.2.14.2.69.2.12 2008/01/22 01:34:24 iliaa Exp $ */
+/* $Id: string.c,v 1.445.2.14.2.69.2.13 2008/01/25 01:31:10 iliaa Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -2604,9 +2604,14 @@
long c;
char temp[2];
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, l, c) ==
FAILURE) {
- return;
+ if (ZEND_NUM_ARGS() != 1) {
+ WRONG_PARAM_COUNT;
}
+
+ if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS()
TSRMLS_CC, l, c) == FAILURE) {
+ c = 0;
+ }
+
temp[0] = (char)c;
temp[1] = '\0';
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
