From 84b195d9fc5ba2b65ceb46d8ec3d4676bf51a538 Mon Sep 17 00:00:00 2001 From: Gabriel Caruso Date: Thu, 9 Aug 2018 23:19:55 -0300 Subject: [PATCH] Fix some misspellings --- README.STREAMS | 2 +- Zend/tests/019.phpt | 4 +-- Zend/tests/assign_ref_error_var_handling.phpt | 2 +- Zend/tests/assign_to_obj_001.phpt | 2 +- Zend/tests/bug26698.phpt | 2 +- Zend/tests/bug32674.phpt | 2 +- Zend/tests/bug35017.phpt | 4 +-- Zend/tests/bug35437.phpt | 4 +-- Zend/tests/bug44660.phpt | 2 +- Zend/tests/bug51791.phpt | 2 +- Zend/tests/bug61165.phpt | 2 +- Zend/tests/bug63635.phpt | 8 ++--- Zend/tests/bug65784.phpt | 10 +++--- Zend/tests/bug69892.phpt | 2 +- Zend/tests/bug70012.phpt | 2 +- Zend/tests/bug75420.phpt | 2 +- Zend/tests/ns_010.phpt | 2 +- Zend/tests/ns_020.phpt | 2 +- Zend/tests/ns_064.phpt | 2 +- Zend/zend_alloc.c | 4 +-- Zend/zend_ast.c | 2 +- Zend/zend_compile.c | 2 +- Zend/zend_compile.h | 2 +- Zend/zend_exceptions.c | 2 +- Zend/zend_inheritance.c | 34 +++++++++---------- Zend/zend_interfaces.c | 2 +- Zend/zend_object_handlers.c | 2 +- ext/bcmath/bcmath.c | 2 +- ext/date/php_date.c | 4 +-- ext/exif/exif.c | 2 +- ext/fileinfo/fileinfo.c | 2 +- ext/imap/tests/imap_include.inc | 2 +- ext/imap/tests/skipif.inc | 2 +- ext/interbase/tests/skipif.inc | 2 +- ext/intl/locale/locale_methods.c | 6 ++-- ext/mysqli/mysqli_nonapi.c | 2 +- ext/oci8/oci8_failover.c | 2 +- ext/odbc/php_odbc.c | 6 ++-- ext/opcache/Optimizer/dce.c | 2 +- ext/opcache/Optimizer/sccp.c | 2 +- ext/opcache/ZendAccelerator.c | 2 +- ext/pgsql/pgsql.c | 2 +- ext/pgsql/php_pgsql.h | 2 +- ext/phar/phar/pharcommand.inc | 8 ++--- .../tests/zip/files/corrupt_zipmaker.php.inc | 4 +-- ext/reflection/php_reflection.c | 2 +- ext/session/session.c | 2 +- ext/soap/php_http.c | 4 +-- ext/spl/internal/multipleiterator.inc | 2 +- ext/spl/internal/recursivearrayiterator.inc | 4 +-- ext/spl/internal/recursivecachingiterator.inc | 2 +- ext/spl/internal/recursivefilteriterator.inc | 4 +-- .../internal/recursiveiteratoriterator.inc | 2 +- ext/spl/internal/splfileobject.inc | 2 +- ext/spl/internal/splobjectstorage.inc | 4 +-- ext/spl/php_spl.c | 2 +- ext/spl/spl.php | 6 ++-- ext/spl/spl_directory.c | 2 +- ext/spl/spl_observer.c | 2 +- ext/standard/config.m4 | 2 +- ext/standard/credits_ext.h | 2 +- ext/standard/credits_sapi.h | 2 +- ext/standard/file.c | 2 +- ext/standard/filestat.c | 2 +- ext/standard/image.c | 2 +- ext/standard/link_win32.c | 2 +- ext/standard/streamsfuncs.c | 2 +- ext/standard/tests/file/file.inc | 2 +- ext/standard/tests/mail/mail_include.inc | 2 +- ext/standard/tests/mail/mail_skipif.inc | 2 +- ext/zip/php_zip.c | 4 +-- main/main.c | 2 +- main/output.c | 2 +- main/snprintf.h | 2 +- main/streams/php_stream_filter_api.h | 2 +- run-tests.php | 2 +- sapi/cgi/cgi_main.c | 2 +- sapi/fpm/fpm/events/devpoll.c | 6 ++-- sapi/fpm/fpm/fpm_children.c | 4 +-- sapi/fpm/fpm/fpm_main.c | 2 +- sapi/fpm/fpm/fpm_request.c | 2 +- sapi/fpm/tests/fcgi.inc | 2 +- sapi/litespeed/lsapi_main.c | 2 +- sapi/phpdbg/phpdbg_cmd.c | 2 +- sapi/phpdbg/phpdbg_help.c | 2 +- sapi/phpdbg/phpdbg_prompt.c | 2 +- sapi/phpdbg/phpdbg_watch.c | 2 +- sapi/phpdbg/xml.md | 2 +- scripts/dev/credits | 2 +- server-tests.php | 2 +- tests/classes/class_abstract.phpt | 2 +- tests/classes/clone_004.phpt | 2 +- tests/classes/ctor_dtor_inheritance.phpt | 2 +- tests/output/ob_get_contents_basic_001.phpt | 4 +-- win32/sendmail.c | 4 +-- 95 files changed, 143 insertions(+), 143 deletions(-) diff --git a/README.STREAMS b/README.STREAMS index f22cab5d711..57dc6121172 100644 --- a/README.STREAMS +++ b/README.STREAMS @@ -364,7 +364,7 @@ php_stream_ops my_ops = { "Strange MySQL example" } -Thats it! +That's it! Take a look at the STDIO implementation in streams.c for more information about how these operations work. diff --git a/Zend/tests/019.phpt b/Zend/tests/019.phpt index 0548a38f883..a14a3aead63 100644 --- a/Zend/tests/019.phpt +++ b/Zend/tests/019.phpt @@ -149,7 +149,7 @@ foreach ($array_variables as $array_var) { var_dump( empty($array_var) ); // expected: bool(true) } -echo "\n*** Testing unset(), emtpy() & isset() with resource variables ***\n"; +echo "\n*** Testing unset(), empty() & isset() with resource variables ***\n"; $fp = fopen(__FILE__, "r"); $dfp = opendir( dirname(__FILE__) ); $resources = array ( @@ -1184,7 +1184,7 @@ bool(false) bool(false) bool(true) -*** Testing unset(), emtpy() & isset() with resource variables *** +*** Testing unset(), empty() & isset() with resource variables *** -- Iteration 1 -- resource(%d) of type (stream) bool(true) diff --git a/Zend/tests/assign_ref_error_var_handling.phpt b/Zend/tests/assign_ref_error_var_handling.phpt index ad016631312..5ecb577ba7c 100644 --- a/Zend/tests/assign_ref_error_var_handling.phpt +++ b/Zend/tests/assign_ref_error_var_handling.phpt @@ -1,5 +1,5 @@ --TEST-- -If the LHS of ref-assign ERRORs, that takes precendence over the "only variables" notice +If the LHS of ref-assign ERRORs, that takes precedence over the "only variables" notice --FILE-- current() !== false); } diff --git a/Zend/tests/bug35017.phpt b/Zend/tests/bug35017.phpt index 0a89d23aa18..3cd28a37555 100644 --- a/Zend/tests/bug35017.phpt +++ b/Zend/tests/bug35017.phpt @@ -11,11 +11,11 @@ try { } echo "?\n"; } catch(Exception $e) { - echo "This Exception should be catched\n"; + echo "This Exception should be caught\n"; } function errorHandler($errno, $errstr, $errfile, $errline, $vars) { throw new Exception('Some Exception'); } ?> --EXPECT-- -This Exception should be catched +This Exception should be caught diff --git a/Zend/tests/bug35437.phpt b/Zend/tests/bug35437.phpt index 73222a9f232..4f61e4fbfd5 100644 --- a/Zend/tests/bug35437.phpt +++ b/Zend/tests/bug35437.phpt @@ -20,8 +20,8 @@ class TestClass try { TestClass::testMethod(); } catch (Exception $e) { - echo "Catched: ".$e->getMessage()."\n"; + echo "Caught: ".$e->getMessage()."\n"; } ?> --EXPECT-- -Catched: Error occuried: Non-static method TestClass::testMethod() should not be called statically +Caught: Error occuried: Non-static method TestClass::testMethod() should not be called statically diff --git a/Zend/tests/bug44660.phpt b/Zend/tests/bug44660.phpt index 002744ce647..980c2274cda 100644 --- a/Zend/tests/bug44660.phpt +++ b/Zend/tests/bug44660.phpt @@ -1,5 +1,5 @@ --TEST-- -Bug #44660 (Indexed and reference assignment to propery of non-object don't trigger warning) +Bug #44660 (Indexed and reference assignment to property of non-object don't trigger warning) --FILE-- _this = $this; // <-- uncoment this + $this->_this = $this; // <-- uncomment this return 'A'; } } diff --git a/Zend/tests/bug63635.phpt b/Zend/tests/bug63635.phpt index 6f6fc6a44f4..a72d3dd31d2 100644 --- a/Zend/tests/bug63635.phpt +++ b/Zend/tests/bug63635.phpt @@ -4,17 +4,17 @@ Bug #63635 (Segfault in gc_collect_cycles) childs[] = $this; + $parent->children[] = $this; } - $this->childs[] = $this; + $this->children[] = $this; } function __destruct() { - $this->childs = NULL; + $this->children = NULL; } } diff --git a/Zend/tests/bug65784.phpt b/Zend/tests/bug65784.phpt index 663ea95761c..43369e2d607 100644 --- a/Zend/tests/bug65784.phpt +++ b/Zend/tests/bug65784.phpt @@ -8,7 +8,7 @@ function foo1() { return true; } finally { try { - throw new Exception("catched"); + throw new Exception("caught"); } catch (Exception $e) { } } @@ -25,11 +25,11 @@ try { function foo2() { try { try { - throw new Exception("catched"); + throw new Exception("caught"); return true; } finally { try { - throw new Exception("catched"); + throw new Exception("caught"); } catch (Exception $e) { } } @@ -42,7 +42,7 @@ var_dump($foo); function foo3() { try { - throw new Exception("not catched"); + throw new Exception("not caught"); return true; } finally { try { @@ -57,7 +57,7 @@ $bar = foo3(); string(9) "not catch" NULL -Fatal error: Uncaught Exception: not catched in %sbug65784.php:42 +Fatal error: Uncaught Exception: not caught in %sbug65784.php:42 Stack trace: #0 %sbug65784.php(52): foo3() #1 {main} diff --git a/Zend/tests/bug69892.phpt b/Zend/tests/bug69892.phpt index d14f85fa522..f6380449350 100644 --- a/Zend/tests/bug69892.phpt +++ b/Zend/tests/bug69892.phpt @@ -1,5 +1,5 @@ --TEST-- -Bug #69892: Different arrays compare indentical due to integer key truncation +Bug #69892: Different arrays compare identical due to integer key truncation --SKIPIF-- --FILE-- diff --git a/Zend/tests/bug70012.phpt b/Zend/tests/bug70012.phpt index 5337649d2d8..9e532218a91 100644 --- a/Zend/tests/bug70012.phpt +++ b/Zend/tests/bug70012.phpt @@ -15,7 +15,7 @@ try { echo " Inner finally\n"; } } - echo "Outer shouldnt get here\n"; + echo "Outer shouldn't get here\n"; } catch (Exception $e) { echo "Outer catch\n"; } finally { diff --git a/Zend/tests/bug75420.phpt b/Zend/tests/bug75420.phpt index 5528ad301b2..05ef8928791 100644 --- a/Zend/tests/bug75420.phpt +++ b/Zend/tests/bug75420.phpt @@ -1,5 +1,5 @@ --TEST-- -Bug #75420 (Crash when modifing property name in __isset for BP_VAR_IS) +Bug #75420 (Crash when modifying property name in __isset for BP_VAR_IS) --FILE-- opcode == ZEND_JMPNZ_EX || def->opcode == ZEND_BOOL || def->opcode == ZEND_BOOL_NOT) { - /* result IS_BOOL, it does't have to be destroyed */ + /* result IS_BOOL, it doesn't have to be destroyed */ break; } else if (def->opcode == ZEND_DECLARE_CLASS || def->opcode == ZEND_DECLARE_INHERITED_CLASS || diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h index e1bb9eb3763..53f646d930d 100644 --- a/Zend/zend_compile.h +++ b/Zend/zend_compile.h @@ -302,7 +302,7 @@ typedef struct _zend_oparray_context { /* | | | */ #define ZEND_ACC_GENERATOR (1 << 23) /* | X | | */ /* | | | */ -/* Function with varable number of arguments | | | */ +/* Function with variable number of arguments | | | */ #define ZEND_ACC_VARIADIC (1 << 24) /* | X | | */ /* | | | */ /* Immutable op_array (lazy loading) | | | */ diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c index e4f2a99da25..0c30a6be30b 100644 --- a/Zend/zend_exceptions.c +++ b/Zend/zend_exceptions.c @@ -761,7 +761,7 @@ static const zend_function_entry zend_funcs_throwable[] = { * such exceptions in that handler. * Also all getXY() methods are final because thy serve as read only access to * their corresponding properties, no more, no less. If after all you need to - * override somthing then it is method __toString(). + * override something then it is method __toString(). * And never try to change the state of exceptions and never implement anything * that gives the user anything to accomplish this. */ diff --git a/Zend/zend_inheritance.c b/Zend/zend_inheritance.c index 8af409f1919..9df10b3a975 100644 --- a/Zend/zend_inheritance.c +++ b/Zend/zend_inheritance.c @@ -25,7 +25,7 @@ #include "zend_smart_str.h" #include "zend_operators.h" -static void overriden_ptr_dtor(zval *zv) /* {{{ */ +static void overridden_ptr_dtor(zval *zv) /* {{{ */ { efree_size(Z_PTR_P(zv), sizeof(zend_function)); } @@ -1172,7 +1172,7 @@ static void zend_add_magic_methods(zend_class_entry* ce, zend_string* mname, zen } /* }}} */ -static void zend_add_trait_method(zend_class_entry *ce, const char *name, zend_string *key, zend_function *fn, HashTable **overriden) /* {{{ */ +static void zend_add_trait_method(zend_class_entry *ce, const char *name, zend_string *key, zend_function *fn, HashTable **overridden) /* {{{ */ { zend_function *existing_fn = NULL; zend_function *new_fn; @@ -1187,9 +1187,9 @@ static void zend_add_trait_method(zend_class_entry *ce, const char *name, zend_s if (existing_fn->common.scope == ce) { /* members from the current class override trait methods */ - /* use temporary *overriden HashTable to detect hidden conflict */ - if (*overriden) { - if ((existing_fn = zend_hash_find_ptr(*overriden, key)) != NULL) { + /* use temporary *overridden HashTable to detect hidden conflict */ + if (*overridden) { + if ((existing_fn = zend_hash_find_ptr(*overridden, key)) != NULL) { if (existing_fn->common.fn_flags & ZEND_ACC_ABSTRACT) { /* Make sure the trait method is compatible with previosly declared abstract method */ if (UNEXPECTED(!zend_traits_method_compatibility_check(fn, existing_fn))) { @@ -1209,10 +1209,10 @@ static void zend_add_trait_method(zend_class_entry *ce, const char *name, zend_s } } } else { - ALLOC_HASHTABLE(*overriden); - zend_hash_init_ex(*overriden, 8, NULL, overriden_ptr_dtor, 0, 0); + ALLOC_HASHTABLE(*overridden); + zend_hash_init_ex(*overridden, 8, NULL, overridden_ptr_dtor, 0, 0); } - zend_hash_update_mem(*overriden, key, fn, sizeof(zend_function)); + zend_hash_update_mem(*overridden, key, fn, sizeof(zend_function)); return; } else if (existing_fn->common.fn_flags & ZEND_ACC_ABSTRACT && (existing_fn->common.scope->ce_flags & ZEND_ACC_INTERFACE) == 0) { @@ -1274,7 +1274,7 @@ static void zend_fixup_trait_method(zend_function *fn, zend_class_entry *ce) /* } /* }}} */ -static int zend_traits_copy_functions(zend_string *fnname, zend_function *fn, zend_class_entry *ce, HashTable **overriden, HashTable *exclude_table, zend_class_entry **aliases) /* {{{ */ +static int zend_traits_copy_functions(zend_string *fnname, zend_function *fn, zend_class_entry *ce, HashTable **overridden, HashTable *exclude_table, zend_class_entry **aliases) /* {{{ */ { zend_trait_alias *alias, **alias_ptr; zend_string *lcname; @@ -1300,7 +1300,7 @@ static int zend_traits_copy_functions(zend_string *fnname, zend_function *fn, ze } lcname = zend_string_tolower(alias->alias); - zend_add_trait_method(ce, ZSTR_VAL(alias->alias), lcname, &fn_copy, overriden); + zend_add_trait_method(ce, ZSTR_VAL(alias->alias), lcname, &fn_copy, overridden); zend_string_release_ex(lcname, 0); /* Record the trait from which this alias was resolved. */ @@ -1352,7 +1352,7 @@ static int zend_traits_copy_functions(zend_string *fnname, zend_function *fn, ze } } - zend_add_trait_method(ce, ZSTR_VAL(fn->common.function_name), fnname, &fn_copy, overriden); + zend_add_trait_method(ce, ZSTR_VAL(fn->common.function_name), fnname, &fn_copy, overridden); } return ZEND_HASH_APPLY_KEEP; @@ -1496,7 +1496,7 @@ static void zend_traits_init_trait_structures(zend_class_entry *ce, HashTable ** static void zend_do_traits_method_binding(zend_class_entry *ce, HashTable **exclude_tables, zend_class_entry **aliases) /* {{{ */ { uint32_t i; - HashTable *overriden = NULL; + HashTable *overridden = NULL; zend_string *key; zend_function *fn; @@ -1504,7 +1504,7 @@ static void zend_do_traits_method_binding(zend_class_entry *ce, HashTable **excl for (i = 0; i < ce->num_traits; i++) { /* copies functions, applies defined aliasing, and excludes unused trait methods */ ZEND_HASH_FOREACH_STR_KEY_PTR(&ce->traits[i]->function_table, key, fn) { - zend_traits_copy_functions(key, fn, ce, &overriden, exclude_tables[i], aliases); + zend_traits_copy_functions(key, fn, ce, &overridden, exclude_tables[i], aliases); } ZEND_HASH_FOREACH_END(); if (exclude_tables[i]) { @@ -1516,7 +1516,7 @@ static void zend_do_traits_method_binding(zend_class_entry *ce, HashTable **excl } else { for (i = 0; i < ce->num_traits; i++) { ZEND_HASH_FOREACH_STR_KEY_PTR(&ce->traits[i]->function_table, key, fn) { - zend_traits_copy_functions(key, fn, ce, &overriden, NULL, aliases); + zend_traits_copy_functions(key, fn, ce, &overridden, NULL, aliases); } ZEND_HASH_FOREACH_END(); } } @@ -1525,9 +1525,9 @@ static void zend_do_traits_method_binding(zend_class_entry *ce, HashTable **excl zend_fixup_trait_method(fn, ce); } ZEND_HASH_FOREACH_END(); - if (overriden) { - zend_hash_destroy(overriden); - FREE_HASHTABLE(overriden); + if (overridden) { + zend_hash_destroy(overridden); + FREE_HASHTABLE(overridden); } } /* }}} */ diff --git a/Zend/zend_interfaces.c b/Zend/zend_interfaces.c index addc9e560f8..7ccfe1fa750 100644 --- a/Zend/zend_interfaces.c +++ b/Zend/zend_interfaces.c @@ -315,7 +315,7 @@ static int zend_implement_aggregate(zend_class_entry *interface, zend_class_entr /* inheritance ensures the class has necessary userland methods */ return SUCCESS; } else if (class_type->get_iterator != zend_user_it_get_new_iterator) { - /* c-level get_iterator cannot be changed (exception being only Traversable is implmented) */ + /* c-level get_iterator cannot be changed (exception being only Traversable is implemented) */ if (class_type->num_interfaces) { for (i = 0; i < class_type->num_interfaces; i++) { if (class_type->interfaces[i] == zend_ce_iterator) { diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c index ab7c06859e0..810e323f4e0 100644 --- a/Zend/zend_object_handlers.c +++ b/Zend/zend_object_handlers.c @@ -1424,7 +1424,7 @@ ZEND_API zval *zend_std_get_static_property(zend_class_entry *ce, zend_string *p } } - /* check if static properties were destoyed */ + /* check if static properties were destroyed */ if (UNEXPECTED(CE_STATIC_MEMBERS(ce) == NULL)) { if (ce->type == ZEND_INTERNAL_CLASS) { zend_intenal_class_init_statics(ce); diff --git a/ext/bcmath/bcmath.c b/ext/bcmath/bcmath.c index 9a39642a2d0..6404969b4f0 100644 --- a/ext/bcmath/bcmath.c +++ b/ext/bcmath/bcmath.c @@ -472,7 +472,7 @@ PHP_FUNCTION(bcpow) /* }}} */ /* {{{ proto string bcsqrt(string operand [, int scale]) - Returns the square root of an arbitray precision number */ + Returns the square root of an arbitrary precision number */ PHP_FUNCTION(bcsqrt) { zend_string *left; diff --git a/ext/date/php_date.c b/ext/date/php_date.c index 59eb4f2a8d1..507bdb4738b 100644 --- a/ext/date/php_date.c +++ b/ext/date/php_date.c @@ -786,7 +786,7 @@ PHP_RSHUTDOWN_FUNCTION(date) * Wdy, DD Mon YY HH:MM:SS TIMEZONE * There is no hope of having a complete list of timezones. Universal * Time (GMT), the North American timezones (PST, PDT, MST, MDT, CST, - * CDT, EST, EDT) and the +/-hhmm offset specifed in RFC-822 should be supported. + * CDT, EST, EDT) and the +/-hhmm offset specified in RFC-822 should be supported. */ #define DATE_FORMAT_RFC1036 "D, d M y H:i:s O" @@ -3935,7 +3935,7 @@ PHP_FUNCTION(timezone_name_get) /* }}} */ /* {{{ proto string timezone_name_from_abbr(string abbr[, int gmtOffset[, int isdst]]) - Returns the timezone name from abbrevation + Returns the timezone name from abbreviation */ PHP_FUNCTION(timezone_name_from_abbr) { diff --git a/ext/exif/exif.c b/ext/exif/exif.c index d0eb8f3203a..7b51e2f9a77 100644 --- a/ext/exif/exif.c +++ b/ext/exif/exif.c @@ -3368,7 +3368,7 @@ static int exif_process_IFD_TAG(image_info_type *ImageInfo, char *dir_entry, cha ImageInfo->CopyrightPhotographer = estrdup(value_ptr); ImageInfo->CopyrightEditor = estrndup(value_ptr+length+1, byte_count-length-1); spprintf(&ImageInfo->Copyright, 0, "%s, %s", ImageInfo->CopyrightPhotographer, ImageInfo->CopyrightEditor); - /* format = TAG_FMT_UNDEFINED; this musn't be ASCII */ + /* format = TAG_FMT_UNDEFINED; this mustn't be ASCII */ /* but we are not supposed to change this */ /* keep in mind that image_info does not store editor value */ } else { diff --git a/ext/fileinfo/fileinfo.c b/ext/fileinfo/fileinfo.c index 5565964c20f..9a7982041f7 100644 --- a/ext/fileinfo/fileinfo.c +++ b/ext/fileinfo/fileinfo.c @@ -604,7 +604,7 @@ PHP_FUNCTION(finfo_file) /* }}} */ /* {{{ proto string finfo_buffer(resource finfo, char *string [, int options [, resource context]]) - Return infromation about a string buffer. */ + Return information about a string buffer. */ PHP_FUNCTION(finfo_buffer) { _php_finfo_get_type(INTERNAL_FUNCTION_PARAM_PASSTHRU, FILEINFO_MODE_BUFFER, 0); diff --git a/ext/imap/tests/imap_include.inc b/ext/imap/tests/imap_include.inc index ccb1685d739..0425faa4ae3 100644 --- a/ext/imap/tests/imap_include.inc +++ b/ext/imap/tests/imap_include.inc @@ -178,7 +178,7 @@ function populate_mailbox($imap_stream, $mailbox, $message_count, $msg_type = "s } /** - * Get the mailbox name from a mailbox decription, i.e strip off server details. + * Get the mailbox name from a mailbox description, i.e strip off server details. * * @param string mailbox complete mailbox name * @return mailbox name diff --git a/ext/imap/tests/skipif.inc b/ext/imap/tests/skipif.inc index 19ad7893bdb..12b14086349 100644 --- a/ext/imap/tests/skipif.inc +++ b/ext/imap/tests/skipif.inc @@ -6,7 +6,7 @@ $mailbox = '{localhost/norsh}'; $username = 'webmaster@something.com'; $password = 'p4ssw0rd'; $options = OP_HALFOPEN; // this should be enough to verify server present -$retries = 0; // dont retry connect on failure +$retries = 0; // don't retry connect on failure $mbox = @imap_open($mailbox, $username, $password, $options, $retries); if (!$mbox) { diff --git a/ext/interbase/tests/skipif.inc b/ext/interbase/tests/skipif.inc index 37bf023f4df..c854f5bc995 100644 --- a/ext/interbase/tests/skipif.inc +++ b/ext/interbase/tests/skipif.inc @@ -3,6 +3,6 @@ if (!extension_loaded("interbase")) print "skip interbase extension not available"; require("interbase.inc"); if(!@ibase_connect($test_base)){ - die("skip cannot connnect"); + die("skip cannot connect"); } ?> diff --git a/ext/intl/locale/locale_methods.c b/ext/intl/locale/locale_methods.c index d710e1926a7..f971f4d77af 100644 --- a/ext/intl/locale/locale_methods.c +++ b/ext/intl/locale/locale_methods.c @@ -340,7 +340,7 @@ static zend_string* get_icu_value_internal( const char* loc_name , char* tag_nam continue; } - /* Error in retriving data */ + /* Error in retrieving data */ *result = 0; if( tag_value ){ zend_string_release_ex( tag_value, 0 ); @@ -1517,12 +1517,12 @@ static zend_string* lookup_loc_range(const char* loc_range, HashTable* hash_arr, /* }}} */ /* {{{ proto string Locale::lookup(array $langtag, string $locale[, bool $canonicalize[, string $default = null]]) -* Searchs the items in $langtag for the best match to the language +* Searches the items in $langtag for the best match to the language * range */ /* }}} */ /* {{{ proto string locale_lookup(array $langtag, string $locale[, bool $canonicalize[, string $default = null]]) -* Searchs the items in $langtag for the best match to the language +* Searches the items in $langtag for the best match to the language * range */ PHP_FUNCTION(locale_lookup) diff --git a/ext/mysqli/mysqli_nonapi.c b/ext/mysqli/mysqli_nonapi.c index 7b6c07d2e38..bd89006b7d3 100644 --- a/ext/mysqli/mysqli_nonapi.c +++ b/ext/mysqli/mysqli_nonapi.c @@ -155,7 +155,7 @@ void mysqli_common_connect(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_real_conne mysql->hash_key = hash_key; - /* check if we can reuse exisiting connection ... */ + /* check if we can reuse existing connection ... */ if ((le = zend_hash_find_ptr(&EG(persistent_list), hash_key)) != NULL) { if (le->type == php_le_pmysqli()) { plist = (mysqli_plist_entry *) le->ptr; diff --git a/ext/oci8/oci8_failover.c b/ext/oci8/oci8_failover.c index 106945ece77..ab279974581 100644 --- a/ext/oci8/oci8_failover.c +++ b/ext/oci8/oci8_failover.c @@ -71,7 +71,7 @@ sb4 callback_fn(void *svchp, void *envhp, void *fo_ctx, ub4 fo_type, ub4 fo_even returnValue = (sb4) Z_LVAL(retval); } - /* Setting params[0] to null so ressource isn't destroyed on zval_dtor */ + /* Setting params[0] to null so resource isn't destroyed on zval_dtor */ ZVAL_NULL(¶ms[0]); /* Cleanup */ diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c index c99862cd041..429ce073ae5 100644 --- a/ext/odbc/php_odbc.c +++ b/ext/odbc/php_odbc.c @@ -2247,7 +2247,7 @@ PHP_FUNCTION(odbc_result) efree(field); RETURN_NULL(); } - /* chop the trailing \0 by outputing only 4095 bytes */ + /* chop the trailing \0 by outputting only 4095 bytes */ PHPWRITE(field,(rc == SQL_SUCCESS_WITH_INFO) ? 4095 : result->values[field_ind].vallen); if (rc == SQL_SUCCESS) { /* no more data avail */ @@ -3043,7 +3043,7 @@ PHP_FUNCTION(odbc_errormsg) persistent connections. I think that SetStmtOption is of little use, since most of those can only be specified before preparing/executing statements. On the other hand, they can be made connection wide default through SetConnectOption - - but will be overidden by calls to SetStmtOption() in odbc_prepare/odbc_do + - but will be overridden by calls to SetStmtOption() in odbc_prepare/odbc_do */ PHP_FUNCTION(odbc_setoption) { @@ -3580,7 +3580,7 @@ PHP_FUNCTION(odbc_procedurecolumns) #if !defined(HAVE_SOLID) && !defined(HAVE_SOLID_30) && !defined(HAVE_SOLID_35) /* {{{ proto resource odbc_procedures(resource connection_id [, string qualifier, string owner, string name]) - Returns a result identifier containg the list of procedure names in a datasource */ + Returns a result identifier containing the list of procedure names in a datasource */ PHP_FUNCTION(odbc_procedures) { zval *pv_conn; diff --git a/ext/opcache/Optimizer/dce.c b/ext/opcache/Optimizer/dce.c index 58925975cad..4d0e40984b6 100644 --- a/ext/opcache/Optimizer/dce.c +++ b/ext/opcache/Optimizer/dce.c @@ -127,7 +127,7 @@ static inline zend_bool may_have_side_effects( /* No side effects */ return 0; case ZEND_ROPE_END: - /* TODO: Rope dce optmization, see #76446 */ + /* TODO: Rope dce optimization, see #76446 */ return 1; case ZEND_JMP: case ZEND_JMPZ: diff --git a/ext/opcache/Optimizer/sccp.c b/ext/opcache/Optimizer/sccp.c index c9acb049838..632a36782f8 100644 --- a/ext/opcache/Optimizer/sccp.c +++ b/ext/opcache/Optimizer/sccp.c @@ -2045,7 +2045,7 @@ static int try_remove_definition(sccp_ctx *ctx, int var_num, zend_ssa_var *var, if (ssa_op->result_def == var_num) { if (ssa_op->op1_def >= 0 || ssa_op->op2_def >= 0) { - /* we cannot remove instruction that defines other varibales */ + /* we cannot remove instruction that defines other variables */ return 0; } else if (opline->opcode == ZEND_JMPZ_EX || opline->opcode == ZEND_JMPNZ_EX diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c index c08f098ed80..0d3334dc771 100644 --- a/ext/opcache/ZendAccelerator.c +++ b/ext/opcache/ZendAccelerator.c @@ -1996,7 +1996,7 @@ zend_op_array *persistent_compile_file(zend_file_handle *file_handle, int type) ZCG(counted) = 1; } - /* Revalidate acessibility of cached file */ + /* Revalidate accessibility of cached file */ if (EXPECTED(persistent_script != NULL) && UNEXPECTED(ZCG(accel_directives).validate_permission) && file_handle->type == ZEND_HANDLE_FILENAME && diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c index 5b613a43280..e5054bd087a 100644 --- a/ext/pgsql/pgsql.c +++ b/ext/pgsql/pgsql.c @@ -1055,7 +1055,7 @@ static int _php_pgsql_detect_identifier_escape(const char *identifier, size_t le if (len <= 2) { return FAILURE; } - /* Detect double qoutes */ + /* Detect double quotes */ if (identifier[0] == '"' && identifier[len-1] == '"') { size_t i; diff --git a/ext/pgsql/php_pgsql.h b/ext/pgsql/php_pgsql.h index 0d575d2b853..c6d93a39272 100644 --- a/ext/pgsql/php_pgsql.h +++ b/ext/pgsql/php_pgsql.h @@ -198,7 +198,7 @@ PHP_FUNCTION(pg_select); #define PGSQL_CONNECT_FORCE_NEW (1<<1) #define PGSQL_CONNECT_ASYNC (1<<2) /* php_pgsql_convert options */ -#define PGSQL_CONV_IGNORE_DEFAULT (1<<1) /* Do not use DEAFULT value by removing field from returned array */ +#define PGSQL_CONV_IGNORE_DEFAULT (1<<1) /* Do not use DEFAULT value by removing field from returned array */ #define PGSQL_CONV_FORCE_NULL (1<<2) /* Convert to NULL if string is null string */ #define PGSQL_CONV_IGNORE_NOT_NULL (1<<3) /* Ignore NOT NULL constraints */ #define PGSQL_CONV_OPTS (PGSQL_CONV_IGNORE_DEFAULT|PGSQL_CONV_FORCE_NULL|PGSQL_CONV_IGNORE_NOT_NULL) diff --git a/ext/phar/phar/pharcommand.inc b/ext/phar/phar/pharcommand.inc index 9decdaf9723..07f1c34c942 100644 --- a/ext/phar/phar/pharcommand.inc +++ b/ext/phar/phar/pharcommand.inc @@ -402,7 +402,7 @@ class PharCommand extends CLICommand $hash_avail = Phar::getSupportedSignatures(); if ($arg && !in_array('OpenSSL', $hash_avail)) { - self::error("Cannot specifiy private key without OpenSSL support.\n"); + self::error("Cannot specify private key without OpenSSL support.\n"); } return $arg; } @@ -896,7 +896,7 @@ class PharCommand extends CLICommand * * @param string $pn * @param string $f The file name - * @param array $args The directory and Blen informations + * @param array $args The directory and Blen information */ public function phar_dir_extract($pn, $f, $args) { @@ -936,7 +936,7 @@ class PharCommand extends CLICommand /** * The cli command argument for deleting. * - * @return array informations about the arguments to use. + * @return array information about the arguments to use. */ static function cli_cmd_arg_delete() { @@ -1103,7 +1103,7 @@ class PharCommand extends CLICommand /** * Cli Command Inf Compress * - * Cli Command compress informations + * Cli Command compress information * * @return string A description of the command. */ diff --git a/ext/phar/tests/zip/files/corrupt_zipmaker.php.inc b/ext/phar/tests/zip/files/corrupt_zipmaker.php.inc index 79bade6aaef..ddac6a4ade8 100644 --- a/ext/phar/tests/zip/files/corrupt_zipmaker.php.inc +++ b/ext/phar/tests/zip/files/corrupt_zipmaker.php.inc @@ -41,7 +41,7 @@ class corrupt_zipmaker var $offset = 0; /** - * @var string Optionnal comment to add to the zip + * @var string Optional comment to add to the zip * @access private */ var $comment = ""; @@ -65,7 +65,7 @@ class corrupt_zipmaker /** * @param int $time Unix timestamp of the date to convert - * @return the date formated as a ZIP date + * @return the date formatted as a ZIP date */ function getMTime($time) { diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c index 862936d81cb..6f34cf29bf5 100644 --- a/ext/reflection/php_reflection.c +++ b/ext/reflection/php_reflection.c @@ -4336,7 +4336,7 @@ static int _adddynproperty(zval *ptr, int num_args, va_list args, zend_hash_key zval *retval = va_arg(args, zval*); /* under some circumstances, the properties hash table may contain numeric - * properties (e.g. when casting from array). This is a WONT FIX bug, at + * properties (e.g. when casting from array). This is a WON'T FIX bug, at * least for the moment. Ignore these */ if (hash_key->key == NULL) { return 0; diff --git a/ext/session/session.c b/ext/session/session.c index c46af0d87d7..00a353cfe14 100644 --- a/ext/session/session.c +++ b/ext/session/session.c @@ -1940,7 +1940,7 @@ static PHP_FUNCTION(session_set_save_handler) RETURN_FALSE; } - /* For compatibility reason, implemeted interface is not checked */ + /* For compatibility reason, implemented interface is not checked */ /* Find implemented methods - SessionHandlerInterface */ i = 0; ZEND_HASH_FOREACH_STR_KEY(&php_session_iface_entry->function_table, func_name) { diff --git a/ext/soap/php_http.c b/ext/soap/php_http.c index fc068bf4d14..408afceef7b 100644 --- a/ext/soap/php_http.c +++ b/ext/soap/php_http.c @@ -1447,7 +1447,7 @@ static zend_string* get_http_body(php_stream *stream, int close, char *headers) ch = php_stream_getc(stream); } if (ch != '\n') { - /* Somthing wrong in chunked encoding */ + /* Something wrong in chunked encoding */ if (http_buf) { zend_string_release_ex(http_buf, 0); } @@ -1455,7 +1455,7 @@ static zend_string* get_http_body(php_stream *stream, int close, char *headers) } } } else { - /* Somthing wrong in chunked encoding */ + /* Something wrong in chunked encoding */ if (http_buf) { zend_string_release_ex(http_buf, 0); } diff --git a/ext/spl/internal/multipleiterator.inc b/ext/spl/internal/multipleiterator.inc index 12df011ecc8..c0e31a04ac1 100644 --- a/ext/spl/internal/multipleiterator.inc +++ b/ext/spl/internal/multipleiterator.inc @@ -33,7 +33,7 @@ class MultipleIterator implements Iterator /** keys are created from sub iterators position */ const MIT_KEYS_NUMERIC = 0; - /** keys are created from sub iterators associated infromation */ + /** keys are created from sub iterators associated information */ const MIT_KEYS_ASSOC = 2; /** Construct a new empty MultipleIterator diff --git a/ext/spl/internal/recursivearrayiterator.inc b/ext/spl/internal/recursivearrayiterator.inc index 2059b97c1c6..07dbce3def5 100644 --- a/ext/spl/internal/recursivearrayiterator.inc +++ b/ext/spl/internal/recursivearrayiterator.inc @@ -17,7 +17,7 @@ * * Passes the RecursiveIterator interface to the inner Iterator and provides * the same functionality as FilterIterator. This allows you to skip parents - * and all their childs before loading them all. You need to care about + * and all their children before loading them all. You need to care about * function getChildren() because it may not always suit your needs. The * builtin behavior uses reflection to return a new instance of the exact same * class it is called from. That is you extend RecursiveFilterIterator and @@ -25,7 +25,7 @@ * this does not transport any state or control information of your accept() * implementation to the new instance. To overcome this problem you might * need to overwrite getChildren(), call this implementation and pass the - * control vaules manually. + * control values manually. */ class RecursiveArrayIterator extends ArrayIterator implements RecursiveIterator { diff --git a/ext/spl/internal/recursivecachingiterator.inc b/ext/spl/internal/recursivecachingiterator.inc index 3ae127ad94b..1473b754573 100644 --- a/ext/spl/internal/recursivecachingiterator.inc +++ b/ext/spl/internal/recursivecachingiterator.inc @@ -27,7 +27,7 @@ class RecursiveCachingIterator extends CachingIterator implements RecursiveItera * @param it Iterator to cache * @param flags Bitmask: * - CALL_TOSTRING (whether to call __toString() for every element) - * - CATCH_GET_CHILD (whether to catch exceptions when trying to get childs) + * - CATCH_GET_CHILD (whether to catch exceptions when trying to get children) */ function __construct(RecursiveIterator $it, $flags = self::CALL_TOSTRING) { diff --git a/ext/spl/internal/recursivefilteriterator.inc b/ext/spl/internal/recursivefilteriterator.inc index 87d98da8852..9d176112ba7 100644 --- a/ext/spl/internal/recursivefilteriterator.inc +++ b/ext/spl/internal/recursivefilteriterator.inc @@ -17,7 +17,7 @@ * * Passes the RecursiveIterator interface to the inner Iterator and provides * the same functionality as FilterIterator. This allows you to skip parents - * and all their childs before loading them all. You need to care about + * and all their children before loading them all. You need to care about * function getChildren() because it may not always suit your needs. The * builtin behavior uses reflection to return a new instance of the exact same * class it is called from. That is you extend RecursiveFilterIterator and @@ -25,7 +25,7 @@ * this does not transport any state or control information of your accept() * implementation to the new instance. To overcome this problem you might * need to overwrite getChildren(), call this implementation and pass the - * control vaules manually. + * control values manually. */ abstract class RecursiveFilterIterator extends FilterIterator implements RecursiveIterator { diff --git a/ext/spl/internal/recursiveiteratoriterator.inc b/ext/spl/internal/recursiveiteratoriterator.inc index c22a92bf716..529c01b0760 100644 --- a/ext/spl/internal/recursiveiteratoriterator.inc +++ b/ext/spl/internal/recursiveiteratoriterator.inc @@ -42,7 +42,7 @@ class RecursiveIteratorIterator implements OuterIterator * @param it RecursiveIterator to iterate * @param mode Operation mode (one of): * - LEAVES_ONLY only show leaves - * - SELF_FIRST show parents prior to their childs + * - SELF_FIRST show parents prior to their children * - CHILD_FIRST show all children prior to their parent * @param flags Control flags, zero or any combination of the following * (since PHP 5.1). diff --git a/ext/spl/internal/splfileobject.inc b/ext/spl/internal/splfileobject.inc index 4b0c757b816..fea3d0cf61c 100644 --- a/ext/spl/internal/splfileobject.inc +++ b/ext/spl/internal/splfileobject.inc @@ -17,7 +17,7 @@ */ class SplFileObject extends SplFileInfo implements RecursiveIterator, SeekableIterator { - /** Flag: wheter to suppress new lines */ + /** Flag: whether to suppress new lines */ const DROP_NEW_LINE = 0x00000001; private $fp; diff --git a/ext/spl/internal/splobjectstorage.inc b/ext/spl/internal/splobjectstorage.inc index f27da4e0014..6b9b25f6610 100644 --- a/ext/spl/internal/splobjectstorage.inc +++ b/ext/spl/internal/splobjectstorage.inc @@ -146,7 +146,7 @@ class SplObjectStorage implements Iterator, Countable, ArrayAccess $this->attach($obj, $inf); } - /** @param $obj Exising object to look for + /** @param $obj Existing object to look for * @return associative information stored with object * @throw UnexpectedValueException if Object $obj is not contained in * storage @@ -167,7 +167,7 @@ class SplObjectStorage implements Iterator, Countable, ArrayAccess throw new UnexpectedValueException('Object not found'); } - /** @param $obj Exising object to look for + /** @param $obj Existing object to look for * @return associative information stored with object * @since 5.3.0 */ diff --git a/ext/spl/php_spl.c b/ext/spl/php_spl.c index 0263a132b15..c80adaed944 100644 --- a/ext/spl/php_spl.c +++ b/ext/spl/php_spl.c @@ -387,7 +387,7 @@ static void autoload_func_info_dtor(zval *element) } /* {{{ proto void spl_autoload_call(string class_name) - Try all registerd autoload function to load the requested class */ + Try all registered autoload function to load the requested class */ PHP_FUNCTION(spl_autoload_call) { zval *class_name, retval; diff --git a/ext/spl/spl.php b/ext/spl/spl.php index 8a68613417f..adbcef6e8a1 100755 --- a/ext/spl/spl.php +++ b/ext/spl/spl.php @@ -177,7 +177,7 @@ function spl_autoload(string $class_name, string $file_extensions = NULL) {/**/}; /** @ingroup SPL - * @brief Manual invocation of all registerd autoload functions + * @brief Manual invocation of all registered autoload functions * @since PHP 5.1 * * @param class_name name of class to load @@ -371,7 +371,7 @@ class BadMethodCallException extends BadFunctionCallException * @brief Exception that denotes a value not in the valid domain was used. * @since PHP 5.1 * - * This kind of exception should be used to inform about domain erors in + * This kind of exception should be used to inform about domain errors in * mathematical sense. * * @see RangeException @@ -731,7 +731,7 @@ class ArrayObject implements IteratorAggregate, ArrayAccess, Countable * over Arrays and Objects. * * When you want to iterate over the same array multiple times you need to - * instanciate ArrayObject and let it create ArrayIterator instances that + * instantiate ArrayObject and let it create ArrayIterator instances that * refer to it either by using foreach or by calling its getIterator() * method manually. */ diff --git a/ext/spl/spl_directory.c b/ext/spl/spl_directory.c index 776f2ae44da..e37bd87d87d 100644 --- a/ext/spl/spl_directory.c +++ b/ext/spl/spl_directory.c @@ -724,7 +724,7 @@ void spl_filesystem_object_construct(INTERNAL_FUNCTION_PARAMETERS, zend_long cto intern = Z_SPLFILESYSTEM_P(getThis()); if (intern->_path) { - /* object is alreay initialized */ + /* object is already initialized */ zend_restore_error_handling(&error_handling); php_error_docref(NULL, E_WARNING, "Directory object is already initialized"); return; diff --git a/ext/spl/spl_observer.c b/ext/spl/spl_observer.c index a6e27f47b66..0dd755e07f7 100644 --- a/ext/spl/spl_observer.c +++ b/ext/spl/spl_observer.c @@ -318,7 +318,7 @@ static HashTable* spl_object_storage_debug_info(zval *obj, int *is_temp) /* {{{ } /* }}} */ -/* overriden for garbage collection */ +/* overridden for garbage collection */ static HashTable *spl_object_storage_get_gc(zval *obj, zval **table, int *n) /* {{{ */ { int i = 0; diff --git a/ext/standard/config.m4 b/ext/standard/config.m4 index 6c508e30df8..fe6303eff38 100644 --- a/ext/standard/config.m4 +++ b/ext/standard/config.m4 @@ -433,7 +433,7 @@ if test "$PHP_PASSWORD_ARGON2" != "no"; then LIBS="$LIBS -largon2" AC_DEFINE(HAVE_ARGON2LIB, 1, [ Define to 1 if you have the header file ]) ], [ - AC_MSG_ERROR([Problem with libargon2.(a|so). Please verify that Argon2 header and libaries >= 20161029 are installed]) + AC_MSG_ERROR([Problem with libargon2.(a|so). Please verify that Argon2 header and libraries >= 20161029 are installed]) ]) fi diff --git a/ext/standard/credits_ext.h b/ext/standard/credits_ext.h index fc982a7591c..07c4ba26103 100644 --- a/ext/standard/credits_ext.h +++ b/ext/standard/credits_ext.h @@ -1,7 +1,7 @@ /* DO NOT EDIT THIS FILE! - it has been automaticaly created by php7/scripts/credits from + it has been automatically created by php7/scripts/credits from the information found in the various php7/ext/.../CREDITS and php7/sapi/.../CREDITS files diff --git a/ext/standard/credits_sapi.h b/ext/standard/credits_sapi.h index 471724f70f8..d5f5b81b210 100644 --- a/ext/standard/credits_sapi.h +++ b/ext/standard/credits_sapi.h @@ -1,7 +1,7 @@ /* DO NOT EDIT THIS FILE! - it has been automaticaly created by php7/scripts/credits from + it has been automatically created by php7/scripts/credits from the information found in the various php7/ext/.../CREDITS and php7/sapi/.../CREDITS files diff --git a/ext/standard/file.c b/ext/standard/file.c index 3304c643080..ef2234dba7b 100644 --- a/ext/standard/file.c +++ b/ext/standard/file.c @@ -1593,7 +1593,7 @@ PHP_NAMED_FUNCTION(php_if_fstat) #ifdef HAVE_STRUCT_STAT_ST_RDEV # ifdef PHP_WIN32 /* It is unsigned, so if a negative came from userspace, it'll - convert to UINT_MAX, but we wan't to keep the userspace value. + convert to UINT_MAX, but we want to keep the userspace value. Almost the same as in php_fstat. This is ugly, but otherwise we would have to maintain a fully compatible struct stat. */ if ((int)stat_ssb.sb.st_rdev < 0) { diff --git a/ext/standard/filestat.c b/ext/standard/filestat.c index 5819d537538..220b593bfda 100644 --- a/ext/standard/filestat.c +++ b/ext/standard/filestat.c @@ -926,7 +926,7 @@ PHPAPI void php_stat(const char *filename, size_t filename_length, int type, zva #ifdef HAVE_STRUCT_STAT_ST_RDEV # ifdef PHP_WIN32 /* It is unsigned, so if a negative came from userspace, it'll - convert to UINT_MAX, but we wan't to keep the userspace value. + convert to UINT_MAX, but we want to keep the userspace value. Almost the same as in php_if_fstat. */ if ((int)stat_sb->st_rdev < 0) { ZVAL_LONG(&stat_rdev, (int)stat_sb->st_rdev); diff --git a/ext/standard/image.c b/ext/standard/image.c index 0a8add7e993..425d210ba6f 100644 --- a/ext/standard/image.c +++ b/ext/standard/image.c @@ -980,7 +980,7 @@ static int php_get_wbmp(php_stream *stream, struct gfxinfo **result, int check) return 0; } height = (height << 7) | (i & 0x7f); - /* maximum valid heigth for wbmp (although 127 may be a more accurate one) */ + /* maximum valid height for wbmp (although 127 may be a more accurate one) */ if (height > 2048) { return 0; } diff --git a/ext/standard/link_win32.c b/ext/standard/link_win32.c index bc9931359db..d825137368b 100644 --- a/ext/standard/link_win32.c +++ b/ext/standard/link_win32.c @@ -45,7 +45,7 @@ TODO: - Create php_readlink (done), php_link (done) and php_symlink (done) in win32/link.c - Expose them (PHPAPI) so extensions developers can use them -- define link/readlink/symlink to their php_ equivalent and use them in ext/standart/link.c +- define link/readlink/symlink to their php_ equivalent and use them in ext/standard/link.c - this file is then useless and we have a portable link API */ diff --git a/ext/standard/streamsfuncs.c b/ext/standard/streamsfuncs.c index 9b7bcdbd60a..442091ad46c 100644 --- a/ext/standard/streamsfuncs.c +++ b/ext/standard/streamsfuncs.c @@ -337,7 +337,7 @@ PHP_FUNCTION(stream_socket_get_name) } /* }}} */ -/* {{{ proto int stream_socket_sendto(resouce stream, string data [, int flags [, string target_addr]]) +/* {{{ proto int stream_socket_sendto(resource stream, string data [, int flags [, string target_addr]]) Send data to a socket stream. If target_addr is specified it must be in dotted quad (or [ipv6]) format */ PHP_FUNCTION(stream_socket_sendto) { diff --git a/ext/standard/tests/file/file.inc b/ext/standard/tests/file/file.inc index a0b62bffc70..eda2b32c78a 100644 --- a/ext/standard/tests/file/file.inc +++ b/ext/standard/tests/file/file.inc @@ -218,7 +218,7 @@ function change_file_perms($file_path, If imporper $content type is specified, file is created as empty $size = size of the fill in terms of kilobyte, i.e size of the file. if $flag is specified as "byte", then then given size is taken in bytes - $flag = specifiy if size has to be treated as no of total bytes or + $flag = specify if size has to be treated as no of total bytes or multiple of KB. "kilobytes" = take size in terms of multiple of KB "byte" = take size in terms of bytes diff --git a/ext/standard/tests/mail/mail_include.inc b/ext/standard/tests/mail/mail_include.inc index 2197a1f8c17..8d7a8a9a1cc 100644 --- a/ext/standard/tests/mail/mail_include.inc +++ b/ext/standard/tests/mail/mail_include.inc @@ -132,7 +132,7 @@ function populate_mailbox($imap_stream, $mailbox, $message_count, $msg_type = "s } /** - * Get the mailbox name from a mailbox decription, i.e strip off server details. + * Get the mailbox name from a mailbox description, i.e strip off server details. * * @param string mailbox complete mailbox name * @return mailbox name diff --git a/ext/standard/tests/mail/mail_skipif.inc b/ext/standard/tests/mail/mail_skipif.inc index 8da04b072a4..fedcfbbe4e4 100644 --- a/ext/standard/tests/mail/mail_skipif.inc +++ b/ext/standard/tests/mail/mail_skipif.inc @@ -16,7 +16,7 @@ $mailbox = '{localhost}'; $username = 'webmaster@example.com'; $password = 'p4ssw0rd'; $options = OP_HALFOPEN; // this should be enough to verify server present -$retries = 0; // dont retry connect on failure +$retries = 0; // don't retry connect on failure $mbox = imap_open($mailbox, $username, $password, $options, $retries); if (!$mbox) { diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c index 09a7d3a2807..c4c3e90f535 100644 --- a/ext/zip/php_zip.c +++ b/ext/zip/php_zip.c @@ -1917,7 +1917,7 @@ static ZIPARCHIVE_METHOD(statName) /* }}} */ /* {{{ proto resource ZipArchive::statIndex(int index[, int flags]) -Returns the zip entry informations using its index */ +Returns the zip entry information using its index */ static ZIPARCHIVE_METHOD(statIndex) { struct zip *intern; @@ -2713,7 +2713,7 @@ static ZIPARCHIVE_METHOD(unchangeArchive) /* {{{ proto bool ZipArchive::extractTo(string pathto[, mixed files]) Extract one or more file from a zip archive */ /* TODO: - * - allow index or array of indeces + * - allow index or array of indices * - replace path * - patterns */ diff --git a/main/main.c b/main/main.c index 70e5736e567..e4ae28d87bb 100644 --- a/main/main.c +++ b/main/main.c @@ -2279,7 +2279,7 @@ int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_mod #ifdef ZEND_WIN32 /* Until the current ini values was setup, the current cp is 65001. - If the actual ini vaues are different, some stuff needs to be updated. + If the actual ini values are different, some stuff needs to be updated. It concerns at least main_cwd_state and there might be more. As we're still in the startup phase, lets use the chance and reinit the relevant item according to the current codepage. Still, if ini_set() is used diff --git a/main/output.c b/main/output.c index 3e8b6fe77e1..0d194ccbb2c 100644 --- a/main/output.c +++ b/main/output.c @@ -132,7 +132,7 @@ static void reverse_conflict_dtor(zval *zv) } /* {{{ void php_output_startup(void) - * Set up module globals and initalize the conflict and reverse conflict hash tables */ + * Set up module globals and initialize the conflict and reverse conflict hash tables */ PHPAPI void php_output_startup(void) { ZEND_INIT_MODULE_GLOBALS(output, php_output_init_globals, NULL); diff --git a/main/snprintf.h b/main/snprintf.h index 9dd27e662a0..d5c5dfa8070 100644 --- a/main/snprintf.h +++ b/main/snprintf.h @@ -44,7 +44,7 @@ spprintf is the dynamical version of snprintf. It allocates the buffer in size as needed and allows a maximum setting as snprintf (turn this feature off by setting max_len to 0). spprintf is a little bit slower than snprintf and offers possible memory leakes if you miss freeing the - buffer allocated by the function. Therfore this function should be + buffer allocated by the function. Therefore this function should be used where either no maximum is known or the maximum is much bigger than normal size required. spprintf always terminates the buffer. diff --git a/main/streams/php_stream_filter_api.h b/main/streams/php_stream_filter_api.h index 09714249b85..c24db9e751b 100644 --- a/main/streams/php_stream_filter_api.h +++ b/main/streams/php_stream_filter_api.h @@ -21,7 +21,7 @@ /* The filter API works on the principle of "Bucket-Brigades". This is * partially inspired by the Apache 2 method of doing things, although - * it is intentially a light-weight implementation. + * it is intentionally a light-weight implementation. * * Each stream can have a chain of filters for reading and another for writing. * diff --git a/run-tests.php b/run-tests.php index 554f014a25e..38d905d2684 100644 --- a/run-tests.php +++ b/run-tests.php @@ -758,7 +758,7 @@ Options: filenames to generate with . If --html is being used and given then the generated links are relative and prefixed with the given url. In general you want to make the path - to your source files and some pach in your web page + to your source files and some patch in your web page hierarchy with pointing to . --keep-[all|php|skip|clean] diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c index 71ed2fd98d4..4041f937899 100644 --- a/sapi/cgi/cgi_main.c +++ b/sapi/cgi/cgi_main.c @@ -183,7 +183,7 @@ typedef struct _php_cgi_globals_struct { * Key for each cache entry is dirname(PATH_TRANSLATED). * * NOTE: Each cache entry config_hash contains the combination from all user ini files found in - * the path starting from doc_root throught to dirname(PATH_TRANSLATED). There is no point + * the path starting from doc_root through to dirname(PATH_TRANSLATED). There is no point * storing per-file entries as it would not be possible to detect added / deleted entries * between separate files. */ diff --git a/sapi/fpm/fpm/events/devpoll.c b/sapi/fpm/fpm/events/devpoll.c index e3f73bf1267..b68047be8c4 100644 --- a/sapi/fpm/fpm/events/devpoll.c +++ b/sapi/fpm/fpm/events/devpoll.c @@ -166,7 +166,7 @@ static int fpm_event_devpoll_wait(struct fpm_event_queue_s *queue, unsigned long } } - /* iterate throught triggered events */ + /* iterate through triggered events */ for (i = 0; i < ret; i++) { /* find the corresponding event */ @@ -200,7 +200,7 @@ static int fpm_event_devpoll_add(struct fpm_event_s *ev) /* {{{ */ { struct pollfd pollfd; - /* fill pollfd with event informations */ + /* fill pollfd with event information */ pollfd.fd = ev->fd; pollfd.events = POLLIN; pollfd.revents = 0; @@ -225,7 +225,7 @@ static int fpm_event_devpoll_remove(struct fpm_event_s *ev) /* {{{ */ { struct pollfd pollfd; - /* fill pollfd with the same informations as fpm_event_devpoll_add */ + /* fill pollfd with the same information as fpm_event_devpoll_add */ pollfd.fd = ev->fd; pollfd.events = POLLIN | POLLREMOVE; pollfd.revents = 0; diff --git a/sapi/fpm/fpm/fpm_children.c b/sapi/fpm/fpm/fpm_children.c index 505f71d9d5b..b4ff48ed299 100644 --- a/sapi/fpm/fpm/fpm_children.c +++ b/sapi/fpm/fpm/fpm_children.c @@ -192,7 +192,7 @@ void fpm_children_bury() /* {{{ */ snprintf(buf, sizeof(buf), "with code %d", WEXITSTATUS(status)); /* if it's been killed because of dynamic process management - * don't restart it automaticaly + * don't restart it automatically */ if (child && child->idle_kill) { restart_child = 0; @@ -213,7 +213,7 @@ void fpm_children_bury() /* {{{ */ snprintf(buf, sizeof(buf), "on signal %d (%s%s)", WTERMSIG(status), signame, have_core); /* if it's been killed because of dynamic process management - * don't restart it automaticaly + * don't restart it automatically */ if (child && child->idle_kill && WTERMSIG(status) == SIGQUIT) { restart_child = 0; diff --git a/sapi/fpm/fpm/fpm_main.c b/sapi/fpm/fpm/fpm_main.c index fd594607e1f..640d3eccbe3 100644 --- a/sapi/fpm/fpm/fpm_main.c +++ b/sapi/fpm/fpm/fpm_main.c @@ -162,7 +162,7 @@ typedef struct _php_cgi_globals_struct { * Key for each cache entry is dirname(PATH_TRANSLATED). * * NOTE: Each cache entry config_hash contains the combination from all user ini files found in - * the path starting from doc_root throught to dirname(PATH_TRANSLATED). There is no point + * the path starting from doc_root through to dirname(PATH_TRANSLATED). There is no point * storing per-file entries as it would not be possible to detect added / deleted entries * between separate files. */ diff --git a/sapi/fpm/fpm/fpm_request.c b/sapi/fpm/fpm/fpm_request.c index 9dfdb0f91eb..89346164e70 100644 --- a/sapi/fpm/fpm/fpm_request.c +++ b/sapi/fpm/fpm/fpm_request.c @@ -25,7 +25,7 @@ static const char *requests_stages[] = { [FPM_REQUEST_ACCEPTING] = "Idle", [FPM_REQUEST_READING_HEADERS] = "Reading headers", - [FPM_REQUEST_INFO] = "Getting request informations", + [FPM_REQUEST_INFO] = "Getting request information", [FPM_REQUEST_EXECUTING] = "Running", [FPM_REQUEST_END] = "Ending", [FPM_REQUEST_FINISHED] = "Finishing", diff --git a/sapi/fpm/tests/fcgi.inc b/sapi/fpm/tests/fcgi.inc index 71bdad17b95..29b7b20c0a9 100644 --- a/sapi/fpm/tests/fcgi.inc +++ b/sapi/fpm/tests/fcgi.inc @@ -428,7 +428,7 @@ class Client } /** - * Get Informations on the FastCGI application + * Get Information on the FastCGI application * * @param array $requestedInfo information to retrieve * @return array diff --git a/sapi/litespeed/lsapi_main.c b/sapi/litespeed/lsapi_main.c index 4753bc11a18..fcbb495cc26 100644 --- a/sapi/litespeed/lsapi_main.c +++ b/sapi/litespeed/lsapi_main.c @@ -65,7 +65,7 @@ /* Key for each cache entry is dirname(PATH_TRANSLATED). * * NOTE: Each cache entry config_hash contains the combination from all user ini files found in - * the path starting from doc_root throught to dirname(PATH_TRANSLATED). There is no point + * the path starting from doc_root through to dirname(PATH_TRANSLATED). There is no point * storing per-file entries as it would not be possible to detect added / deleted entries * between separate files. */ diff --git a/sapi/phpdbg/phpdbg_cmd.c b/sapi/phpdbg/phpdbg_cmd.c index 0054e90ceac..ac04717f0d8 100644 --- a/sapi/phpdbg/phpdbg_cmd.c +++ b/sapi/phpdbg/phpdbg_cmd.c @@ -645,7 +645,7 @@ PHPDBG_API const phpdbg_command_t *phpdbg_stack_resolve(const phpdbg_command_t * } /* ", " separated matches */ - phpdbg_error("command", "type=\"ambiguous\" command=\"%s\" matches=\"%lu\" matched=\"%s\"", "The command \"%s\" is ambigious, matching %lu commands (%s)", name->str, matches, list); + phpdbg_error("command", "type=\"ambiguous\" command=\"%s\" matches=\"%lu\" matched=\"%s\"", "The command \"%s\" is ambiguous, matching %lu commands (%s)", name->str, matches, list); efree(list); return NULL; diff --git a/sapi/phpdbg/phpdbg_help.c b/sapi/phpdbg/phpdbg_help.c index e9caa18895d..e0575009db0 100644 --- a/sapi/phpdbg/phpdbg_help.c +++ b/sapi/phpdbg/phpdbg_help.c @@ -924,7 +924,7 @@ phpdbg_help_text_t phpdbg_help_text[] = { " Enable refcount display when hitting watchpoints" CR CR " $P S b 4 off" CR -" Temporarily disable breakpoint 4. This can be subsequently reenabled by a **S b 4 on**." CR +" Temporarily disable breakpoint 4. This can be subsequently re-enabled by a **S b 4 on**." CR //*********** check oplog syntax }, diff --git a/sapi/phpdbg/phpdbg_prompt.c b/sapi/phpdbg/phpdbg_prompt.c index f406810ab94..8815b90be21 100644 --- a/sapi/phpdbg/phpdbg_prompt.c +++ b/sapi/phpdbg/phpdbg_prompt.c @@ -81,7 +81,7 @@ const phpdbg_command_t phpdbg_prompt_commands[] = { PHPDBG_COMMAND_D(back, "show trace", 't', NULL, "|n", PHPDBG_ASYNC_SAFE), PHPDBG_COMMAND_D(frame, "switch to a frame", 'f', NULL, "|n", PHPDBG_ASYNC_SAFE), PHPDBG_COMMAND_D(list, "lists some code", 'l', phpdbg_list_commands, "*", PHPDBG_ASYNC_SAFE), - PHPDBG_COMMAND_D(info, "displays some informations", 'i', phpdbg_info_commands, "|s", PHPDBG_ASYNC_SAFE), + PHPDBG_COMMAND_D(info, "displays some information", 'i', phpdbg_info_commands, "|s", PHPDBG_ASYNC_SAFE), PHPDBG_COMMAND_D(clean, "clean the execution environment", 'X', NULL, 0, 0), PHPDBG_COMMAND_D(clear, "clear breakpoints", 'C', NULL, 0, 0), PHPDBG_COMMAND_D(help, "show help menu", 'h', phpdbg_help_commands, "|s", PHPDBG_ASYNC_SAFE), diff --git a/sapi/phpdbg/phpdbg_watch.c b/sapi/phpdbg/phpdbg_watch.c index 1d7f33ff6f2..488c0a3f070 100644 --- a/sapi/phpdbg/phpdbg_watch.c +++ b/sapi/phpdbg/phpdbg_watch.c @@ -31,7 +31,7 @@ * Watch elements are either simple, recursive or implicit (PHPDBG_WATCH_* flags) * Simple means that a particular watchpoint was explicitly defined * Recursive watch elements are created recursively (recursive root flag is to distinguish the root element easily from its children recursive elements) - * Implicit watch elements are implicitely created on all ancestors of simple or recursive watch elements + * Implicit watch elements are implicitly created on all ancestors of simple or recursive watch elements * Recursive and (simple or implicit) watch elements are mutually exclusive * Array/Object to distinguish watch elements on arrays * diff --git a/sapi/phpdbg/xml.md b/sapi/phpdbg/xml.md index 56dcaaa1f71..8e16754db08 100644 --- a/sapi/phpdbg/xml.md +++ b/sapi/phpdbg/xml.md @@ -633,7 +633,7 @@ Other tags - <watchhit variable="" />: when ever a watched variable is changed, followed by a <watchdata> container - <watchdata> may contain - for watchpoints on variables: - - each of these <watch*> tags conatins a type attribute whose value is either "old" or "new") + - each of these <watch*> tags contains a type attribute whose value is either "old" or "new") - <watchvalue type="" inaccessible="inaccessible" />: old value is inaccessible - <watchvalue type=""> may contain a <stream> element which indicates the old/new (type attribute) value of the variable - <watchrefcount type="" refcount="" isref="" />: old/new (type attribute) refcount and isref, both numbers diff --git a/scripts/dev/credits b/scripts/dev/credits index 0683f59882d..df94e08aeaa 100755 --- a/scripts/dev/credits +++ b/scripts/dev/credits @@ -10,7 +10,7 @@ do /* DO NOT EDIT THIS FILE! - it has been automaticaly created by php7/scripts/credits from + it has been automatically created by php7/scripts/credits from the information found in the various php7/ext/.../CREDITS and php7/sapi/.../CREDITS files diff --git a/server-tests.php b/server-tests.php index 5f38e2f22e4..ef05ab16d9a 100755 --- a/server-tests.php +++ b/server-tests.php @@ -1171,7 +1171,7 @@ class testHarness { $this->showstatus($section_text['TEST'], 'SKIPPED', 'CGI Test needs CGI Binary'); return "SKIPPED"; } - // if we're doing web testing, then we wont be able to set + // if we're doing web testing, then we won't be able to set // ini setting on the command line. be sure the executables // ini settings are compatible with the test, or skip if (($docgi || $this->conf['TEST_WEB']) && diff --git a/tests/classes/class_abstract.phpt b/tests/classes/class_abstract.phpt index fe95d9bcc33..d852884d52b 100644 --- a/tests/classes/class_abstract.phpt +++ b/tests/classes/class_abstract.phpt @@ -1,5 +1,5 @@ --TEST-- -ZE2 An abstract class cannot be instanciated +ZE2 An abstract class cannot be instantiated --FILE--