From 171184b64deaf9df0d00baa4b4a3c88f4359d4a9 Mon Sep 17 00:00:00 2001 From: Jani Taskinen Date: Wed, 31 Oct 2007 13:39:14 +0000 Subject: [PATCH] MFH: fix typo --- ext/standard/array.c | 8 ++++---- ext/standard/tests/array/max.phpt | 4 ++-- ext/standard/tests/array/min.phpt | 4 ++-- ext/standard/tests/file/fgetc_basic.phpt | 2 +- ext/standard/tests/file/fgetc_variation4.phpt | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ext/standard/array.c b/ext/standard/array.c index 4710776648..d27894c6dd 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -964,7 +964,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(); } set_compare_func(SORT_REGULAR TSRMLS_CC); @@ -977,7 +977,7 @@ PHP_FUNCTION(min) if (zend_hash_minmax(Z_ARRVAL_PP(arr), 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 { @@ -1014,7 +1014,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(); } set_compare_func(SORT_REGULAR TSRMLS_CC); @@ -1027,7 +1027,7 @@ PHP_FUNCTION(max) if (zend_hash_minmax(Z_ARRVAL_PP(arr), 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 1495a78dc9..6293dee372 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 diff --git a/ext/standard/tests/array/min.phpt b/ext/standard/tests/array/min.phpt index dfb3c9bde8..2fae3f9d44 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 diff --git a/ext/standard/tests/file/fgetc_basic.phpt b/ext/standard/tests/file/fgetc_basic.phpt index 8d38f3f1dd..d82110f784 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 15d5b60b8c..a2bc9e5245 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) ); -- 2.40.0