Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  typo fixes (argument)
  typo fixes (accommodate, parameter)
  • Loading branch information...
commit 84e35fb2e0fcd7400d289e06395c975fc7a77816 2 parents cf5b3fb + 04145dc
Stanislav Malyshev smalyshev authored

Showing 62 changed files with 69 additions and 69 deletions. Show diff stats Hide diff stats

  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
2  README.PARAMETER_PARSING_API
@@ -43,7 +43,7 @@ See also https://wiki.php.net/rfc/zpp_improv#expose_zend_parse_arg_as_zend_parse
43 43 Type specifiers
44 44 ---------------
45 45 The following list shows the type specifier, its meaning and the parameter
46   - types that need to be passed by address. All passed paramaters are set
  46 + types that need to be passed by address. All passed parameters are set
47 47 if the PHP parameter is non optional and untouched if optional and the
48 48 parameter is not present. The only exception is O where the zend_class_entry*
49 49 has to be provided on input and is used to verify the PHP parameter is an
4 Zend/zend_API.h
@@ -465,7 +465,7 @@ ZEND_API extern const zend_fcall_info_cache empty_fcall_info_cache;
465 465 */
466 466 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);
467 467
468   -/** Clear argumens connected with zend_fcall_info *fci
  468 +/** Clear arguments connected with zend_fcall_info *fci
469 469 * If free_mem is not zero then the params array gets free'd as well
470 470 */
471 471 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
503 503 ZEND_API int zend_fcall_info_argn(zend_fcall_info *fci TSRMLS_DC, int argc, ...);
504 504
505 505 /** Call a function using information created by zend_fcall_info_init()/args().
506   - * If args is given then those replace the arguement info in fci is temporarily.
  506 + * If args is given then those replace the argument info in fci is temporarily.
507 507 */
508 508 ZEND_API int zend_fcall_info_call(zend_fcall_info *fci, zend_fcall_info_cache *fcc, zval **retval, zval *args TSRMLS_DC);
509 509
2  ext/intl/tests/badargs.phpt
... ... @@ -1,5 +1,5 @@
1 1 --TEST--
2   -Check that bad argumens return the same
  2 +Check that bad arguments return the same
3 3 --SKIPIF--
4 4 <?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
5 5 --FILE--
2  ext/pcre/pcrelib/NEWS
@@ -591,7 +591,7 @@ some of the new functionality in Perl 5.005.
591 591 Another (I hope this is the last!) change has been made to the API for the
592 592 pcre_compile() function. An additional argument has been added to make it
593 593 possible to pass over a pointer to character tables built in the current
594   -locale by pcre_maketables(). To use the default tables, this new arguement
  594 +locale by pcre_maketables(). To use the default tables, this new argument
