Fix some misspellings

Author: carusogabriel

README.STREAMS

@@ -364,7 +364,7 @@ php_stream_ops my_ops = {
     "Strange MySQL example"
 }
 
-Thats it!
+That's it!
 
 Take a look at the STDIO implementation in streams.c for more information
 about how these operations work.

Zend/tests/019.phpt

@@ -149,7 +149,7 @@ foreach ($array_variables as $array_var) {
   var_dump( empty($array_var) ); // expected: bool(true)
 }
 
-echo "\n*** Testing unset(), emtpy() & isset() with resource variables ***\n";
+echo "\n*** Testing unset(), empty() & isset() with resource variables ***\n";
 $fp = fopen(__FILE__, "r");
 $dfp = opendir( dirname(__FILE__) );
 $resources = array (
@@ -1184,7 +1184,7 @@ bool(false)
 bool(false)
 bool(true)
 
-*** Testing unset(), emtpy() & isset() with resource variables ***
+*** Testing unset(), empty() & isset() with resource variables ***
 -- Iteration 1 --
 resource(%d) of type (stream)
 bool(true)

Zend/tests/assign_ref_error_var_handling.phpt

@@ -1,5 +1,5 @@
 --TEST--
-If the LHS of ref-assign ERRORs, that takes precendence over the "only variables" notice
+If the LHS of ref-assign ERRORs, that takes precedence over the "only variables" notice
 --FILE--
 <?php
 

Zend/tests/assign_to_obj_001.phpt

@@ -1,5 +1,5 @@
 --TEST--
-assgin to object leaks with ref
+assign to object leaks with ref
 --FILE--
 <?php
 function &a($i) {

Zend/tests/bug26698.phpt

@@ -1,5 +1,5 @@
 --TEST--
-Bug #26698 (Thrown exceptions while evaluting argument to pass as parameter crash PHP)
+Bug #26698 (Thrown exceptions while evaluating argument to pass as parameter crash PHP)
 --FILE--
 <?php
 

Zend/tests/bug32674.phpt

@@ -34,7 +34,7 @@ class collection implements Iterator {
   }
 
   public function valid() {
-    throw new Exception('shit happend');
+    throw new Exception('shit happened');
 
     return ($this->current() !== false);
   }

Zend/tests/bug35017.phpt

@@ -11,11 +11,11 @@ try {
 	}
 	echo "?\n";
 } catch(Exception $e) { 
-  echo "This Exception should be catched\n";
+  echo "This Exception should be caught\n";
 }
 function errorHandler($errno, $errstr, $errfile, $errline, $vars) {
 	throw new Exception('Some Exception');
 }
 ?>
 --EXPECT--
-This Exception should be catched
+This Exception should be caught

Zend/tests/bug35437.phpt

@@ -20,8 +20,8 @@ class TestClass
 try {
 	TestClass::testMethod();
 } catch (Exception $e) {
-	echo "Catched: ".$e->getMessage()."\n";
+	echo "Caught: ".$e->getMessage()."\n";
 }
 ?>
 --EXPECT--
-Catched: Error occuried: Non-static method TestClass::testMethod() should not be called statically
+Caught: Error occuried: Non-static method TestClass::testMethod() should not be called statically

Zend/tests/bug44660.phpt

@@ -1,5 +1,5 @@
 --TEST--
-Bug #44660 (Indexed and reference assignment to propery of non-object don't trigger warning)
+Bug #44660 (Indexed and reference assignment to property of non-object don't trigger warning)
 --FILE--
 <?php
 $s = "hello";

Zend/tests/bug51791.phpt

@@ -1,5 +1,5 @@
 --TEST--
-Bug #51791 (constant() failed to check undefined constant and php interpreter stoped)
+Bug #51791 (constant() failed to check undefined constant and php interpreter stopped)
 --FILE--
 <?php
 

Zend/tests/bug61165.phpt

@@ -10,7 +10,7 @@ class T {
     public function __toString() {
 		global $handler;
 	    $handler = $this;
-        $this->_this = $this; // <-- uncoment this
+        $this->_this = $this; // <-- uncomment this
         return 'A';
     }
 }

Zend/tests/bug63635.phpt

@@ -4,17 +4,17 @@ Bug #63635 (Segfault in gc_collect_cycles)
 <?php
 class Node {
 	public $parent = NULL;
-	public $childs = array();
+	public $children = array();
 
 	function __construct(Node $parent=NULL) {
 		if ($parent) {
-			$parent->childs[] = $this;
+			$parent->children[] = $this;
 		}
-		$this->childs[] = $this;
+		$this->children[] = $this;
 	}
 
 	function __destruct() {
-		$this->childs = NULL;
+		$this->children = NULL;
 	}	
 }
 

Zend/tests/bug65784.phpt

@@ -8,7 +8,7 @@ function foo1() {
 		return true;
 	} finally {
 		try {
-			throw new Exception("catched");
+			throw new Exception("caught");
 		} catch (Exception $e) {
 		}
 	}
@@ -25,11 +25,11 @@ try {
 function foo2() {
 	try  {
 		try {
-			throw new Exception("catched");
+			throw new Exception("caught");
 			return true;
 		} finally {
 			try {
-				throw new Exception("catched");
+				throw new Exception("caught");
 			} catch (Exception $e) {
 			}
 		}
@@ -42,7 +42,7 @@ var_dump($foo);
 
 function foo3() {
 	try {
-		throw new Exception("not catched");
+		throw new Exception("not caught");
 		return true;
 	} finally {
 		try {
@@ -57,7 +57,7 @@ $bar = foo3();
 string(9) "not catch"
 NULL
 
-Fatal error: Uncaught Exception: not catched in %sbug65784.php:42
+Fatal error: Uncaught Exception: not caught in %sbug65784.php:42
 Stack trace:
 #0 %sbug65784.php(52): foo3()
 #1 {main}

Zend/tests/bug69892.phpt

@@ -1,5 +1,5 @@
 --TEST--
-Bug #69892: Different arrays compare indentical due to integer key truncation
+Bug #69892: Different arrays compare identical due to integer key truncation
 --SKIPIF--
 <?php if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platforms only"); ?>
 --FILE--

Zend/tests/bug70012.phpt

@@ -15,7 +15,7 @@ try {
 			echo "    Inner finally\n";
 		}
 	}
-	echo "Outer shouldnt get here\n";
+	echo "Outer shouldn't get here\n";
 } catch (Exception $e) {
 	echo "Outer catch\n";
 } finally {

Zend/tests/bug75420.phpt

@@ -1,5 +1,5 @@
 --TEST--
-Bug #75420 (Crash when modifing property name in __isset for BP_VAR_IS)
+Bug #75420 (Crash when modifying property name in __isset for BP_VAR_IS)
 --FILE--
 <?php
 

Zend/tests/ns_010.phpt

@@ -1,5 +1,5 @@
 --TEST--
-010: Accesing internal namespace class
+010: Accessing internal namespace class
 --FILE--
 <?php
 namespace X;

Zend/tests/ns_020.phpt

@@ -1,5 +1,5 @@
 --TEST--
-020: Accesing internal namespace function
+020: Accessing internal namespace function
 --FILE--
 <?php
 namespace X;

Zend/tests/ns_064.phpt

@@ -1,5 +1,5 @@
 --TEST--
-Magic methods in overrided stdClass inside namespace
+Magic methods in overridden stdClass inside namespace
 --FILE--
 <?php
 

Zend/zend_alloc.c

@@ -196,7 +196,7 @@ int zend_mm_use_huge_pages = 0;
 #endif
 
 /*
- * Memory is retrived from OS by chunks of fixed size 2MB.
+ * Memory is retrieved from OS by chunks of fixed size 2MB.
  * Inside chunk it's managed by pages of fixed size 4096B.
  * So each chunk consists from 512 pages.
  * The first page of each chunk is reseved for chunk header.
@@ -254,7 +254,7 @@ struct _zend_mm_heap {
 
 	zend_mm_chunk     *main_chunk;
 	zend_mm_chunk     *cached_chunks;			/* list of unused chunks */
-	int                chunks_count;			/* number of alocated chunks */
+	int                chunks_count;			/* number of allocated chunks */
 	int                peak_chunks_count;		/* peak number of allocated chunks for current request */
 	int                cached_chunks_count;		/* number of cached chunks */
 	double             avg_chunks_count;		/* average number of chunks allocated per request */

Zend/zend_ast.c

@@ -821,7 +821,7 @@ ZEND_API void zend_ast_apply(zend_ast *ast, zend_ast_apply_func fn) {
 }
 
 /*
- * Operator Precendence
+ * Operator Precedence
  * ====================
  * priority  associativity  operators
  * ----------------------------------

Zend/zend_compile.c

@@ -1954,7 +1954,7 @@ static void zend_find_live_range(zend_op *opline, zend_uchar type, uint32_t var)
 			           def->opcode == ZEND_JMPNZ_EX ||
 			           def->opcode == ZEND_BOOL ||
 			           def->opcode == ZEND_BOOL_NOT) {
-				/* result IS_BOOL, it does't have to be destroyed */
+				/* result IS_BOOL, it doesn't have to be destroyed */
 				break;
 			} else if (def->opcode == ZEND_DECLARE_CLASS ||
 			           def->opcode == ZEND_DECLARE_INHERITED_CLASS ||

Zend/zend_compile.h

@@ -302,7 +302,7 @@ typedef struct _zend_oparray_context {
 /*                                                        |     |     |     */
 #define ZEND_ACC_GENERATOR               (1 << 23) /*     |  X  |     |     */
 /*                                                        |     |     |     */
-/* Function with varable number of arguments              |     |     |     */
+/* Function with variable number of arguments             |     |     |     */
 #define ZEND_ACC_VARIADIC                (1 << 24) /*     |  X  |     |     */
 /*                                                        |     |     |     */
 /* Immutable op_array (lazy loading)                      |     |     |     */

Zend/zend_exceptions.c

@@ -761,7 +761,7 @@ static const zend_function_entry zend_funcs_throwable[] = {
  * such exceptions in that handler.
  * Also all getXY() methods are final because thy serve as read only access to
  * their corresponding properties, no more, no less. If after all you need to
- * override somthing then it is method __toString().
+ * override something then it is method __toString().
  * And never try to change the state of exceptions and never implement anything
  * that gives the user anything to accomplish this.
  */

Zend/zend_inheritance.c

@@ -25,7 +25,7 @@
 #include "zend_smart_str.h"
 #include "zend_operators.h"
 
-static void overriden_ptr_dtor(zval *zv) /* {{{ */
+static void overridden_ptr_dtor(zval *zv) /* {{{ */
 {
 	efree_size(Z_PTR_P(zv), sizeof(zend_function));
 }
@@ -1172,7 +1172,7 @@ static void zend_add_magic_methods(zend_class_entry* ce, zend_string* mname, zen
 }
 /* }}} */
 
-static void zend_add_trait_method(zend_class_entry *ce, const char *name, zend_string *key, zend_function *fn, HashTable **overriden) /* {{{ */
+static void zend_add_trait_method(zend_class_entry *ce, const char *name, zend_string *key, zend_function *fn, HashTable **overridden) /* {{{ */
 {
 	zend_function *existing_fn = NULL;
 	zend_function *new_fn;
@@ -1187,9 +1187,9 @@ static void zend_add_trait_method(zend_class_entry *ce, const char *name, zend_s
 
 		if (existing_fn->common.scope == ce) {
 			/* members from the current class override trait methods */
-			/* use temporary *overriden HashTable to detect hidden conflict */
-			if (*overriden) {
-				if ((existing_fn = zend_hash_find_ptr(*overriden, key)) != NULL) {
+			/* use temporary *overridden HashTable to detect hidden conflict */
+			if (*overridden) {
+				if ((existing_fn = zend_hash_find_ptr(*overridden, key)) != NULL) {
 					if (existing_fn->common.fn_flags & ZEND_ACC_ABSTRACT) {
 						/* Make sure the trait method is compatible with previosly declared abstract method */
 						if (UNEXPECTED(!zend_traits_method_compatibility_check(fn, existing_fn))) {
@@ -1209,10 +1209,10 @@ static void zend_add_trait_method(zend_class_entry *ce, const char *name, zend_s
 					}
 				}
 			} else {
-				ALLOC_HASHTABLE(*overriden);
-				zend_hash_init_ex(*overriden, 8, NULL, overriden_ptr_dtor, 0, 0);
+				ALLOC_HASHTABLE(*overridden);
+				zend_hash_init_ex(*overridden, 8, NULL, overridden_ptr_dtor, 0, 0);
 			}
-			zend_hash_update_mem(*overriden, key, fn, sizeof(zend_function));
+			zend_hash_update_mem(*overridden, key, fn, sizeof(zend_function));
 			return;
 		} else if (existing_fn->common.fn_flags & ZEND_ACC_ABSTRACT &&
 				(existing_fn->common.scope->ce_flags & ZEND_ACC_INTERFACE) == 0) {
@@ -1274,7 +1274,7 @@ static void zend_fixup_trait_method(zend_function *fn, zend_class_entry *ce) /*
 }
 /* }}} */
 
-static int zend_traits_copy_functions(zend_string *fnname, zend_function *fn, zend_class_entry *ce, HashTable **overriden, HashTable *exclude_table, zend_class_entry **aliases) /* {{{ */
+static int zend_traits_copy_functions(zend_string *fnname, zend_function *fn, zend_class_entry *ce, HashTable **overridden, HashTable *exclude_table, zend_class_entry **aliases) /* {{{ */
 {
 	zend_trait_alias  *alias, **alias_ptr;
 	zend_string       *lcname;
@@ -1300,7 +1300,7 @@ static int zend_traits_copy_functions(zend_string *fnname, zend_function *fn, ze
 				}
 
 				lcname = zend_string_tolower(alias->alias);
-				zend_add_trait_method(ce, ZSTR_VAL(alias->alias), lcname, &fn_copy, overriden);
+				zend_add_trait_method(ce, ZSTR_VAL(alias->alias), lcname, &fn_copy, overridden);
 				zend_string_release_ex(lcname, 0);
 
 				/* Record the trait from which this alias was resolved. */
@@ -1352,7 +1352,7 @@ static int zend_traits_copy_functions(zend_string *fnname, zend_function *fn, ze
 			}
 		}
 
-		zend_add_trait_method(ce, ZSTR_VAL(fn->common.function_name), fnname, &fn_copy, overriden);
+		zend_add_trait_method(ce, ZSTR_VAL(fn->common.function_name), fnname, &fn_copy, overridden);
 	}
 
 	return ZEND_HASH_APPLY_KEEP;
@@ -1496,15 +1496,15 @@ static void zend_traits_init_trait_structures(zend_class_entry *ce, HashTable **
 static void zend_do_traits_method_binding(zend_class_entry *ce, HashTable **exclude_tables, zend_class_entry **aliases) /* {{{ */
 {
 	uint32_t i;
-	HashTable *overriden = NULL;
+	HashTable *overridden = NULL;
 	zend_string *key;
 	zend_function *fn;
 
 	if (exclude_tables) {
 		for (i = 0; i < ce->num_traits; i++) {
 			/* copies functions, applies defined aliasing, and excludes unused trait methods */
 			ZEND_HASH_FOREACH_STR_KEY_PTR(&ce->traits[i]->function_table, key, fn) {
-				zend_traits_copy_functions(key, fn, ce, &overriden, exclude_tables[i], aliases);
+				zend_traits_copy_functions(key, fn, ce, &overridden, exclude_tables[i], aliases);
 			} ZEND_HASH_FOREACH_END();
 
 			if (exclude_tables[i]) {
@@ -1516,7 +1516,7 @@ static void zend_do_traits_method_binding(zend_class_entry *ce, HashTable **excl
 	} else {
 		for (i = 0; i < ce->num_traits; i++) {
 			ZEND_HASH_FOREACH_STR_KEY_PTR(&ce->traits[i]->function_table, key, fn) {
-				zend_traits_copy_functions(key, fn, ce, &overriden, NULL, aliases);
+				zend_traits_copy_functions(key, fn, ce, &overridden, NULL, aliases);
 			} ZEND_HASH_FOREACH_END();
 		}
 	}
@@ -1525,9 +1525,9 @@ static void zend_do_traits_method_binding(zend_class_entry *ce, HashTable **excl
 		zend_fixup_trait_method(fn, ce);
 	} ZEND_HASH_FOREACH_END();
 
-	if (overriden) {
-		zend_hash_destroy(overriden);
-		FREE_HASHTABLE(overriden);
+	if (overridden) {
+		zend_hash_destroy(overridden);
+		FREE_HASHTABLE(overridden);
 	}
 }
 /* }}} */

Zend/zend_interfaces.c

@@ -315,7 +315,7 @@ static int zend_implement_aggregate(zend_class_entry *interface, zend_class_entr
 			/* inheritance ensures the class has necessary userland methods */
 			return SUCCESS;
 		} else if (class_type->get_iterator != zend_user_it_get_new_iterator) {
-			/* c-level get_iterator cannot be changed (exception being only Traversable is implmented) */
+			/* c-level get_iterator cannot be changed (exception being only Traversable is implemented) */
 			if (class_type->num_interfaces) {
 				for (i = 0; i < class_type->num_interfaces; i++) {
 					if (class_type->interfaces[i] == zend_ce_iterator) {

Zend/zend_object_handlers.c

@@ -1424,7 +1424,7 @@ ZEND_API zval *zend_std_get_static_property(zend_class_entry *ce, zend_string *p
 		}
 	}
 
-	/* check if static properties were destoyed */
+	/* check if static properties were destroyed */
 	if (UNEXPECTED(CE_STATIC_MEMBERS(ce) == NULL)) {
 		if (ce->type == ZEND_INTERNAL_CLASS) {
 			zend_intenal_class_init_statics(ce);