typo fixes

Author: vlajos

Zend/README.ZEND_VM

@@ -6,7 +6,7 @@ fields and using different execution methods (call threading, switch threading
 and direct threading). As a result ZE2 got more than 20% speedup on raw PHP
 code execution (with specialized executor and direct threading execution
 method). As in most PHP applications raw execution speed isn't the limiting
-factor but system calls and database callls are, your mileage with this patch
+factor but system calls and database calls are, your mileage with this patch
 will vary.
 
 Most parts of the old zend_execute.c go into zend_vm_def.h. Here you can

Zend/tests/closure_044.phpt

@@ -3,7 +3,7 @@ Closure 044: Scope/bounding combination invariants; non static closures
 --FILE--
 <?php
 /* A non-static closure has a bound instance if it has a scope
- * and does't have an instance if it has no scope */
+ * and doesn't have an instance if it has no scope */
 
 $nonstaticUnscoped = function () { var_dump(isset(A::$priv)); var_dump(isset($this)); };
 

Zend/zend_compile.c

@@ -4108,7 +4108,7 @@ static void zend_traits_init_trait_structures(zend_class_entry *ce TSRMLS_DC) /*
 				/** With the other traits, we are more permissive.
 					We do not give errors for those. This allows to be more
 					defensive in such definitions.
-					However, we want to make sure that the insteadof declartion
+					However, we want to make sure that the insteadof declaration
 					is consistent in itself.
 				 */
 				j = 0;

Zend/zend_vm_gen.php