595 595 should be passed as NULL.
596 596
597 597 IMPORTANT FOR THOSE UPGRADING FROM VERSION 2.05
4 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
761 761 while (SUCCESS == zend_hash_get_current_data(params, (void**)&param)) {
762 762 if(param->parameter) {
763 763 convert_to_string(param->parameter);
764   - /* accomodate a string that needs to be fully quoted
  764 + /* accommodate a string that needs to be fully quoted
765 765 bind placeholders are at least 2 characters, so
766   - the accomodate their own "'s
  766 + the accommodate their own "'s
767 767 */
768 768 newbuffer_len += padding * Z_STRLEN_P(param->parameter);
769 769 }
4 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
408 408 while (SUCCESS == zend_hash_get_current_data(params, (void**)&param)) {
409 409 if(param->parameter) {
410 410 convert_to_string(param->parameter);
411   - /* accomodate a string that needs to be fully quoted
  411 + /* accommodate a string that needs to be fully quoted
412 412 bind placeholders are at least 2 characters, so
413   - the accomodate their own "'s
  413 + the accommodate their own "'s
414 414 */
415 415 newbuffer_len += padding * Z_STRLEN_P(param->parameter);
416 416 }
4 ext/soap/php_sdl.c
@@ -40,8 +40,8 @@ static void delete_binding(void *binding);
40 40 static void delete_binding_persistent(void *binding);
41 41 static void delete_function(void *function);
42 42 static void delete_function_persistent(void *function);
43   -static void delete_parameter(void *paramater);
44   -static void delete_parameter_persistent(void *paramater);
  43 +static void delete_parameter(void *parameter);
  44 +static void delete_parameter_persistent(void *parameter);
45 45 static void delete_header(void *header);
46 46 static void delete_header_persistent(void *header);
47 47 static void delete_document(void *doc_ptr);
6 ext/sqlite3/libsqlite/sqlite3.c
@@ -93544,7 +93544,7 @@ static u8 minMaxQuery(Select *p){
93544 93544
93545 93545 /*
93546 93546 ** The select statement passed as the first argument is an aggregate query.
93547   -** The second argment is the associated aggregate-info object. This
  93547 +** The second argument is the associated aggregate-info object. This
93548 93548 ** function tests if the SELECT is of the form:
93549 93549 **
93550 93550 ** SELECT count(*) FROM <tbl>
@@ -93617,7 +93617,7 @@ SQLITE_PRIVATE int sqlite3IndexedByLookup(Parse *pParse, struct SrcList_item *pF
93617 93617 ** without worrying about messing up the presistent representation
93618 93618 ** of the view.
93619 93619 **
93620   -** (3) Add terms to the WHERE clause to accomodate the NATURAL keyword
  93620 +** (3) Add terms to the WHERE clause to accommodate the NATURAL keyword
93621 93621 ** on joins and the ON and USING clause of joins.
93622 93622 **
93623 93623 ** (4) Scan the list of columns in the result set (pEList) looking
@@ -96115,7 +96115,7 @@ SQLITE_PRIVATE void sqlite3CodeRowTriggerDirect(
96115 96115 /*
96116 96116 ** This is called to code the required FOR EACH ROW triggers for an operation
96117 96117 ** on table pTab. The operation to code triggers for (INSERT, UPDATE or DELETE)
96118   -** is given by the op paramater. The tr_tm parameter determines whether the
  96118 +** is given by the op parameter. The tr_tm parameter determines whether the
96119 96119 ** BEFORE or AFTER triggers are coded. If the operation is an UPDATE, then
96120 96120 ** parameter pChanges is passed the list of columns being modified.
96121 96121 **
2  ext/sqlite3/sqlite3.c
@@ -1409,7 +1409,7 @@ static int register_bound_parameter_to_sqlite(struct php_sqlite3_bound_param *pa
1409 1409 /* }}} */
1410 1410
1411 1411 /* {{{ proto bool SQLite3Stmt::bindParam(int parameter_number, mixed parameter [, int type])
1412   - Bind Paramater to a stmt variable. */
  1412 + Bind Parameter to a stmt variable. */
1413 1413 PHP_METHOD(sqlite3stmt, bindParam)
1414 1414 {
1415 1415 php_sqlite3_stmt *stmt_obj;
2  ext/standard/tests/array/009.phpt
@@ -94,7 +94,7 @@ var_dump( current($temp_array, $temp_array) );
94 94 var_dump( reset($temp_array, $temp_array) );
95 95 var_dump( next($temp_array, $temp_array) );
96 96
97   -// invalid args type, valid arguement: array
  97 +// invalid args type, valid argument: array
98 98 $int_var = 1;
99 99 $float_var = 1.5;
100 100 $string = "string";
4 ext/standard/tests/array/array_fill_keys_error.phpt
@@ -20,7 +20,7 @@ var_dump( array_fill_keys($keys, $val, $extra_arg) );
20 20 echo "\n-- Testing array_fill_keys() function with less than expected no. of arguments --\n";
21 21 var_dump( array_fill_keys($keys) );
22 22
23   -echo "\n-- Testing array_fill_keys() function with no argumets --\n";
  23 +echo "\n-- Testing array_fill_keys() function with no arguments --\n";
24 24 var_dump( array_fill_keys() );
25 25
26 26 echo "Done";
@@ -38,7 +38,7 @@ NULL
38 38 Warning: array_fill_keys() expects exactly 2 parameters, 1 given in %sarray_fill_keys_error.php on line %d
39 39 NULL
40 40
41   --- Testing array_fill_keys() function with no argumets --
  41 +-- Testing array_fill_keys() function with no arguments --
42 42
43 43 Warning: array_fill_keys() expects exactly 2 parameters, 0 given in %sarray_fill_keys_error.php on line %d
44 44 NULL
2  ext/standard/tests/array/array_merge.phpt
@@ -79,7 +79,7 @@ echo "\n*** Testing array_merge() with typecasting non-array to array ***\n";
79 79 var_dump(array_merge($begin_array[4], (array)"type1", (array)10, (array)12.34));
80 80
81 81 echo "\n*** Testing error conditions ***";
82   -/* Invalid argumens */
  82 +/* Invalid arguments */
83 83 var_dump(array_merge());
84 84 var_dump(array_merge(100, 200));
85 85 var_dump(array_merge($begin_array[0], $begin_array[1], 100));
2  ext/standard/tests/array/array_walk_basic2.phpt
@@ -25,7 +25,7 @@ function test_alter(&$item, $key, $prefix)
25 25 // with proper type
26 26 var_dump($item); // value
27 27 var_dump($key); // key
28   - var_dump($prefix); // additional agument passed to callback function
  28 + var_dump($prefix); // additional argument passed to callback function
29 29 echo "\n"; // new line to separate the output between each element
30 30 }
31 31
2  ext/standard/tests/array/array_walk_recursive_basic2.phpt
@@ -25,7 +25,7 @@ function test_alter(&$item, $key, $prefix)
25 25 // with proper type
26 26 var_dump($item); // value
27 27 var_dump($key); // key
28   - var_dump($prefix); // additional agument passed to callback function
  28 + var_dump($prefix); // additional argument passed to callback function
29 29 echo "\n"; // new line to separate the output between each element
30 30 }
31 31
2  ext/standard/tests/class_object/class_exists_variation_001.phpt
... ... @@ -1,5 +1,5 @@
1 1 --TEST--
2   -Test class_exists() function : usage variations - unexpected types for agument 1
  2 +Test class_exists() function : usage variations - unexpected types for argument 1
3 3 --FILE--
4 4 <?php
5 5 /* Prototype : proto bool class_exists(string classname [, bool autoload])
2  ext/standard/tests/class_object/class_exists_variation_002.phpt
... ... @@ -1,5 +1,5 @@
1 1 --TEST--
2   -Test class_exists() function : usage variations - unexpected types for agument 2
  2 +Test class_exists() function : usage variations - unexpected types for argument 2
3 3 --FILE--
4 4 <?php
5 5 /* Prototype : proto bool class_exists(string classname [, bool autoload])
2  ext/standard/tests/class_object/trait_exists_variation_001.phpt
... ... @@ -1,5 +1,5 @@
1 1 --TEST--
2   -Test trait_exists() function : usage variations - unexpected types for agument 1
  2 +Test trait_exists() function : usage variations - unexpected types for argument 1
3 3 --FILE--
4 4 <?php
5 5 /* Prototype : proto bool trait_exists(string traitname [, bool autoload])
2  ext/standard/tests/class_object/trait_exists_variation_002.phpt
... ... @@ -1,5 +1,5 @@
1 1 --TEST--
2   -Test trait_exists() function : usage variations - unexpected types for agument 2
  2 +Test trait_exists() function : usage variations - unexpected types for argument 2
3 3 --FILE--
4 4 <?php
5 5 /* Prototype : proto bool trait_exists(string traitname [, bool autoload])
2  ext/standard/tests/file/005_error.phpt
@@ -23,7 +23,7 @@ Test fileatime(), filemtime(), filectime() & touch() functions : error condition
23 23 echo "*** Testing error conditions ***\n";
24 24
25 25 echo "\n-- Testing with Non-existing files --";
26   -/* Both invalid argumetns */
  26 +/* Both invalid arguments */
27 27 var_dump( fileatime("/no/such/file/or/dir") );
28 28 var_dump( filemtime("/no/such/file/or/dir") );
29 29 var_dump( filectime("/no/such/file/or/dir") );
4 ext/standard/tests/file/fileinode_error.phpt
@@ -16,10 +16,10 @@ var_dump( fileinode("/no/such/file/dir") );
16 16 var_dump( fileinode("string") );
17 17 var_dump( fileinode(100) );
18 18
19   -/* No.of argumetns less than expected */
  19 +/* No.of arguments less than expected */
20 20 var_dump( fileinode() );
21 21
22   -/* No.of argumetns greater than expected */
  22 +/* No.of arguments greater than expected */
23 23 var_dump( fileinode(__FILE__, "string") );
24 24
25 25 echo "\n*** Done ***";
2  ext/standard/tests/file/fstat_variation1.phpt
... ... @@ -1,5 +1,5 @@
1 1 --TEST--
2   -Test function fstat() by substituting agument 1 with array values.
  2 +Test function fstat() by substituting argument 1 with array values.
3 3 --FILE--
4 4 <?php
5 5 $index_array = array(1, 2, 3);
2  ext/standard/tests/file/fstat_variation2.phpt
... ... @@ -1,5 +1,5 @@
1 1 --TEST--
2   -Test function fstat() by substituting agument 1 with boolean values.
  2 +Test function fstat() by substituting argument 1 with boolean values.
3 3 --FILE--
4 4 <?php
5 5 $variation_array = array(
2  ext/standard/tests/file/fstat_variation3.phpt
... ... @@ -1,5 +1,5 @@
1 1 --TEST--
2   -Test function fstat() by substituting agument 1 with emptyUnsetUndefNull values.
  2 +Test function fstat() by substituting argument 1 with emptyUnsetUndefNull values.
3 3 --FILE--
4 4 <?php
5 5 $unset_var = 10;
2  ext/standard/tests/file/fstat_variation4.phpt
... ... @@ -1,5 +1,5 @@
1 1 --TEST--
2   -Test function fstat() by substituting agument 1 with float values.
  2 +Test function fstat() by substituting argument 1 with float values.
3 3 --FILE--
4 4 <?php
5 5 $variation_array = array(
2  ext/standard/tests/file/fstat_variation5.phpt
... ... @@ -1,5 +1,5 @@
1 1 --TEST--
2   -Test function fstat() by substituting agument 1 with int values.
  2 +Test function fstat() by substituting argument 1 with int values.
3 3 --FILE--
4 4 <?php
5 5 $variation_array = array (
2  ext/standard/tests/file/fstat_variation6.phpt
... ... @@ -1,5 +1,5 @@
1 1 --TEST--
2   -Test function fstat() by substituting agument 1 with object values.
  2 +Test function fstat() by substituting argument 1 with object values.
3 3 --FILE--
4 4 <?php
5 5
2  ext/standard/tests/file/fstat_variation7.phpt
... ... @@ -1,5 +1,5 @@
1 1 --TEST--
2   -Test function fstat() by substituting agument 1 with string values.
  2 +Test function fstat() by substituting argument 1 with string values.
3 3 --FILE--
4 4 <?php
5 5 $heredoc = <<<EOT
2  ext/standard/tests/strings/chunk_split_error.phpt
@@ -10,7 +10,7 @@ Test chunk_split() function : error conditions
10 10
11 11 /*
12 12 * Testing error conditions of chunk_split() with zero arguments
13   -* and for more than expected number of argments
  13 +* and for more than expected number of arguments
14 14 */
15 15
16 16 echo "*** Testing chunk_split() : error conditions ***\n";
2  ext/standard/user_filters.c
@@ -474,7 +474,7 @@ static void php_stream_bucket_attach(int append, INTERNAL_FUNCTION_PARAMETERS)
474 474 } else {
475 475 php_stream_bucket_prepend(brigade, bucket TSRMLS_CC);
476 476 }
477   - /* This is a hack necessary to accomodate situations where bucket is appended to the stream
  477 + /* This is a hack necessary to accommodate situations where bucket is appended to the stream
478 478 * multiple times. See bug35916.phpt for reference.
479 479 */
480 480 if (bucket->refcount == 1) {
2  ext/zlib/tests/gzfile_variation1.phpt
... ... @@ -1,5 +1,5 @@
1 1 --TEST--
2   -Test function gzfile() by substituting agument 1 with array values.
  2 +Test function gzfile() by substituting argument 1 with array values.
3 3 --SKIPIF--
4 4 <?php
5 5 if (!extension_loaded('zlib')) die ('skip zlib extension not available in this build');
2  ext/zlib/tests/gzfile_variation10.phpt
... ... @@ -1,5 +1,5 @@
1 1 --TEST--
2   -Test function gzfile() by substituting agument 2 with emptyUnsetUndefNull values.
  2 +Test function gzfile() by substituting argument 2 with emptyUnsetUndefNull values.
3 3 --SKIPIF--
4 4 <?php
5 5 if (!extension_loaded('zlib')) die ('skip zlib extension not available in this build');
2  ext/zlib/tests/gzfile_variation11.phpt
... ... @@ -1,5 +1,5 @@
1 1 --TEST--
2   -Test function gzfile() by substituting agument 2 with float values.
  2 +Test function gzfile() by substituting argument 2 with float values.
3 3 --SKIPIF--
4 4 <?php
5 5 if (!extension_loaded('zlib')) die ('skip zlib extension not available in this build');
2  ext/zlib/tests/gzfile_variation12.phpt
... ... @@ -1,5 +1,5 @@
1 1 --TEST--
2   -Test function gzfile() by substituting agument 2 with int values.
  2 +Test function gzfile() by substituting argument 2 with int values.
3 3 --SKIPIF--
4 4 <?php
5 5 if (!extension_loaded('zlib')) die ('skip zlib extension not available in this build');
2  ext/zlib/tests/gzfile_variation13.phpt
... ... @@ -1,5 +1,5 @@
1 1 --TEST--
2   -Test function gzfile() by substituting agument 2 with object values.
  2 +Test function gzfile() by substituting argument 2 with object values.
3 3 --SKIPIF--
4 4 <?php
5 5 if (!extension_loaded('zlib')) die ('skip zlib extension not available in this build');
2  ext/zlib/tests/gzfile_variation14.phpt
... ... @@ -1,5 +1,5 @@
1 1 --TEST--
2   -Test function gzfile() by substituting agument 2 with string values.
  2 +Test function gzfile() by substituting argument 2 with string values.
3 3 --SKIPIF--
4 4 <?php
5 5 if (!extension_loaded('zlib')) die ('skip zlib extension not available in this build');
2  ext/zlib/tests/gzfile_variation2.phpt
... ... @@ -1,5 +1,5 @@
1 1 --TEST--
2   -Test function gzfile() by substituting agument 1 with boolean values.
  2 +Test function gzfile() by substituting argument 1 with boolean values.
3 3 --SKIPIF--
4 4 <?php
5 5 if (!extension_loaded('zlib')) die ('skip zlib extension not available in this build');
2  ext/zlib/tests/gzfile_variation3.phpt
... ... @@ -1,5 +1,5 @@
1 1 --TEST--
2   -Test function gzfile() by substituting agument 1 with emptyUnsetUndefNull values.
  2 +Test function gzfile() by substituting argument 1 with emptyUnsetUndefNull values.
3 3 --SKIPIF--
4 4 <?php
5 5 if (!extension_loaded('zlib')) die ('skip zlib extension not available in this build');
2  ext/zlib/tests/gzfile_variation4.phpt
... ... @@ -1,5 +1,5 @@
1 1 --TEST--
2   -Test function gzfile() by substituting agument 1 with float values.
  2 +Test function gzfile() by substituting argument 1 with float values.
3 3 --SKIPIF--
4 4 <?php
5 5 if (!extension_loaded(zlib)) die ('skip zlib extension not available in this build');
2  ext/zlib/tests/gzfile_variation5.phpt
... ... @@ -1,5 +1,5 @@
1 1 --TEST--
2   -Test function gzfile() by substituting agument 1 with int values.
  2 +Test function gzfile() by substituting argument 1 with int values.
3 3 --SKIPIF--
4 4 <?php
5 5 if (!extension_loaded('zlib')) die ('skip zlib extension not available in this build');
2  ext/zlib/tests/gzfile_variation6.phpt
... ... @@ -1,5 +1,5 @@
1 1 --TEST--
2   -Test function gzfile() by substituting agument 1 with object values.
  2 +Test function gzfile() by substituting argument 1 with object values.
3 3 --SKIPIF--
4 4 <?php
5 5 if (!extension_loaded('zlib')) die ('skip zlib extension not available in this build');
2  ext/zlib/tests/gzfile_variation7.phpt
... ... @@ -1,5 +1,5 @@
1 1 --TEST--
2   -Test function gzfile() by substituting agument 1 with string values.
  2 +Test function gzfile() by substituting argument 1 with string values.
3 3 --SKIPIF--
4 4 <?php
5 5 if (!extension_loaded('zlib')) die ('skip zlib extension not available in this build');
2  ext/zlib/tests/gzfile_variation8.phpt
... ... @@ -1,5 +1,5 @@
1 1 --TEST--
2   -Test function gzfile() by substituting agument 2 with array values.
  2 +Test function gzfile() by substituting argument 2 with array values.
3 3 --SKIPIF--
4 4 <?php
5 5 if (!extension_loaded('zlib')) die ('skip zlib extension not available in this build');
2  ext/zlib/tests/gzfile_variation9.phpt
... ... @@ -1,5 +1,5 @@
1 1 --TEST--
2   -Test function gzfile() by substituting agument 2 with boolean values.
  2 +Test function gzfile() by substituting argument 2 with boolean values.
3 3 --SKIPIF--
4 4 <?php
5 5 if (!extension_loaded('zlib')) die ('skip zlib extension not available in this build');
2  ext/zlib/tests/readgzfile_variation1.phpt
... ... @@ -1,5 +1,5 @@
1 1 --TEST--
2   -Test function readgzfile() by substituting agument 1 with array values.
  2 +Test function readgzfile() by substituting argument 1 with array values.
3 3 --SKIPIF--
4 4 <?php
5 5 if (!extension_loaded('zlib')) die ('skip zlib extension not available in this build');
2  ext/zlib/tests/readgzfile_variation10.phpt
... ... @@ -1,5 +1,5 @@
1 1 --TEST--
2   -Test function readgzfile() by substituting agument 2 with emptyUnsetUndefNull values.
  2 +Test function readgzfile() by substituting argument 2 with emptyUnsetUndefNull values.
3 3 --SKIPIF--
4 4 <?php
5 5 if (!extension_loaded('zlib')) die ('skip zlib extension not available in this build');
2  ext/zlib/tests/readgzfile_variation11.phpt
... ... @@ -1,5 +1,5 @@
1 1 --TEST--
2   -Test function readgzfile() by substituting agument 2 with float values.
  2 +Test function readgzfile() by substituting argument 2 with float values.
3 3 --SKIPIF--
4 4 <?php
5 5 if (!extension_loaded('zlib')) die ('skip zlib extension not available in this build');
2  ext/zlib/tests/readgzfile_variation12.phpt
... ... @@ -1,5 +1,5 @@
1 1 --TEST--
2   -Test function readgzfile() by substituting agument 2 with int values.
  2 +Test function readgzfile() by substituting argument 2 with int values.
3 3 --SKIPIF--
4 4 <?php
5 5 if (!extension_loaded('zlib')) die ('skip zlib extension not available in this build');
2  ext/zlib/tests/readgzfile_variation13.phpt
... ... @@ -1,5 +1,5 @@
1 1 --TEST--
2   -Test function readgzfile() by substituting agument 2 with object values.
  2 +Test function readgzfile() by substituting argument 2 with object values.
3 3 --SKIPIF--
4 4 <?php
5 5 if (!extension_loaded('zlib')) die ('skip zlib extension not available in this build');
2  ext/zlib/tests/readgzfile_variation14.phpt
... ... @@ -1,5 +1,5 @@
1 1 --TEST--
2   -Test function readgzfile() by substituting agument 2 with string values.
  2 +Test function readgzfile() by substituting argument 2 with string values.
3 3 --SKIPIF--
4 4 <?php
5 5 if (!extension_loaded('zlib')) die ('skip zlib extension not available in this build');
2  ext/zlib/tests/readgzfile_variation2.phpt
... ... @@ -1,5 +1,5 @@
1 1 --TEST--
2   -Test function readgzfile() by substituting agument 1 with boolean values.
  2 +Test function readgzfile() by substituting argument 1 with boolean values.
3 3 --SKIPIF--
4 4 <?php
5 5 if (!extension_loaded('zlib')) die ('skip zlib extension not available in this build');
2  ext/zlib/tests/readgzfile_variation3.phpt
... ... @@ -1,5 +1,5 @@
1 1 --TEST--
2   -Test function readgzfile() by substituting agument 1 with emptyUnsetUndefNull values.
  2 +Test function readgzfile() by substituting argument 1 with emptyUnsetUndefNull values.
3 3 --SKIPIF--
4 4 <?php
5 5 if (!extension_loaded('zlib')) die ('skip zlib extension not available in this build');
2  ext/zlib/tests/readgzfile_variation4.phpt
... ... @@ -1,5 +1,5 @@
1 1 --TEST--
2   -Test function readgzfile() by substituting agument 1 with float values.
  2 +Test function readgzfile() by substituting argument 1 with float values.
3 3 --SKIPIF--
4 4 <?php
5 5 if (!extension_loaded(zlib)) die ('skip zlib extension not available in this build');
2  ext/zlib/tests/readgzfile_variation5.phpt
... ... @@ -1,5 +1,5 @@
1 1 --TEST--
2   -Test function readgzfile() by substituting agument 1 with int values.
  2 +Test function readgzfile() by substituting argument 1 with int values.
3 3 --SKIPIF--
4 4 <?php
5 5 if (!extension_loaded('zlib')) die ('skip zlib extension not available in this build');
2  ext/zlib/tests/readgzfile_variation6.phpt
... ... @@ -1,5 +1,5 @@
1 1 --TEST--
2   -Test function readgzfile() by substituting agument 1 with object values.
  2 +Test function readgzfile() by substituting argument 1 with object values.
3 3 --SKIPIF--
4 4 <?php
5 5 if (!extension_loaded('zlib')) die ('skip zlib extension not available in this build');
2  ext/zlib/tests/readgzfile_variation7.phpt
... ... @@ -1,5 +1,5 @@
1 1 --TEST--
2   -Test function readgzfile() by substituting agument 1 with string values.
  2 +Test function readgzfile() by substituting argument 1 with string values.
3 3 --SKIPIF--
4 4 <?php
5 5 if (!extension_loaded('zlib')) die ('skip zlib extension not available in this build');
2  ext/zlib/tests/readgzfile_variation8.phpt
... ... @@ -1,5 +1,5 @@
1 1 --TEST--
2   -Test function readgzfile() by substituting agument 2 with array values.
  2 +Test function readgzfile() by substituting argument 2 with array values.
3 3 --SKIPIF--
4 4 <?php
5 5 if (!extension_loaded('zlib')) die ('skip zlib extension not available in this build');
2  ext/zlib/tests/readgzfile_variation9.phpt
... ... @@ -1,5 +1,5 @@
1 1 --TEST--
2   -Test function readgzfile() by substituting agument 2 with boolean values.
  2 +Test function readgzfile() by substituting argument 2 with boolean values.
3 3 --SKIPIF--
4 4 <?php
5 5 if (!extension_loaded('zlib')) die ('skip zlib extension not available in this build');
2  sapi/fpm/php-fpm.conf.in
@@ -10,7 +10,7 @@
10 10 ; files from a glob(3) pattern. This directive can be used everywhere in the
11 11 ; file.
12 12 ; Relative path can also be used. They will be prefixed by:
13   -; - the global prefix if it's been set (-p arguement)
  13 +; - the global prefix if it's been set (-p argument)
14 14 ; - @prefix@ otherwise
15 15 ;include=etc/fpm.d/*.conf
16 16
2  sapi/isapi/stresstest/stresstest.cpp
@@ -796,7 +796,7 @@ BOOL WINAPI ServerSupportFunction(HCONN hConn, DWORD dwHSERequest,
796 796
797 797 switch(dwHSERequest) {
798 798 case (HSE_REQ_SEND_RESPONSE_HEADER) :
799   - lpszRespBuf = (char *)xmalloc(*lpdwSize);//+ 80);//accomodate our header
  799 + lpszRespBuf = (char *)xmalloc(*lpdwSize);//+ 80);//accommodate our header
800 800 if (!lpszRespBuf)
801 801 return FALSE;
802 802 wsprintf(lpszRespBuf,"%s",
BIN  scripts/dev/generate-phpt.phar
Binary file not shown
2  scripts/dev/generate-phpt/src/gtFunction.php
@@ -19,7 +19,7 @@ public function __construct($functionName) {
19 19
20 20
21 21 /**
22   - * Get the names of function argments and initialise mandatory and optional argument arrays
  22 + * Get the names of function arguments and initialise mandatory and optional argument arrays
23 23 *
24 24 */
25 25 public function setArgumentNames() {
2  win32/glob.c
@@ -689,7 +689,7 @@ glob3(pathbuf, pathbuf_last, pathend, pathend_last, pattern, pattern_last,
689 689
690 690
691 691 /*
692   - * Extend the gl_pathv member of a glob_t structure to accomodate a new item,
  692 + * Extend the gl_pathv member of a glob_t structure to accommodate a new item,
693 693 * add the new item, and update gl_pathc.
694 694 *
695 695 * This assumes the BSD realloc, which only copies the block when its size

0 comments on commit 84e35fb

Please sign in to comment.
Something went wrong with that request. Please try again.