Merge branch 'pull-request/341'

* pull-request/341: (23 commits)
  typofixes

README.TESTING

@@ -1,6 +1,6 @@
 [IMPORTANT NOTICE]
 ------------------
- Failed tests usualy indicate a problem with your local system setup
+ Failed tests usually indicate a problem with your local system setup
 and not within PHP itself (at least for official PHP release versions).
 You may decide to automaticaly submit a test summary to our QA workflow
 at the end of a test run.

Zend/ZEND_CHANGES

@@ -435,7 +435,7 @@ Changes in the Zend Engine 2.0
       that of other object-oriented languages, such as Java: When the
       last reference to an object is destroyed the object's
       destructor, which is a class method name __destruct() that
-      recieves no parameters, is called before the object is freed
+      receives no parameters, is called before the object is freed
       from memory.
 
       Example:

Zend/tests/019.phpt

@@ -357,7 +357,7 @@ var_dump($global_var);
 test_unset3();
 var_dump($global_var);
 
-//Note: No error conditions relating to passing arugments can be tested
+//Note: No error conditions relating to passing arguments can be tested
 // because these are not functions but statements, it will result in syntax error.
 ?>
 ===DONE===

Zend/tests/bug32428.phpt

@@ -1,5 +1,5 @@
 --TEST--
-Bug #32428 (The @ warning error supression operator is broken)
+Bug #32428 (The @ warning error suppression operator is broken)
 --FILE--
 <?php 
   $data = @$not_exists; 

Zend/tests/gc_007.phpt

@@ -1,5 +1,5 @@
 --TEST--
-GC 007: Unreferensed array cycle
+GC 007: Unreferenced array cycle
 --INI--
 zend.enable_gc=1
 --FILE--

Zend/tests/gc_008.phpt

@@ -1,5 +1,5 @@
 --TEST--
-GC 008: Unreferensed object cycle
+GC 008: Unreferenced object cycle
 --INI--
 zend.enable_gc=1
 --FILE--

Zend/tests/gc_009.phpt

@@ -1,5 +1,5 @@
 --TEST--
-GC 009: Unreferensed array-object cycle
+GC 009: Unreferenced array-object cycle
 --INI--
 zend.enable_gc=1
 --FILE--

Zend/zend_API.c

@@ -1172,7 +1172,7 @@ ZEND_API void object_properties_init(zend_object *object, zend_class_entry *clas
 
 /* This function requires 'properties' to contain all props declared in the
  * class and all props being public. If only a subset is given or the class
- * has protected members then you need to merge the properties seperately by
+ * has protected members then you need to merge the properties separately by
  * calling zend_merge_properties(). */
 ZEND_API int _object_and_properties_init(zval *arg, zend_class_entry *class_type, HashTable *properties ZEND_FILE_LINE_DC TSRMLS_DC) /* {{{ */
 {

Zend/zend_compile.c

@@ -3941,7 +3941,7 @@ static void zend_add_trait_method(zend_class_entry *ce, const char *name, const
 #endif
 		} else {
 			/* inherited members are overridden by members inserted by traits */
-			/* check whether the trait method fullfills the inheritance requirements */
+			/* check whether the trait method fulfills the inheritance requirements */
 			do_inheritance_check_on_method(fn, existing_fn TSRMLS_CC);
 		}
 	}
@@ -7176,7 +7176,7 @@ ZEND_API size_t zend_dirname(char *path, size_t len)
 	}
 #elif defined(NETWARE)
 	/*
-	 * Find the first occurence of : from the left
+	 * Find the first occurrence of : from the left
 	 * move the path pointer to the position just after :
 	 * increment the len_adjust to the length of path till colon character(inclusive)
 	 * If there is no character beyond : simple return len

Zend/zend_operators.c

@@ -1530,7 +1530,7 @@ ZEND_API int compare_function(zval *result, zval *op1, zval *op2 TSRMLS_DC) /* {
 				/* If both are objects sharing the same comparision handler then use is */
 				if (Z_OBJ_HANDLER_P(op1,compare_objects) == Z_OBJ_HANDLER_P(op2,compare_objects)) {
 					if (Z_OBJ_HANDLE_P(op1) == Z_OBJ_HANDLE_P(op2)) {
-						/* object handles are identical, apprently this is the same object */
+						/* object handles are identical, apparently this is the same object */
 						ZVAL_LONG(result, 0);
 						return SUCCESS;
 					}

acinclude.m4

@@ -1832,7 +1832,7 @@ AC_TRY_COMPILE([
 ])
 
 dnl -------------------------------------------------------------------------
-dnl Library/function existance and build sanity checks
+dnl Library/function existence and build sanity checks
 dnl -------------------------------------------------------------------------
 
 dnl

build/shtool

@@ -376,11 +376,11 @@ while [ $# -gt 0 ]; do
             eval "opt_${opt_OPT}=yes"
             ;;
         ':' )
-            #   option with argument (multiple occurances override)
+            #   option with argument (multiple occurrences override)
             eval "opt_${opt_OPT}=\"\$opt_ARG\""
             ;;
         '+' )
