From: Jani Taskinen Date: Wed, 31 Oct 2007 13:39:00 +0000 (+0000) Subject: - Fix typo (bug #43125) X-Git-Tag: RELEASE_2_0_0a1~1517 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7bd01cbce2955a3a7f862375929fb2b06a1a13fc;p=php - Fix typo (bug #43125) --- diff --git a/ext/standard/array.c b/ext/standard/array.c index eda9dfc88c..f0423ccb9e 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -946,7 +946,7 @@ PHP_FUNCTION(min) 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 @@ PHP_FUNCTION(min) 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 @@ PHP_FUNCTION(max) 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 @@ PHP_FUNCTION(max) 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 { diff --git a/ext/standard/tests/array/max.phpt b/ext/standard/tests/array/max.phpt index 8525508908..6f9367c7b4 100644 --- a/ext/standard/tests/array/max.phpt +++ b/ext/standard/tests/array/max.phpt @@ -20,13 +20,13 @@ var_dump(max(0, true, false, true)); 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 @@ int(1) 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 diff --git a/ext/standard/tests/array/min.phpt b/ext/standard/tests/array/min.phpt index e104b2b5e7..ae5a2b700d 100644 --- a/ext/standard/tests/array/min.phpt +++ b/ext/standard/tests/array/min.phpt @@ -20,13 +20,13 @@ var_dump(min(0, true, false, true)); 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 @@ bool(false) 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 diff --git a/ext/standard/tests/file/fgetc_basic.phpt b/ext/standard/tests/file/fgetc_basic.phpt index 9a27f4cf51..dba9d475dd 100644 --- a/ext/standard/tests/file/fgetc_basic.phpt +++ b/ext/standard/tests/file/fgetc_basic.phpt @@ -40,7 +40,7 @@ for($outerloop_counter = 0; $outerloop_counter < count($file_content_types); $ou 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 diff --git a/ext/standard/tests/file/fgetc_variation4.phpt b/ext/standard/tests/file/fgetc_variation4.phpt index a8a4061d99..eb40a72091 100644 --- a/ext/standard/tests/file/fgetc_variation4.phpt +++ b/ext/standard/tests/file/fgetc_variation4.phpt @@ -34,7 +34,7 @@ foreach ($file_modes as $file_mode ) { 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) );