summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authorGabriel Caruso <carusogabriel34@gmail.com>2018-08-09 23:19:55 -0300
committerChristoph M. Becker <cmbecker69@gmx.de>2018-08-12 16:15:45 +0200
commit84b195d9fc5ba2b65ceb46d8ec3d4676bf51a538 (patch)
tree2c3100631a749d0ebc5515f06a950dae8c9d9b3b /ext
parent9ea7d259effc81700e8b7f03f56c47c14201548e (diff)
downloadphp-git-84b195d9fc5ba2b65ceb46d8ec3d4676bf51a538.tar.gz
Fix some misspellings
Diffstat (limited to 'ext')
-rw-r--r--ext/bcmath/bcmath.c2
-rw-r--r--ext/date/php_date.c4
-rw-r--r--ext/exif/exif.c2
-rw-r--r--ext/fileinfo/fileinfo.c2
-rw-r--r--ext/imap/tests/imap_include.inc2
-rw-r--r--ext/imap/tests/skipif.inc2
-rw-r--r--ext/interbase/tests/skipif.inc2
-rw-r--r--ext/intl/locale/locale_methods.c6
-rw-r--r--ext/mysqli/mysqli_nonapi.c2
-rw-r--r--ext/oci8/oci8_failover.c2
-rw-r--r--ext/odbc/php_odbc.c6
-rw-r--r--ext/opcache/Optimizer/dce.c2
-rw-r--r--ext/opcache/Optimizer/sccp.c2
-rw-r--r--ext/opcache/ZendAccelerator.c2
-rw-r--r--ext/pgsql/pgsql.c2
-rw-r--r--ext/pgsql/php_pgsql.h2
-rw-r--r--ext/phar/phar/pharcommand.inc8
-rw-r--r--ext/phar/tests/zip/files/corrupt_zipmaker.php.inc4
-rw-r--r--ext/reflection/php_reflection.c2
-rw-r--r--ext/session/session.c2
-rw-r--r--ext/soap/php_http.c4
-rw-r--r--ext/spl/internal/multipleiterator.inc2
-rw-r--r--ext/spl/internal/recursivearrayiterator.inc4
-rw-r--r--ext/spl/internal/recursivecachingiterator.inc2
-rw-r--r--ext/spl/internal/recursivefilteriterator.inc4
-rw-r--r--ext/spl/internal/recursiveiteratoriterator.inc2
-rw-r--r--ext/spl/internal/splfileobject.inc2
-rw-r--r--ext/spl/internal/splobjectstorage.inc4
-rw-r--r--ext/spl/php_spl.c2
-rwxr-xr-xext/spl/spl.php6
-rw-r--r--ext/spl/spl_directory.c2
-rw-r--r--ext/spl/spl_observer.c2
-rw-r--r--ext/standard/config.m42
-rw-r--r--ext/standard/credits_ext.h2
-rw-r--r--ext/standard/credits_sapi.h2
-rw-r--r--ext/standard/file.c2
-rw-r--r--ext/standard/filestat.c2
-rw-r--r--ext/standard/image.c2
-rw-r--r--ext/standard/link_win32.c2
-rw-r--r--ext/standard/streamsfuncs.c2
-rw-r--r--ext/standard/tests/file/file.inc2
-rw-r--r--ext/standard/tests/mail/mail_include.inc2
-rw-r--r--ext/standard/tests/mail/mail_skipif.inc2
-rw-r--r--ext/zip/php_zip.c4
44 files changed, 60 insertions, 60 deletions
diff --git a/ext/bcmath/bcmath.c b/ext/bcmath/bcmath.c
index 9a39642a2d..6404969b4f 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 59eb4f2a8d..507bdb4738 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 d0eb8f3203..7b51e2f9a7 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 5565964c20..9a7982041f 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 ccb1685d73..0425faa4ae 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 19ad7893bd..12b1408634 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 37bf023f4d..c854f5bc99 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 d710e1926a..f971f4d77a 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 7b6c07d2e3..bd89006b7d 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 106945ece7..ab27997458 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(&params[0]);
/* Cleanup */
diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c
index c99862cd04..429ce073ae 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 58925975ca..4d0e40984b 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 c9acb04983..632a36782f 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 c08f098ed8..0d3334dc77 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 5b613a4328..e5054bd087 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 0d575d2b85..c6d93a3927 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 9decdaf972..07f1c34c94 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 79bade6aae..ddac6a4ade 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 862936d81c..6f34cf29bf 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 c46af0d87d..00a353cfe1 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 fc068bf4d1..408afceef7 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 12df011ecc..c0e31a04ac 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 2059b97c1c..07dbce3def 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 3ae127ad94..1473b75457 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 87d98da885..9d176112ba 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 c22a92bf71..529c01b076 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 4b0c757b81..fea3d0cf61 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 f27da4e001..6b9b25f661 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 0263a132b1..c80adaed94 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 8a68613417..adbcef6e8a 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 776f2ae44d..e37bd87d87 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 a6e27f47b6..0dd755e07f 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 6c508e30df..fe6303eff3 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 <argon2.h> 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 fc982a7591..07c4ba2610 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 471724f70f..d5f5b81b21 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 3304c64308..ef2234dba7 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 5819d53753..220b593bfd 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 0a8add7e99..425d210ba6 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 bc9931359d..d825137368 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 9b7bcdbd60..442091ad46 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 a0b62bffc7..eda2b32c78 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 2197a1f8c1..8d7a8a9a1c 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 8da04b072a..fedcfbbe4e 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 09a7d3a280..c4c3e90f53 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
*/