Permalink
Browse files

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  typo fixes (argument)
  typo fixes (accommodate, parameter)
  • Loading branch information...
2 parents cf5b3fb + 04145dc commit 84e35fb2e0fcd7400d289e06395c975fc7a77816 @smalyshev smalyshev committed Jun 10, 2013
Showing with 69 additions and 69 deletions.
  1. +1 −1 README.PARAMETER_PARSING_API
  2. +2 −2 Zend/zend_API.h
  3. +1 −1 ext/intl/tests/badargs.phpt
  4. +1 −1 ext/pcre/pcrelib/NEWS
  5. +2 −2 ext/pdo/pdo_sql_parser.c
  6. +2 −2 ext/pdo/pdo_sql_parser.re
  7. +2 −2 ext/soap/php_sdl.c
  8. +3 −3 ext/sqlite3/libsqlite/sqlite3.c
  9. +1 −1 ext/sqlite3/sqlite3.c
  10. +1 −1 ext/standard/tests/array/009.phpt
  11. +2 −2 ext/standard/tests/array/array_fill_keys_error.phpt
  12. +1 −1 ext/standard/tests/array/array_merge.phpt
  13. +1 −1 ext/standard/tests/array/array_walk_basic2.phpt
  14. +1 −1 ext/standard/tests/array/array_walk_recursive_basic2.phpt
  15. +1 −1 ext/standard/tests/class_object/class_exists_variation_001.phpt
  16. +1 −1 ext/standard/tests/class_object/class_exists_variation_002.phpt
  17. +1 −1 ext/standard/tests/class_object/trait_exists_variation_001.phpt
  18. +1 −1 ext/standard/tests/class_object/trait_exists_variation_002.phpt
  19. +1 −1 ext/standard/tests/file/005_error.phpt
  20. +2 −2 ext/standard/tests/file/fileinode_error.phpt
  21. +1 −1 ext/standard/tests/file/fstat_variation1.phpt
  22. +1 −1 ext/standard/tests/file/fstat_variation2.phpt
  23. +1 −1 ext/standard/tests/file/fstat_variation3.phpt
  24. +1 −1 ext/standard/tests/file/fstat_variation4.phpt
  25. +1 −1 ext/standard/tests/file/fstat_variation5.phpt
  26. +1 −1 ext/standard/tests/file/fstat_variation6.phpt
  27. +1 −1 ext/standard/tests/file/fstat_variation7.phpt
  28. +1 −1 ext/standard/tests/strings/chunk_split_error.phpt
  29. +1 −1 ext/standard/user_filters.c
  30. +1 −1 ext/zlib/tests/gzfile_variation1.phpt
  31. +1 −1 ext/zlib/tests/gzfile_variation10.phpt
  32. +1 −1 ext/zlib/tests/gzfile_variation11.phpt
  33. +1 −1 ext/zlib/tests/gzfile_variation12.phpt
  34. +1 −1 ext/zlib/tests/gzfile_variation13.phpt
  35. +1 −1 ext/zlib/tests/gzfile_variation14.phpt
  36. +1 −1 ext/zlib/tests/gzfile_variation2.phpt
  37. +1 −1 ext/zlib/tests/gzfile_variation3.phpt
  38. +1 −1 ext/zlib/tests/gzfile_variation4.phpt
  39. +1 −1 ext/zlib/tests/gzfile_variation5.phpt
  40. +1 −1 ext/zlib/tests/gzfile_variation6.phpt
  41. +1 −1 ext/zlib/tests/gzfile_variation7.phpt
  42. +1 −1 ext/zlib/tests/gzfile_variation8.phpt
  43. +1 −1 ext/zlib/tests/gzfile_variation9.phpt
  44. +1 −1 ext/zlib/tests/readgzfile_variation1.phpt
  45. +1 −1 ext/zlib/tests/readgzfile_variation10.phpt
  46. +1 −1 ext/zlib/tests/readgzfile_variation11.phpt
  47. +1 −1 ext/zlib/tests/readgzfile_variation12.phpt
  48. +1 −1 ext/zlib/tests/readgzfile_variation13.phpt
  49. +1 −1 ext/zlib/tests/readgzfile_variation14.phpt
  50. +1 −1 ext/zlib/tests/readgzfile_variation2.phpt
  51. +1 −1 ext/zlib/tests/readgzfile_variation3.phpt
  52. +1 −1 ext/zlib/tests/readgzfile_variation4.phpt
  53. +1 −1 ext/zlib/tests/readgzfile_variation5.phpt
  54. +1 −1 ext/zlib/tests/readgzfile_variation6.phpt
  55. +1 −1 ext/zlib/tests/readgzfile_variation7.phpt
  56. +1 −1 ext/zlib/tests/readgzfile_variation8.phpt
  57. +1 −1 ext/zlib/tests/readgzfile_variation9.phpt
  58. +1 −1 sapi/fpm/php-fpm.conf.in
  59. +1 −1 sapi/isapi/stresstest/stresstest.cpp
  60. BIN scripts/dev/generate-phpt.phar
  61. +1 −1 scripts/dev/generate-phpt/src/gtFunction.php
  62. +1 −1 win32/glob.c
