jani Wed Oct 31 13:39:01 2007 UTC Modified files: /php-src/ext/standard array.c /php-src/ext/standard/tests/array max.phpt min.phpt /php-src/ext/standard/tests/file fgetc_basic.phpt fgetc_variation4.phpt Log: - Fix typo (bug #43125) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/array.c?r1=1.422&r2=1.423&diff_format=u Index: php-src/ext/standard/array.c diff -u php-src/ext/standard/array.c:1.422 php-src/ext/standard/array.c:1.423 --- php-src/ext/standard/array.c:1.422 Sun Oct 7 05:15:06 2007 +++ php-src/ext/standard/array.c Wed Oct 31 13:39:00 2007 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: array.c,v 1.422 2007/10/07 05:15:06 davidw Exp $ */ +/* $Id: array.c,v 1.423 2007/10/31 13:39:00 jani Exp $ */ #include "php.h" #include "php_ini.h" @@ -946,7 +946,7 @@ zval **result; if (argc<=0) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Atleast one value should be passed"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "At least one value should be passed"); RETURN_NULL(); } php_set_compare_func(SORT_REGULAR TSRMLS_CC); @@ -959,7 +959,7 @@ if (zend_hash_minmax(Z_ARRVAL_PP(arr), php_array_data_compare, 0, (void **) &result TSRMLS_CC) == SUCCESS) { RETVAL_ZVAL(*result, 1, 0); } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Array must contain atleast one element"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Array must contain at least one element"); RETURN_FALSE; } } else { @@ -996,7 +996,7 @@ zval **result; if (argc<=0) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Atleast one value should be passed"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "At least one value should be passed"); RETURN_NULL(); } php_set_compare_func(SORT_REGULAR TSRMLS_CC); @@ -1009,7 +1009,7 @@ if (zend_hash_minmax(Z_ARRVAL_PP(arr), php_array_data_compare, 1, (void **) &result TSRMLS_CC) == SUCCESS) { RETVAL_ZVAL(*result, 1, 0); } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Array must contain atleast one element"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Array must contain at least one element"); RETURN_FALSE; } } else { http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/max.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/array/max.phpt diff -u php-src/ext/standard/tests/array/max.phpt:1.2 php-src/ext/standard/tests/array/max.phpt:1.3 --- php-src/ext/standard/tests/array/max.phpt:1.2 Mon May 7 22:33:38 2007 +++ php-src/ext/standard/tests/array/max.phpt Wed Oct 31 13:39:00 2007 @@ -20,13 +20,13 @@ echo "Done\n"; ?> --EXPECTF-- -Warning: max(): Atleast one value should be passed in %s on line %d +Warning: max(): At least one value should be passed in %s on line %d NULL Warning: Wrong parameter count for max() in %s on line %d NULL -Warning: max(): Array must contain atleast one element in %s on line %d +Warning: max(): Array must contain at least one element in %s on line %d bool(false) Warning: Wrong parameter count for max() in %s on line %d @@ -40,13 +40,13 @@ bool(true) Done --UEXPECTF-- -Warning: max(): Atleast one value should be passed in %s on line %d +Warning: max(): At least one value should be passed in %s on line %d NULL Warning: Wrong parameter count for max() in %s on line %d NULL -Warning: max(): Array must contain atleast one element in %s on line %d +Warning: max(): Array must contain at least one element in %s on line %d bool(false) Warning: Wrong parameter count for max() in %s on line %d http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/min.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/array/min.phpt diff -u php-src/ext/standard/tests/array/min.phpt:1.2 php-src/ext/standard/tests/array/min.phpt:1.3 --- php-src/ext/standard/tests/array/min.phpt:1.2 Mon May 7 22:33:38 2007 +++ php-src/ext/standard/tests/array/min.phpt Wed Oct 31 13:39:00 2007 @@ -20,13 +20,13 @@ echo "Done\n"; ?> --EXPECTF-- -Warning: min(): Atleast one value should be passed in %s on line %d +Warning: min(): At least one value should be passed in %s on line %d NULL Warning: Wrong parameter count for min() in %s on line %d NULL -Warning: min(): Array must contain atleast one element in %s on line %d +Warning: min(): Array must contain at least one element in %s on line %d bool(false) Warning: Wrong parameter count for min() in %s on line %d @@ -40,13 +40,13 @@ int(0) Done --UEXPECTF-- -Warning: min(): Atleast one value should be passed in %s on line %d +Warning: min(): At least one value should be passed in %s on line %d NULL Warning: Wrong parameter count for min() in %s on line %d NULL -Warning: min(): Array must contain atleast one element in %s on line %d +Warning: min(): Array must contain at least one element in %s on line %d bool(false) Warning: Wrong parameter count for min() in %s on line %d http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fgetc_basic.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/standard/tests/file/fgetc_basic.phpt diff -u php-src/ext/standard/tests/file/fgetc_basic.phpt:1.4 php-src/ext/standard/tests/file/fgetc_basic.phpt:1.5 --- php-src/ext/standard/tests/file/fgetc_basic.phpt:1.4 Thu Oct 11 11:50:10 2007 +++ php-src/ext/standard/tests/file/fgetc_basic.phpt Wed Oct 31 13:39:00 2007 @@ -40,7 +40,7 @@ exit(); } - // perform the read file atleast 6 char and check + // perform the read file at least 6 char and check for( $counter = 1; $counter <= 6; $counter++ ) { // read data from the file and check, file pointer position, feof etc var_dump( fgetc($file_handle) ); // read a char http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fgetc_variation4.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/file/fgetc_variation4.phpt diff -u php-src/ext/standard/tests/file/fgetc_variation4.phpt:1.2 php-src/ext/standard/tests/file/fgetc_variation4.phpt:1.3 --- php-src/ext/standard/tests/file/fgetc_variation4.phpt:1.2 Sat Jul 21 08:01:25 2007 +++ php-src/ext/standard/tests/file/fgetc_variation4.phpt Wed Oct 31 13:39:00 2007 @@ -34,7 +34,7 @@ var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); - // read from file, atleast 7 chars + // read from file, at least 7 chars for($counter =0; $counter < 7; $counter ++) { var_dump( fgetc($file_handle) ); // expected : 1 char var_dump( ftell($file_handle) );
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php