Fix some misspellings

47 files changed, 84 insertions, 85 deletions

diff --git a/Zend/tests/bug66811.phpt b/Zend/tests/bug66811.phpt
index 6409ceb4ab..339e0a226c 100644
--- a/Zend/tests/bug66811.phpt
+++ b/Zend/tests/bug66811.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Bug #66811: Cannot access static::class in lambda, writen outside of a class
+Bug #66811: Cannot access static::class in lambda, written outside of a class
 --FILE--
 <?php
 class A {
diff --git a/Zend/tests/bug70958.phpt b/Zend/tests/bug70958.phpt
index b00d7aea81..faa75e0b16 100644
--- a/Zend/tests/bug70958.phpt
+++ b/Zend/tests/bug70958.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Bug #70958 (Invalid opcode while using ::class as trait method paramater default value)
+Bug #70958 (Invalid opcode while using ::class as trait method parameter default value)
 --FILE--
 <?php
 trait Foo
diff --git a/Zend/tests/get_defined_vars.phpt b/Zend/tests/get_defined_vars.phpt
index 81aa97a455..199afd0b50 100644
--- a/Zend/tests/get_defined_vars.phpt
+++ b/Zend/tests/get_defined_vars.phpt
@@ -3,7 +3,7 @@ Testing get_defined_vars() Function
 --FILE--
 <?php
 /* Prototype: array get_defined_vars(void);
- * Description: Returns a  multidimentional array of all defined variables.
+ * Description: Returns a  multidimensional array of all defined variables.
  */
 
 /* Various variables definitions used for testing of the function */
diff --git a/Zend/tests/list_self_assign.phpt b/Zend/tests/list_self_assign.phpt
index 4640912696..33993c50ca 100644
--- a/Zend/tests/list_self_assign.phpt
+++ b/Zend/tests/list_self_assign.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test variable occuring on both LHS and RHS of list()
+Test variable occurring on both LHS and RHS of list()
 --FILE--
 <?php
 
diff --git a/Zend/tests/traits/bug65576a.phpt b/Zend/tests/traits/bug65576a.phpt
index 49b2ba0c96..d5a86578ab 100644
--- a/Zend/tests/traits/bug65576a.phpt
+++ b/Zend/tests/traits/bug65576a.phpt
@@ -7,7 +7,7 @@ trait T
 {
   public function __construct()
   {
-    echo "Trait contructor\n";
+    echo "Trait constructor\n";
   }
 }
 
@@ -27,5 +27,5 @@ class B extends A
 new B();
 
 --EXPECT--
-Trait contructor
+Trait constructor
 
diff --git a/Zend/tests/traits/bug65576b.phpt b/Zend/tests/traits/bug65576b.phpt
index 3be52ba7c9..857c582d80 100644
--- a/Zend/tests/traits/bug65576b.phpt
+++ b/Zend/tests/traits/bug65576b.phpt
@@ -8,7 +8,7 @@ trait T
   public function __construct()
   {
     parent::__construct();
-    echo "Trait contructor\n";
+    echo "Trait constructor\n";
   }
 }
 
@@ -29,5 +29,5 @@ new B();
 
 --EXPECT--
 Parent constructor
-Trait contructor
+Trait constructor
 
diff --git a/Zend/tests/traits/bug75607.phpt b/Zend/tests/traits/bug75607.phpt
index a3a10425f4..e466e6333b 100644
--- a/Zend/tests/traits/bug75607.phpt
+++ b/Zend/tests/traits/bug75607.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Bug #75607 (Comparision of initial static properties failing)
+Bug #75607 (Comparison of initial static properties failing)
 --FILE--
 <?php
 
diff --git a/Zend/tests/traits/bug75607a.phpt b/Zend/tests/traits/bug75607a.phpt
index 9f5f03521e..acf59186b6 100644
--- a/Zend/tests/traits/bug75607a.phpt
+++ b/Zend/tests/traits/bug75607a.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Bug #75607 (Comparision of initial static properties failing)
+Bug #75607 (Comparison of initial static properties failing)
 --FILE--
 <?php
 
diff --git a/Zend/zend_API.h b/Zend/zend_API.h
index a3e7baa772..1db7aef5ae 100644
--- a/Zend/zend_API.h
+++ b/Zend/zend_API.h
@@ -419,7 +419,7 @@ ZEND_API int add_assoc_zval_ex(zval *arg, const char *key, size_t key_len, zval
 #define add_assoc_stringl(__arg, __key, __str, __length) add_assoc_stringl_ex(__arg, __key, strlen(__key), __str, __length)
 #define add_assoc_zval(__arg, __key, __value) add_assoc_zval_ex(__arg, __key, strlen(__key), __value)
 
-/* unset() functions are only suported for legacy modules and null() functions should be used */
+/* unset() functions are only supported for legacy modules and null() functions should be used */
 #define add_assoc_unset(__arg, __key) add_assoc_null_ex(__arg, __key, strlen(__key))
 #define add_index_unset(__arg, __key) add_index_null(__arg, __key)
 #define add_next_index_unset(__arg) add_next_index_null(__arg)
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 7ee810d1e7..9c8fe3f4d7 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -5378,7 +5378,7 @@ static int zend_declare_is_first_statement(zend_ast *ast) /* {{{ */
 	uint32_t i = 0;
 	zend_ast_list *file_ast = zend_ast_get_list(CG(ast));
 
-	/* Check to see if this declare is preceeded only by declare statements */
+	/* Check to see if this declare is preceded only by declare statements */
 	while (i < file_ast->children) {
 		if (file_ast->child[i] == ast) {
 			return SUCCESS;
@@ -5386,7 +5386,7 @@ static int zend_declare_is_first_statement(zend_ast *ast) /* {{{ */
 			/* Empty statements are not allowed prior to a declare */
 			return FAILURE;
 		} else if (file_ast->child[i]->kind != ZEND_AST_DECLARE) {
-			/* declares can only be preceeded by other declares */
+			/* declares can only be preceded by other declares */
 			return FAILURE;
 		}
 		i++;
@@ -5719,7 +5719,7 @@ void zend_compile_params(zend_ast *ast, zend_ast *return_type_ast) /* {{{ */
 		}
 	}
 