@@ -43,7 +43,7 @@ See also https://wiki.php.net/rfc/zpp_improv#expose_zend_parse_arg_as_zend_parse
Type specifiers
---------------
The following list shows the type specifier, its meaning and the parameter
- types that need to be passed by address. All passed paramaters are set
+ types that need to be passed by address. All passed parameters are set
if the PHP parameter is non optional and untouched if optional and the
parameter is not present. The only exception is O where the zend_class_entry*
has to be provided on input and is used to verify the PHP parameter is an
View
@@ -465,7 +465,7 @@ ZEND_API extern const zend_fcall_info_cache empty_fcall_info_cache;
*/
ZEND_API int zend_fcall_info_init(zval *callable, uint check_flags, zend_fcall_info *fci, zend_fcall_info_cache *fcc, char **callable_name, char **error TSRMLS_DC);
-/** Clear argumens connected with zend_fcall_info *fci
+/** Clear arguments connected with zend_fcall_info *fci
* If free_mem is not zero then the params array gets free'd as well
*/
ZEND_API void zend_fcall_info_args_clear(zend_fcall_info *fci, int free_mem);
@@ -503,7 +503,7 @@ ZEND_API int zend_fcall_info_argv(zend_fcall_info *fci TSRMLS_DC, int argc, va_l
ZEND_API int zend_fcall_info_argn(zend_fcall_info *fci TSRMLS_DC, int argc, ...);
/** Call a function using information created by zend_fcall_info_init()/args().
- * If args is given then those replace the arguement info in fci is temporarily.
+ * If args is given then those replace the argument info in fci is temporarily.
*/
ZEND_API int zend_fcall_info_call(zend_fcall_info *fci, zend_fcall_info_cache *fcc, zval **retval, zval *args TSRMLS_DC);
@@ -1,5 +1,5 @@
--TEST--
-Check that bad argumens return the same
+Check that bad arguments return the same
--SKIPIF--
<?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
--FILE--
View
@@ -591,7 +591,7 @@ some of the new functionality in Perl 5.005.
Another (I hope this is the last!) change has been made to the API for the
pcre_compile() function. An additional argument has been added to make it
possible to pass over a pointer to character tables built in the current
-locale by pcre_maketables(). To use the default tables, this new arguement
+locale by pcre_maketables(). To use the default tables, this new argument
should be passed as NULL.
IMPORTANT FOR THOSE UPGRADING FROM VERSION 2.05
View
@@ -761,9 +761,9 @@ int old_pdo_parse_params(pdo_stmt_t *stmt, char *inquery, int inquery_len, char
while (SUCCESS == zend_hash_get_current_data(params, (void**)&param)) {
if(param->parameter) {
convert_to_string(param->parameter);
- /* accomodate a string that needs to be fully quoted
+ /* accommodate a string that needs to be fully quoted
bind placeholders are at least 2 characters, so
- the accomodate their own "'s
+ the accommodate their own "'s
*/
newbuffer_len += padding * Z_STRLEN_P(param->parameter);
}
@@ -408,9 +408,9 @@ int old_pdo_parse_params(pdo_stmt_t *stmt, char *inquery, int inquery_len, char
while (SUCCESS == zend_hash_get_current_data(params, (void**)&param)) {
if(param->parameter) {
convert_to_string(param->parameter);
- /* accomodate a string that needs to be fully quoted
+ /* accommodate a string that needs to be fully quoted
bind placeholders are at least 2 characters, so
- the accomodate their own "'s
+ the accommodate their own "'s
*/
newbuffer_len += padding * Z_STRLEN_P(param->parameter);
}
View
@@ -40,8 +40,8 @@ static void delete_binding(void *binding);
static void delete_binding_persistent(void *binding);
static void delete_function(void *function);
static void delete_function_persistent(void *function);
-static void delete_parameter(void *paramater);
-static void delete_parameter_persistent(void *paramater);
+static void delete_parameter(void *parameter);
+static void delete_parameter_persistent(void *parameter);
static void delete_header(void *header);
static void delete_header_persistent(void *header);
static void delete_document(void *doc_ptr);
@@ -93544,7 +93544,7 @@ static u8 minMaxQuery(Select *p){
/*
** The select statement passed as the first argument is an aggregate query.
-** The second argment is the associated aggregate-info object. This
+** The second argument is the associated aggregate-info object. This
** function tests if the SELECT is of the form:
**
** SELECT count(*) FROM <tbl>
@@ -93617,7 +93617,7 @@ SQLITE_PRIVATE int sqlite3IndexedByLookup(Parse *pParse, struct SrcList_item *pF
** without worrying about messing up the presistent representation
** of the view.
**
-** (3) Add terms to the WHERE clause to accomodate the NATURAL keyword
+** (3) Add terms to the WHERE clause to accommodate the NATURAL keyword
** on joins and the ON and USING clause of joins.
**
** (4) Scan the list of columns in the result set (pEList) looking
@@ -96115,7 +96115,7 @@ SQLITE_PRIVATE void sqlite3CodeRowTriggerDirect(
/*
** This is called to code the required FOR EACH ROW triggers for an operation
** on table pTab. The operation to code triggers for (INSERT, UPDATE or DELETE)
-** is given by the op paramater. The tr_tm parameter determines whether the
+** is given by the op parameter. The tr_tm parameter determines whether the
** BEFORE or AFTER triggers are coded. If the operation is an UPDATE, then
** parameter pChanges is passed the list of columns being modified.
**
View
@@ -1409,7 +1409,7 @@ static int register_bound_parameter_to_sqlite(struct php_sqlite3_bound_param *pa
/* }}} */
/* {{{ proto bool SQLite3Stmt::bindParam(int parameter_number, mixed parameter [, int type])
- Bind Paramater to a stmt variable. */
+ Bind Parameter to a stmt variable. */
PHP_METHOD(sqlite3stmt, bindParam)
{
php_sqlite3_stmt *stmt_obj;
@@ -94,7 +94,7 @@ var_dump( current($temp_array, $temp_array) );
var_dump( reset($temp_array, $temp_array) );
var_dump( next($temp_array, $temp_array) );
-// invalid args type, valid arguement: array
+// invalid args type, valid argument: array
$int_var = 1;
$float_var = 1.5;
$string = "string";
@@ -20,7 +20,7 @@ var_dump( array_fill_keys($keys, $val, $extra_arg) );
echo "\n-- Testing array_fill_keys() function with less than expected no. of arguments --\n";
var_dump( array_fill_keys($keys) );
-echo "\n-- Testing array_fill_keys() function with no argumets --\n";
+echo "\n-- Testing array_fill_keys() function with no arguments --\n";
var_dump( array_fill_keys() );
echo "Done";
@@ -38,7 +38,7 @@ NULL
Warning: array_fill_keys() expects exactly 2 parameters, 1 given in %sarray_fill_keys_error.php on line %d
NULL
--- Testing array_fill_keys() function with no argumets --
+-- Testing array_fill_keys() function with no arguments --
Warning: array_fill_keys() expects exactly 2 parameters, 0 given in %sarray_fill_keys_error.php on line %d
NULL
@@ -79,7 +79,7 @@ echo "\n*** Testing array_merge() with typecasting non-array to array ***\n";
var_dump(array_merge($begin_array[4], (array)"type1", (array)10, (array)12.34));
echo "\n*** Testing error conditions ***";
-/* Invalid argumens */
+/* Invalid arguments */
var_dump(array_merge());
var_dump(array_merge(100, 200));
var_dump(array_merge($begin_array[0], $begin_array[1], 100));
@@ -25,7 +25,7 @@ function test_alter(&$item, $key, $prefix)
// with proper type
var_dump($item); // value
var_dump($key); // key
- var_dump($prefix); // additional agument passed to callback function
+ var_dump($prefix); // additional argument passed to callback function
echo "\n"; // new line to separate the output between each element
}
@@ -25,7 +25,7 @@ function test_alter(&$item, $key, $prefix)
// with proper type
var_dump($item); // value
var_dump($key); // key
- var_dump($prefix); // additional agument passed to callback function
+ var_dump($prefix); // additional argument passed to callback function
echo "\n"; // new line to separate the output between each element
}
@@ -1,5 +1,5 @@
--TEST--
-Test class_exists() function : usage variations - unexpected types for agument 1
+Test class_exists() function : usage variations - unexpected types for argument 1
--FILE--
<?php
/* Prototype : proto bool class_exists(string classname [, bool autoload])
@@ -1,5 +1,5 @@
--TEST--
-Test class_exists() function : usage variations - unexpected types for agument 2
+Test class_exists() function : usage variations - unexpected types for argument 2
--FILE--
<?php
/* Prototype : proto bool class_exists(string classname [, bool autoload])
@@ -1,5 +1,5 @@
--TEST--
-Test trait_exists() function : usage variations - unexpected types for agument 1
+Test trait_exists() function : usage variations - unexpected types for argument 1
--FILE--
<?php
/* Prototype : proto bool trait_exists(string traitname [, bool autoload])
@@ -1,5 +1,5 @@
--TEST--
-Test trait_exists() function : usage variations - unexpected types for agument 2
+Test trait_exists() function : usage variations - unexpected types for argument 2
--FILE--
<?php
/* Prototype : proto bool trait_exists(string traitname [, bool autoload])
@@ -23,7 +23,7 @@ Test fileatime(), filemtime(), filectime() & touch() functions : error condition
echo "*** Testing error conditions ***\n";
echo "\n-- Testing with Non-existing files --";
-/* Both invalid argumetns */
+/* Both invalid arguments */
var_dump( fileatime("/no/such/file/or/dir") );
var_dump( filemtime("/no/such/file/or/dir") );
var_dump( filectime("/no/such/file/or/dir") );
@@ -16,10 +16,10 @@ var_dump( fileinode("/no/such/file/dir") );
var_dump( fileinode("string") );
var_dump( fileinode(100) );
-/* No.of argumetns less than expected */
+/* No.of arguments less than expected */
var_dump( fileinode() );
-/* No.of argumetns greater than expected */
+/* No.of arguments greater than expected */
var_dump( fileinode(__FILE__, "string") );
echo "\n*** Done ***";
@@ -1,5 +1,5 @@
--TEST--
-Test function fstat() by substituting agument 1 with array values.
+Test function fstat() by substituting argument 1 with array values.
--FILE--
<?php
$index_array = array(1, 2, 3);
@@ -1,5 +1,5 @@
--TEST--
-Test function fstat() by substituting agument 1 with boolean values.
+Test function fstat() by substituting argument 1 with boolean values.
--FILE--
<?php
$variation_array = array(
@@ -1,5 +1,5 @@
--TEST--
-Test function fstat() by substituting agument 1 with emptyUnsetUndefNull values.
+Test function fstat() by substituting argument 1 with emptyUnsetUndefNull values.
--FILE--
<?php
$unset_var = 10;
@@ -1,5 +1,5 @@
--TEST--
-Test function fstat() by substituting agument 1 with float values.
+Test function fstat() by substituting argument 1 with float values.
--FILE--
<?php
$variation_array = array(
@@ -1,5 +1,5 @@
--TEST--
-Test function fstat() by substituting agument 1 with int values.
+Test function fstat() by substituting argument 1 with int values.
--FILE--
<?php
$variation_array = array (
@@ -1,5 +1,5 @@
--TEST--
-Test function fstat() by substituting agument 1 with object values.
+Test function fstat() by substituting argument 1 with object values.
--FILE--
<?php
@@ -1,5 +1,5 @@
--TEST--
-Test function fstat() by substituting agument 1 with string values.
+Test function fstat() by substituting argument 1 with string values.
--FILE--
<?php
$heredoc = <<<EOT
@@ -10,7 +10,7 @@ Test chunk_split() function : error conditions
/*
* Testing error conditions of chunk_split() with zero arguments
-* and for more than expected number of argments
+* and for more than expected number of arguments
*/
echo "*** Testing chunk_split() : error conditions ***\n";
@@ -474,7 +474,7 @@ static void php_stream_bucket_attach(int append, INTERNAL_FUNCTION_PARAMETERS)
} else {
php_stream_bucket_prepend(brigade, bucket TSRMLS_CC);
}
- /* This is a hack necessary to accomodate situations where bucket is appended to the stream
+ /* This is a hack necessary to accommodate situations where bucket is appended to the stream
* multiple times. See bug35916.phpt for reference.
*/
if (bucket->refcount == 1) {
@@ -1,5 +1,5 @@
--TEST--
-Test function gzfile() by substituting agument 1 with array values.
+Test function gzfile() by substituting argument 1 with array values.
--SKIPIF--
<?php
if (!extension_loaded('zlib')) die ('skip zlib extension not available in this build');
@@ -1,5 +1,5 @@
--TEST--
-Test function gzfile() by substituting agument 2 with emptyUnsetUndefNull values.
+Test function gzfile() by substituting argument 2 with emptyUnsetUndefNull values.
--SKIPIF--
<?php
if (!extension_loaded('zlib')) die ('skip zlib extension not available in this build');
@@ -1,5 +1,5 @@
--TEST--
-Test function gzfile() by substituting agument 2 with float values.
+Test function gzfile() by substituting argument 2 with float values.
--SKIPIF--
<?php
if (!extension_loaded('zlib')) die ('skip zlib extension not available in this build');
@@ -1,5 +1,5 @@
--TEST--
-Test function gzfile() by substituting agument 2 with int values.
+Test function gzfile() by substituting argument 2 with int values.
--SKIPIF--
<?php
if (!extension_loaded('zlib')) die ('skip zlib extension not available in this build');
@@ -1,5 +1,5 @@
--TEST--
-Test function gzfile() by substituting agument 2 with object values.
+Test function gzfile() by substituting argument 2 with object values.
--SKIPIF--
<?php
if (!extension_loaded('zlib')) die ('skip zlib extension not available in this build');
@@ -1,5 +1,5 @@
--TEST--
-Test function gzfile() by substituting agument 2 with string values.
+Test function gzfile() by substituting argument 2 with string values.
--SKIPIF--
<?php
if (!extension_loaded('zlib')) die ('skip zlib extension not available in this build');
@@ -1,5 +1,5 @@
--TEST--
-Test function gzfile() by substituting agument 1 with boolean values.
+Test function gzfile() by substituting argument 1 with boolean values.
--SKIPIF--
<?php
if (!extension_loaded('zlib')) die ('skip zlib extension not available in this build');
@@ -1,5 +1,5 @@
--TEST--
-Test function gzfile() by substituting agument 1 with emptyUnsetUndefNull values.
+Test function gzfile() by substituting argument 1 with emptyUnsetUndefNull values.
--SKIPIF--
<?php
if (!extension_loaded('zlib')) die ('skip zlib extension not available in this build');
@@ -1,5 +1,5 @@
--TEST--
-Test function gzfile() by substituting agument 1 with float values.
+Test function gzfile() by substituting argument 1 with float values.
--SKIPIF--
<?php
if (!extension_loaded(zlib)) die ('skip zlib extension not available in this build');
@@ -1,5 +1,5 @@
--TEST--
-Test function gzfile() by substituting agument 1 with int values.
+Test function gzfile() by substituting argument 1 with int values.
--SKIPIF--
<?php
if (!extension_loaded('zlib')) die ('skip zlib extension not available in this build');
@@ -1,5 +1,5 @@
--TEST--
-Test function gzfile() by substituting agument 1 with object values.
+Test function gzfile() by substituting argument 1 with object values.
--SKIPIF--
<?php
if (!extension_loaded('zlib')) die ('skip zlib extension not available in this build');
@@ -1,5 +1,5 @@
--TEST--
-Test function gzfile() by substituting agument 1 with string values.
+Test function gzfile() by substituting argument 1 with string values.
--SKIPIF--
<?php
if (!extension_loaded('zlib')) die ('skip zlib extension not available in this build');
@@ -1,5 +1,5 @@
--TEST--
-Test function gzfile() by substituting agument 2 with array values.
+Test function gzfile() by substituting argument 2 with array values.
--SKIPIF--
<?php
if (!extension_loaded('zlib')) die ('skip zlib extension not available in this build');
@@ -1,5 +1,5 @@
--TEST--
-Test function gzfile() by substituting agument 2 with boolean values.
+Test function gzfile() by substituting argument 2 with boolean values.
--SKIPIF--
<?php
if (!extension_loaded('zlib')) die ('skip zlib extension not available in this build');
@@ -1,5 +1,5 @@
--TEST--
-Test function readgzfile() by substituting agument 1 with array values.
+Test function readgzfile() by substituting argument 1 with array values.
--SKIPIF--
<?php
if (!extension_loaded('zlib')) die ('skip zlib extension not available in this build');
@@ -1,5 +1,5 @@
--TEST--
-Test function readgzfile() by substituting agument 2 with emptyUnsetUndefNull values.
+Test function readgzfile() by substituting argument 2 with emptyUnsetUndefNull values.
--SKIPIF--
<?php
if (!extension_loaded('zlib')) die ('skip zlib extension not available in this build');
Oops, something went wrong.

0 comments on commit 84e35fb

Please sign in to comment.