Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  typo fixes (argument)
  typo fixes (accommodate, parameter)

62 files changed, 69 insertions, 69 deletions

diff --git a/README.PARAMETER_PARSING_API b/README.PARAMETER_PARSING_API
index edcee0f2ea..25a41096cf 100644
--- a/README.PARAMETER_PARSING_API
+++ b/README.PARAMETER_PARSING_API
@@ -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 
diff --git a/Zend/zend_API.h b/Zend/zend_API.h
index f10fc91704..ecc8d9acd9 100644
--- a/Zend/zend_API.h
+++ b/Zend/zend_API.h
@@ -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);
 
diff --git a/ext/intl/tests/badargs.phpt b/ext/intl/tests/badargs.phpt
index b8f48b371e..b2120977f3 100644
--- a/ext/intl/tests/badargs.phpt
+++ b/ext/intl/tests/badargs.phpt
@@ -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--
diff --git a/ext/pcre/pcrelib/NEWS b/ext/pcre/pcrelib/NEWS
index ebd9c5ec9d..082139f222 100644
--- a/ext/pcre/pcrelib/NEWS
+++ b/ext/pcre/pcrelib/NEWS
@@ -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
diff --git a/ext/pdo/pdo_sql_parser.c b/ext/pdo/pdo_sql_parser.c
index ec488e053f..37c71987a9 100644
--- a/ext/pdo/pdo_sql_parser.c
+++ b/ext/pdo/pdo_sql_parser.c
@@ -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);
 			}
diff --git a/ext/pdo/pdo_sql_parser.re b/ext/pdo/pdo_sql_parser.re
index d4272d679b..80e3b4f95f 100644
--- a/ext/pdo/pdo_sql_parser.re
+++ b/ext/pdo/pdo_sql_parser.re
@@ -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);
 			}
diff --git a/ext/soap/php_sdl.c b/ext/soap/php_sdl.c
index 33e137cbbb..0ac4c2ed7a 100644
--- a/ext/soap/php_sdl.c
+++ b/ext/soap/php_sdl.c
@@ -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);
diff --git a/ext/sqlite3/libsqlite/sqlite3.c b/ext/sqlite3/libsqlite/sqlite3.c
index f3c06d49b1..2bcd2409a9 100644
--- a/ext/sqlite3/libsqlite/sqlite3.c
+++ b/ext/sqlite3/libsqlite/sqlite3.c
@@ -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.
 **
diff --git a/ext/sqlite3/sqlite3.c b/ext/sqlite3/sqlite3.c
index df449d7380..2aef0414aa 100644
--- a/ext/sqlite3/sqlite3.c
+++ b/ext/sqlite3/sqlite3.c
@@ -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;
diff --git a/ext/standard/tests/array/009.phpt b/ext/standard/tests/array/009.phpt
index f88f8763fa..7b3bba2261 100644
--- a/ext/standard/tests/array/009.phpt
+++ b/ext/standard/tests/array/009.phpt
@@ -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";
diff --git a/ext/standard/tests/array/array_fill_keys_error.phpt b/ext/standard/tests/array/array_fill_keys_error.phpt
index 31a03e7f5f..012a729d62 100644
--- a/ext/standard/tests/array/array_fill_keys_error.phpt
+++ b/ext/standard/tests/array/array_fill_keys_error.phpt
@@ -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
diff --git a/ext/standard/tests/array/array_merge.phpt b/ext/standard/tests/array/array_merge.phpt
index b718386da1..30830de2b3 100644
--- a/ext/standard/tests/array/array_merge.phpt
+++ b/ext/standard/tests/array/array_merge.phpt
@@ -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));
diff --git a/ext/standard/tests/array/array_walk_basic2.phpt b/ext/standard/tests/array/array_walk_basic2.phpt
index e856b580ba..3ef15605e7 100644
--- a/ext/standard/tests/array/array_walk_basic2.phpt
+++ b/ext/standard/tests/array/array_walk_basic2.phpt
@@ -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
 }
 