-            #   option with argument (multiple occurances append)
+            #   option with argument (multiple occurrences append)
             eval "opt_${opt_OPT}=\"\$opt_${opt_OPT}\${ASC_NL}\$opt_ARG\""
             ;;
         * )

ext/bz2/bz2.c

@@ -518,7 +518,7 @@ static PHP_FUNCTION(bzcompress)
 		efree(dest);
 		RETURN_LONG(error);
 	} else {
-		/* Copy the buffer, we have perhaps allocate alot more than we need,
+		/* Copy the buffer, we have perhaps allocate a lot more than we need,
 		   so we erealloc() the buffer to the proper size */
 		dest = erealloc(dest, dest_len + 1);
 		dest[dest_len] = 0;

ext/com_dotnet/com_variant.c

@@ -429,7 +429,7 @@ PHP_FUNCTION(com_variant_create_instance)
 		/* If already an array and VT_ARRAY is passed then:
 			- if only VT_ARRAY passed then do not perform a conversion
 			- if VT_ARRAY plus other type passed then perform conversion 
-			  but will probably fail (origional behavior)
+			  but will probably fail (original behavior)
 		*/
 		if ((vt & VT_ARRAY) && (V_VT(&obj->v) & VT_ARRAY)) {
 			long orig_vt = vt;

ext/date/tests/date_sunrise_and_sunset_basic.phpt

@@ -14,7 +14,7 @@ offset: +1 GMT
 
 echo "Basic test for date_sunrise() and date_sunset()\n";
 
-// supress date() function strict msgs 
+// suppress date() function strict msgs 
 error_reporting(E_ALL & ~E_STRICT);
 
 echo date("D M d Y") . ', sunrise time : ' . date_sunrise(time(), SUNFUNCS_RET_STRING, 38.4, -9, 90, 1) . "\n";

ext/dba/tests/dba_cdb_read.phpt

@@ -20,7 +20,7 @@ DBA CDB handler test (read only)
 			$keys .= $a;
 			$count++;
 		}
-		// display number of entries and key existance
+		// display number of entries and key existence
 		echo $count;
 		for ($i=1; $i<8; $i++) {
 			echo dba_exists($i, $db_file) ? "Y" : "N";

ext/dom/element.c

@@ -177,7 +177,7 @@ PHP_METHOD(domelement, __construct)
 		RETURN_FALSE;
 	}
 
-	/* Namespace logic is seperate and only when uri passed in to insure no BC breakage */
+	/* Namespace logic is separate and only when uri passed in to insure no BC breakage */
 	if (uri_len > 0) {
 		errorcode = dom_check_qname(name, &localname, &prefix, uri_len, name_len);
 		if (errorcode == 0) {

ext/dom/tests/DOMNode_removeChild_basic.phpt

@@ -39,7 +39,7 @@ $root = $dom->documentElement;
 
 $children = $root->childNodes;
 $len = $children->length;
-echo "orignal has $len nodes\n";
+echo "original has $len nodes\n";
 for ($index = $children->length - 1; $index >=0; $index--) {
 	echo "node $index\n";
 	$current = $children->item($index);
@@ -58,7 +58,7 @@ for ($index = 0; $index < $children->length; $index++) {
 }
 
 --EXPECTF--
-orignal has 5 nodes
+original has 5 nodes
 node 4
 Course: no title:DOMText
 ~string(1) "

ext/enchant/enchant.c

@@ -651,7 +651,7 @@ PHP_FUNCTION(enchant_broker_free_dict)
 /* }}} */
 
 /* {{{ proto bool enchant_broker_dict_exists(resource broker, string tag)
-   Wether a dictionary exists or not. Using non-empty tag */
+   Whether a dictionary exists or not. Using non-empty tag */
 PHP_FUNCTION(enchant_broker_dict_exists)
 {
 	zval *broker;

ext/exif/tests/exif_tagname_variation1.phpt

@@ -78,7 +78,7 @@ $values =  array (
 
 
 // loop through each element of the array and check the working of exif_tagname()
-// when $index arugment is supplied with different values
+// when $index argument is supplied with different values
 
 echo "\n--- Testing exif_tagname() by supplying different values for 'index' argument ---\n";
 $counter = 1;

ext/fileinfo/tests/finfo_phpinfo_basic.phpt

@@ -1,5 +1,5 @@
 --TEST--
-Test finfo extention : loading into phpinfo()
+Test finfo extension : loading into phpinfo()
 --SKIPIF--
 <?php require_once(dirname(__FILE__) . '/skipif.inc'); ?>
 --FILE--

ext/fileinfo/tests/magic

@@ -4957,7 +4957,7 @@
 >>>>0	ubelong			=0		\b, next free block index %lu
 >>>>0	ubelong			!0		\b, next free block index %lu
 >>>512	default			x		dBase IV DBT
-# DBF file name without extention 
+# DBF file name without extension 
 >>>>8	string			>\0		\b of %-.8s.DBF
 # size of blocks  ; not reliable 0x2020204C
 #>>>>4	ulelong			=0		\b, blocks size %lu
@@ -13205,7 +13205,7 @@
 # they have their real name at offset 22
 >>>>>22		string			>\0			\b%-.5s
 >4	uleshort&0x8000			0x0000			
-# 32 bit sector adressing ( > 32 MB) for block devices
+# 32 bit sector addressing ( > 32 MB) for block devices
 >>4	uleshort&0x0002			0x0002			\b,32-bit sector-
 # support by driver functions 13h, 17h, 18h
 >4	uleshort&0x0040			0x0040			\b,IOCTL-
@@ -17951,7 +17951,7 @@
 #   00030  00 00 00 00 01 00 00 00  00 00 00 00 00 00 00 00  ................
 #   00040  00 00 00 00 ff ff ff ff  ff ff ff ff 02 00 00 00  ................
 #
-# GRR this test is still too general as it catches example adressen.dbt
+# GRR this test is still too general as it catches example addressen.dbt
 0	belong	0x03000000	
 >8	ubelong	0xec020000	VMS Alpha executable
 >>75264	string	PK\003\004	\b, Info-ZIP SFX archive v5.12 w/decryption

ext/gd/tests/imagecopyresampled_basic.phpt

@@ -35,9 +35,9 @@ imagefilledellipse($image_lge, 200, 150, 300, 200, $col_ellipse);
 imagepng($image_lge, $dest_lge);
 
 // Get new dimensions
-$percent = 0.5; // new image 50% of orginal
+$percent = 0.5; // new image 50% of original
 list($width, $height) = getimagesize($dest_lge);
-echo "Size of orginal: width=". $width . " height=" . $height . "\n";
+echo "Size of original: width=". $width . " height=" . $height . "\n";
 
 $new_width = $width * $percent;
 $new_height = $height * $percent;
@@ -66,6 +66,6 @@ echo "Done\n";
 ?>
 --EXPECT--
 Simple test of imagecopyresampled() function
-Size of orginal: width=400 height=300
+Size of original: width=400 height=300
 Size of copy: width=200 height=150
 Done

ext/hash/tests/mhash_002.phpt

@@ -24,7 +24,7 @@ $supported_hash_al = array(
 "CRC32"     => 4,
 "CRC32B"    => 4,
 "ADLER32"   => 4,
-"NA_XYZ"    => 0   /* verify that the algorythm works */
+"NA_XYZ"    => 0   /* verify that the algorithm works */
 );
 
 $hc = mhash_count() + 1;

ext/imap/tests/imap_include.inc

@@ -61,7 +61,7 @@ function displayOverviewFields($resp, $fields=null) {
  * @param string mailbox_suffix Suffix used to uniquely identify mailboxes
  * @param int message_count number of test msgs to be written to new mailbox 
  * 
- * @return IMAP stream to new mailbox on sucesss; FALSE on failure
+ * @return IMAP stream to new mailbox on success; FALSE on failure
  */
 function setup_test_mailbox($mailbox_suffix, $message_count, &$new_mailbox = null, $msg_type = "simple"){
 	global $server, $default_mailbox, $username, $password;

ext/interbase/tests/005.phpt

@@ -18,7 +18,7 @@ InterBase: transactions
 
 /*
 Difference between default and other transactions:
-default commited when you call  ibase_close().
+default committed when you call  ibase_close().
 Other transaction doing rollback.
 
 If you not open default transaction with
@@ -158,7 +158,7 @@ three transaction on default link
 
     ibase_free_result($res);
 
- 	/* tr_4 IBASE_COMMITED + IBASE_REC_NO_VERSION + IBASE_NOWAIT */
+ 	/* tr_4 IBASE_COMMITTED + IBASE_REC_NO_VERSION + IBASE_NOWAIT */
  	$res = ibase_query($tr_4, "select * from test5");
 
  	 echo "three rows in fourth transaction with deadlock\n";

ext/intl/doc/Tutorial.txt

@@ -7,7 +7,7 @@ Examle of locales format: 'en_US', 'ru_UA', 'ua_UA' (see http://demo.icu-project
 
 
 2. Collator::getDisplayName( $obj_locale, $disp_locale ).
-Get name of the object for the desired Locale, in the desired langauge. Both arguments 
+Get name of the object for the desired Locale, in the desired language. Both arguments 
 must be from getAvailableLocales method.
 
      @param  string  $obj_locale   Locale to get display name for.

ext/intl/doc/grapheme_api.php

@@ -98,7 +98,7 @@ function grapheme_substr($string, $start, $length = -1) {}
 	 * @param string	$haystack	The input string.
 	 * @param string	$needle		The string to look for.
 	 * @param [boolean]	$before_needle	If TRUE (the default is FALSE), grapheme_strstr() returns the part of the
-						haystack before the first occurence of the needle.
+						haystack before the first occurrence of the needle.
 	 * @return string	Returns the portion of string, or FALSE if needle is not found.
 	*/
 	function grapheme_strstr($haystack, $needle, $before_needle = FALSE) {}
@@ -109,7 +109,7 @@ function grapheme_strstr($haystack, $needle, $before_needle = FALSE) {}
          * @param string        $haystack       The input string.
          * @param string        $needle         The string to look for.
          * @param [boolean]     $before_needle  If TRUE (the default is FALSE), grapheme_strstr() returns the part of the
-                                                haystack before the first occurence of the needle.
+                                                haystack before the first occurrence of the needle.
          * @return string       Returns the portion of string, or FALSE if needle is not found.
         */
         function grapheme_stristr($haystack, $needle, $before_needle = FALSE) {}

ext/intl/doc/msgfmt_api.php

@@ -31,7 +31,7 @@ public static function create($locale, $pattern) {}
 	/**
 	 * Format the message
 	 * @param   array   $args   arguments to insert into the pattern string
-	 * @return  string  the formatted string, or false if an error ocurred
+	 * @return  string  the formatted string, or false if an error occurred
 	 */
 	public function format($args) {}
 
@@ -124,7 +124,7 @@ function msgfmt_create($locale, $pattern) {}
 	 * Format the message
 	 * @param MessageFormatter $fmt The message formatter 
 	 * @param   array   $args   arguments to insert into the pattern string
-	 * @return  string  the formatted string, or false if an error ocurred
+	 * @return  string  the formatted string, or false if an error occurred
 	 */
 	function msgfmt_format($fmt, $args) {}
 

ext/libxml/tests/bug61367-read.phpt

@@ -8,7 +8,7 @@ error_reporting=E_ALL & ~E_NOTICE
 --FILE--
 <?php
 /*
- * Note: Using error_reporting=E_ALL & ~E_NOTICE to supress "Trying to get property of non-object" notices.
+ * Note: Using error_reporting=E_ALL & ~E_NOTICE to suppress "Trying to get property of non-object" notices.
  */
 class StreamExploiter {
 	public function stream_close (  ) {

ext/mbstring/README_PHP3-i18n-ja

@@ -408,7 +408,7 @@ o i18n.script_encoding - script encoding
     entering the script parser.
 
     Be aware that auto detection may fail under some conditions.
-    For best auto detection, add multibyte charactor at begining of
+    For best auto detection, add multibyte charactor at beginning of
     script.
 
 

ext/mbstring/libmbfl/filters/unicode_table_jis2004.h

@@ -4643,7 +4643,7 @@ static const int ucs_r2_jisx0213_min = 0xFA0F;
 static const int ucs_r2_jisx0213_max = 0xFA6A;
 
 /* 
-   CJK Compatibility Ideographs: U+F900 - U+FAFF (seperate mapping for U+F9XX)
+   CJK Compatibility Ideographs: U+F900 - U+FAFF (separate mapping for U+F9XX)
 */
 static const unsigned short ucs_r2b_jisx0213_cmap_key[] = {
 	0xf91d,0xf928,0xf929,0xf936,0xf970,0xf9d0,0xf9dc};

ext/mbstring/oniguruma/HISTORY

@@ -1812,7 +1812,7 @@ History
 2003/01/31: [impl] rename TTRANS() to TOLOWER().
 2003/01/30: [bug]  .c.o --> .c.obj in win32\Makefile.
 2003/01/30: [impl] add -DNOT_RUBY to Makefile.in.
-                   NOT_RUBY is refered in regint.h for escape double
+                   NOT_RUBY is referred in regint.h for escape double
                    including config.h.
 2003/01/30: [impl] when string hasn't case ambiguity, don't compile
                    to ignore case opcode.

ext/mbstring/php_mbregex.c

@@ -648,7 +648,7 @@ _php_mb_regex_init_options(const char *parg, int narg, OnigOptionType *option, O
 /* }}} */
 
 /*
- * php funcions
+ * php functions
  */
 
 /* {{{ proto string mb_regex_encoding([string encoding])

ext/mysqli/tests/bug34810.phpt

@@ -16,7 +16,7 @@ class DbConnection {
 		var_dump($link);
 
 		$link = mysqli_init();
-		/* @ is to supress 'Property access is not allowed yet' */
+		/* @ is to suppress 'Property access is not allowed yet' */
 		@var_dump($link);
 
 		$mysql = new my_mysqli($host, $user, $passwd, $db, $port, $socket);

ext/mysqlnd/mysqlnd.c

@@ -1455,7 +1455,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, list_fields)(MYSQLND_CONN_DATA * conn, const c
 			}
 
 			if (FAIL == result->m.read_result_metadata(result, conn TSRMLS_CC)) {
-				DBG_ERR("Error ocurred while reading metadata");
+				DBG_ERR("Error occurred while reading metadata");
 				result->m.free_result(result, TRUE TSRMLS_CC);
 				result = NULL;
 				break;