diff options
25 files changed, 30 insertions, 30 deletions
diff --git a/Zend/zend_inheritance.c b/Zend/zend_inheritance.c index 9a9199a198..ce55704ef7 100644 --- a/Zend/zend_inheritance.c +++ b/Zend/zend_inheritance.c @@ -451,7 +451,7 @@ static inheritance_status zend_perform_covariant_type_check( } } ZEND_TYPE_LIST_FOREACH_END(); - /* All individual checks suceeded, overall success */ + /* All individual checks succeeded, overall success */ if (all_success) { return INHERITANCE_SUCCESS; } diff --git a/ext/date/tests/DateTime_extends_basic3.phpt b/ext/date/tests/DateTime_extends_basic3.phpt index 95a74631c3..3f48cb2e21 100644 --- a/ext/date/tests/DateTime_extends_basic3.phpt +++ b/ext/date/tests/DateTime_extends_basic3.phpt @@ -1,5 +1,5 @@ --TEST-- -Test DateTime class inheritance : with user space fromat() method +Test DateTime class inheritance : with user space format() method --FILE-- <?php //Set the default time zone diff --git a/ext/date/tests/bug30096.phpt b/ext/date/tests/bug30096.phpt index 9ca45c4ffe..dbda97beff 100644 --- a/ext/date/tests/bug30096.phpt +++ b/ext/date/tests/bug30096.phpt @@ -1,5 +1,5 @@ --TEST-- -Bug #30096 (gmmktime does not return the corrent time) +Bug #30096 (gmmktime does not return the correct time) --INI-- error_reporting=2047 --FILE-- diff --git a/ext/date/tests/bug73858.phpt b/ext/date/tests/bug73858.phpt index 300b366749..fb41390b0f 100644 --- a/ext/date/tests/bug73858.phpt +++ b/ext/date/tests/bug73858.phpt @@ -45,7 +45,7 @@ var_dump($d->days); // 30 ... and should be 30 /* [Workaround] -This final test seems to prove that the input string is important and that the "- 1 secord" has a negative knock-on +This final test seems to prove that the input string is important and that the "- 1 second" has a negative knock-on effect on the results of the diff. By modifying the datetime with ->modify everything works as expected ... it just means you have to be careful of how we work with DateTimes . */ diff --git a/ext/date/tests/timezone_name_from_abbr_basic1.phpt b/ext/date/tests/timezone_name_from_abbr_basic1.phpt index dd2a796cb6..51b5d9b19e 100644 --- a/ext/date/tests/timezone_name_from_abbr_basic1.phpt +++ b/ext/date/tests/timezone_name_from_abbr_basic1.phpt @@ -3,7 +3,7 @@ Test timezone_name_from_abbr() function : basic functionality --FILE-- <?php /* Prototype : string timezone_name_from_abbr ( string $abbr [, int $gmtOffset= -1 [, int $isdst= -1 ]] ) - * Description: Returns the timezone name from abbrevation + * Description: Returns the timezone name from abbreviation * Source code: ext/date/php_date.c * Alias to functions: */ diff --git a/ext/dba/dba.c b/ext/dba/dba.c index 6c151fbba9..d407d2a8e7 100644 --- a/ext/dba/dba.c +++ b/ext/dba/dba.c @@ -1003,8 +1003,8 @@ PHP_FUNCTION(dba_fetch) skip = 0; } } else if (!strcmp(info->hnd->name, "inifile")) { - /* "-1" is compareable to 0 but allows a non restrictive - * access which is fater. For example 'inifile' uses this + /* "-1" is comparable to 0 but allows a non restrictive + * access which is faster. For example 'inifile' uses this * to allow faster access when the key was already found * using firstkey/nextkey. However explicitly setting the * value to 0 ensures the first value. diff --git a/ext/dom/tests/DOMDocument_createAttribute_error.phpt b/ext/dom/tests/DOMDocument_createAttribute_error.phpt index da2a967c3a..a395ba9579 100644 --- a/ext/dom/tests/DOMDocument_createAttribute_error.phpt +++ b/ext/dom/tests/DOMDocument_createAttribute_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test DOMDocument::createAttribute() for expected expection thrown when wrong parameter passed +Test DOMDocument::createAttribute() for expected exception thrown when wrong parameter passed --SKIPIF-- <?php require_once('skipif.inc'); ?> --FILE-- diff --git a/ext/enchant/enchant.c b/ext/enchant/enchant.c index f4becaac46..9d12c9341f 100644 --- a/ext/enchant/enchant.c +++ b/ext/enchant/enchant.c @@ -312,7 +312,7 @@ PHP_FUNCTION(enchant_broker_init) /* }}} */ /* {{{ proto bool enchant_broker_free(resource broker) - Destroys the broker object and its dictionnaries */ + Destroys the broker object and its dictionaries */ PHP_FUNCTION(enchant_broker_free) { zval *broker; diff --git a/ext/exif/exif.c b/ext/exif/exif.c index ff23b67764..a8aa9e46f0 100644 --- a/ext/exif/exif.c +++ b/ext/exif/exif.c @@ -335,7 +335,7 @@ static char *exif_get_tagformat(int format) #define TAG_GPS_AREA_INFORMATION 0x001C #define TAG_GPS_DATE_STAMP 0x001D #define TAG_GPS_DIFFERENTIAL 0x001E -#define TAG_TIFF_COMMENT 0x00FE /* SHOUDLNT HAPPEN */ +#define TAG_TIFF_COMMENT 0x00FE /* SHOULDN'T HAPPEN */ #define TAG_NEW_SUBFILE 0x00FE /* New version of subfile tag */ #define TAG_SUBFILE_TYPE 0x00FF /* Old version of subfile tag */ #define TAG_IMAGEWIDTH 0x0100 @@ -3002,7 +3002,7 @@ static int exif_process_user_comment(image_info_type *ImageInfo, char **pszInfoP szValuePtr = szValuePtr+8; ByteCount -= 8; } else if (!memcmp(szValuePtr, "JIS\0\0\0\0\0", 8)) { - /* JIS should be tanslated to MB or we leave it to the user - leave it to the user */ + /* JIS should be translated to MB or we leave it to the user - leave it to the user */ *pszEncoding = estrdup((const char*)szValuePtr); szValuePtr = szValuePtr+8; ByteCount -= 8; diff --git a/ext/gd/tests/imageantialias_error2.phpt b/ext/gd/tests/imageantialias_error2.phpt index 7971e90cae..2b17b78258 100644 --- a/ext/gd/tests/imageantialias_error2.phpt +++ b/ext/gd/tests/imageantialias_error2.phpt @@ -11,7 +11,7 @@ if (!extension_loaded("gd")) die("skip GD not present"); <?php /* -It seems the second argument passing is not being correclty checked. +It seems the second argument passing is not being correctly checked. This test is failing due to this wrogn check */ diff --git a/ext/gd/tests/imagecolorset_basic.phpt b/ext/gd/tests/imagecolorset_basic.phpt index f051a2202f..ef7f361ad5 100644 --- a/ext/gd/tests/imagecolorset_basic.phpt +++ b/ext/gd/tests/imagecolorset_basic.phpt @@ -20,7 +20,7 @@ imagecolorallocate($im, 255, 0, 0); // Get the color index for the background $bg = imagecolorat($im, 0, 0); -// Set the backgrund to be blue +// Set the background to be blue imagecolorset($im, $bg, 0, 0, 255); include_once __DIR__ . '/func.inc'; diff --git a/ext/hash/hash.c b/ext/hash/hash.c index 614d53666b..e4b28c0e6b 100644 --- a/ext/hash/hash.c +++ b/ext/hash/hash.c @@ -544,7 +544,7 @@ PHP_FUNCTION(hash_final) hash->key[i] ^= 0x6A; } - /* Feed this result into the outter hash */ + /* Feed this result into the outer hash */ hash->ops->hash_init(hash->context); hash->ops->hash_update(hash->context, hash->key, hash->ops->block_size); hash->ops->hash_update(hash->context, (unsigned char *) ZSTR_VAL(digest), hash->ops->digest_size); diff --git a/ext/mbstring/tests/htmlent.phpt b/ext/mbstring/tests/htmlent.phpt index 23ac68ba98..eb251efd7b 100644 --- a/ext/mbstring/tests/htmlent.phpt +++ b/ext/mbstring/tests/htmlent.phpt @@ -24,7 +24,7 @@ filter.default=unsafe_raw // If you do not see ä... on output this means output encoding fails. // Using UTF-8 internally allows to encode/decode ALL characters. // &128... will stay as they are since their character codes are above 127 -// and they do not have a named entity representaion. +// and they do not have a named entity representation. ?> <?php echo mb_http_input('l').'>'.mb_internal_encoding().'>'.mb_http_output();?> diff --git a/ext/opcache/Optimizer/zend_ssa.c b/ext/opcache/Optimizer/zend_ssa.c index b4d581f247..947602eb98 100644 --- a/ext/opcache/Optimizer/zend_ssa.c +++ b/ext/opcache/Optimizer/zend_ssa.c @@ -223,7 +223,7 @@ static int find_adjusted_tmp_var(const zend_op_array *op_array, uint32_t build_f /* e-SSA construction: Pi placement (Pi is actually a Phi with single * source and constraint). - * Order of Phis is importent, Pis must be placed before Phis + * Order of Phis is important, Pis must be placed before Phis */ static void place_essa_pis( zend_arena **arena, const zend_script *script, const zend_op_array *op_array, diff --git a/ext/opcache/jit/zend_jit_x86.dasc b/ext/opcache/jit/zend_jit_x86.dasc index 345da92a24..f28c39f8a4 100644 --- a/ext/opcache/jit/zend_jit_x86.dasc +++ b/ext/opcache/jit/zend_jit_x86.dasc @@ -6870,7 +6870,7 @@ static int zend_jit_do_fcall(dasm_State **Dst, const zend_op *opline, const zend /* Reuse reserved arguments stack */ res_addr = ZEND_ADDR_MEM_ZVAL(ZREG_R4, 0x20); #else - /* CPU stack alocated temporary zval */ + /* CPU stack allocated temporary zval */ res_addr = ZEND_ADDR_MEM_ZVAL(ZREG_R4, 8); #endif } @@ -7917,7 +7917,7 @@ static int zend_jit_free_compiled_variables(dasm_State **Dst, const zend_op *opl } #ifdef ZEND_JIT_USE_RC_INFERENCE - /* Refcount may be increased by RETRUN opcode */ + /* Refcount may be increased by RETURN opcode */ if ((info & MAY_BE_RC1) && !(info & MAY_BE_RCN)) { for (j = 0; j < ssa->cfg.blocks_count; j++) { if ((ssa->cfg.blocks[j].flags & ZEND_BB_REACHABLE) && @@ -8847,7 +8847,7 @@ static uint32_t zend_get_known_property_offset(zend_class_entry *ce, zend_string if (ce->ce_flags & ZEND_ACC_INHERITED) { if (!ce->parent) { - /* property offets may be changed by inheritance */ + /* property offsets may be changed by inheritance */ return ZEND_WRONG_PROPERTY_OFFSET; } else { zend_class_entry *parent = ce->parent; diff --git a/ext/opcache/tests/wrong_inlining_004.phpt b/ext/opcache/tests/wrong_inlining_004.phpt index 8ecb87cd4f..26f8f4b2bf 100644 --- a/ext/opcache/tests/wrong_inlining_004.phpt +++ b/ext/opcache/tests/wrong_inlining_004.phpt @@ -1,5 +1,5 @@ --TEST-- -Inlining throgh call_user_func() +Inlining through call_user_func() --INI-- opcache.enable=1 opcache.enable_cli=1 diff --git a/ext/openssl/tests/openssl_error_string_basic.phpt b/ext/openssl/tests/openssl_error_string_basic.phpt index 2d753e11be..3e3bbd03af 100644 --- a/ext/openssl/tests/openssl_error_string_basic.phpt +++ b/ext/openssl/tests/openssl_error_string_basic.phpt @@ -145,7 +145,7 @@ expect_openssl_errors('openssl_csr_get_subject open', ['02001002', '2006D080']); @openssl_csr_get_subject($crt_file); expect_openssl_errors('openssl_csr_get_subjec pem', [$err_pem_no_start_line]); -// other possible cuases that are difficult to catch: +// other possible causes that are difficult to catch: // - ASN1_STRING_to_UTF8 fails in add_assoc_name_entry // - invalid php_x509_request field (NULL) would cause error with CONF_get_string diff --git a/ext/pdo_mysql/tests/pdo_mysql_stmt_variable_columncount.phpt b/ext/pdo_mysql/tests/pdo_mysql_stmt_variable_columncount.phpt index 63a500b7b3..7c39b88558 100644 --- a/ext/pdo_mysql/tests/pdo_mysql_stmt_variable_columncount.phpt +++ b/ext/pdo_mysql/tests/pdo_mysql_stmt_variable_columncount.phpt @@ -49,7 +49,7 @@ if ($version < 50000) try { - // What will happen if a PS returns a differen number of result set column upon each execution? + // What will happen if a PS returns a different number of result set column upon each execution? // Lets try with a SP accepting parameters... $db->exec('DROP PROCEDURE IF EXISTS p'); $db->exec('CREATE PROCEDURE p(IN cols INT) BEGIN IF cols < 2 THEN SELECT cols AS "one"; ELSE SELECT 1 AS "one", cols AS "two"; END IF; END;'); diff --git a/ext/phar/tests/tar/bug67761.phpt b/ext/phar/tests/tar/bug67761.phpt index c8d013cab1..add6b06cfa 100644 --- a/ext/phar/tests/tar/bug67761.phpt +++ b/ext/phar/tests/tar/bug67761.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #67761 (Phar::mapPhar fails for Phars inside a path containing ".tar") --SKIPIF-- -<?php extension_loaded("phar") or die("SKIP need ext/phar suppport"); ?> +<?php extension_loaded("phar") or die("SKIP need ext/phar support"); ?> --FILE-- <?php diff --git a/ext/posix/tests/posix_ttyname_error_wrongparams.phpt b/ext/posix/tests/posix_ttyname_error_wrongparams.phpt index 66a6cd9bd9..92cf671c1d 100644 --- a/ext/posix/tests/posix_ttyname_error_wrongparams.phpt +++ b/ext/posix/tests/posix_ttyname_error_wrongparams.phpt @@ -12,14 +12,14 @@ PHP Testfest Berlin 2009-05-10 if (!extension_loaded('posix')) { die('SKIP - POSIX extension not available'); } - + if (!function_exists('curl_init')) { die('SKIP - Function curl_init() not available'); } ?> --FILE-- <?php -var_dump(posix_ttyname(0)); // param not a ressource +var_dump(posix_ttyname(0)); // param not a resource try { var_dump(posix_ttyname(curl_init())); // wrong resource type } catch (TypeError $e) { diff --git a/ext/snmp/snmp.c b/ext/snmp/snmp.c index 95117686f8..ac630871bd 100644 --- a/ext/snmp/snmp.c +++ b/ext/snmp/snmp.c @@ -308,7 +308,7 @@ static void php_snmp_getvalue(struct variable_list *vars, zval *snmpval, int val int buflen = sizeof(sbuf) - 1; int val_len = vars->val_len; - /* use emalloc() for large values, use static array otherwize */ + /* use emalloc() for large values, use static array otherwise */ /* There is no way to know the size of buffer snprint_value() needs in order to print a value there. * So we are forced to probe it diff --git a/ext/standard/tests/array/array_change_key_case_variation6.phpt b/ext/standard/tests/array/array_change_key_case_variation6.phpt index 383993c38c..aa87ee1fb5 100644 --- a/ext/standard/tests/array/array_change_key_case_variation6.phpt +++ b/ext/standard/tests/array/array_change_key_case_variation6.phpt @@ -20,7 +20,7 @@ $input = array('English' => array('one' => 1, 'two' => 2, 'three' => 3), echo "\n-- Pass a two-dimensional array as \$input argument --\n"; var_dump(array_change_key_case($input, CASE_UPPER)); -echo "\n-- Pass a sub-arry as \$input argument --\n"; +echo "\n-- Pass a sub-array as \$input argument --\n"; var_dump(array_change_key_case($input['English'], CASE_UPPER)); echo "Done"; @@ -59,7 +59,7 @@ array(3) { } } --- Pass a sub-arry as $input argument -- +-- Pass a sub-array as $input argument -- array(3) { ["ONE"]=> int(1) diff --git a/ext/standard/tests/array/sort_variation11.phpt b/ext/standard/tests/array/sort_variation11.phpt Binary files differindex 5a0bea5ffb..50d40fca63 100644 --- a/ext/standard/tests/array/sort_variation11.phpt +++ b/ext/standard/tests/array/sort_variation11.phpt diff --git a/ext/standard/tests/strings/join_basic.phpt b/ext/standard/tests/strings/join_basic.phpt index 483976d942..0429fe0b49 100644 --- a/ext/standard/tests/strings/join_basic.phpt +++ b/ext/standard/tests/strings/join_basic.phpt @@ -14,7 +14,7 @@ echo "*** Testing join() : basic functionality ***\n"; $glue = ','; $pieces = array(1, 2, 3, 4); -// pieces as arry with numeric values +// pieces as array with numeric values var_dump( join($glue, $pieces) ); // pieces as array with strings values diff --git a/ext/standard/tests/strings/setlocale_variation1.phpt b/ext/standard/tests/strings/setlocale_variation1.phpt index 6dc4179baf..a44dbc7e9e 100644 --- a/ext/standard/tests/strings/setlocale_variation1.phpt +++ b/ext/standard/tests/strings/setlocale_variation1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test setlocale() function : usage variations - passing multiple valid/invlaid locales as argument +Test setlocale() function : usage variations - passing multiple valid/invalid locales as argument --SKIPIF-- <?php if (substr(PHP_OS, 0, 3) == 'WIN') { |