diff --git a/ext/standard/tests/array/array_walk_recursive_basic2.phpt b/ext/standard/tests/array/array_walk_recursive_basic2.phpt
index c71d92b456..a049c0b812 100644
--- a/ext/standard/tests/array/array_walk_recursive_basic2.phpt
+++ b/ext/standard/tests/array/array_walk_recursive_basic2.phpt
@@ -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
 }
 
diff --git a/ext/standard/tests/class_object/class_exists_variation_001.phpt b/ext/standard/tests/class_object/class_exists_variation_001.phpt
index c9146ba9f7..52a3584763 100644
--- a/ext/standard/tests/class_object/class_exists_variation_001.phpt
+++ b/ext/standard/tests/class_object/class_exists_variation_001.phpt
@@ -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])
diff --git a/ext/standard/tests/class_object/class_exists_variation_002.phpt b/ext/standard/tests/class_object/class_exists_variation_002.phpt
index ae9de157f6..954e4d8cbc 100644
--- a/ext/standard/tests/class_object/class_exists_variation_002.phpt
+++ b/ext/standard/tests/class_object/class_exists_variation_002.phpt
@@ -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])
diff --git a/ext/standard/tests/class_object/trait_exists_variation_001.phpt b/ext/standard/tests/class_object/trait_exists_variation_001.phpt
index 65ef1993cf..e7fa4afd1e 100644
--- a/ext/standard/tests/class_object/trait_exists_variation_001.phpt
+++ b/ext/standard/tests/class_object/trait_exists_variation_001.phpt
@@ -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])
diff --git a/ext/standard/tests/class_object/trait_exists_variation_002.phpt b/ext/standard/tests/class_object/trait_exists_variation_002.phpt
index a2fcbbf018..365efffe41 100644
--- a/ext/standard/tests/class_object/trait_exists_variation_002.phpt
+++ b/ext/standard/tests/class_object/trait_exists_variation_002.phpt
@@ -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])
diff --git a/ext/standard/tests/file/005_error.phpt b/ext/standard/tests/file/005_error.phpt
index fc4852e4ad..20ba3a7fc0 100644
--- a/ext/standard/tests/file/005_error.phpt
+++ b/ext/standard/tests/file/005_error.phpt
@@ -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") );
diff --git a/ext/standard/tests/file/fileinode_error.phpt b/ext/standard/tests/file/fileinode_error.phpt
index d716c4ae5b..eb5d79e0c3 100644
--- a/ext/standard/tests/file/fileinode_error.phpt
+++ b/ext/standard/tests/file/fileinode_error.phpt
@@ -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 ***";
diff --git a/ext/standard/tests/file/fstat_variation1.phpt b/ext/standard/tests/file/fstat_variation1.phpt
index b2ad54196c..14b7b31c4b 100644
--- a/ext/standard/tests/file/fstat_variation1.phpt
+++ b/ext/standard/tests/file/fstat_variation1.phpt
@@ -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);
diff --git a/ext/standard/tests/file/fstat_variation2.phpt b/ext/standard/tests/file/fstat_variation2.phpt
index fd62f23b60..6368c3b849 100644
--- a/ext/standard/tests/file/fstat_variation2.phpt
+++ b/ext/standard/tests/file/fstat_variation2.phpt
@@ -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(
diff --git a/ext/standard/tests/file/fstat_variation3.phpt b/ext/standard/tests/file/fstat_variation3.phpt
index 4cd74e3c14..59de1bbfc1 100644
--- a/ext/standard/tests/file/fstat_variation3.phpt
+++ b/ext/standard/tests/file/fstat_variation3.phpt
@@ -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;
diff --git a/ext/standard/tests/file/fstat_variation4.phpt b/ext/standard/tests/file/fstat_variation4.phpt
index 16497760b8..dc2575f7d0 100644
--- a/ext/standard/tests/file/fstat_variation4.phpt
+++ b/ext/standard/tests/file/fstat_variation4.phpt
@@ -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(
diff --git a/ext/standard/tests/file/fstat_variation5.phpt b/ext/standard/tests/file/fstat_variation5.phpt
index ef4f4eaf3d..6f98da81e7 100644
--- a/ext/standard/tests/file/fstat_variation5.phpt
+++ b/ext/standard/tests/file/fstat_variation5.phpt
@@ -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 (
diff --git a/ext/standard/tests/file/fstat_variation6.phpt b/ext/standard/tests/file/fstat_variation6.phpt
index 0789ff7a93..01f6d36199 100644
--- a/ext/standard/tests/file/fstat_variation6.phpt
+++ b/ext/standard/tests/file/fstat_variation6.phpt
@@ -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
 
diff --git a/ext/standard/tests/file/fstat_variation7.phpt b/ext/standard/tests/file/fstat_variation7.phpt
index 1f3f001b25..5a55dceb9a 100644
--- a/ext/standard/tests/file/fstat_variation7.phpt
+++ b/ext/standard/tests/file/fstat_variation7.phpt
@@ -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
diff --git a/ext/standard/tests/strings/chunk_split_error.phpt b/ext/standard/tests/strings/chunk_split_error.phpt
index 9313b65b5b..341f04ffd3 100644
--- a/ext/standard/tests/strings/chunk_split_error.phpt
+++ b/ext/standard/tests/strings/chunk_split_error.phpt
@@ -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";
diff --git a/ext/standard/user_filters.c b/ext/standard/user_filters.c
index b009e67aa1..b44be124a1 100644
--- a/ext/standard/user_filters.c
+++ b/ext/standard/user_filters.c
@@ -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) {
diff --git a/ext/zlib/tests/gzfile_variation1.phpt b/ext/zlib/tests/gzfile_variation1.phpt
index 767abb7e30..131170b4b7 100644
--- a/ext/zlib/tests/gzfile_variation1.phpt
+++ b/ext/zlib/tests/gzfile_variation1.phpt
@@ -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');
diff --git a/ext/zlib/tests/gzfile_variation10.phpt b/ext/zlib/tests/gzfile_variation10.phpt
index 2a6d8915d0..20de8cb535 100644
--- a/ext/zlib/tests/gzfile_variation10.phpt
+++ b/ext/zlib/tests/gzfile_variation10.phpt
@@ -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');
diff --git a/ext/zlib/tests/gzfile_variation11.phpt b/ext/zlib/tests/gzfile_variation11.phpt
index 02faa4501f..a3585e5420 100644
--- a/ext/zlib/tests/gzfile_variation11.phpt
+++ b/ext/zlib/tests/gzfile_variation11.phpt
@@ -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');
diff --git a/ext/zlib/tests/gzfile_variation12.phpt b/ext/zlib/tests/gzfile_variation12.phpt
index a8efc7616c..be28f01681 100644
--- a/ext/zlib/tests/gzfile_variation12.phpt
+++ b/ext/zlib/tests/gzfile_variation12.phpt
@@ -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');
diff --git a/ext/zlib/tests/gzfile_variation13.phpt b/ext/zlib/tests/gzfile_variation13.phpt
index 8014d7d9d9..4198c474df 100644
--- a/ext/zlib/tests/gzfile_variation13.phpt
+++ b/ext/zlib/tests/gzfile_variation13.phpt
@@ -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');
diff --git a/ext/zlib/tests/gzfile_variation14.phpt b/ext/zlib/tests/gzfile_variation14.phpt
index 8eb183c1c8..7462bea809 100644
--- a/ext/zlib/tests/gzfile_variation14.phpt
+++ b/ext/zlib/tests/gzfile_variation14.phpt
@@ -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');
diff --git a/ext/zlib/tests/gzfile_variation2.phpt b/ext/zlib/tests/gzfile_variation2.phpt
index 2f75c7f81a..ba487435cd 100644
--- a/ext/zlib/tests/gzfile_variation2.phpt
+++ b/ext/zlib/tests/gzfile_variation2.phpt
@@ -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');
diff --git a/ext/zlib/tests/gzfile_variation3.phpt b/ext/zlib/tests/gzfile_variation3.phpt
index 8a6f2cec2c..cf4520d412 100644
--- a/ext/zlib/tests/gzfile_variation3.phpt
+++ b/ext/zlib/tests/gzfile_variation3.phpt
@@ -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');
diff --git a/ext/zlib/tests/gzfile_variation4.phpt b/ext/zlib/tests/gzfile_variation4.phpt
index b3c8ac483c..3310231566 100644
--- a/ext/zlib/tests/gzfile_variation4.phpt
+++ b/ext/zlib/tests/gzfile_variation4.phpt
@@ -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');
diff --git a/ext/zlib/tests/gzfile_variation5.phpt b/ext/zlib/tests/gzfile_variation5.phpt
index 5e210b653f..6a874a5786 100644
--- a/ext/zlib/tests/gzfile_variation5.phpt
+++ b/ext/zlib/tests/gzfile_variation5.phpt
@@ -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');
diff --git a/ext/zlib/tests/gzfile_variation6.phpt b/ext/zlib/tests/gzfile_variation6.phpt
index 1ce1be6591..64168180fc 100644
--- a/ext/zlib/tests/gzfile_variation6.phpt
+++ b/ext/zlib/tests/gzfile_variation6.phpt
@@ -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');
diff --git a/ext/zlib/tests/gzfile_variation7.phpt b/ext/zlib/tests/gzfile_variation7.phpt
index b441dd670e..c9dd298269 100644
--- a/ext/zlib/tests/gzfile_variation7.phpt
+++ b/ext/zlib/tests/gzfile_variation7.phpt
@@ -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');
diff --git a/ext/zlib/tests/gzfile_variation8.phpt b/ext/zlib/tests/gzfile_variation8.phpt
index 32d969326c..50d042218c 100644
--- a/ext/zlib/tests/gzfile_variation8.phpt
+++ b/ext/zlib/tests/gzfile_variation8.phpt
@@ -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');
diff --git a/ext/zlib/tests/gzfile_variation9.phpt b/ext/zlib/tests/gzfile_variation9.phpt
index c2c24ae26c..3675dcbef9 100644
--- a/ext/zlib/tests/gzfile_variation9.phpt
+++ b/ext/zlib/tests/gzfile_variation9.phpt
@@ -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');
diff --git a/ext/zlib/tests/readgzfile_variation1.phpt b/ext/zlib/tests/readgzfile_variation1.phpt
index e31824ce1f..5a5ec4f6e7 100644
--- a/ext/zlib/tests/readgzfile_variation1.phpt
+++ b/ext/zlib/tests/readgzfile_variation1.phpt
@@ -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');
diff --git a/ext/zlib/tests/readgzfile_variation10.phpt b/ext/zlib/tests/readgzfile_variation10.phpt
index 29249a1f2b..bc6cc5b452 100644
--- a/ext/zlib/tests/readgzfile_variation10.phpt
+++ b/ext/zlib/tests/readgzfile_variation10.phpt
@@ -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');
diff --git a/ext/zlib/tests/readgzfile_variation11.phpt b/ext/zlib/tests/readgzfile_variation11.phpt
index 4023211ff1..01dc78721d 100644
--- a/ext/zlib/tests/readgzfile_variation11.phpt
+++ b/ext/zlib/tests/readgzfile_variation11.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test function readgzfile() by substituting agument 2 with float values.
+Test function readgzfile() by substituting argument 2 with float values.
 --SKIPIF--
 <?php
 if (!extension_loaded('zlib')) die ('skip zlib extension not available in this build');
diff --git a/ext/zlib/tests/readgzfile_variation12.phpt b/ext/zlib/tests/readgzfile_variation12.phpt
index 8c291a4f46..06486acdd0 100644
--- a/ext/zlib/tests/readgzfile_variation12.phpt
+++ b/ext/zlib/tests/readgzfile_variation12.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test function readgzfile() by substituting agument 2 with int values.
+Test function readgzfile() by substituting argument 2 with int values.
 --SKIPIF--
 <?php
 if (!extension_loaded('zlib')) die ('skip zlib extension not available in this build');
diff --git a/ext/zlib/tests/readgzfile_variation13.phpt b/ext/zlib/tests/readgzfile_variation13.phpt
index 117860eb40..db1bd892a5 100644
--- a/ext/zlib/tests/readgzfile_variation13.phpt
+++ b/ext/zlib/tests/readgzfile_variation13.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test function readgzfile() by substituting agument 2 with object values.
+Test function readgzfile() by substituting argument 2 with object values.
 --SKIPIF--
 <?php
 if (!extension_loaded('zlib')) die ('skip zlib extension not available in this build');
diff --git a/ext/zlib/tests/readgzfile_variation14.phpt b/ext/zlib/tests/readgzfile_variation14.phpt
index ee0d6d6d4e..90081a9465 100644
--- a/ext/zlib/tests/readgzfile_variation14.phpt
+++ b/ext/zlib/tests/readgzfile_variation14.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test function readgzfile() by substituting agument 2 with string values.
+Test function readgzfile() by substituting argument 2 with string values.
 --SKIPIF--
 <?php
 if (!extension_loaded('zlib')) die ('skip zlib extension not available in this build');
diff --git a/ext/zlib/tests/readgzfile_variation2.phpt b/ext/zlib/tests/readgzfile_variation2.phpt
index 367cc401b3..53a9f3e31e 100644
--- a/ext/zlib/tests/readgzfile_variation2.phpt
+++ b/ext/zlib/tests/readgzfile_variation2.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test function readgzfile() by substituting agument 1 with boolean values.
+Test function readgzfile() by substituting argument 1 with boolean values.
 --SKIPIF--
 <?php
 if (!extension_loaded('zlib')) die ('skip zlib extension not available in this build');
diff --git a/ext/zlib/tests/readgzfile_variation3.phpt b/ext/zlib/tests/readgzfile_variation3.phpt
index 6645d67b7a..8afb16946e 100644
--- a/ext/zlib/tests/readgzfile_variation3.phpt
+++ b/ext/zlib/tests/readgzfile_variation3.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test function readgzfile() by substituting agument 1 with emptyUnsetUndefNull values.
+Test function readgzfile() by substituting argument 1 with emptyUnsetUndefNull values.
 --SKIPIF--
 <?php
 if (!extension_loaded('zlib')) die ('skip zlib extension not available in this build');
diff --git a/ext/zlib/tests/readgzfile_variation4.phpt b/ext/zlib/tests/readgzfile_variation4.phpt
index ece84a990e..00211f7dfe 100644
--- a/ext/zlib/tests/readgzfile_variation4.phpt
+++ b/ext/zlib/tests/readgzfile_variation4.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test function readgzfile() by substituting agument 1 with float values.
+Test function readgzfile() by substituting argument 1 with float values.
 --SKIPIF--
 <?php
 if (!extension_loaded(zlib)) die ('skip zlib extension not available in this build');
diff --git a/ext/zlib/tests/readgzfile_variation5.phpt b/ext/zlib/tests/readgzfile_variation5.phpt
index 460e188930..2aa83fde3b 100644
--- a/ext/zlib/tests/readgzfile_variation5.phpt
+++ b/ext/zlib/tests/readgzfile_variation5.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test function readgzfile() by substituting agument 1 with int values.
+Test function readgzfile() by substituting argument 1 with int values.
 --SKIPIF--
 <?php
 if (!extension_loaded('zlib')) die ('skip zlib extension not available in this build');
diff --git a/ext/zlib/tests/readgzfile_variation6.phpt b/ext/zlib/tests/readgzfile_variation6.phpt
index 69a4dc190a..702f91850e 100644
--- a/ext/zlib/tests/readgzfile_variation6.phpt
+++ b/ext/zlib/tests/readgzfile_variation6.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test function readgzfile() by substituting agument 1 with object values.
+Test function readgzfile() by substituting argument 1 with object values.
 --SKIPIF--
 <?php
 if (!extension_loaded('zlib')) die ('skip zlib extension not available in this build');
diff --git a/ext/zlib/tests/readgzfile_variation7.phpt b/ext/zlib/tests/readgzfile_variation7.phpt
index 20162b5cb5..f4abdac9b5 100644
--- a/ext/zlib/tests/readgzfile_variation7.phpt
+++ b/ext/zlib/tests/readgzfile_variation7.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test function readgzfile() by substituting agument 1 with string values.
+Test function readgzfile() by substituting argument 1 with string values.
 --SKIPIF--
 <?php
 if (!extension_loaded('zlib')) die ('skip zlib extension not available in this build');
diff --git a/ext/zlib/tests/readgzfile_variation8.phpt b/ext/zlib/tests/readgzfile_variation8.phpt
index 2e155288fa..291b69efcf 100644
--- a/ext/zlib/tests/readgzfile_variation8.phpt
+++ b/ext/zlib/tests/readgzfile_variation8.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test function readgzfile() by substituting agument 2 with array values.
+Test function readgzfile() by substituting argument 2 with array values.
 --SKIPIF--
 <?php
 if (!extension_loaded('zlib')) die ('skip zlib extension not available in this build');
diff --git a/ext/zlib/tests/readgzfile_variation9.phpt b/ext/zlib/tests/readgzfile_variation9.phpt
index 5cdb5b5da5..d90058f8d2 100644
--- a/ext/zlib/tests/readgzfile_variation9.phpt
+++ b/ext/zlib/tests/readgzfile_variation9.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test function readgzfile() by substituting agument 2 with boolean values.
+Test function readgzfile() by substituting argument 2 with boolean values.
 --SKIPIF--
 <?php
 if (!extension_loaded('zlib')) die ('skip zlib extension not available in this build');
diff --git a/sapi/fpm/php-fpm.conf.in b/sapi/fpm/php-fpm.conf.in
index f4d6e06c3b..e0d80970af 100644
--- a/sapi/fpm/php-fpm.conf.in
+++ b/sapi/fpm/php-fpm.conf.in
@@ -10,7 +10,7 @@
 ; files from a glob(3) pattern. This directive can be used everywhere in the
 ; file.
 ; Relative path can also be used. They will be prefixed by:
-;  - the global prefix if it's been set (-p arguement)
+;  - the global prefix if it's been set (-p argument)
 ;  - @prefix@ otherwise
 ;include=etc/fpm.d/*.conf
 
diff --git a/sapi/isapi/stresstest/stresstest.cpp b/sapi/isapi/stresstest/stresstest.cpp
index 97824e6be8..9a5964a6ba 100644
--- a/sapi/isapi/stresstest/stresstest.cpp
+++ b/sapi/isapi/stresstest/stresstest.cpp
@@ -796,7 +796,7 @@ BOOL WINAPI ServerSupportFunction(HCONN hConn, DWORD dwHSERequest,
 
 	switch(dwHSERequest) {
 		case (HSE_REQ_SEND_RESPONSE_HEADER) :
-			lpszRespBuf = (char *)xmalloc(*lpdwSize);//+ 80);//accomodate our header
+			lpszRespBuf = (char *)xmalloc(*lpdwSize);//+ 80);//accommodate our header
 			if (!lpszRespBuf)
 				return FALSE;
 			wsprintf(lpszRespBuf,"%s",
diff --git a/scripts/dev/generate-phpt.phar b/scripts/dev/generate-phpt.phar
index d9e6ce4302..a12c040f9c 100644
--- a/scripts/dev/generate-phpt.phar
+++ b/scripts/dev/generate-phpt.phar
diff --git a/scripts/dev/generate-phpt/src/gtFunction.php b/scripts/dev/generate-phpt/src/gtFunction.php
index 74058216ee..47f4bafcb3 100644
--- a/scripts/dev/generate-phpt/src/gtFunction.php
+++ b/scripts/dev/generate-phpt/src/gtFunction.php
@@ -19,7 +19,7 @@ class gtFunction extends gtTestSubject {
 
 
   /**
-   * Get the names of function argments and initialise mandatory and optional argument arrays
+   * Get the names of function arguments and initialise mandatory and optional argument arrays
    *
    */
   public function setArgumentNames() {
diff --git a/win32/glob.c b/win32/glob.c
index a197f3bbee..1aeac78fda 100644
--- a/win32/glob.c
+++ b/win32/glob.c
@@ -689,7 +689,7 @@ glob3(pathbuf, pathbuf_last, pathend, pathend_last, pattern, pattern_last,
 
 
 /*
- * Extend the gl_pathv member of a glob_t structure to accomodate a new item,
+ * Extend the gl_pathv member of a glob_t structure to accommodate a new item,
  * add the new item, and update gl_pathc.
  *
  * This assumes the BSD realloc, which only copies the block when its size