-	/* These are assigned at the end to avoid unitialized memory in case of an error */
+	/* These are assigned at the end to avoid uninitialized memory in case of an error */
 	op_array->num_args = list->children;
 	op_array->arg_info = arg_infos;
 
diff --git a/ext/dom/characterdata.c b/ext/dom/characterdata.c
index f7873b92d9..671f4033ee 100644
--- a/ext/dom/characterdata.c
+++ b/ext/dom/characterdata.c
@@ -213,7 +213,7 @@ PHP_FUNCTION(dom_characterdata_append_data)
 
 	DOM_GET_OBJ(nodep, id, xmlNodePtr, intern);
 #if LIBXML_VERSION < 20627
-/* Implement logic from libxml xmlTextConcat to add suport for comments and PI */
+/* Implement logic from libxml xmlTextConcat to add support for comments and PI */
     if ((nodep->content == (xmlChar *) &(nodep->properties)) ||
         ((nodep->doc != NULL) && (nodep->doc->dict != NULL) &&
 		xmlDictOwns(nodep->doc->dict, nodep->content))) {
diff --git a/ext/fileinfo/tests/magic b/ext/fileinfo/tests/magic
index 1e465506c7..30ab7760a8 100644
--- a/ext/fileinfo/tests/magic
+++ b/ext/fileinfo/tests/magic
@@ -7014,7 +7014,7 @@
 >>>>>>>>>>>>>8		uleshort	>0		\b, at offset %d
 >>>>>>>>>>>>>(8.s+1)	ubyte		>0
 >>>>>>>>>>>>>>&-1	string		>\0		1st record "%s"
-# for multiple index files (*.MDX) Production flag,tag numbers(<=0x30),tag length(<=0x20), reserverd (NULL)
+# for multiple index files (*.MDX) Production flag,tag numbers(<=0x30),tag length(<=0x20), reserved (NULL)
 >>>>>>>24	ubelong&0x0133f7ff	>0
 # test for reserved NULL byte
 >>>>>>>>47	ubyte			0
diff --git a/ext/fileinfo/tests/magic私はガラスを食べられます b/ext/fileinfo/tests/magic私はガラスを食べられます
index 1e465506c7..30ab7760a8 100644
--- a/ext/fileinfo/tests/magic私はガラスを食べられます
+++ b/ext/fileinfo/tests/magic私はガラスを食べられます
@@ -7014,7 +7014,7 @@
 >>>>>>>>>>>>>8		uleshort	>0		\b, at offset %d
 >>>>>>>>>>>>>(8.s+1)	ubyte		>0
 >>>>>>>>>>>>>>&-1	string		>\0		1st record "%s"
-# for multiple index files (*.MDX) Production flag,tag numbers(<=0x30),tag length(<=0x20), reserverd (NULL)
+# for multiple index files (*.MDX) Production flag,tag numbers(<=0x30),tag length(<=0x20), reserved (NULL)
 >>>>>>>24	ubelong&0x0133f7ff	>0
 # test for reserved NULL byte
 >>>>>>>>47	ubyte			0
diff --git a/ext/ftp/ftp.c b/ext/ftp/ftp.c
index 32d7338333..4339c9d18f 100644
--- a/ext/ftp/ftp.c
+++ b/ext/ftp/ftp.c
@@ -1803,7 +1803,7 @@ data_accepted:
 	if (ftp->use_ssl && ftp->use_ssl_for_data) {
 		ctx = SSL_get_SSL_CTX(ftp->ssl_handle);
 		if (ctx == NULL) {
-			php_error_docref(NULL, E_WARNING, "data_accept: failed to retreive the existing SSL context");
+			php_error_docref(NULL, E_WARNING, "data_accept: failed to retrieve the existing SSL context");
 			return 0;
 		}
 
@@ -1822,7 +1822,7 @@ data_accepted:
 		/* get the session from the control connection so we can re-use it */
 		session = SSL_get_session(ftp->ssl_handle);
 		if (session == NULL) {
-			php_error_docref(NULL, E_WARNING, "data_accept: failed to retreive the existing SSL session");
+			php_error_docref(NULL, E_WARNING, "data_accept: failed to retrieve the existing SSL session");
 			SSL_free(data->ssl_handle);
 			return 0;
 		}
diff --git a/ext/gd/libgd/gd_bmp.c b/ext/gd/libgd/gd_bmp.c
index 8af8751299..e1f70174f4 100644
--- a/ext/gd/libgd/gd_bmp.c
+++ b/ext/gd/libgd/gd_bmp.c
@@ -708,7 +708,7 @@ static int bmp_read_direct(gdImagePtr im, gdIOCtxPtr infile, bmp_info_t *info, b
 		return 1;
 	}
 
-	/* There is a chance the data isn't until later, would be wierd but it is possible */
+	/* There is a chance the data isn't until later, would be weird but it is possible */
 	if (gdTell(infile) != header->off) {
 		/* Should make sure we don't seek past the file size */
 		if (!gdSeek(infile, header->off)) {
@@ -805,7 +805,7 @@ static int bmp_read_1bit(gdImagePtr im, gdIOCtxPtr infile, bmp_info_t *info, bmp
 
 	im->colorsTotal = info->numcolors;
 
-	/* There is a chance the data isn't until later, would be wierd but it is possible */
+	/* There is a chance the data isn't until later, would be weird but it is possible */
 	if (gdTell(infile) != header->off) {
 		/* Should make sure we don't seek past the file size */
 		if (!gdSeek(infile, header->off)) {
@@ -875,7 +875,7 @@ static int bmp_read_4bit(gdImagePtr im, gdIOCtxPtr infile, bmp_info_t *info, bmp
 
 	im->colorsTotal = info->numcolors;
 
-	/* There is a chance the data isn't until later, would be wierd but it is possible */
+	/* There is a chance the data isn't until later, would be weird but it is possible */
 	if (gdTell(infile) != header->off) {
 		/* Should make sure we don't seek past the file size */
 		if (!gdSeek(infile, header->off)) {
@@ -962,7 +962,7 @@ static int bmp_read_8bit(gdImagePtr im, gdIOCtxPtr infile, bmp_info_t *info, bmp
 
 	im->colorsTotal = info->numcolors;
 
-	/* There is a chance the data isn't until later, would be wierd but it is possible */
+	/* There is a chance the data isn't until later, would be weird but it is possible */
 	if (gdTell(infile) != header->off) {
 		/* Should make sure we don't seek past the file size */
 		if (!gdSeek(infile, header->off)) {
diff --git a/ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.c b/ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.c
index ca3d437dfa..c7acf21409 100644
--- a/ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.c
@@ -297,7 +297,7 @@ mbfilter_sjis_emoji_docomo2unicode(int s, int *snd)
 			w = mb_tbl_code2uni_docomo1[s - mb_tbl_code2uni_docomo1_min];
 			if (w > 0xf000) {
 				w += 0x10000;
-			} else if (w > 0xe000) { /* unsuported by Unicode 6.0 */
+			} else if (w > 0xe000) { /* unsupported by Unicode 6.0 */
 				w += 0xf0000;
 			}
 			*snd = 0;
@@ -332,7 +332,7 @@ mbfilter_sjis_emoji_kddi2unicode(int s, int *snd)
 			w = mb_tbl_code2uni_kddi1[si];
 			if (w > 0xf000) {
 				w += 0x10000;
-			} else if (w > 0xe000) { /* unsuported by Unicode 6.0 */
+			} else if (w > 0xe000) { /* unsupported by Unicode 6.0 */
 				w += 0xf0000;
 			}
 		}
@@ -350,7 +350,7 @@ mbfilter_sjis_emoji_kddi2unicode(int s, int *snd)
 			w = mb_tbl_code2uni_kddi2[si];
 			if (w > 0xf000) {
 				w += 0x10000;
-			} else if (w > 0xe000) { /* unsuported by Unicode 6.0 */
+			} else if (w > 0xe000) { /* unsupported by Unicode 6.0 */
 				w += 0xf0000;
 			}
 		}
@@ -377,7 +377,7 @@ mbfilter_sjis_emoji_sb2unicode(int s, int *snd)
 			w = mb_tbl_code2uni_sb1[si];
 			if (w > 0xf000) {
 				w += 0x10000;
-			} else if (w > 0xe000) { /* unsuported by Unicode 6.0 */
+			} else if (w > 0xe000) { /* unsupported by Unicode 6.0 */
 				w += 0xf0000;
 			}
 		}
@@ -386,7 +386,7 @@ mbfilter_sjis_emoji_sb2unicode(int s, int *snd)
 		w = mb_tbl_code2uni_sb2[si];
 		if (w > 0xf000) {
 			w += 0x10000;
-		} else if (w > 0xe000) { /* unsuported by Unicode 6.0 */
+		} else if (w > 0xe000) { /* unsupported by Unicode 6.0 */
 			w += 0xf0000;
 		}
 	} else if (s >= mb_tbl_code2uni_sb3_min && s <= mb_tbl_code2uni_sb3_max) {
@@ -398,7 +398,7 @@ mbfilter_sjis_emoji_sb2unicode(int s, int *snd)
 			w = mb_tbl_code2uni_sb3[si];
 			if (w > 0xf000) {
 				w += 0x10000;
-			} else if (w > 0xe000) { /* unsuported by Unicode 6.0 */
+			} else if (w > 0xe000) { /* unsupported by Unicode 6.0 */
 				w += 0xf0000;
 			}
 		}
diff --git a/ext/mbstring/tests/mb_language.phpt b/ext/mbstring/tests/mb_language.phpt
index d3f5bb2c28..0b8bcff28c 100644
--- a/ext/mbstring/tests/mb_language.phpt
+++ b/ext/mbstring/tests/mb_language.phpt
@@ -19,7 +19,7 @@ var_dump(mb_language('English'));
 echo "Confirm language was changed:\n";
 var_dump(mb_language());
 
-echo "Try changing to a non-existant language:\n";
+echo "Try changing to a non-existent language:\n";
 var_dump(mb_language('Pig Latin'));
 var_dump(mb_language());
 ?>
@@ -32,7 +32,7 @@ Changing language to English should be successful:
 bool(true)
 Confirm language was changed:
 string(7) "English"
-Try changing to a non-existant language:
+Try changing to a non-existent language:
 
 Warning: mb_language(): Unknown language "Pig Latin" in %s on line %d
 bool(false)
diff --git a/ext/odbc/tests/bug47803.phpt b/ext/odbc/tests/bug47803.phpt
index 9a2600dd18..ec023a5c87 100644
--- a/ext/odbc/tests/bug47803.phpt
+++ b/ext/odbc/tests/bug47803.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Bug #47803 Executing prepared statements is succesfull only for the first two statements
+Bug #47803 Executing prepared statements is successful only for the first two statements
 --SKIPIF--
 <?php include 'skipif.inc'; ?>
 --FILE--
diff --git a/ext/opcache/Optimizer/optimize_func_calls.c b/ext/opcache/Optimizer/optimize_func_calls.c
index 1642994765..4b48b73bee 100644
--- a/ext/opcache/Optimizer/optimize_func_calls.c
+++ b/ext/opcache/Optimizer/optimize_func_calls.c
@@ -120,7 +120,7 @@ static void zend_try_inline_call(zend_op_array *op_array, zend_op *fcall, zend_o
 			}
 
 			if (fcall->extended_value < func->op_array.num_args) {
-				/* don't inline funcions with named constants in default arguments */
+				/* don't inline functions with named constants in default arguments */
 				i = fcall->extended_value;
 
 				do {
diff --git a/ext/opcache/Optimizer/zend_inference.c b/ext/opcache/Optimizer/zend_inference.c
index d01f4df446..e43a646abd 100644
--- a/ext/opcache/Optimizer/zend_inference.c
+++ b/ext/opcache/Optimizer/zend_inference.c
@@ -2799,7 +2799,7 @@ static int zend_update_type_info(const zend_op_array *op_array,
 					(tmp & func_info->arg_info[opline->op1.num-1].info.type);
 			}
 #if 0
-			/* We won't recieve unused arguments */
+			/* We won't receive unused arguments */
 			if (ssa_vars[ssa_ops[i].result_def].use_chain < 0 &&
 			    ssa_vars[ssa_ops[i].result_def].phi_use_chain == NULL &&
 			    op_array->arg_info &&
diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c
index aa84b318c3..1c870e908d 100644
--- a/ext/opcache/ZendAccelerator.c
+++ b/ext/opcache/ZendAccelerator.c
@@ -2801,7 +2801,7 @@ static int accel_post_startup(void)
 
 		/* from this point further, shared memory is supposed to be OK */
 
-		/* remeber the last restart time in the process memory */
+		/* remember the last restart time in the process memory */
 		ZCG(last_restart_time) = ZCSG(last_restart_time);
 
 		/* Init auto-global strings */
diff --git a/ext/openssl/tests/openssl_encrypt_error.phpt b/ext/openssl/tests/openssl_encrypt_error.phpt
index ea69ad9ee2..ea39bff604 100644
--- a/ext/openssl/tests/openssl_encrypt_error.phpt
+++ b/ext/openssl/tests/openssl_encrypt_error.phpt
@@ -12,7 +12,7 @@ $wrong = "wrong";
 $object = new stdclass;
 $arr = array(1);
 
-// wrong paramters tests
+// wrong parameters tests
 var_dump(openssl_encrypt($data, $wrong, $password));
 var_dump(openssl_encrypt($object, $method, $password));
 var_dump(openssl_encrypt($data, $object, $password));
diff --git a/ext/openssl/tests/openssl_error_string_basic.phpt b/ext/openssl/tests/openssl_error_string_basic.phpt
index 04cc5508a4..9293a704d2 100644
--- a/ext/openssl/tests/openssl_error_string_basic.phpt
+++ b/ext/openssl/tests/openssl_error_string_basic.phpt
@@ -90,7 +90,7 @@ expect_openssl_errors('openssl_pkey_export_to_file pem', ['0906D06C']);
 // file to export cannot be written
 @openssl_pkey_export_to_file($private_key_file, $invalid_file_for_write);
 expect_openssl_errors('openssl_pkey_export_to_file write', ['2006D002']);
-// succesful export
+// successful export
 @openssl_pkey_export($private_key_file_with_pass, $out, 'wrong pwd');
 expect_openssl_errors('openssl_pkey_export', ['06065064', '0906A065']);
 // invalid x509 for getting public key
diff --git a/ext/pdo_mysql/tests/bug_50323.phpt b/ext/pdo_mysql/tests/bug_50323.phpt
index 02050fac5d..5455c664c0 100644
--- a/ext/pdo_mysql/tests/bug_50323.phpt
+++ b/ext/pdo_mysql/tests/bug_50323.phpt
@@ -18,7 +18,7 @@ $db = PDOTest::test_factory(dirname(__FILE__) . '/common.phpt');
                 strpos($original, ':') + 1,
                 strlen($original));
 
-        // no real parser - any excotic setting can fool us
+        // no real parser - any exotic setting can fool us
         $parts = explode(';', $dsn);
         foreach ($parts as $k => $v) {
             $tmp = explode('=', $v);
@@ -44,7 +44,7 @@ if (1 === @$db->exec('CREATE DATABASE `crazy;dbname`')) {
     $dsn = changeDSN(getenv('PDOTEST_DSN'), array('dbname' => 'crazy;;dbname'));
     $user = getenv('PDOTEST_USER');
     $pass = getenv('PDOTEST_PASS');
-    
+
     new PDO($dsn, $user, $pass);
 }
 echo 'done!';
@@ -58,4 +58,3 @@ $db = PDOTest::test_factory(dirname(__FILE__) . '/common.phpt');
 ?>
 --EXPECTF--
 done!
-
diff --git a/ext/session/session.c b/ext/session/session.c
index 7d0665a901..4e5985e7ad 100644
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -1434,7 +1434,7 @@ PHPAPI int php_session_reset_id(void) /* {{{ */
 	}
 
 	/* If the SID constant exists, destroy it. */
-	/* We must not delete any items in EG(zend_contants) */
+	/* We must not delete any items in EG(zend_constants) */
 	/* zend_hash_str_del(EG(zend_constants), "sid", sizeof("sid") - 1); */
 	sid = zend_get_constant_str("SID", sizeof("SID") - 1);
 
diff --git a/ext/sockets/tests/socket_send.phpt b/ext/sockets/tests/socket_send.phpt
index 4093ad47cf..969a79eb2a 100644
--- a/ext/sockets/tests/socket_send.phpt
+++ b/ext/sockets/tests/socket_send.phpt
@@ -17,24 +17,24 @@ if(substr(PHP_OS, 0, 3) == 'WIN' ) {
 $port = 80;
 $host = "yahoo.com";
 $stringSocket = "send_socket_to_connected_socket";
-$stringSocketLenght = strlen($stringSocket);
+$stringSocketLength = strlen($stringSocket);
 
 $socket = socket_create(AF_INET, SOCK_STREAM, SOL_TCP);
 $socketConn = socket_connect($socket, $host, $port);
 
-if(socket_send($socket, $stringSocket, $stringSocketLenght, MSG_OOB)===$stringSocketLenght){
+if(socket_send($socket, $stringSocket, $stringSocketLength, MSG_OOB)===$stringSocketLength){
   print("okey\n");
 }
 
-if(socket_send($socket, $stringSocket, $stringSocketLenght, MSG_EOR)===$stringSocketLenght){
+if(socket_send($socket, $stringSocket, $stringSocketLength, MSG_EOR)===$stringSocketLength){
   print("okey\n");
 }
 
-if(socket_send($socket, $stringSocket, $stringSocketLenght, MSG_EOF)===$stringSocketLenght){
+if(socket_send($socket, $stringSocket, $stringSocketLength, MSG_EOF)===$stringSocketLength){
   print("okey\n");
 }
 
-if(socket_send($socket, $stringSocket, $stringSocketLenght, MSG_DONTROUTE)===$stringSocketLenght){
+if(socket_send($socket, $stringSocket, $stringSocketLength, MSG_DONTROUTE)===$stringSocketLength){
   print("okey\n");
 }
 ?>
@@ -43,7 +43,7 @@ socket_close($socket);
 unset($port);
 unset($host);
 unset($stringSocket);
-unset($stringSocketLenght);
+unset($stringSocketLength);
 unset($socket);
 unset($socketConn);
 ?>
diff --git a/ext/sockets/tests/socket_send_win32.phpt b/ext/sockets/tests/socket_send_win32.phpt
index 04a985c781..0f2311b984 100644
--- a/ext/sockets/tests/socket_send_win32.phpt
+++ b/ext/sockets/tests/socket_send_win32.phpt
@@ -16,16 +16,16 @@ if(substr(PHP_OS, 0, 3) != 'WIN' ) {
 $port = 80;
 $host = "yahoo.com";
 $stringSocket = "send_socket_to_connected_socket";
-$stringSocketLenght = strlen($stringSocket);
+$stringSocketLength = strlen($stringSocket);
 
 $socket = socket_create(AF_INET, SOCK_STREAM, SOL_TCP);
 $socketConn = socket_connect($socket, $host, $port);
 
-if(socket_send($socket, $stringSocket, $stringSocketLenght, MSG_OOB)===$stringSocketLenght){
+if(socket_send($socket, $stringSocket, $stringSocketLength, MSG_OOB)===$stringSocketLength){
   print("okey\n");
 }
 
-if(socket_send($socket, $stringSocket, $stringSocketLenght, MSG_DONTROUTE)===$stringSocketLenght){
+if(socket_send($socket, $stringSocket, $stringSocketLength, MSG_DONTROUTE)===$stringSocketLength){
   print("okey\n");
 }
 ?>
@@ -34,7 +34,7 @@ socket_close($socket);
 unset($port);
 unset($host);
 unset($stringSocket);
-unset($stringSocketLenght);
+unset($stringSocketLength);
 unset($socket);
 unset($socketConn);
 ?>
diff --git a/ext/spl/spl_observer.c b/ext/spl/spl_observer.c
index dd9fa72e7f..96fc3a1047 100644
--- a/ext/spl/spl_observer.c
+++ b/ext/spl/spl_observer.c
@@ -90,7 +90,7 @@ typedef struct _spl_SplObjectStorage { /* {{{ */
 	zend_object       std;
 } spl_SplObjectStorage; /* }}} */
 
-/* {{{ storage is an assoc aray of [zend_object*]=>[zval *obj, zval *inf] */
+/* {{{ storage is an assoc array of [zend_object*]=>[zval *obj, zval *inf] */
 typedef struct _spl_SplObjectStorageElement {
 	zval obj;
 	zval inf;
diff --git a/ext/standard/string.c b/ext/standard/string.c
index caaee8c1da..a515283cec 100644
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -1653,7 +1653,7 @@ PHP_FUNCTION(dirname)
 	ret = zend_string_init(str, str_len, 0);
 
 	if (levels == 1) {
-		/* Defaut case */
+		/* Default case */
 #ifdef PHP_WIN32
 		ZSTR_LEN(ret) = php_win32_ioutil_dirname(ZSTR_VAL(ret), str_len);
 #else
diff --git a/ext/standard/tests/array/in_array_variation4.phpt b/ext/standard/tests/array/in_array_variation4.phpt
index 9a5312b268..789dbd6923 100644
--- a/ext/standard/tests/array/in_array_variation4.phpt
+++ b/ext/standard/tests/array/in_array_variation4.phpt
@@ -9,7 +9,7 @@ Test in_array() function : usage variations - haystack as resource/multi dimensi
  * Source Code: ext/standard/array.c
 */
 
-/* Test in_array() with haystack as resouce and multidimentional arrays */
+/* Test in_array() with haystack as resouce and multidimensional arrays */
 
 /* checking for Resources */
 echo "*** Testing resource type with in_array() ***\n";
diff --git a/ext/standard/tests/mail/mail_basic6.phpt b/ext/standard/tests/mail/mail_basic6.phpt
index d0d45b78f3..01d315ae06 100644
--- a/ext/standard/tests/mail/mail_basic6.phpt
+++ b/ext/standard/tests/mail/mail_basic6.phpt
@@ -59,7 +59,7 @@ echo @file_get_contents($outFile);
 $additional_headers = "\nHEAD1: a\nHEAD2: b\n";
 @unlink($outFile);
 
-echo "-- Invalid Header - preceeding newline--\n";
+echo "-- Invalid Header - preceding newline--\n";
 // Calling mail() with all additional headers
 var_dump( mail($to, $subject, $message, $additional_headers) );
 echo @file_get_contents($outFile);
@@ -69,7 +69,7 @@ echo @file_get_contents($outFile);
 $additional_headers = "\rHEAD1: a\nHEAD2: b\r";
 @unlink($outFile);
 
-echo "-- Invalid Header - preceeding newline--\n";
+echo "-- Invalid Header - preceding newline--\n";
 // Calling mail() with all additional headers
 var_dump( mail($to, $subject, $message, $additional_headers) );
 echo @file_get_contents($outFile);
@@ -79,7 +79,7 @@ echo @file_get_contents($outFile);
 $additional_headers = "\r\nHEAD1: a\r\nHEAD2: b\r\n";
 @unlink($outFile);
 
-echo "-- Invalid Header - preceeding newline--\n";
+echo "-- Invalid Header - preceding newline--\n";
 // Calling mail() with all additional headers
 var_dump( mail($to, $subject, $message, $additional_headers) );
 echo @file_get_contents($outFile);
@@ -89,7 +89,7 @@ echo @file_get_contents($outFile);
 $additional_headers = "\r\n\r\nHEAD1: a\r\nHEAD2: b\r\n";
 @unlink($outFile);
 
-echo "-- Invalid Header - preceeding newline--\n";
+echo "-- Invalid Header - preceding newline--\n";
 // Calling mail() with all additional headers
 var_dump( mail($to, $subject, $message, $additional_headers) );
 echo @file_get_contents($outFile);
@@ -99,7 +99,7 @@ echo @file_get_contents($outFile);
 $additional_headers = "\n\nHEAD1: a\r\nHEAD2: b\r\n";
 @unlink($outFile);
 
-echo "-- Invalid Header - preceeding newline--\n";
+echo "-- Invalid Header - preceding newline--\n";
 // Calling mail() with all additional headers
 var_dump( mail($to, $subject, $message, $additional_headers) );
 echo @file_get_contents($outFile);
@@ -109,7 +109,7 @@ echo @file_get_contents($outFile);
 $additional_headers = "\r\rHEAD1: a\r\nHEAD2: b\r\n";
 @unlink($outFile);
 
-echo "-- Invalid Header - preceeding newline--\n";
+echo "-- Invalid Header - preceding newline--\n";
 // Calling mail() with all additional headers
 var_dump( mail($to, $subject, $message, $additional_headers) );
 echo @file_get_contents($outFile);
@@ -246,27 +246,27 @@ Subject: Test Subject
 HEAD1: a
HEAD2: b
 
 A Message
--- Invalid Header - preceeding newline--
+-- Invalid Header - preceding newline--
 
 Warning: mail(): Multiple or malformed newlines found in additional_header in %s/mail_basic6.php on line %d
 bool(false)
--- Invalid Header - preceeding newline--
+-- Invalid Header - preceding newline--
 
 Warning: mail(): Multiple or malformed newlines found in additional_header in %s/mail_basic6.php on line %d
 bool(false)
--- Invalid Header - preceeding newline--
+-- Invalid Header - preceding newline--
 
 Warning: mail(): Multiple or malformed newlines found in additional_header in %s/mail_basic6.php on line %d
 bool(false)
--- Invalid Header - preceeding newline--
+-- Invalid Header - preceding newline--
 
 Warning: mail(): Multiple or malformed newlines found in additional_header in %s/mail_basic6.php on line %d
 bool(false)
--- Invalid Header - preceeding newline--
+-- Invalid Header - preceding newline--
 
 Warning: mail(): Multiple or malformed newlines found in additional_header in %s/mail_basic6.php on line %d
 bool(false)
--- Invalid Header - preceeding newline--
+-- Invalid Header - preceding newline--
 
 Warning: mail(): Multiple or malformed newlines found in additional_header in %s/mail_basic6.php on line %d
 bool(false)
diff --git a/ext/standard/tests/math/rand_inverted_order.phpt b/ext/standard/tests/math/rand_inverted_order.phpt
index 4c2fc96b54..f3af4c0219 100644
--- a/ext/standard/tests/math/rand_inverted_order.phpt
+++ b/ext/standard/tests/math/rand_inverted_order.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test rand funtion when min and max are in proper or inverted order
+Test rand function when min and max are in proper or inverted order
 --CREDITS--
 PHP TestFEst 2017 - PHPDublin, PHPSP - Joao P V Martins <jp.joao@gmail.com>
 --FILE--
diff --git a/ext/standard/tests/strings/trim1.phpt b/ext/standard/tests/strings/trim1.phpt
index dd52efd98e..2096b61f22 100644
--- a/ext/standard/tests/strings/trim1.phpt
+++ b/ext/standard/tests/strings/trim1.phpt
diff --git a/ext/standard/tests/strings/vprintf_basic7.phpt b/ext/standard/tests/strings/vprintf_basic7.phpt
index fdf90fd47e..7633e08f51 100644
--- a/ext/standard/tests/strings/vprintf_basic7.phpt
+++ b/ext/standard/tests/strings/vprintf_basic7.phpt
@@ -6,8 +6,8 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
 ?>
 --FILE--
 <?php
-/* Prototype  : string vprintf(string $format , aaray $args)
- * Description: Output a formatted string 
+/* Prototype  : string vprintf(string $format , array $args)
+ * Description: Output a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
diff --git a/ext/standard/tests/strings/vprintf_basic7_64bit.phpt b/ext/standard/tests/strings/vprintf_basic7_64bit.phpt
index 32aa338897..ac8a5f0dc5 100644
--- a/ext/standard/tests/strings/vprintf_basic7_64bit.phpt
+++ b/ext/standard/tests/strings/vprintf_basic7_64bit.phpt
@@ -6,8 +6,8 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 ?>
 --FILE--
 <?php
-/* Prototype  : string vprintf(string $format , aaray $args)
- * Description: Output a formatted string 
+/* Prototype  : string vprintf(string $format , array $args)
+ * Description: Output a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
diff --git a/ext/standard/tests/strings/vsprintf_basic7.phpt b/ext/standard/tests/strings/vsprintf_basic7.phpt
index daf514391b..c477a20ee7 100644
--- a/ext/standard/tests/strings/vsprintf_basic7.phpt
+++ b/ext/standard/tests/strings/vsprintf_basic7.phpt
@@ -6,8 +6,8 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
 ?>
 --FILE--
 <?php
-/* Prototype  : string vsprintf(string $format , aaray $args)
- * Description: Return a formatted string 
+/* Prototype  : string vsprintf(string $format , array $args)
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
diff --git a/ext/standard/tests/strings/vsprintf_basic7_64bit.phpt b/ext/standard/tests/strings/vsprintf_basic7_64bit.phpt
index 022919ec73..ce26d246d3 100644
--- a/ext/standard/tests/strings/vsprintf_basic7_64bit.phpt
+++ b/ext/standard/tests/strings/vsprintf_basic7_64bit.phpt
@@ -6,8 +6,8 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 ?>
 --FILE--
 <?php
-/* Prototype  : string vsprintf(string $format , aaray $args)
- * Description: Return a formatted string 
+/* Prototype  : string vsprintf(string $format , array $args)
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
diff --git a/ext/standard/url_scanner_ex.c b/ext/standard/url_scanner_ex.c
index b4eab19579..2601087658 100644
--- a/ext/standard/url_scanner_ex.c
+++ b/ext/standard/url_scanner_ex.c
@@ -1319,7 +1319,7 @@ static inline int php_url_scanner_reset_var_impl(zend_string *name, int encode,
 		php_url_scanner_reset_vars_impl(type);
 		goto finish;
 	}
-	/* Check preceeding separator */
+	/* Check preceding separator */
 	if (!sep_removed
 		&& (size_t)(start - PG(arg_separator).output) >= separator_len
 		&& !memcmp(start - separator_len, PG(arg_separator).output, separator_len)) {
diff --git a/ext/standard/url_scanner_ex.re b/ext/standard/url_scanner_ex.re
index ab9779c49b..d21004f3ce 100644
--- a/ext/standard/url_scanner_ex.re
+++ b/ext/standard/url_scanner_ex.re
@@ -904,7 +904,7 @@ static inline int php_url_scanner_reset_var_impl(zend_string *name, int encode,
 		php_url_scanner_reset_vars_impl(type);
 		goto finish;
 	}
-	/* Check preceeding separator */
+	/* Check preceding separator */
 	if (!sep_removed
 		&& (size_t)(start - PG(arg_separator).output) >= separator_len
 		&& !memcmp(start - separator_len, PG(arg_separator).output, separator_len)) {
diff --git a/ext/wddx/tests/bug73793.phpt b/ext/wddx/tests/bug73793.phpt
index fed4b3525f..d677a34c5b 100644
--- a/ext/wddx/tests/bug73793.phpt
+++ b/ext/wddx/tests/bug73793.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Bug #73793 (WDDX uses wrong decimal seperator)
+Bug #73793 (WDDX uses wrong decimal separator)
 --SKIPIF--
 <?php
 if (!extension_loaded('wddx')) print 'skip wddx extension not available';
diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
index 264881267d..b5e7999c3c 100644
--- a/sapi/cgi/cgi_main.c
+++ b/sapi/cgi/cgi_main.c
@@ -1196,7 +1196,7 @@ static void init_request_info(fcgi_request *request)
 	/* script_path_translated being set is a good indication that
 	 * we are running in a cgi environment, since it is always
 	 * null otherwise.  otherwise, the filename
-	 * of the script will be retreived later via argc/argv */
+	 * of the script will be retrieved later via argc/argv */
 	if (script_path_translated) {
 		const char *auth;
 		char *content_length = CGI_GETENV("CONTENT_LENGTH");
diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c
index f124c8a1f8..27335a2199 100644
--- a/sapi/cli/php_cli.c
+++ b/sapi/cli/php_cli.c
@@ -917,7 +917,7 @@ static int do_cli(int argc, char **argv) /* {{{ */
 #if defined(PHP_WIN32) && !defined(PHP_CLI_WIN32_NO_CONSOLE) && (HAVE_LIBREADLINE || HAVE_LIBEDIT) && !defined(COMPILE_DL_READLINE)
 		if (!interactive) {
 		/* The -a option was not passed. If there is no file, it could
-		 	still make sense to run interactively. The presense of a file
+		 	still make sense to run interactively. The presence of a file
 			is essential to mitigate buggy console info. */
 			interactive = php_win32_console_is_own() &&
 				!(script_file ||
diff --git a/sapi/fpm/fpm/fpm_main.c b/sapi/fpm/fpm/fpm_main.c
index 2632f2aa58..022a7809c7 100644
--- a/sapi/fpm/fpm/fpm_main.c
+++ b/sapi/fpm/fpm/fpm_main.c
@@ -1047,7 +1047,7 @@ static void init_request_info(void)
 	/* script_path_translated being set is a good indication that
 	 * we are running in a cgi environment, since it is always
 	 * null otherwise.  otherwise, the filename
-	 * of the script will be retreived later via argc/argv */
+	 * of the script will be retrieved later via argc/argv */
 	if (script_path_translated) {
 		const char *auth;
 		char *content_length = FCGI_GETENV(request, "CONTENT_LENGTH");
diff --git a/sapi/phpdbg/phpdbg_watch.c b/sapi/phpdbg/phpdbg_watch.c
index 7eddf1b052..1d7f33ff6f 100644
--- a/sapi/phpdbg/phpdbg_watch.c
+++ b/sapi/phpdbg/phpdbg_watch.c
@@ -29,7 +29,7 @@
  * WATCH_ON_HASHDATA: special watchpoint to watch for HT_GET_DATA_ADDR(ht) being efree()'d to be able to properly relocate Bucket watches
  *
  * Watch elements are either simple, recursive or implicit (PHPDBG_WATCH_* flags)
- * Simple means that a particular watchpoint was explicitely defined
+ * Simple means that a particular watchpoint was explicitly defined
  * Recursive watch elements are created recursively (recursive root flag is to distinguish the root element easily from its children recursive elements)
  * Implicit  watch elements are implicitely created on all ancestors of simple or recursive watch elements
  * Recursive and (simple or implicit) watch elements are mutually exclusive
diff --git a/scripts/dev/find_tested.php b/scripts/dev/find_tested.php
index 0881e9ea47..4e1e2a3bb4 100644
--- a/scripts/dev/find_tested.php
+++ b/scripts/dev/find_tested.php
@@ -69,7 +69,7 @@ get_phpt_files($extension_test_path, $count, $phpt_files);
 $extension_method_info = mark_methods_as_tested($extension_method_info, $phpt_files);
 
 /**
- * The loop to ouput the test coverage info
+ * The loop to output the test coverage info
  * Should output: Extension, Class Name, Method/Function Name, Test Status, Test Files
  */ 
 foreach($extension_method_info as $record) {
diff --git a/win32/codepage.c b/win32/codepage.c
index 773df129d2..74e3323097 100644
--- a/win32/codepage.c
+++ b/win32/codepage.c
@@ -156,7 +156,7 @@ PW32CP wchar_t *php_win32_cp_conv_ascii_to_w(const char* in, size_t in_len, size
 
 	/* Check and conversion could be merged. This however would
 		be more expencive, if a non ASCII string was passed.
-		TODO check wether the impact is acceptable. */
+		TODO check whether the impact is acceptable. */
 	if (in_len > 15) {
 		const char *aidx = (const char *)ZEND_SLIDE_TO_ALIGNED16(in);
 
diff --git a/win32/sendmail.c b/win32/sendmail.c
index 05629db91b..1c4610d807 100644
--- a/win32/sendmail.c
+++ b/win32/sendmail.c
@@ -1,7 +1,7 @@
 /*
  *    PHP Sendmail for Windows.
  *
- *  This file is rewriten specificly for PHPFI.  Some functionality
+ *  This file is rewritten specificly for PHPFI.  Some functionality
  *  has been removed (MIME and file attachments).  This code was
  *  modified from code based on code written by Jarle Aase.
  *