diff options
102 files changed, 141 insertions, 141 deletions
diff --git a/README.TESTING b/README.TESTING index 1972f5f6f3..dd09ecbe38 100644 --- a/README.TESTING +++ b/README.TESTING @@ -123,7 +123,7 @@ MYMAIL=qa-test@domain.com TMPDIR=/var/tmp TODAY=`date +"%Y%m%d"` -# Make sure compilation enviroment is correct +# Make sure compilation environment is correct CONFIGURE_OPTS='--disable-all --enable-cli --with-pcre' export MAKE=gmake export CC=gcc @@ -126,7 +126,7 @@ PHP X.Y UPGRADE NOTES ======================================== - Core - . Instead of being undefined and platform-dependant, NaN and Infinity will + . Instead of being undefined and platform-dependent, NaN and Infinity will always be zero when casted to integer. . Calling a method on a non-object no longer raises a fatal error; see also: https://wiki.php.net/rfc/catchable-call-to-member-of-non-object diff --git a/Zend/ZEND_CHANGES b/Zend/ZEND_CHANGES index afb3595595..94e164c290 100644 --- a/Zend/ZEND_CHANGES +++ b/Zend/ZEND_CHANGES @@ -1103,7 +1103,7 @@ Changes in the Zend Engine 1.0 Use ob_start() to begin output buffering, ob_end_flush() to end buffering and send out the buffered contents, ob_end_clean() to end buffering without sending the buffered contents, and - ob_get_contents() to retreive the current contents of the output + ob_get_contents() to retrieve the current contents of the output buffer. Header information (header(), content type, cookies) are not buffered. By turning on output buffering, you can effectively send header information all throughout your file, diff --git a/Zend/tests/bug21478.phpt b/Zend/tests/bug21478.phpt index 8b38f24d6e..5955c4c1dc 100644 --- a/Zend/tests/bug21478.phpt +++ b/Zend/tests/bug21478.phpt @@ -27,7 +27,7 @@ stream_filter_append($fp, "myfilter"); fwrite($fp, "This is a test.\n"); print "Done.\n"; fclose($fp); -// Uncommenting the following 'print' line causes the segfault to stop occuring +// Uncommenting the following 'print' line causes the segfault to stop occurring // print "2\n"; readfile(dirname(__FILE__)."/test.txt"); unlink(dirname(__FILE__)."/test.txt"); diff --git a/Zend/tests/bug33512.phpt b/Zend/tests/bug33512.phpt index 9dd4e4e5f9..dcb8f0417e 100644 --- a/Zend/tests/bug33512.phpt +++ b/Zend/tests/bug33512.phpt @@ -53,7 +53,7 @@ class TheObj { unset($SomeObj->Virtual1); unset($SomeObj->{'Virtual'.(3)}); - //but, these variables are still available??? eventhough they're "unset"-ed + //but, these variables are still available??? even though they're "unset"-ed print $SomeObj->Virtual1."\n"; print $SomeObj->{'Virtual'.(3)}."\n"; ?> diff --git a/Zend/tests/bug40809.phpt b/Zend/tests/bug40809.phpt index 08fc89f553..9ff4e6f1b6 100644 --- a/Zend/tests/bug40809.phpt +++ b/Zend/tests/bug40809.phpt @@ -1,5 +1,5 @@ --TEST-- -Bug #40809 (Poor perfomance of ".=") +Bug #40809 (Poor performance of ".=") --FILE-- <?php error_reporting(E_ALL|E_STRICT); diff --git a/Zend/tests/bug43200.phpt b/Zend/tests/bug43200.phpt index 24a8bbb1d7..7a995aab3e 100644 --- a/Zend/tests/bug43200.phpt +++ b/Zend/tests/bug43200.phpt @@ -1,5 +1,5 @@ --TEST-- -Bug #43200 (Interface implementation / inheritence not possible in abstract classes) +Bug #43200 (Interface implementation / inheritance not possible in abstract classes) --FILE-- <?php diff --git a/Zend/tests/bug43200_2.phpt b/Zend/tests/bug43200_2.phpt index 5efc5facff..3c8a98bddc 100644 --- a/Zend/tests/bug43200_2.phpt +++ b/Zend/tests/bug43200_2.phpt @@ -1,5 +1,5 @@ --TEST-- -Bug #43200.2 (Interface implementation / inheritence not possible in abstract classes) +Bug #43200.2 (Interface implementation / inheritance not possible in abstract classes) --FILE-- <?php diff --git a/Zend/tests/debug_backtrace_with_include_and_this.phpt b/Zend/tests/debug_backtrace_with_include_and_this.phpt index 171ad9f451..2827ab1b74 100644 --- a/Zend/tests/debug_backtrace_with_include_and_this.phpt +++ b/Zend/tests/debug_backtrace_with_include_and_this.phpt @@ -23,15 +23,15 @@ set_error_handler(function($code, $msg, $file, $line) { }); try { - (new CL())->load('class://non.existant.Class'); + (new CL())->load('class://non.existent.Class'); } catch (CLException $e) { echo $e."\n"; } --EXPECTF-- -ERR#2: include(class://non.existant.Class): failed to open stream: "CLWrapper::stream_open" call failed @ include -ERR#2: include(): Failed opening 'class://non.existant.Class' for inclusion (include_path='%s') @ include +ERR#2: include(class://non.existent.Class): failed to open stream: "CLWrapper::stream_open" call failed @ include +ERR#2: include(): Failed opening 'class://non.existent.Class' for inclusion (include_path='%s') @ include -Fatal error: Uncaught exception 'Exception' with message 'Failed loading class://non.existant.Class' in %s +Fatal error: Uncaught exception 'Exception' with message 'Failed loading class://non.existent.Class' in %s Stack trace: #0 %s(%d): CL->load('class://non.exi...') #1 {main} diff --git a/Zend/tests/traits/bug54441.phpt b/Zend/tests/traits/bug54441.phpt index 84139f326b..3fe688b3b1 100644 --- a/Zend/tests/traits/bug54441.phpt +++ b/Zend/tests/traits/bug54441.phpt @@ -16,4 +16,4 @@ class Boo { ?> --EXPECTF-- -Fatal error: The modifiers for the trait alias dontKnow() need to be changed in the same statment in which the alias is defined. Error in %s on line %d +Fatal error: The modifiers for the trait alias dontKnow() need to be changed in the same statement in which the alias is defined. Error in %s on line %d diff --git a/Zend/tests/try_finally_010.phpt b/Zend/tests/try_finally_010.phpt index bbac8dd1e5..91eb7821ee 100644 --- a/Zend/tests/try_finally_010.phpt +++ b/Zend/tests/try_finally_010.phpt @@ -1,5 +1,5 @@ --TEST-- -Try finally (function call in the finaly block after exception) +Try finally (function call in the finally block after exception) --FILE-- <?php function foo() { diff --git a/Zend/tests/varSyntax/tempDimFetchByRefError.phpt b/Zend/tests/varSyntax/tempDimFetchByRefError.phpt index dbcac75ea9..492627302f 100644 --- a/Zend/tests/varSyntax/tempDimFetchByRefError.phpt +++ b/Zend/tests/varSyntax/tempDimFetchByRefError.phpt @@ -1,5 +1,5 @@ --TEST-- -Passing a dimention fetch on a temporary by reference is not allowed +Passing a dimension fetch on a temporary by reference is not allowed --FILE-- <?php diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c index 588657d8b4..9d5e079dfa 100644 --- a/Zend/zend_alloc.c +++ b/Zend/zend_alloc.c @@ -30,7 +30,7 @@ * performed using mmap(). The result is aligned on 2M boundary. * * Large - a number of 4096K pages inside a CHUNK. Large blocks - * are always alligned on page boundary. + * are always aligned on page boundary. * * Small - less than 3/4 of page size. Small sizes are rounded up to nearest * greater predefined small size (there are 30 predefined sizes: @@ -272,7 +272,7 @@ struct _zend_mm_page { }; /* - * bin - is one or few continuous pages (up to 8) used for alocation of + * bin - is one or few continuous pages (up to 8) used for allocation of * a particular "small size". */ struct _zend_mm_bin { diff --git a/Zend/zend_float.h b/Zend/zend_float.h index 33f8e93fbf..e3bb72e580 100644 --- a/Zend/zend_float.h +++ b/Zend/zend_float.h @@ -53,7 +53,7 @@ extern ZEND_API void zend_ensure_fpu_mode(TSRMLS_D); Implementation notes: x86_64: - - Since all x86_64 compilers use SSE by default, it is probably unecessary + - Since all x86_64 compilers use SSE by default, it is probably unnecessary to use these macros there. We define them anyway since we are too lazy to differentiate the architecture. Also, the compiler option -mfpmath=i387 justifies this decision. diff --git a/Zend/zend_gc.c b/Zend/zend_gc.c index b331f979fd..e47b5350d4 100644 --- a/Zend/zend_gc.c +++ b/Zend/zend_gc.c @@ -469,7 +469,7 @@ tail_call: ht = NULL; GC_SET_BLACK(GC_INFO(ref)); - /* don't count references for compatibilty ??? */ + /* don't count references for compatibility ??? */ if (GC_TYPE(ref) != IS_REFERENCE) { count++; } @@ -515,7 +515,7 @@ tail_call: ZVAL_OBJ(&tmp, obj); props = get_gc(&tmp, &table, &n TSRMLS_CC); while (n > 0 && !Z_REFCOUNTED(table[n-1])) { - /* count non-refcounted for compatibilty ??? */ + /* count non-refcounted for compatibility ??? */ if (Z_TYPE(table[n-1]) != IS_UNDEF) { count++; } @@ -532,7 +532,7 @@ tail_call: } else { count += gc_collect_white(ref TSRMLS_CC); } - /* count non-refcounted for compatibilty ??? */ + /* count non-refcounted for compatibility ??? */ } else if (Z_TYPE(table[i]) != IS_UNDEF) { count++; } @@ -563,7 +563,7 @@ tail_call: for (idx = 0; idx < ht->nNumUsed; idx++) { p = ht->arData + idx; if (!Z_REFCOUNTED(p->val)) { - /* count non-refcounted for compatibilty ??? */ + /* count non-refcounted for compatibility ??? */ if (Z_TYPE(p->val) != IS_UNDEF && Z_TYPE(p->val) != IS_INDIRECT) { count++; } diff --git a/Zend/zend_inheritance.c b/Zend/zend_inheritance.c index 7d9d1aade8..d577ba524c 100644 --- a/Zend/zend_inheritance.c +++ b/Zend/zend_inheritance.c @@ -1206,7 +1206,7 @@ static void zend_traits_init_trait_structures(zend_class_entry *ce TSRMLS_DC) /* } zend_check_trait_usage(ce, cur_precedence->trait_method->ce TSRMLS_CC); - /** Ensure that the prefered method is actually available. */ + /** Ensure that the preferred method is actually available. */ lcname = zend_string_alloc(cur_method_ref->method_name->len, 0); zend_str_tolower_copy(lcname->val, cur_method_ref->method_name->val, @@ -1507,7 +1507,7 @@ static void zend_do_check_for_inconsistent_traits_aliasing(zend_class_entry *ce lc_method_name)) { zend_string_free(lc_method_name); zend_error_noreturn(E_COMPILE_ERROR, - "The modifiers for the trait alias %s() need to be changed in the same statment in which the alias is defined. Error", + "The modifiers for the trait alias %s() need to be changed in the same statement in which the alias is defined. Error", cur_alias->trait_method->method_name->val); } else { zend_string_free(lc_method_name); diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c index ad5a55510b..af2ba2d708 100644 --- a/Zend/zend_object_handlers.c +++ b/Zend/zend_object_handlers.c @@ -184,7 +184,7 @@ static void zend_std_call_getter(zval *object, zval *member, zval *retval TSRMLS /* __get handler is called with one argument: property name - it should return whether the call was successfull or not + it should return whether the call was successful or not */ if (Z_REFCOUNTED_P(member)) Z_ADDREF_P(member); @@ -207,7 +207,7 @@ static int zend_std_call_setter(zval *object, zval *member, zval *value TSRMLS_D property name value to be set - it should return whether the call was successfull or not + it should return whether the call was successful or not */ zend_call_method_with_2_params(object, ce, &ce->__set, ZEND_SET_FUNC_NAME, &retval, member, value); diff --git a/ext/com_dotnet/com_typeinfo.c b/ext/com_dotnet/com_typeinfo.c index ac5777cef1..f07d7ff65d 100644 --- a/ext/com_dotnet/com_typeinfo.c +++ b/ext/com_dotnet/com_typeinfo.c @@ -67,7 +67,7 @@ PHP_COM_DOTNET_API ITypeLib *php_com_load_typelib(char *search_string, int codep hr = LoadRegTypeLib((REFGUID)&clsid, major_i, minor_i, LANG_NEUTRAL, &TL); /* if that failed, assumed that the GUID is actually a CLSID and - * attemp to get the library via an instance of that class */ + * attempt to get the library via an instance of that class */ if (FAILED(hr) && (major == NULL || minor == NULL)) { IDispatch *disp = NULL; ITypeInfo *info = NULL; diff --git a/ext/ctype/ctype.xml b/ext/ctype/ctype.xml index 5837b9b5d0..0e7c714b70 100644 --- a/ext/ctype/ctype.xml +++ b/ext/ctype/ctype.xml @@ -9,7 +9,7 @@ current locale. </para> <para> - When called with an integer argument theese functions + When called with an integer argument these functions behave exactly like their C counterparts. </para> <para> diff --git a/ext/dba/README b/ext/dba/README index 0c22830e54..a79413f100 100755 --- a/ext/dba/README +++ b/ext/dba/README @@ -39,7 +39,7 @@ inifile This is available since PHP 4.3.3 to be able to modify php.ini As the functions dba_firstkey() and dba_nextkey() return string representations of the key there is a new function dba_key_split() available since PHP 5 which allows to convert the string keys into - array keys without loosing FALSE. + array keys without losing FALSE. qdbm This is available since PHP 5.0.0. The qdbm library can be loaded from http://qdbm.sourceforge.net. diff --git a/ext/ereg/regex/regcomp.c b/ext/ereg/regex/regcomp.c index 156eee9329..730bcf568a 100644 --- a/ext/ereg/regex/regcomp.c +++ b/ext/ereg/regex/regcomp.c @@ -450,7 +450,7 @@ int starordinary; /* is a leading * an ordinary character? */ register sopno subno; # define BACKSL (1<<CHAR_BIT) - pos = HERE(); /* repetion op, if any, covers from here */ + pos = HERE(); /* repetition op, if any, covers from here */ assert(MORE()); /* caller should have ensured this */ c = GETNEXT(); diff --git a/ext/intl/collator/collator_convert.c b/ext/intl/collator/collator_convert.c index bc279b25f7..607add2fcf 100644 --- a/ext/intl/collator/collator_convert.c +++ b/ext/intl/collator/collator_convert.c @@ -273,7 +273,7 @@ zval* collator_convert_object_to_string( zval* obj, zval *rv TSRMLS_DC ) } } - /* Object wasn't successfuly converted => bail out. */ + /* Object wasn't successfully converted => bail out. */ if( zstr == NULL ) { COLLATOR_CONVERT_RETURN_FAILED( obj ); diff --git a/ext/intl/collator/collator_sort.c b/ext/intl/collator/collator_sort.c index 4fd7c4597e..6f29c9b6de 100644 --- a/ext/intl/collator/collator_sort.c +++ b/ext/intl/collator/collator_sort.c @@ -482,7 +482,7 @@ PHP_FUNCTION( collator_sort_with_sort_keys ) sortKeyIndxBuf = erealloc( sortKeyIndxBuf, sortKeyIndxBufSize ); } - sortKeyIndxBuf[sortKeyCount].key = (char*)sortKeyBufOffset; /* remeber just offset, cause address */ + sortKeyIndxBuf[sortKeyCount].key = (char*)sortKeyBufOffset; /* remember just offset, cause address */ /* of 'sortKeyBuf' may be changed due to realloc. */ sortKeyIndxBuf[sortKeyCount].zstr = hashData; diff --git a/ext/intl/doc/datefmt_api.php b/ext/intl/doc/datefmt_api.php index 272abdb57c..2084e1a2c8 100644 --- a/ext/intl/doc/datefmt_api.php +++ b/ext/intl/doc/datefmt_api.php @@ -150,7 +150,7 @@ class DateFormatter { * time patterns, parsing as much as possible to obtain a value. * 'false' sets the parser to strictly parse strings into dates. * Extra space, unrecognized tokens, or invalid values - * ("Feburary 30th") are not accepted. + * ("February 30th") are not accepted. * * @return boolean 'true' if successful; 'false' if an error occurred. */ @@ -338,7 +338,7 @@ class DateFormatter { * time patterns, parsing as much as possible to obtain a value. * 'false' sets the parser to strictly parse strings into dates. * Extra space, unrecognized tokens, or invalid values - * ("Feburary 30th") are not accepted. + * ("February 30th") are not accepted. * * @return boolean 'true' if successful; 'false' if an error occurred. */ diff --git a/ext/intl/intl_convert.c b/ext/intl/intl_convert.c index 7f756b9e7f..50a742082f 100644 --- a/ext/intl/intl_convert.c +++ b/ext/intl/intl_convert.c @@ -61,7 +61,7 @@ void intl_convert_utf8_to_utf16( if( *status == U_ZERO_ERROR ) { - /* String is converted successfuly */ + /* String is converted successfully */ (*target)[dst_len] = 0; *target_len = dst_len; return; diff --git a/ext/intl/tests/bug60192-compare.phpt b/ext/intl/tests/bug60192-compare.phpt index 0fd24cce80..12f3273538 100644 --- a/ext/intl/tests/bug60192-compare.phpt +++ b/ext/intl/tests/bug60192-compare.phpt @@ -8,7 +8,7 @@ Bug #60192 (SegFault when Collator not constructed properly) <?php class Collator2 extends Collator{ public function __construct() { - // ommitting parent::__construct($someLocale); + // omitting parent::__construct($someLocale); } } diff --git a/ext/intl/tests/bug60192-getlocale.phpt b/ext/intl/tests/bug60192-getlocale.phpt index 50e3ec35e4..9f340c5f67 100644 --- a/ext/intl/tests/bug60192-getlocale.phpt +++ b/ext/intl/tests/bug60192-getlocale.phpt @@ -9,7 +9,7 @@ Bug #60192 (SegFault when Collator not constructed properly) class Collator2 extends Collator{ public function __construct() { - // ommitting parent::__construct($someLocale); + // omitting parent::__construct($someLocale); } } diff --git a/ext/intl/tests/bug60192-getsortkey.phpt b/ext/intl/tests/bug60192-getsortkey.phpt index 39755ae8f9..f3e68f9c61 100644 --- a/ext/intl/tests/bug60192-getsortkey.phpt +++ b/ext/intl/tests/bug60192-getsortkey.phpt @@ -9,7 +9,7 @@ Bug #60192 (SegFault when Collator not constructed properly) class Collator2 extends Collator{ public function __construct() { - // ommitting parent::__construct($someLocale); + // omitting parent::__construct($someLocale); } } diff --git a/ext/intl/tests/bug60192-sort.phpt b/ext/intl/tests/bug60192-sort.phpt index 57057215e6..ee506d3a5a 100644 --- a/ext/intl/tests/bug60192-sort.phpt +++ b/ext/intl/tests/bug60192-sort.phpt @@ -9,7 +9,7 @@ Bug #60192 (SegFault when Collator not constructed properly) class Collator2 extends Collator{ public function __construct() { - // ommitting parent::__construct($someLocale); + // omitting parent::__construct($someLocale); } } diff --git a/ext/intl/tests/bug60192-sortwithsortkeys.phpt b/ext/intl/tests/bug60192-sortwithsortkeys.phpt index 445f4a03b9..c26b2daf85 100644 --- a/ext/intl/tests/bug60192-sortwithsortkeys.phpt +++ b/ext/intl/tests/bug60192-sortwithsortkeys.phpt @@ -9,7 +9,7 @@ Bug #60192 (SegFault when Collator not constructed properly) class Collator2 extends Collator{ public function __construct() { - // ommitting parent::__construct($someLocale); + // omitting parent::__construct($someLocale); } } diff --git a/ext/intl/tests/collator_get_error_code.phpt b/ext/intl/tests/collator_get_error_code.phpt index 45a8e710f4..c886943d5d 100644 --- a/ext/intl/tests/collator_get_error_code.phpt +++ b/ext/intl/tests/collator_get_error_code.phpt @@ -6,7 +6,7 @@ get_error_code() <?php /* - * Retreive error code. + * Retrieve error code. */ diff --git a/ext/intl/tests/collator_get_error_message.phpt b/ext/intl/tests/collator_get_error_message.phpt index af4b9c3821..2c1cc79a5f 100644 --- a/ext/intl/tests/collator_get_error_message.phpt +++ b/ext/intl/tests/collator_get_error_message.phpt @@ -6,7 +6,7 @@ get_error_message() <?php /* - * Retreive error message. + * Retrieve error message. */ diff --git a/ext/mysql/tests/mysql_deprecated_api.phpt b/ext/mysql/tests/mysql_deprecated_api.phpt index ebf72375cf..8844617c66 100644 --- a/ext/mysql/tests/mysql_deprecated_api.phpt +++ b/ext/mysql/tests/mysql_deprecated_api.phpt @@ -13,7 +13,7 @@ error_reporting=E_ALL | E_NOTICE | E_STRICT /* We use an extra test to cover deprecation warning. Due to this extra test we can silence deprecation warnings - in have other test using @ operator without loosing the information + in have other test using @ operator without losing the information which function is deprecated and, without reducing test portability. */ include "table.inc"; diff --git a/ext/mysqlnd/mysqlnd.h b/ext/mysqlnd/mysqlnd.h index 1a23781eb0..aab977d24c 100644 --- a/ext/mysqlnd/mysqlnd.h +++ b/ext/mysqlnd/mysqlnd.h @@ -29,7 +29,7 @@ #define MYSQLND_STRING_TO_INT_CONVERSION /* - This force mysqlnd to do a single (or more depending on ammount of data) + This force mysqlnd to do a single (or more depending on amount of data) non-blocking read() calls before sending a command to the server. Useful for debugging, if previous function hasn't consumed all the output sent to it - like stmt_send_long_data() error because the data was larger that diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c index dba13ced93..122a27fd48 100644 --- a/ext/oci8/oci8.c +++ b/ext/oci8/oci8.c @@ -1475,7 +1475,7 @@ static void php_oci_pconnection_list_np_dtor(zend_resource *entry TSRMLS_DC) * semantics. With the PECL OCI 1.3.x extensions, we release pconnections when oci_close * takes the refcount to zero. * - * If oci_old_close_semantics is set, we artifically bump up the refcount and decremented + * If oci_old_close_semantics is set, we artificially bump up the refcount and decremented * only at request shutdown. */ php_oci_connection_release(connection TSRMLS_CC); diff --git a/ext/oci8/tests/bug36010.phpt b/ext/oci8/tests/bug36010.phpt index d181046871..3ad49ecad8 100644 --- a/ext/oci8/tests/bug36010.phpt +++ b/ext/oci8/tests/bug36010.phpt @@ -1,5 +1,5 @@ --TEST-- -Bug #36010 (Crash when executing SQL statment with lob parameter twice) +Bug #36010 (Crash when executing SQL statement with lob parameter twice) --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c index 6729163996..594a37383e 100644 --- a/ext/odbc/php_odbc.c +++ b/ext/odbc/php_odbc.c @@ -437,7 +437,7 @@ static void _free_odbc_result(zend_resource *rsrc TSRMLS_DC) (SQLUSMALLINT) SQL_COMMIT); #endif rc = SQLFreeStmt(res->stmt,SQL_DROP); - /* We don't want the connection to be closed after the last statment has been closed + /* We don't want the connection to be closed after the last statement has been closed * Connections will be closed on shutdown * zend_list_delete(res->conn_ptr->id); */ @@ -2493,8 +2493,8 @@ int odbc_sqlconnect(odbc_connection **conn, char *db, char *uid, char *pwd, int * * We do have to hash non-persistent connections, and reuse connections. * In the case where two connects were being made, without closing the first - * connect, access violations were occuring. This is because some of the - * "globals" in this module should actualy be per-connection variables. I + * connect, access violations were occurring. This is because some of the + * "globals" in this module should actually be per-connection variables. I * simply fixed things to get them working for now. Shane */ /* {{{ odbc_do_connect */ diff --git a/ext/odbc/tests/bug60616.phpt b/ext/odbc/tests/bug60616.phpt index 937049a9b8..72226f23bb 100644 --- a/ext/odbc/tests/bug60616.phpt +++ b/ext/odbc/tests/bug60616.phpt @@ -12,7 +12,7 @@ $euc_jp = base64_decode($euc_jp_base64); $ascii = 'abcdefghijklmnopqrstuvwxyz;]=#0123456789'; include 'config.inc'; -ini_set("odbc.defaultlrl", 4); // Set artifically low +ini_set("odbc.defaultlrl", 4); // Set artificially low $conn = odbc_connect($dsn, $user, $pass); diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c index d79e42740d..34b5b47808 100644 --- a/ext/opcache/ZendAccelerator.c +++ b/ext/opcache/ZendAccelerator.c @@ -824,7 +824,7 @@ static inline int do_validate_timestamps(zend_persistent_script *persistent_scri zend_file_handle ps_handle; char *full_path_ptr = NULL; - /** check that the persistant script is indeed the same file we cached + /** check that the persistent script is indeed the same file we cached * (if part of the path is a symlink than it possible that the user will change it) * See bug #15140 */ diff --git a/ext/pdo_oci/oci_driver.c b/ext/pdo_oci/oci_driver.c index 9132999461..2abc84ba33 100644 --- a/ext/pdo_oci/oci_driver.c +++ b/ext/pdo_oci/oci_driver.c @@ -174,7 +174,7 @@ ub4 _oci_error(OCIError *err, pdo_dbh_t *dbh, pdo_stmt_t *stmt, char *what, swor } if (stmt) { - /* always propogate the error code back up to the dbh, + /* always propagate the error code back up to the dbh, * so that we can catch the error information when execute * is called via query. See Bug #33707 */ if (H->einfo.errmsg) { diff --git a/ext/standard/array.c b/ext/standard/array.c index 57d0065b25..bacd98cf30 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -615,7 +615,7 @@ PHP_FUNCTION(usort) return; } - /* Increase reference counter, so the attemts to modify the array in user + /* Increase reference counter, so the attempts to modify the array in user * comparison function will create a copy of array and won't affect the * original array. The fact of modification is detected using refcount * comparison. The result of sorting in such case is undefined and the @@ -660,7 +660,7 @@ PHP_FUNCTION(uasort) return; } - /* Increase reference counter, so the attemts to modify the array in user + /* Increase reference counter, so the attempts to modify the array in user * comparison function will create a copy of array and won't affect the * original array. The fact of modification is detected using refcount * comparison. The result of sorting in such case is undefined and the @@ -748,7 +748,7 @@ PHP_FUNCTION(uksort) return; } - /* Increase reference counter, so the attemts to modify the array in user + /* Increase reference counter, so the attempts to modify the array in user * comparison function will create a copy of array and won't affect the * original array. The fact of modification is detected using refcount * comparison. The result of sorting in such case is undefined and the diff --git a/ext/standard/exec.c b/ext/standard/exec.c index 15e4876af5..ca6942a9c9 100644 --- a/ext/standard/exec.c +++ b/ext/standard/exec.c @@ -279,7 +279,7 @@ PHPAPI zend_string *php_escape_shell_cmd(char *str) cmd->val[y++] = str[x]; break; #else - /* % is Windows specific for enviromental variables, ^%PATH% will + /* % is Windows specific for environmental variables, ^%PATH% will output PATH whil ^%PATH^% not. escapeshellcmd->val will escape all %. */ case '%': diff --git a/ext/standard/file.c b/ext/standard/file.c index 4804e49338..e7d870d719 100644 --- a/ext/standard/file.c +++ b/ext/standard/file.c @@ -1601,7 +1601,7 @@ PHP_NAMED_FUNCTION(php_if_fstat) #else ZVAL_LONG(&stat_blocks,-1); #endif - /* Store numeric indexes in propper order */ + /* Store numeric indexes in proper order */ zend_hash_next_index_insert(HASH_OF(return_value), &stat_dev); zend_hash_next_index_insert(HASH_OF(return_value), &stat_ino); zend_hash_next_index_insert(HASH_OF(return_value), &stat_mode); diff --git a/ext/standard/filestat.c b/ext/standard/filestat.c index 53aede1469..80d4ca4388 100644 --- a/ext/standard/filestat.c +++ b/ext/standard/filestat.c @@ -1048,7 +1048,7 @@ PHPAPI void php_stat(const char *filename, php_stat_len filename_length, int typ #else ZVAL_LONG(&stat_blocks,-1); #endif - /* Store numeric indexes in propper order */ + /* Store numeric indexes in proper order */ zend_hash_next_index_insert(HASH_OF(return_value), &stat_dev); zend_hash_next_index_insert(HASH_OF(return_value), &stat_ino); zend_hash_next_index_insert(HASH_OF(return_value), &stat_mode); diff --git a/ext/standard/flock_compat.h b/ext/standard/flock_compat.h index 14405022b6..ac3f52697b 100644 --- a/ext/standard/flock_compat.h +++ b/ext/standard/flock_compat.h @@ -21,7 +21,7 @@ #ifndef FLOCK_COMPAT_H #define FLOCK_COMPAT_H -/* php_flock internally uses fcntl whther or not flock is available +/* php_flock internally uses fcntl whether or not flock is available * This way our php_flock even works on NFS files. * More info: /usr/src/linux/Documentation */ diff --git a/ext/standard/ftp_fopen_wrapper.c b/ext/standard/ftp_fopen_wrapper.c index 01522bc7a9..526a45b470 100644 --- a/ext/standard/ftp_fopen_wrapper.c +++ b/ext/standard/ftp_fopen_wrapper.c @@ -788,7 +788,7 @@ static int php_stream_ftp_url_stat(php_stream_wrapper *wrapper, const char *url, goto stat_errexit; } - ssb->sb.st_mode = 0644; /* FTP won't give us a valid mode, so aproximate one based on being readable */ + ssb->sb.st_mode = 0644; /* FTP won't give us a valid mode, so approximate one based on being readable */ php_stream_printf(stream TSRMLS_CC, "CWD %s\r\n", (resource->path != NULL ? resource->path : "/")); /* If we can CWD to it, it's a directory (maybe a link, but we can't tell) */ result = GET_FTP_RESULT(stream); if (result < 200 || result > 299) { diff --git a/ext/standard/metaphone.c b/ext/standard/metaphone.c index 5327869a50..55b8509f04 100644 --- a/ext/standard/metaphone.c +++ b/ext/standard/metaphone.c @@ -90,7 +90,7 @@ char _codes[26] = /* These letters are passed through unchanged */ #define NOCHANGE(c) (ENCODE(c) & 2) /* FJMNR */ -/* These form dipthongs when preceding H */ +/* These form diphthongs when preceding H */ #define AFFECTH(c) (ENCODE(c) & 4) /* CGPST */ /* These make C and G soft */ diff --git a/ext/standard/password.c b/ext/standard/password.c index 4f211dd35f..087b3ace76 100644 --- a/ext/standard/password.c +++ b/ext/standard/password.c @@ -278,7 +278,7 @@ PHP_FUNCTION(password_verify) } /* We're using this method instead of == in order to provide - * resistence towards timing attacks. This is a constant time + * resistance towards timing attacks. This is a constant time * equality check that will always check every byte of both * values. */ for (i = 0; i < hash_len; i++) { diff --git a/ext/standard/rand.c b/ext/standard/rand.c index 55388e3c13..47b55af466 100644 --- a/ext/standard/rand.c +++ b/ext/standard/rand.c @@ -271,7 +271,7 @@ PHP_FUNCTION(mt_srand) * We have a problem here in that only n==M will get mapped to b which # means the chances of getting b is much much less than getting any of # the other values in the range. We can fix this by increasing our range - # artifically and using: + # artificially and using: # # n' = a + n(b-a+1)/M * diff --git a/ext/standard/string.c b/ext/standard/string.c index 152ae6d66f..c5c6520cf7 100644 --- a/ext/standard/string.c +++ b/ext/standard/string.c @@ -2807,7 +2807,7 @@ static void php_strtr_array(zval *return_value, char *str, size_t slen, HashTabl char *key; smart_str result = {0}; - /* we will collect all possible key lenghts */ + /* we will collect all possible key lengths */ ZVAL_NULL(&dummy); zend_hash_init(&num_hash, 8, NULL, NULL, 0); @@ -2829,7 +2829,7 @@ static void php_strtr_array(zval *return_value, char *str, size_t slen, HashTabl if (len < minlen) { minlen = len; } - /* remember possible key lenght */ + /* remember possible key length */ zend_hash_index_add(&num_hash, len, &dummy); } } ZEND_HASH_FOREACH_END(); @@ -2854,7 +2854,7 @@ static void php_strtr_array(zval *return_value, char *str, size_t slen, HashTabl if (len < minlen) { minlen = len; } - /* remember possible key lenght */ + /* remember possible key length */ zend_hash_index_add(&num_hash, len, &dummy); } else { len = str_key->len; diff --git a/ext/standard/tests/array/array_search_variation4.phpt b/ext/standard/tests/array/array_search_variation4.phpt index c247879ccc..7feb2ef147 100644 --- a/ext/standard/tests/array/array_search_variation4.phpt +++ b/ext/standard/tests/array/array_search_variation4.phpt @@ -1,5 +1,5 @@ --TEST-- -Test array_search() function : usage variations - haystack as resource/multi dimentional array +Test array_search() function : usage variations - haystack as resource/multi dimensional array --FILE-- <?php /* diff --git a/ext/standard/tests/array/in_array_variation4.phpt b/ext/standard/tests/array/in_array_variation4.phpt index a27bb196b4..9a5312b268 100644 --- a/ext/standard/tests/array/in_array_variation4.phpt +++ b/ext/standard/tests/array/in_array_variation4.phpt @@ -1,5 +1,5 @@ --TEST-- -Test in_array() function : usage variations - haystack as resource/multi dimentional array +Test in_array() function : usage variations - haystack as resource/multi dimensional array --FILE-- <?php /* diff --git a/ext/standard/tests/file/fgetc_variation1.phpt b/ext/standard/tests/file/fgetc_variation1.phpt index 007b2e0f9c..03258cac5d 100644 --- a/ext/standard/tests/file/fgetc_variation1.phpt +++ b/ext/standard/tests/file/fgetc_variation1.phpt @@ -34,7 +34,7 @@ for(; $loop_counter < count($file_modes); $loop_counter++) { var_dump( feof($file_handle) ); // expected false var_dump( ftell($file_handle) ); // ensure that file pointer is at eof var_dump( fgetc($file_handle) ); // try n read a char, none expected - var_dump( feof($file_handle) ); // ensure thta file pointer is at eof + var_dump( feof($file_handle) ); // ensure that file pointer is at eof var_dump( ftell($file_handle) ); // file pointer position // close the file handle diff --git a/ext/standard/tests/file/fgets_variation6-win32.phpt b/ext/standard/tests/file/fgets_variation6-win32.phpt index 14cb46f185..0334050aaa 100644 --- a/ext/standard/tests/file/fgets_variation6-win32.phpt +++ b/ext/standard/tests/file/fgets_variation6-win32.phpt @@ -49,7 +49,7 @@ foreach($file_modes as $file_mode) { var_dump( fgets($file_handle) ); // try n read a line, none expected var_dump( ftell($file_handle) ); // file pointer position - var_dump( feof($file_handle) ); // ensure thta file pointer is at eof + var_dump( feof($file_handle) ); // ensure that file pointer is at eof //close file fclose($file_handle); diff --git a/ext/standard/tests/file/fgets_variation6.phpt b/ext/standard/tests/file/fgets_variation6.phpt index da6c2149b9..69215d9020 100644 --- a/ext/standard/tests/file/fgets_variation6.phpt +++ b/ext/standard/tests/file/fgets_variation6.phpt @@ -49,7 +49,7 @@ foreach($file_modes as $file_mode) { var_dump( fgets($file_handle) ); // try n read a line, none expected var_dump( ftell($file_handle) ); // file pointer position - var_dump( feof($file_handle) ); // ensure thta file pointer is at eof + var_dump( feof($file_handle) ); // ensure that file pointer is at eof //close file fclose($file_handle); diff --git a/ext/standard/tests/file/file.inc b/ext/standard/tests/file/file.inc index b3cd99e1c1..aff9d107d9 100644 --- a/ext/standard/tests/file/file.inc +++ b/ext/standard/tests/file/file.inc @@ -451,7 +451,7 @@ function delete_file($filename) { Description: Deletes given number of files if exists. $file_path = location of the files $name_prefix = prefix for the filename, rest of the name is incremental(increment by 1 only) - numeric starting from suffix upto count + numeric starting from suffix up to count $count = number of files to be deleted $name_suffix = first numeric suffix in the name Returns: An array with following key/value pair @@ -495,7 +495,7 @@ function delete_files($file_path, $file_path = location of link files $link_file_count = Number of link files $link_name_prefix = prefix for the linkname, rest of the name is incremental(increment by 1 only) - numeric starting from $link_name_suffix upto count + numeric starting from $link_name_suffix up to count $link_name_suffix = first numeric suffix in the name Returns: An array with following key/value pair diff --git a/ext/standard/tests/file/fscanf_variation18.phpt b/ext/standard/tests/file/fscanf_variation18.phpt index 71b72984b8..bdd444d0e5 100644 --- a/ext/standard/tests/file/fscanf_variation18.phpt +++ b/ext/standard/tests/file/fscanf_variation18.phpt @@ -35,8 +35,8 @@ $integer_values = array ( 0Xfff, 0XFA, -0x80000000, // max negative integer as hexadecimal - 0x7fffffff, // max postive integer as hexadecimal - 0x7FFFFFFF, // max postive integer as hexadecimal + 0x7fffffff, // max positive integer as hexadecimal + 0x7FFFFFFF, // max positive integer as hexadecimal 0123, // integer as octal 01912, // should be quivalent to octal 1 -020000000000, // max negative integer as octal diff --git a/ext/standard/tests/file/fscanf_variation2.phpt b/ext/standard/tests/file/fscanf_variation2.phpt index 77ae474ccc..8179aee78e 100644 --- a/ext/standard/tests/file/fscanf_variation2.phpt +++ b/ext/standard/tests/file/fscanf_variation2.phpt @@ -34,8 +34,8 @@ $valid_ints = array( 0Xfff, 0XFA, -0x80000000, // max negative integer as hexadecimal - 0x7fffffff, // max postive integer as hexadecimal - 0x7FFFFFFF, // max postive integer as hexadecimal + 0x7fffffff, // max positive integer as hexadecimal + 0x7FFFFFFF, // max positive integer as hexadecimal 0123, // integer as octal 01912, // should be quivalent to octal 1 -020000000000, // max negative integer as octal diff --git a/ext/standard/tests/file/fscanf_variation20.phpt b/ext/standard/tests/file/fscanf_variation20.phpt index 7ce609c680..3c176773ed 100644 --- a/ext/standard/tests/file/fscanf_variation20.phpt +++ b/ext/standard/tests/file/fscanf_variation20.phpt @@ -34,8 +34,8 @@ $valid_ints = array( 0Xfff, 0XFA, -0x80000000, // max negative integer as hexadecimal - 0x7fffffff, // max postive integer as hexadecimal - 0x7FFFFFFF, // max postive integer as hexadecimal + 0x7fffffff, // max positive integer as hexadecimal + 0x7FFFFFFF, // max positive integer as hexadecimal 0123, // integer as octal 01912, // should be quivalent to octal 1 -020000000000, // max negative integer as octal diff --git a/ext/standard/tests/file/fscanf_variation27.phpt b/ext/standard/tests/file/fscanf_variation27.phpt index 7a691fcc60..04f2dd5a62 100644 --- a/ext/standard/tests/file/fscanf_variation27.phpt +++ b/ext/standard/tests/file/fscanf_variation27.phpt @@ -34,8 +34,8 @@ $valid_ints = array( 0Xfff, 0XFA, -0x80000000, // max negative integer as hexadecimal - 0x7fffffff, // max postive integer as hexadecimal - 0x7FFFFFFF, // max postive integer as hexadecimal + 0x7fffffff, // max positive integer as hexadecimal + 0x7FFFFFFF, // max positive integer as hexadecimal 0123, // integer as octal 01912, // should be quivalent to octal 1 -020000000000, // max negative integer as octal diff --git a/ext/standard/tests/file/fscanf_variation33.phpt b/ext/standard/tests/file/fscanf_variation33.phpt index 7ecff33fb9..2dc404ac76 100644 --- a/ext/standard/tests/file/fscanf_variation33.phpt +++ b/ext/standard/tests/file/fscanf_variation33.phpt @@ -40,8 +40,8 @@ $valid_ints = array( 0Xfff, 0XFA, -0x80000000, // max negative integer as hexadecimal - 0x7fffffff, // max postive integer as hexadecimal - 0x7FFFFFFF, // max postive integer as hexadecimal + 0x7fffffff, // max positive integer as hexadecimal + 0x7FFFFFFF, // max positive integer as hexadecimal 0123, // integer as octal 01912, // should be quivalent to octal 1 -020000000000, // max negative integer as octal diff --git a/ext/standard/tests/file/fscanf_variation39.phpt b/ext/standard/tests/file/fscanf_variation39.phpt index 1b17015bc1..30d299662a 100644 --- a/ext/standard/tests/file/fscanf_variation39.phpt +++ b/ext/standard/tests/file/fscanf_variation39.phpt @@ -40,8 +40,8 @@ $valid_ints = array( 0Xfff, 0XFA, -0x80000000, // max negative integer as hexadecimal - 0x7fffffff, // max postive integer as hexadecimal - 0x7FFFFFFF, // max postive integer as hexadecimal + 0x7fffffff, // max positive integer as hexadecimal + 0x7FFFFFFF, // max positive integer as hexadecimal 0123, // integer as octal 01912, // should be quivalent to octal 1 -020000000000, // max negative integer as octal diff --git a/ext/standard/tests/file/fscanf_variation45.phpt b/ext/standard/tests/file/fscanf_variation45.phpt index 7db0cc9748..cfd1fe2c4f 100644 --- a/ext/standard/tests/file/fscanf_variation45.phpt +++ b/ext/standard/tests/file/fscanf_variation45.phpt @@ -34,8 +34,8 @@ $valid_ints = array( 0Xfff, 0XFA, -0x80000000, // max negative integer as hexadecimal - 0x7fffffff, // max postive integer as hexadecimal - 0x7FFFFFFF, // max postive integer as hexadecimal + 0x7fffffff, // max positive integer as hexadecimal + 0x7FFFFFFF, // max positive integer as hexadecimal 0123, // integer as octal 01912, // should be quivalent to octal 1 -020000000000, // max negative integer as octal diff --git a/ext/standard/tests/file/fscanf_variation9.phpt b/ext/standard/tests/file/fscanf_variation9.phpt index f3551f08d2..609c3ef139 100644 --- a/ext/standard/tests/file/fscanf_variation9.phpt +++ b/ext/standard/tests/file/fscanf_variation9.phpt @@ -41,8 +41,8 @@ $integer_values = array ( 0Xfff, 0XFA, -0x80000000, // max negative integer as hexadecimal - 0x7fffffff, // max postive integer as hexadecimal - 0x7FFFFFFF, // max postive integer as hexadecimal + 0x7fffffff, // max positive integer as hexadecimal + 0x7FFFFFFF, // max positive integer as hexadecimal 0123, // integer as octal 01912, // should be quivalent to octal 1 -020000000000, // max negative integer as octal diff --git a/ext/standard/tests/general_functions/bug39322.phpt b/ext/standard/tests/general_functions/bug39322.phpt index a9f83c75bf..da06e89847 100644 --- a/ext/standard/tests/general_functions/bug39322.phpt +++ b/ext/standard/tests/general_functions/bug39322.phpt @@ -1,5 +1,5 @@ --TEST-- -Bug #39322 (proc_terminate() loosing process resource) +Bug #39322 (proc_terminate() losing process resource) --SKIPIF-- <?php if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); diff --git a/ext/standard/tests/general_functions/getrusage_basic.phpt b/ext/standard/tests/general_functions/getrusage_basic.phpt index c9b34597cf..0e5b42c420 100644 --- a/ext/standard/tests/general_functions/getrusage_basic.phpt +++ b/ext/standard/tests/general_functions/getrusage_basic.phpt @@ -18,7 +18,7 @@ echo "Simple testcase for getrusage() function\n"; $dat = getrusage(); if (!is_array($dat)) { - echo "TEST FAILED : getrusage shoudl return an array\n"; + echo "TEST FAILED : getrusage should return an array\n"; } // echo the fields which are common to all platforms diff --git a/ext/standard/tests/general_functions/intval.phpt b/ext/standard/tests/general_functions/intval.phpt index 7986e2dd14..095d66e3f2 100644 --- a/ext/standard/tests/general_functions/intval.phpt +++ b/ext/standard/tests/general_functions/intval.phpt @@ -25,8 +25,8 @@ $valid_ints = array( '0Xfff', '0XFA', -0x80000000, // max negative integer as hexadecimal - '0x7fffffff', // max postive integer as hexadecimal - 0x7FFFFFFF, // max postive integer as hexadecimal + '0x7fffffff', // max positive integer as hexadecimal + 0x7FFFFFFF, // max positive integer as hexadecimal '0123', // integer as octal 01912, // should be quivalent to octal 1 -020000000000, // max negative integer as octal diff --git a/ext/standard/tests/general_functions/is_int.phpt b/ext/standard/tests/general_functions/is_int.phpt index 7cc3f3b2f5..3aed0c9f17 100644 --- a/ext/standard/tests/general_functions/is_int.phpt +++ b/ext/standard/tests/general_functions/is_int.phpt @@ -25,8 +25,8 @@ $valid_ints = array( 0Xfff, 0XFA, -0x80000000, // max negative integer as hexadecimal - 0x7fffffff, // max postive integer as hexadecimal - 0x7FFFFFFF, // max postive integer as hexadecimal + 0x7fffffff, // max positive integer as hexadecimal + 0x7FFFFFFF, // max positive integer as hexadecimal 0123, // integer as octal 01912, // should be quivalent to octal 1 -020000000000, // max negative integer as octal diff --git a/ext/standard/tests/general_functions/is_int_64bit.phpt b/ext/standard/tests/general_functions/is_int_64bit.phpt index 9de376eb1c..6f7f5162cd 100644 --- a/ext/standard/tests/general_functions/is_int_64bit.phpt +++ b/ext/standard/tests/general_functions/is_int_64bit.phpt @@ -27,8 +27,8 @@ $valid_ints = array( 0Xfff, 0XFA, -0x80000000, // max negative integer as hexadecimal - 0x7fffffff, // max postive integer as hexadecimal - 0x7FFFFFFF, // max postive integer as hexadecimal + 0x7fffffff, // max positive integer as hexadecimal + 0x7FFFFFFF, // max positive integer as hexadecimal 0123, // integer as octal 01912, // should be quivalent to octal 1 -020000000000, // max negative integer as octal diff --git a/ext/standard/tests/general_functions/php_uname_error.phpt b/ext/standard/tests/general_functions/php_uname_error.phpt index 5e221b75cc..ca4c3d4022 100644 --- a/ext/standard/tests/general_functions/php_uname_error.phpt +++ b/ext/standard/tests/general_functions/php_uname_error.phpt @@ -12,7 +12,7 @@ echo "\n-- Testing php_uname() function with more than expected no. of arguments var_dump( php_uname('a', true) ); echo "\n-- Testing php_uname() function with invalid mode --\n"; -// am invalid mode shoudl result in same o/p as mode 'a' +// am invalid mode should result in same o/p as mode 'a' var_dump( php_uname('z') == php_uname('z') ); class barClass { diff --git a/ext/standard/tests/general_functions/strval.phpt b/ext/standard/tests/general_functions/strval.phpt index 372ac6701e..89f5c591e8 100644 --- a/ext/standard/tests/general_functions/strval.phpt +++ b/ext/standard/tests/general_functions/strval.phpt @@ -43,8 +43,8 @@ $scalars = array( /* floats */ -0x80000000, // max negative integer as hexadecimal - 0x7fffffff, // max postive integer as hexadecimal - 0x7FFFFFFF, // max postive integer as hexadecimal + 0x7fffffff, // max positive integer as hexadecimal + 0x7FFFFFFF, // max positive integer as hexadecimal 0123, // integer as octal 01912, // should be quivalent to octal 1 -020000000000, // max negative integer as octal diff --git a/ext/standard/tests/general_functions/var_export-locale.phpt b/ext/standard/tests/general_functions/var_export-locale.phpt index b6f87c431c..b4d122e7b3 100644 --- a/ext/standard/tests/general_functions/var_export-locale.phpt +++ b/ext/standard/tests/general_functions/var_export-locale.phpt @@ -31,8 +31,8 @@ $valid_ints = array( '0Xfff', '0XFA', -0x80000000, // max negative integer as hexadecimal - '0x7fffffff', // max postive integer as hexadecimal - 0x7FFFFFFF, // max postive integer as hexadecimal + '0x7fffffff', // max positive integer as hexadecimal + 0x7FFFFFFF, // max positive integer as hexadecimal '0123', // integer as octal 01912, // should be quivalent to octal 1 -020000000000, // max negative integer as octal diff --git a/ext/standard/tests/general_functions/var_export_basic1.phpt b/ext/standard/tests/general_functions/var_export_basic1.phpt index 3a734c7fe0..8a23fe341b 100644 --- a/ext/standard/tests/general_functions/var_export_basic1.phpt +++ b/ext/standard/tests/general_functions/var_export_basic1.phpt @@ -23,8 +23,8 @@ $valid_ints = array( "'0Xfff'" => '0Xfff', "'0XFA'" => '0XFA', "-0x80000000" => -0x80000000, // max negative integer as hexadecimal - "'0x7fffffff'" => '0x7fffffff', // max postive integer as hexadecimal - "0x7FFFFFFF" => 0x7FFFFFFF, // max postive integer as hexadecimal + "'0x7fffffff'" => '0x7fffffff', // max positive integer as hexadecimal + "0x7FFFFFFF" => 0x7FFFFFFF, // max positive integer as hexadecimal "'0123'" => '0123', // integer as octal "01912" => 01912, // should be quivalent to octal 1 "-020000000000" => -020000000000, // max negative integer as octal diff --git a/ext/standard/tests/image/test1bpix.bmp b/ext/standard/tests/image/test1bpix.bmp Binary files differindex 5522e503d2..ddac2a0dda 100644 --- a/ext/standard/tests/image/test1bpix.bmp +++ b/ext/standard/tests/image/test1bpix.bmp diff --git a/ext/standard/tests/serialize/precision.phpt b/ext/standard/tests/serialize/precision.phpt index 142b2cecf8..229c514e69 100644 --- a/ext/standard/tests/serialize/precision.phpt +++ b/ext/standard/tests/serialize/precision.phpt @@ -15,8 +15,8 @@ $numbers = array( "0100000000001000", //2^-1022. + 10^-Accuracy[2^-1022.]*1.01 "ffffffffffffef7f", //2^1024. (maximum normal double) "feffffffffffef7f", //2^1024. - 10^-Accuracy[2^1024.] - "0100000000000000", //minumum subnormal double - "0200000000000000", //2nd minumum subnormal double + "0100000000000000", //minimum subnormal double + "0200000000000000", //2nd minimum subnormal double "fffffffffffff000", //maximum subnormal double "fefffffffffff000", //2nd maximum subnormal double "0000000000000f7f", //+inf diff --git a/ext/standard/tests/strings/addcslashes_001.phpt b/ext/standard/tests/strings/addcslashes_001.phpt Binary files differindex c9722c7fe7..9ccef61038 100644 --- a/ext/standard/tests/strings/addcslashes_001.phpt +++ b/ext/standard/tests/strings/addcslashes_001.phpt diff --git a/ext/standard/tests/strings/sprintf_variation10.phpt b/ext/standard/tests/strings/sprintf_variation10.phpt index 702dc34c77..e989d9f8b8 100644 --- a/ext/standard/tests/strings/sprintf_variation10.phpt +++ b/ext/standard/tests/strings/sprintf_variation10.phpt @@ -23,8 +23,8 @@ $integer_values = array ( 0Xfff, 0XFA, -0x80000000, // max negative integer as hexadecimal - 0x7fffffff, // max postive integer as hexadecimal - 0x7FFFFFFF, // max postive integer as hexadecimal + 0x7fffffff, // max positive integer as hexadecimal + 0x7FFFFFFF, // max positive integer as hexadecimal 0123, // integer as octal 01912, // should be quivalent to octal 1 -020000000000, // max negative integer as octal diff --git a/ext/standard/tests/strings/sprintf_variation19.phpt b/ext/standard/tests/strings/sprintf_variation19.phpt index ae7b910573..542ba52aa3 100644 --- a/ext/standard/tests/strings/sprintf_variation19.phpt +++ b/ext/standard/tests/strings/sprintf_variation19.phpt @@ -23,8 +23,8 @@ $integer_values = array( 0Xfff, 0XFA, -0x80000000, // max negative integer as hexadecimal - 0x7fffffff, // max postive integer as hexadecimal - 0x7FFFFFFF, // max postive integer as hexadecimal + 0x7fffffff, // max positive integer as hexadecimal + 0x7FFFFFFF, // max positive integer as hexadecimal 0123, // integer as octal 01912, // should be quivalent to octal 1 -020000000000, // max negative integer as octal diff --git a/ext/standard/tests/strings/sprintf_variation21.phpt b/ext/standard/tests/strings/sprintf_variation21.phpt Binary files differindex afedfcaf7c..cbbf16e066 100644 --- a/ext/standard/tests/strings/sprintf_variation21.phpt +++ b/ext/standard/tests/strings/sprintf_variation21.phpt diff --git a/ext/standard/tests/strings/sprintf_variation28.phpt b/ext/standard/tests/strings/sprintf_variation28.phpt index 8fad68b0d9..40af96f960 100644 --- a/ext/standard/tests/strings/sprintf_variation28.phpt +++ b/ext/standard/tests/strings/sprintf_variation28.phpt @@ -29,8 +29,8 @@ $integer_values = array( 0Xfff, 0XFA, -0x80000000, // max negative integer as hexadecimal - 0x7fffffff, // max postive integer as hexadecimal - 0x7FFFFFFF, // max postive integer as hexadecimal + 0x7fffffff, // max positive integer as hexadecimal + 0x7FFFFFFF, // max positive integer as hexadecimal 0123, // integer as octal 01912, // should be quivalent to octal 1 -020000000000, // max negative integer as octal diff --git a/ext/standard/tests/strings/sprintf_variation28_64bit.phpt b/ext/standard/tests/strings/sprintf_variation28_64bit.phpt index cd83093a74..92fdf78da1 100644 --- a/ext/standard/tests/strings/sprintf_variation28_64bit.phpt +++ b/ext/standard/tests/strings/sprintf_variation28_64bit.phpt @@ -25,8 +25,8 @@ $integer_values = array( 0Xfff, 0XFA, -0x80000000, // max negative integer as hexadecimal - 0x7fffffff, // max postive integer as hexadecimal - 0x7FFFFFFF, // max postive integer as hexadecimal + 0x7fffffff, // max positive integer as hexadecimal + 0x7FFFFFFF, // max positive integer as hexadecimal 0123, // integer as octal 01912, // should be quivalent to octal 1 -020000000000, // max negative integer as octal diff --git a/ext/standard/tests/strings/sprintf_variation3.phpt b/ext/standard/tests/strings/sprintf_variation3.phpt index 51a89ea08b..0435cf3d77 100644 --- a/ext/standard/tests/strings/sprintf_variation3.phpt +++ b/ext/standard/tests/strings/sprintf_variation3.phpt @@ -23,8 +23,8 @@ $valid_ints = array( 0Xfff, 0XFA, -0x80000000, // max negative integer as hexadecimal - 0x7fffffff, // max postive integer as hexadecimal - 0x7FFFFFFF, // max postive integer as hexadecimal + 0x7fffffff, // max positive integer as hexadecimal + 0x7FFFFFFF, // max positive integer as hexadecimal 0123, // integer as octal 01912, // should be quivalent to octal 1 -020000000000, // max negative integer as octal diff --git a/ext/standard/tests/strings/sprintf_variation34_64bit.phpt b/ext/standard/tests/strings/sprintf_variation34_64bit.phpt index f9a7805f98..27e3f0c73e 100644 --- a/ext/standard/tests/strings/sprintf_variation34_64bit.phpt +++ b/ext/standard/tests/strings/sprintf_variation34_64bit.phpt @@ -25,8 +25,8 @@ $integer_values = array( 0Xfff, 0XFA, -0x80000000, // max negative integer as hexadecimal - 0x7fffffff, // max postive integer as hexadecimal - 0x7FFFFFFF, // max postive integer as hexadecimal + 0x7fffffff, // max positive integer as hexadecimal + 0x7FFFFFFF, // max positive integer as hexadecimal 0123, // integer as octal 01912, // should be quivalent to octal 1 -020000000000, // max negative integer as octal diff --git a/ext/standard/tests/strings/sprintf_variation40.phpt b/ext/standard/tests/strings/sprintf_variation40.phpt index 0da6a10b8a..6efcee0608 100644 --- a/ext/standard/tests/strings/sprintf_variation40.phpt +++ b/ext/standard/tests/strings/sprintf_variation40.phpt @@ -29,8 +29,8 @@ $integer_values = array( 0Xfff, 0XFA, -0x80000000, // max negative integer as hexadecimal - 0x7fffffff, // max postive integer as hexadecimal - 0x7FFFFFFF, // max postive integer as hexadecimal + 0x7fffffff, // max positive integer as hexadecimal + 0x7FFFFFFF, // max positive integer as hexadecimal 0123, // integer as octal 01912, // should be quivalent to octal 1 -020000000000, // max negative integer as octal diff --git a/ext/standard/tests/strings/sprintf_variation46.phpt b/ext/standard/tests/strings/sprintf_variation46.phpt index 36aef14dd8..311d8c192a 100644 --- a/ext/standard/tests/strings/sprintf_variation46.phpt +++ b/ext/standard/tests/strings/sprintf_variation46.phpt @@ -23,8 +23,8 @@ $integer_values = array( 0Xfff, 0XFA, -0x80000000, // max negative integer as hexadecimal - 0x7fffffff, // max postive integer as hexadecimal - 0x7FFFFFFF, // max postive integer as hexadecimal + 0x7fffffff, // max positive integer as hexadecimal + 0x7FFFFFFF, // max positive integer as hexadecimal 0123, // integer as octal 01912, // should be quivalent to octal 1 -020000000000, // max negative integer as octal diff --git a/ext/standard/tests/strings/str_pad.phpt b/ext/standard/tests/strings/str_pad.phpt Binary files differindex 645d8ff385..0c0c2026cd 100644 --- a/ext/standard/tests/strings/str_pad.phpt +++ b/ext/standard/tests/strings/str_pad.phpt diff --git a/ext/standard/tests/strings/str_repeat.phpt b/ext/standard/tests/strings/str_repeat.phpt Binary files differindex 73c193b6d7..795050a9a4 100644 --- a/ext/standard/tests/strings/str_repeat.phpt +++ b/ext/standard/tests/strings/str_repeat.phpt diff --git a/ext/standard/tests/strings/strncasecmp_variation6.phpt b/ext/standard/tests/strings/strncasecmp_variation6.phpt index 765032b773..56276e9554 100644 --- a/ext/standard/tests/strings/strncasecmp_variation6.phpt +++ b/ext/standard/tests/strings/strncasecmp_variation6.phpt @@ -13,11 +13,11 @@ echo "*** Test strncasecmp() function: with binary inputs ***\n"; /* A binary function should work with all 256 characters that a character(8-bit) can take */ echo "\n-- Checking with all 256 characters given, in binary format --\n"; -/* loop through to get all 256 character's equivelent binary value, and check working of strncasecmp() */ +/* loop through to get all 256 character's equivalent binary value, and check working of strncasecmp() */ $count = 1; for($ASCII = 0; $ASCII <= 255; $ASCII++) { $str1 = decbin($ASCII); //ASCII value in binary form - $str2 = decbin( ord( chr($ASCII) ) ); //Getting equivelent ASCII value for the character in binary form + $str2 = decbin( ord( chr($ASCII) ) ); //Getting equivalent ASCII value for the character in binary form echo "-- Iteration $count --\n"; var_dump( strncasecmp($str1, $str2, 8) ); //comparing all the 8-bits; expected: int(0) var_dump( strncasecmp($str1, $str2, 4) ); //comparing only 4-bits; expected: int(0) diff --git a/ext/standard/tests/strings/strncmp_variation6.phpt b/ext/standard/tests/strings/strncmp_variation6.phpt index 7a79d29a51..b3b918920e 100644 --- a/ext/standard/tests/strings/strncmp_variation6.phpt +++ b/ext/standard/tests/strings/strncmp_variation6.phpt @@ -13,11 +13,11 @@ echo "*** Test strncmp() function: with binary inputs ***\n"; echo "\n-- Checking with all 256 characters given, in binary format --\n"; /* A binary function should work with all 256 characters that a character(8-bit) can take */ -/* loop through to get all 256 character's equivelent binary value, and check working of strncmp() */ +/* loop through to get all 256 character's equivalent binary value, and check working of strncmp() */ $count = 1; for($ASCII = 0; $ASCII <= 255; $ASCII++) { $str1 = decbin($ASCII); //ASCII value in binary form - $str2 = decbin( ord( chr($ASCII) ) ); //Getting equivelent ASCII value for the character in binary form + $str2 = decbin( ord( chr($ASCII) ) ); //Getting equivalent ASCII value for the character in binary form echo "-- Iteration $count --\n"; var_dump( strncmp($str1, $str2, 8) ); //comparing all the 8-bits; expected: int(0) var_dump( strncmp($str1, $str2, 4) ); //comparing only 4-bits; expected: int(0) diff --git a/ext/standard/var_unserializer.c b/ext/standard/var_unserializer.c index 9be2b0658a..c7641b1334 100644 --- a/ext/standard/var_unserializer.c +++ b/ext/standard/var_unserializer.c @@ -826,7 +826,7 @@ yy34: } array_init_size(rval, elements); -//??? we can't convert from packed to hash during unserialization, becaue +//??? we can't convert from packed to hash during unserialization, because //??? reference to some zvals might be keept in var_hash (to support references) zend_hash_real_init(Z_ARRVAL_P(rval), 0); diff --git a/ext/standard/var_unserializer.re b/ext/standard/var_unserializer.re index 1898c7734c..b8c65b7c4b 100644 --- a/ext/standard/var_unserializer.re +++ b/ext/standard/var_unserializer.re @@ -659,7 +659,7 @@ use_double: } array_init_size(rval, elements); -//??? we can't convert from packed to hash during unserialization, becaue +//??? we can't convert from packed to hash during unserialization, because //??? reference to some zvals might be keept in var_hash (to support references) zend_hash_real_init(Z_ARRVAL_P(rval), 0); diff --git a/ext/tokenizer/tests/token_get_all_variation17.phpt b/ext/tokenizer/tests/token_get_all_variation17.phpt index f71444bc1e..188df97916 100644 --- a/ext/tokenizer/tests/token_get_all_variation17.phpt +++ b/ext/tokenizer/tests/token_get_all_variation17.phpt @@ -22,7 +22,7 @@ $source = '<?php function inverse($x) { if($x == 0) { - throw new Exception("Divison by zero"); + throw new Exception("Division by zero"); else return 1/$x; } @@ -244,7 +244,7 @@ array(81) { [0]=> int(%d) [1]=> - string(17) ""Divison by zero"" + string(17) ""Division by zero"" [2]=> int(5) } diff --git a/main/main.c b/main/main.c index 5b969a930c..41e84a79f7 100644 --- a/main/main.c +++ b/main/main.c @@ -2278,7 +2278,7 @@ int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_mod /* load and startup extensions compiled as shared objects (aka DLLs) as requested by php.ini entries - theese are loaded after initialization of internal extensions + these are loaded after initialization of internal extensions as extensions *might* rely on things from ext/standard which is always an internal extension and to be initialized ahead of all other internals diff --git a/main/snprintf.h b/main/snprintf.h index 789ab7d41a..115a15aa58 100644 --- a/main/snprintf.h +++ b/main/snprintf.h @@ -31,7 +31,7 @@ sprintf offers the ability to make a lot of failures since it does not know snprintf knows the buffers size and will not write behind it. But you will have to use either a static buffer or allocate a dynamic buffer - before beeing able to call the function. In other words you must + before being able to call the function. In other words you must be sure that you really know the maximum size of the buffer required. A bad thing is having a big maximum while in most cases you would only need a small buffer. If the size of the resulting string is diff --git a/main/streams/streams.c b/main/streams/streams.c index 13af362681..c6420dc0d0 100644 --- a/main/streams/streams.c +++ b/main/streams/streams.c @@ -1066,7 +1066,7 @@ PHPAPI zend_string *php_stream_get_record(php_stream *stream, size_t maxlen, con * searched for the delimiter. * The left part of the delimiter may still remain in the buffer, * so subtract up to <delim_len - 1> from buffered_len, which is - * the ammount of data we skip on this search as an optimization + * the amount of data we skip on this search as an optimization */ found_delim = _php_stream_search_delim( stream, maxlen, diff --git a/run-tests.php b/run-tests.php index 17930b29bc..e2d0f9987f 100755 --- a/run-tests.php +++ b/run-tests.php @@ -342,7 +342,7 @@ function save_or_mail_results() if ($just_save_results || TRAVIS_CI || strlen(trim($user_input)) == 0 || strtolower($user_input[0]) == 'y') { /* * Collect information about the host system for our report - * Fetch phpinfo() output so that we can see the PHP enviroment + * Fetch phpinfo() output so that we can see the PHP environment * Make an archive of all the failed tests * Send an email */ diff --git a/scripts/dev/generate-phpt.phar b/scripts/dev/generate-phpt.phar Binary files differindex c6268c0af3..3b2137ade6 100644 --- a/scripts/dev/generate-phpt.phar +++ b/scripts/dev/generate-phpt.phar diff --git a/server-tests-config.php b/server-tests-config.php index a4fa88a5b2..5961deea98 100755 --- a/server-tests-config.php +++ b/server-tests-config.php @@ -37,11 +37,11 @@ $conf = array( 'TEST_WEB_BASE_URL' => NULL, /* if set, copy phpt files into this directory, - which should be accessable via an http server. The + which should be accessible via an http server. The TEST_WEB_BASE_URL setting should be the base url to access this path. If this is not used, TEST_WEB_BASE_URL should be the base url pointing - to TEST_PHP_SRCDIR, which should then be accessable via + to TEST_PHP_SRCDIR, which should then be accessible via an http server. An example would be: diff --git a/tests/classes/constants_error_004.phpt b/tests/classes/constants_error_004.phpt index 03e67258a6..3f34473dad 100644 --- a/tests/classes/constants_error_004.phpt +++ b/tests/classes/constants_error_004.phpt @@ -1,5 +1,5 @@ --TEST-- -Class constant whose initial value refereces a non-existent class +Class constant whose initial value references a non-existent class --FILE-- <?php class C diff --git a/tests/lang/bug20175.phpt b/tests/lang/bug20175.phpt index 7c6ec780ed..6cad4f14c2 100644 --- a/tests/lang/bug20175.phpt +++ b/tests/lang/bug20175.phpt @@ -35,7 +35,7 @@ function foo_static() { /* Part 2: * Storing a reference to the result of a function in a static variable. * Same as Part 1 but: - * The return statment transports a copy of the value to return. In other + * The return statement transports a copy of the value to return. In other * words the return value of bar_global() is a temporary variable only valid * after the function call bar_global() is done in current local scope. */ diff --git a/tests/lang/operators/coalesce.phpt b/tests/lang/operators/coalesce.phpt index 2ee54c5276..4486f30485 100644 --- a/tests/lang/operators/coalesce.phpt +++ b/tests/lang/operators/coalesce.phpt @@ -24,7 +24,7 @@ function foobar() { return ['a']; } -var_dump($nonexistant_variable ?? 3); +var_dump($nonexistent_variable ?? 3); echo PHP_EOL; var_dump($var ?? 3); var_dump($var2 ?? 3); diff --git a/win32/sendmail.c b/win32/sendmail.c index aaeeea3aa5..a88323722d 100644 --- a/win32/sendmail.c +++ b/win32/sendmail.c @@ -3,7 +3,7 @@ * * This file is rewriten specificly for PHPFI. Some functionality * has been removed (MIME and file attachments). This code was - * modified from code based on code writen by Jarle Aase. + * modified from code based on code written by Jarle Aase. * * This class is based on the original code by Jarle Aase, see bellow: * wSendmail.cpp It has been striped of some functionality to match @@ -572,7 +572,7 @@ static int SendText(char *RPath, char *Subject, char *mailTo, char *mailCc, char pos1 = pointer IN headers where the Bcc starts '4' = Length of the characters 'bcc:' Because we've added +4 above for parsing the Emails - we've to substract them here. */ + we've to subtract them here. */ memcpy(stripped_header, headers, pos1 - headers - 4); if (pos1 != pos2) { /* if pos1 != pos2 , pos2 points to the rest of the headers. |