@@ -1408,7 +1408,7 @@ function usage() {
 	  // Disabling code for old-style executor
 		define("ZEND_VM_OLD_EXECUTOR", 1);
 	} else if ($argv[$i] == "--with-lines") {
-		// Enabling debuging using original zend_vm_def.h
+		// Enabling debugging using original zend_vm_def.h
 		define("ZEND_VM_LINES", 1);
 	} else if ($argv[$i] == "--help") {
 		usage();

build/libtool.m4

@@ -1230,7 +1230,7 @@ if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
    test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \
    test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
 
-  # We can hardcode non-existant directories.
+  # We can hardcode non-existent directories.
   if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
      # If the only mechanism to avoid hardcoding is shlibpath_var, we
      # have to relink, otherwise we might link with an installed library

config.guess

@@ -1080,7 +1080,7 @@ EOF
 	# uname -m prints for DJGPP always 'pc', but it prints nothing about
 	# the processor, so we play safe by assuming i586.
 	# Note: whatever this is, it MUST be the same as what config.sub
-	# prints for the "djgpp" host, or else GDB configury will decide that
+	# prints for the "djgpp" host, or else GDB configure will decide that
 	# this is a cross-build.
 	echo i586-pc-msdosdjgpp
 	exit ;;

ext/date/tests/bug55397.phpt

@@ -1,5 +1,5 @@
 --TEST--
-Bug #55397 (comparsion of incomplete DateTime causes SIGSEGV)
+Bug #55397 (comparison of incomplete DateTime causes SIGSEGV)
 --INI--
 --FILE--
 <?php

ext/dba/dba.c

@@ -888,7 +888,7 @@ static void php_dba_open(INTERNAL_FUNCTION_PARAMETERS, int persistent)
 			RETURN_FALSE;
 		}
 		if (hptr->flags & (DBA_NO_APPEND|DBA_CAST_AS_FD)) {
-			/* Needed becasue some systems do not allow to write to the original 
+			/* Needed because some systems do not allow to write to the original 
 			 * file contents with O_APPEND being set.
 			 */
 			if (SUCCESS != php_stream_cast(info->fp, PHP_STREAM_AS_FD, (void*)&info->fd, 1)) {

ext/dba/tests/dba_gdbm.phpt

@@ -12,7 +12,7 @@ DBA GDBM handler test
 	$lock_flag = ''; // lock in library
 	require_once dirname(__FILE__) .'/dba_handler.inc';
 
-	// Read during write is system dependant. Important is that there is no deadlock
+	// Read during write is system dependent. Important is that there is no deadlock
 ?>
 ===DONE===
 --EXPECTF--

ext/dom/tests/DOMDocument_schemaValidate_error5.phpt

@@ -1,5 +1,5 @@
 --TEST--
-DomDocument::schemaValidate() - non-existant schema file
+DomDocument::schemaValidate() - non-existent schema file
 --CREDITS--
 Daniel Convissor <danielc@php.net>
 # TestFest 2009 NYPHP
@@ -12,14 +12,14 @@ $doc = new DOMDocument;
 
 $doc->load(dirname(__FILE__)."/book.xml");
 
-$result = $doc->schemaValidate(dirname(__FILE__)."/non-existant-file");
+$result = $doc->schemaValidate(dirname(__FILE__)."/non-existent-file");
 var_dump($result);
 
 ?>
 --EXPECTF--
-Warning: DOMDocument::schemaValidate(): I/O warning : failed to load external entity "%snon-existant-file" in %s.php on line %d
+Warning: DOMDocument::schemaValidate(): I/O warning : failed to load external entity "%snon-existent-file" in %s.php on line %d
 
-Warning: DOMDocument::schemaValidate(): Failed to locate the main schema resource at '%s/non-existant-file'. in %s.php on line %d
+Warning: DOMDocument::schemaValidate(): Failed to locate the main schema resource at '%s/non-existent-file'. in %s.php on line %d
 
 Warning: DOMDocument::schemaValidate(): Invalid Schema in %s.php on line %d
 bool(false)

ext/enchant/enchant.c

@@ -674,7 +674,7 @@ PHP_FUNCTION(enchant_broker_dict_exists)
 	described/referred to by 'tag'. The ordering is a comma delimited
 	list of provider names. As a special exception, the "*" tag can
 	be used as a language tag to declare a default ordering for any
-	language that does not explictly declare an ordering. */
+	language that does not explicitly declare an ordering. */
 
 PHP_FUNCTION(enchant_broker_set_ordering)
 {

ext/exif/exif.c

@@ -2595,7 +2595,7 @@ static int exif_process_string_raw(char **result, char *value, size_t byte_count
 
 /* {{{ exif_process_string
  * Copy a string in Exif header to a character string and return length of allocated buffer if any.
- * In contrast to exif_process_string this function does allways return a string buffer */
+ * In contrast to exif_process_string this function does always return a string buffer */
 static int exif_process_string(char **result, char *value, size_t byte_count TSRMLS_DC) {
 	/* we cannot use strlcpy - here the problem is that we cannot use strlen to
 	 * determin length of string and we cannot use strlcpy with len=byte_count+1

ext/fileinfo/libmagic/softmagic.c

@@ -1630,7 +1630,7 @@ mget(struct magic_set *ms, const unsigned char *s, struct magic *m,
 	/* Verify we have enough data to match magic type */
 	switch (m->type) {
 	case FILE_BYTE:
-		if (nbytes < (offset + 1)) /* should alway be true */
+		if (nbytes < (offset + 1)) /* should always be true */
 			return 0;
 		break;
 

ext/fileinfo/tests/magic

@@ -3303,7 +3303,7 @@
 >>>0x44		string	=GLOB		\b.
 >>>>0x60	beshort	x		\b%.4d
 
-# Scripts that run in the embeded Python interpreter
+# Scripts that run in the embedded Python interpreter
 0		string	#!BPY		Blender3D BPython script
 
 #------------------------------------------------------------------------------

ext/ftp/tests/ftp_fget_basic.phpt

@@ -27,7 +27,7 @@ var_dump(ftp_fget($ftp, $fp, 'binary data.bin', FTP_BINARY));
 fseek($fp, $postition);
 var_dump(urlencode(fgets($fp)));
 
-//test non-existant file request 
+//test non-existent file request 
 ftp_fget($ftp, $fp ,'a warning.txt', FTP_ASCII);
 
 //remove file

ext/ftp/tests/ftp_get_basic.phpt

@@ -27,7 +27,7 @@ var_dump(ftp_get($ftp, $tmpfname, 'binary data.bin', FTP_BINARY));
 var_dump(urlencode(file_get_contents($tmpfname)));
 unlink($tmpfname);
 
-//test non-existant file request 
+//test non-existent file request 
 ftp_get($ftp, $tmpfname ,'a warning.txt', FTP_ASCII);
 ?>
 --EXPECTF--

ext/gd/gd.c

@@ -104,7 +104,7 @@ int overflow2(int a, int b);
 /* IMPORTANT NOTE FOR NEW FILTER
  * Do not forget to update:
  * IMAGE_FILTER_MAX: define the last filter index
- * IMAGE_FILTER_MAX_ARGS: define the biggest amout of arguments
+ * IMAGE_FILTER_MAX_ARGS: define the biggest amount of arguments
  * image_filter array in PHP_FUNCTION(imagefilter)
  * */
 #define IMAGE_FILTER_NEGATE         0

ext/gd/libgd/gd_crop.c

@@ -69,7 +69,7 @@ printf("rect->x: %i\nrect->y: %i\nrect->width: %i\nrect->height: %i\n", crop->x,
 		if (src->trueColor) {
 			unsigned int dst_y = 0;
 			while (y < (crop->y + (crop->height - 1))) {
-				/* TODO: replace 4 w/byte per channel||pitch once avaiable */
+				/* TODO: replace 4 w/byte per channel||pitch once available */
 				memcpy(dst->tpixels[dst_y++], src->tpixels[y++] + crop->x, crop->width * 4);
 			}
 		} else {

ext/gd/libgd/webpimg.h

@@ -84,7 +84,7 @@ WebPResult WebPDecode(const uint8* data,
  *                               height.
  *      6. y_stride: The width (in bytes) of one row of Y data. This may not
  *                   match width if there is end of row padding (e.g., for 32
- *                   bit row aligment).
+ *                   bit row alignment).
  *      7. QP: the quantization parameter. This parameter controls the
  *             compression vs quality tradeoff. Use smaller numbers for better
  *             quality (compression will be lesser) and vice versa. 20 is a

ext/hash/tests/hash_file_error.phpt

@@ -23,8 +23,8 @@ file_put_contents( $filename, 'The quick brown fox jumped over the lazy dog.' );
 echo "\n-- Testing hash_file() function with an unknown algorithm --\n";
 var_dump( hash_file( 'foobar', $filename ) );
 
-echo "\n-- Testing hash_file() function with a non-existant file --\n";
-var_dump( hash_file( 'md5', 'nonexistant.txt' ) );
+echo "\n-- Testing hash_file() function with a non-existent file --\n";
+var_dump( hash_file( 'md5', 'nonexistent.txt' ) );
 
 echo "\n-- Testing hash_file() function with less than expected no. of arguments --\n";
 var_dump( hash_file( 'md5' ) );
@@ -50,7 +50,7 @@ unlink( $filename );
 Warning: hash_file(): Unknown hashing algorithm: %s in %s on line %d
 bool(false)
 
--- Testing hash_file() function with a non-existant file --
+-- Testing hash_file() function with a non-existent file --
 
 Warning: hash_file(%s): failed to open stream: No such file or directory in %s on line %d
 bool(false)

ext/intl/tests/transliterator_create_error.phpt

@@ -6,15 +6,15 @@ Transliterator::create (error)
 <?php
 
 ini_set("intl.error_level", E_WARNING);
-Transliterator::create("inexistant id");
+Transliterator::create("inexistent id");
 echo intl_get_error_message(), "\n";
 Transliterator::create("bad UTF-8 \x8F");
 echo intl_get_error_message(), "\n";
 
 echo "Done.\n";
 --EXPECTF--
-Warning: Transliterator::create(): transliterator_create: unable to open ICU transliterator with id "inexistant id" in %s on line %d
-transliterator_create: unable to open ICU transliterator with id "inexistant id": U_INVALID_ID
+Warning: Transliterator::create(): transliterator_create: unable to open ICU transliterator with id "inexistent id" in %s on line %d
+transliterator_create: unable to open ICU transliterator with id "inexistent id": U_INVALID_ID
 
 Warning: Transliterator::create(): String conversion of id to UTF-16 failed in %s on line %d
 String conversion of id to UTF-16 failed: U_INVALID_CHAR_FOUND

ext/intl/tests/transliterator_transliterate_variant1.phpt

@@ -13,7 +13,7 @@ echo transliterator_transliterate("\x8F", $str), "\n";
 echo intl_get_error_message(), "\n";
 
 class A {
-function __toString() { return "inexistant id"; }
+function __toString() { return "inexistent id"; }
 }
 
 echo transliterator_transliterate(new A(), $str), "\n";
@@ -29,9 +29,9 @@ Warning: transliterator_transliterate(): Could not create transliterator with ID
 
 String conversion of id to UTF-16 failed: U_INVALID_CHAR_FOUND
 
-Warning: transliterator_transliterate(): transliterator_create: unable to open ICU transliterator with id "inexistant id" in %s on line %d
+Warning: transliterator_transliterate(): transliterator_create: unable to open ICU transliterator with id "inexistent id" in %s on line %d
 
-Warning: transliterator_transliterate(): Could not create transliterator with ID "inexistant id" (transliterator_create: unable to open ICU transliterator with id "inexistant id": U_INVALID_ID) in %s on line %d
+Warning: transliterator_transliterate(): Could not create transliterator with ID "inexistent id" (transliterator_create: unable to open ICU transliterator with id "inexistent id": U_INVALID_ID) in %s on line %d
 
-transliterator_create: unable to open ICU transliterator with id "inexistant id": U_INVALID_ID
+transliterator_create: unable to open ICU transliterator with id "inexistent id": U_INVALID_ID
 Done.

ext/ldap/tests/ldap_get_values_len_error.phpt

@@ -20,7 +20,7 @@ var_dump(ldap_get_values_len($link));
 var_dump(ldap_get_values_len($link, $entry));
 var_dump(ldap_get_values_len($link, $entry, "weirdAttribute", "Additional data"));
 
-var_dump(ldap_get_values_len($link, $entry, "inexistantAttribute"));
+var_dump(ldap_get_values_len($link, $entry, "inexistentAttribute"));
 ?>
 ===DONE===
 --CLEAN--

ext/ldap/tests/ldap_set_rebind_proc_error.phpt

@@ -35,7 +35,7 @@ function rebind_proc ($ds, $ldap_url) {
 $link = ldap_connect($host, $port);
 var_dump(ldap_set_rebind_proc($link));
 var_dump(ldap_set_rebind_proc($link, "rebind_proc", "Additional data"));
-var_dump(ldap_set_rebind_proc($link, "rebind_proc_inexistant"));
+var_dump(ldap_set_rebind_proc($link, "rebind_proc_inexistent"));
 ?>
 ===DONE===
 --EXPECTF--
@@ -45,6 +45,6 @@ bool(false)
 Warning: ldap_set_rebind_proc() expects exactly 2 parameters, 3 given in %s on line %d
 bool(false)
 
-Warning: ldap_set_rebind_proc(): Two arguments expected for 'rebind_proc_inexistant' to be a valid callback in %s on line %d
+Warning: ldap_set_rebind_proc(): Two arguments expected for 'rebind_proc_inexistent' to be a valid callback in %s on line %d
 bool(false)
 ===DONE===

ext/mysqli/tests/mysqli_driver.phpt

@@ -53,7 +53,7 @@ require_once('skipifconnectfailure.inc');
 	} catch (mysqli_sql_exception $e) {
 		$ok = true;
 		if ('' == $e->getMessage())
-			printf("[008] getMessage() has returned an emptry string.\n");
+			printf("[008] getMessage() has returned an empty string.\n");
 		if ('' == $e->getCode())
 			printf("[009] getCode() has returned an empty string.\n");
 		if ('' == $e->getFile())

ext/mysqli/tests/mysqli_fetch_assoc_no_alias_utf8.phpt

@@ -17,7 +17,7 @@ mysqli_fetch_assoc() - utf8
 		die("skip Looks like UTF8 is not available on the server");
 
 	if (strtolower($tmp['Charset']) !== 'utf8')
-		die("skip Not sure if UTF8 is available, cancelling the test");
+		die("skip Not sure if UTF8 is available, canceling the test");
 
 	mysqli_free_result($res);
 
@@ -28,7 +28,7 @@ mysqli_fetch_assoc() - utf8
 		die("skip Looks like UCS2 is not available on the server");
 
 	if (strtolower($tmp['Charset']) !== 'ucs2')
-		die("skip Not sure if UCS2 is available, cancelling the test");
+		die("skip Not sure if UCS2 is available, canceling the test");
 
 	mysqli_free_result($res);
 	mysqli_close($link);

ext/mysqli/tests/mysqli_options.phpt

@@ -12,7 +12,7 @@ require_once('skipifconnectfailure.inc');
 
 	$valid_options = array(
 		MYSQLI_READ_DEFAULT_GROUP 			=> "MYSQLI_READ_DEFAULT_GROUP",
-		MYSQLI_READ_DEFAULT_FILE 			=> "MYSQLI_READ_DEFAUTL_FILE",
+		MYSQLI_READ_DEFAULT_FILE 			=> "MYSQLI_READ_DEFAULT_FILE",
 		MYSQLI_OPT_CONNECT_TIMEOUT			=> "MYSQLI_OPT_CONNECT_TIMEOUT",
 		MYSQLI_OPT_LOCAL_INFILE				=> "MYSQLI_OPT_LOCAL_INFILE",
 		MYSQLI_INIT_COMMAND					=> "MYSQLI_INIT_COMMAND",

ext/oci8/tests/bug43492_2.phpt

@@ -8,7 +8,7 @@ require(dirname(__FILE__).'/skipif.inc');
 --FILE--
 <?php
 
-// This test is similar to bug43492.phpt without the explict free.
+// This test is similar to bug43492.phpt without the explicit free.
 // Now that bug 44206 is fixed an automatic clean up will occur -
 // though it is still recommended in practice.
 

ext/odbc/php_odbc.c

@@ -2704,7 +2704,7 @@ PHP_FUNCTION(odbc_num_rows)
 
 #if !defined(HAVE_SOLID) && !defined(HAVE_SOLID_30)
 /* {{{ proto bool odbc_next_result(resource result_id)
-   Checks if multiple results are avaiable */
+   Checks if multiple results are available */
 PHP_FUNCTION(odbc_next_result)
 {
 	odbc_result *result;

ext/opcache/ZendAccelerator.c

@@ -138,7 +138,7 @@ static inline int is_stream_path(const char *filename)
 	return ((*p == ':') && (p - filename > 1) && (p[1] == '/') && (p[2] == '/'));
 }
 
-static inline int is_cachable_stream_path(const char *filename)
+static inline int is_cacheable_stream_path(const char *filename)
 {
 	return memcmp(filename, "file://", sizeof("file://") - 1) == 0 ||
 	       memcmp(filename, "phar://", sizeof("phar://") - 1) == 0;
@@ -1459,7 +1459,7 @@ static zend_op_array *persistent_compile_file(zend_file_handle *file_handle, int
 	    CG(interactive) ||
 	    (ZCSG(restart_in_progress) && accel_restart_is_active(TSRMLS_C)) ||
 	    (is_stream_path(file_handle->filename) && 
-	     !is_cachable_stream_path(file_handle->filename))) {
+	     !is_cacheable_stream_path(file_handle->filename))) {
 		/* The Accelerator is disabled, act as if without the Accelerator */
 		return accelerator_orig_compile_file(file_handle, type TSRMLS_CC);
 	}

ext/opcache/zend_accelerator_util_funcs.c

@@ -936,7 +936,7 @@ zend_op_array* zend_accel_load_script(zend_persistent_script *persistent_script,
 			zend_hash_destroy(&ZCG(bind_hash));
 		}
 		/* we must first to copy all classes and then prepare functions, since functions may try to bind
-		   classes - which depend on pre-bind class entries existant in the class table */
+		   classes - which depend on pre-bind class entries existent in the class table */
 		if (zend_hash_num_elements(&persistent_script->function_table) > 0) {
 			zend_accel_function_hash_copy(CG(function_table), &persistent_script->function_table, (unique_copy_ctor_func_t)zend_prepare_function_for_execution);
 		}

ext/pcntl/php_signal.c

@@ -23,7 +23,7 @@
 #include "Zend/zend.h"
 #include "Zend/zend_signal.h"
 
-/* php_signal using sigaction is derrived from Advanced Programing
+/* php_signal using sigaction is derived from Advanced Programing
  * in the Unix Environment by W. Richard Stevens p 298. */
 Sigfunc *php_signal4(int signo, Sigfunc *func, int restart, int mask_all)
 {

ext/pcre/tests/preg_grep_error1.phpt

@@ -11,9 +11,9 @@ error_reporting(E_ALL&~E_NOTICE);
 * Testing how preg_grep reacts to being passed bad regexes
 */
 echo "*** Testing preg_grep() : error conditions ***\n";
-$values = array('abcdef', //Regex without delimeter
-'/[a-zA-Z]', //Regex without closing delimeter
-'[a-zA-Z]/', //Regex without opening delimeter
+$values = array('abcdef', //Regex without delimiter
+'/[a-zA-Z]', //Regex without closing delimiter
+'[a-zA-Z]/', //Regex without opening delimiter
 '/[a-zA-Z]/F', array('[a-z]', //Array of Regexes
 '[A-Z]', '[0-9]'), '/[a-zA-Z]/', //Regex string
 );

ext/pcre/tests/preg_match_all_error1.phpt

@@ -11,9 +11,9 @@ error_reporting(E_ALL&~E_NOTICE);
 * Testing how preg_match_all reacts to being passed the wrong type of regex argument
 */
 echo "*** Testing preg_match_all() : error conditions ***\n";
-$regex_array = array('abcdef', //Regex without delimeter
-'/[a-zA-Z]', //Regex without closing delimeter
-'[a-zA-Z]/', //Regex without opening delimeter
+$regex_array = array('abcdef', //Regex without delimiter
+'/[a-zA-Z]', //Regex without closing delimiter
+'[a-zA-Z]/', //Regex without opening delimiter
 '/[a-zA-Z]/F', array('[a-z]', //Array of Regexes
 '[A-Z]', '[0-9]'), '/[a-zA-Z]/', //Regex string
 );