Fix #78880: Another bunch of spelling errors

Author: kocsismate

Zend/tests/019.phpt

@@ -243,7 +243,7 @@ var_dump( empty($point1->x) );  // expected: bool(true)
 // unset all members and check
 unset($point1->y);
 unset($point1->lable);
-// dump the objec to check that all variables are unset
+// dump the object to check that all variables are unset
 var_dump($point1);
 var_dump( isset($point1) );  // expected: bool(ture)
 var_dump( empty($point1) );  // expected: bool(false)

Zend/tests/022.phpt

@@ -1,5 +1,5 @@
 --TEST--
-Implementating abstracting methods and optional parameters
+Implementing abstracting methods and optional parameters
 --FILE--
 <?php
 

Zend/tests/bug60536_002.phpt

@@ -1,5 +1,5 @@
 --TEST--
-The same rules are applied for properties that are defined in the class hierarchy. Thus, if the properties are compatible, a notice is issued, if not a fatal error occures. (relevant with #60536)
+The same rules are applied for properties that are defined in the class hierarchy. Thus, if the properties are compatible, a notice is issued, if not a fatal error occurs. (relevant with #60536)
 --FILE--
 <?php
 

Zend/tests/bug60536_004.phpt

@@ -1,5 +1,5 @@
 --TEST--
-Introducing new private variables of the same name in a subclass is ok, and does not lead to any output. That is consitent with normal inheritance handling. (relevant to #60536)
+Introducing new private variables of the same name in a subclass is ok, and does not lead to any output. That is consistent with normal inheritance handling. (relevant to #60536)
 --FILE--
 <?php
 

Zend/tests/bug60536_005.phpt

@@ -1,5 +1,5 @@
 --TEST--
-Introducing new private variables of the same name in a subclass is ok, and does not lead to any output. That is consitent with normal inheritance handling. (relevant to #60536)
+Introducing new private variables of the same name in a subclass is ok, and does not lead to any output. That is consistent with normal inheritance handling. (relevant to #60536)
 --FILE--
 <?php
 

Zend/tests/bug64960.phpt

@@ -16,7 +16,7 @@ class ExceptionHandler {
 // this must be a class, closure does not trigger segfault
 set_exception_handler(new ExceptionHandler());
 
-// exception must be throwed from error handler.
+// exception must be thrown from error handler.
 set_error_handler(function()
 {
 	$e = new Exception;

Zend/tests/bug71930.phpt

@@ -3,7 +3,7 @@ Bug #71930 (_zval_dtor_func: Assertion `(arr)->gc.refcount <= 1' failed)
 --SKIPIF--
 <?php
 if (!extension_loaded("curl")) {
-  die("skip Require a resource which is able to hold a callbck");
+  die("skip Require a resource which is able to hold a callback");
 }
 ?>
 --FILE--

Zend/tests/bug76869.phpt

@@ -1,5 +1,5 @@
 --TEST--
-Bug #76869 (Incorrect bypassing protected method accessibilty check)
+Bug #76869 (Incorrect bypassing protected method accessibility check)
 --FILE--
 <?php
 class A {

Zend/tests/closures/closure_from_callable.inc

@@ -153,7 +153,7 @@ class MagicCall
 
 
 
-class PublicInvokable
+class PublicInvocable
 {
 	public function __invoke($param1)
 	{

Zend/tests/closures/closure_from_callable_basic.phpt

@@ -37,8 +37,8 @@ echo 'Closure is already a closure';
 $fn = Closure::fromCallable($closure);
 echo $fn(" OK".PHP_EOL);
 
-echo 'Class with public invokable';
-$fn = Closure::fromCallable(new PublicInvokable);
+echo 'Class with public invocable';
+$fn = Closure::fromCallable(new PublicInvocable);
 echo $fn(" OK".PHP_EOL);
 
 echo "Instance return private method as callable";
@@ -105,7 +105,7 @@ Access public instance method of parent object through parent::  OK
 Function that exists OK
 Function that exists with different spelling OK
 Closure is already a closure OK
-Class with public invokable OK
+Class with public invocable OK
 Instance return private method as callable OK
 Instance return private static method as callable OK
 Instance return protected static method as callable OK

Zend/tests/closures/closure_instantiate.phpt

@@ -12,7 +12,7 @@ try {
     // Instantiating a closure is an error, not an exception, so we shouldn't see this
     echo 'EXCEPTION: ', $e->getMessage();
 } catch (Throwable $e) {
-    // This is the mesage that we should see for a caught error
+    // This is the message that we should see for a caught error
     echo 'ERROR: ', $e->getMessage();
 }
 

Zend/tests/constant_expressions_classes.phpt

@@ -12,7 +12,7 @@ $classlist = [
   'A'=> 'class A { const HW = "this is A"; }',
   'B'=> 'class B extends A { const HW = parent::HW." extended by B"; }',
   'space1\C' => 'namespace space1; class C { const HW = "this is space1\C"; }',
-  'D' => 'class D  { const HW = \space1\C::HW." extented by D"; }',
+  'D' => 'class D  { const HW = \space1\C::HW." extended by D"; }',
   'trE' => 'trait trE { public static function getHW() { return parent::HW; } }',
   'E' => 'class E extends B { use trE; }',
   'F' => 'class F { const XX = "this is F"; }',
@@ -36,6 +36,6 @@ printf("G::get_me() = %s\n", G::get_me());
 ?>
 --EXPECT--
 B::HW = this is A extended by B
-D::HW = this is space1\C extented by D
+D::HW = this is space1\C extended by D
 E::getHW() = this is A extended by B
 G::get_me() = got this is F extended by G

Zend/tests/ns_094.phpt

@@ -1,5 +1,5 @@
 --TEST--
-Type group use declarations should not allow override on inner itens
+Type group use declarations should not allow override on inner items
 --FILE--
 <?php
 

Zend/tests/traits/bugs/alias-semantics02.phpt

@@ -1,7 +1,7 @@
 --TEST--
 Semantic of alias operation is to provide an additional identifier for the
 method body of the original method.
-It should also work incase the method is fully qualified.
+It should also work in case the method is fully qualified.
 --FILE--
 <?php
 error_reporting(E_ALL);

Zend/tests/traits/conflict002.phpt

@@ -1,5 +1,5 @@
 --TEST--
-Overwridden methods do not cause a conflict.
+Overwritten methods do not cause a conflict.
 --FILE--
 <?php
 error_reporting(E_ALL);

Zend/tests/traits/inheritance001.phpt

@@ -1,5 +1,5 @@
 --TEST--
-Trait method overwridden by a method defined in the class.
+Trait method overwritten by a method defined in the class.
 --FILE--
 <?php
 error_reporting(E_ALL);

Zend/tests/traits/property009.phpt

@@ -1,5 +1,5 @@
 --TEST--
-Handling of public fields with traits needs to have same semantics as with normal inheritance, however, we do add strict warnings since it is easier to run into something unexpeted with changing traits.
+Handling of public fields with traits needs to have same semantics as with normal inheritance, however, we do add strict warnings since it is easier to run into something unexpected with changing traits.
 --FILE--
 <?php
 

Zend/tests/type_declarations/strict_include_explicit_weak.phpt

@@ -8,7 +8,7 @@ declare(strict_types=1);
 // file that's explicitly weak
 require 'strict_include_explicit_weak_2.inc';
 
-// calls within that file should stay weak, despite being included by strict fille
+// calls within that file should stay weak, despite being included by strict file
 ?>
 --EXPECT--
 Success!

Zend/tests/type_declarations/typed_properties_025.phpt

@@ -1,5 +1,5 @@
 --TEST--
-Test typed properties type must preceed first declaration in group
+Test typed properties type must precede first declaration in group
 --FILE--
 <?php
 class Foo {

Zend/tests/type_declarations/typed_properties_036.phpt

@@ -1,5 +1,5 @@
 --TEST--
-Test unitialized typed properties normal foreach must not be yielded
+Test uninitialized typed properties normal foreach must not be yielded
 --FILE--
 <?php
 $foo = new class {

Zend/zend_types.h

@@ -658,7 +658,7 @@ static zend_always_inline uint32_t zval_gc_info(uint32_t gc_type_info) {
 /* zval_gc_flags(zval.value->gc.u.type_info) (common flags) */
 #define GC_COLLECTABLE				(1<<4)
 #define GC_PROTECTED                (1<<5) /* used for recursion detection */
-#define GC_IMMUTABLE                (1<<6) /* can't be canged in place */
+#define GC_IMMUTABLE                (1<<6) /* can't be changed in place */
 #define GC_PERSISTENT               (1<<7) /* allocated using malloc */
 #define GC_PERSISTENT_LOCAL         (1<<8) /* persistent, but thread-local */
 

ext/dom/dom_fe.h

@@ -94,7 +94,7 @@ PHP_METHOD(domdocument, getElementById);
 PHP_METHOD(domdocument, adoptNode);
 PHP_METHOD(domdocument, normalizeDocument);
 PHP_METHOD(domdocument, __construct);
-	/* convienience methods */
+	/* convenience methods */
 PHP_METHOD(domdocument, load);
 PHP_METHOD(domdocument, save);
 PHP_METHOD(domdocument, loadXML);

ext/dom/tests/DOMNode_hasChildNodes_basic.phpt

@@ -8,7 +8,7 @@ include('skipif.inc');
 <?php
 
 /* Create an XML document
- * with strcuture
+ * with structure
  * <book>
  *  <title>This is the title</title>
  * </book>

ext/filter/tests/022.phpt

@@ -7,7 +7,7 @@ filter_var() and FILTER_SANITIZE_EMAIL
 
 var_dump(filter_var("a@b.c", FILTER_SANITIZE_EMAIL));
 var_dump(filter_var("a[!@#$%^&*()@a@#$%^&*(.com@#$%^&*(", FILTER_SANITIZE_EMAIL));
-var_dump(filter_var("white space here \ \ \" som more", FILTER_SANITIZE_EMAIL));
+var_dump(filter_var("white space here \ \ \" some more", FILTER_SANITIZE_EMAIL));
 var_dump(filter_var("", FILTER_SANITIZE_EMAIL));
 var_dump(filter_var("123456789000000", FILTER_SANITIZE_EMAIL));
 
@@ -16,7 +16,7 @@ echo "Done\n";
 --EXPECT--
 string(5) "a@b.c"
 string(30) "a[!@#$%^&*@a@#$%^&*.com@#$%^&*"
-string(21) "whitespaceheresommore"
+string(22) "whitespaceheresomemore"
 string(0) ""
 string(15) "123456789000000"
 Done

ext/gmp/tests/003.phpt

@@ -20,7 +20,7 @@ Check for number base recognition
         $test[] = gmp_init("1234");
         $test[] = gmp_init("1234", 10);
 
-        /* Hexidecimal */
+        /* Hexadecimal */
         $test[] = gmp_init("0x4d2");
         $test[] = gmp_init("0x4d2", 16);
         $test[] = gmp_init("4d2");

ext/imap/php_imap.stub.php

@@ -50,7 +50,7 @@ function imap_fetchmime($stream_id, int $msg_no, string $section, int $options =
 
 /**
  * @param resource $stream_id
- * @todo: should $file be `resouce|string`? it looks like it tries to accept anything?
+ * @todo: should $file be `resource|string`? it looks like it tries to accept anything?
  */
 function imap_savebody($stream_id, $file, int $msg_no, string $section = '', int $options = 0): bool {}
 

ext/mysqli/tests/bug49442.phpt

@@ -67,7 +67,7 @@ mysqli.max_persistent=1
 			mysqlnd makes a connection created through mysql_init()/mysqli_real_connect() always a 'persistent' one.
 			At this point 'persistent' is not to be confused with what a user calls a 'persistent' - in this case
 			'persistent' means that mysqlnd uses malloc() instead of emalloc(). nothing else. ext/mysqli will
-			not consider it as a 'persistent' connection in a user sense, ext/mysqli will not appy max_persistent etc.
+			not consider it as a 'persistent' connection in a user sense, ext/mysqli will not apply max_persistent etc.
 			Its only about malloc() vs. emalloc().
 
 			However, the bug is about malloc() and efree(). You can make make mysqlnd use malloc() by either using

ext/mysqli/tests/bug51647.phpt

@@ -65,7 +65,7 @@ $link->close();
 		if (!$row = $res->fetch_assoc())
 			printf("[006] [%d] %s\n", $link->errno, $link->error);
 		if (!strlen($row["Value"]))
-			printf("[007] Empty cipher. No encrytion!");
+			printf("[007] Empty cipher. No encryption!");
 		var_dump($row);
 	}
 
@@ -95,7 +95,7 @@ $link->close();
 		if (!$row = $res->fetch_assoc())
 			printf("[012] [%d] %s\n", $link->errno, $link->error);
 		if (!strlen($row["Value"]))
-			printf("[013] Empty cipher. No encrytion!");
+			printf("[013] Empty cipher. No encryption!");
 		var_dump($row);
 	}
 

ext/mysqli/tests/mysqli_stmt_result_metadata_sqltests.phpt

@@ -75,7 +75,7 @@ die("skip Check again when the Klingons visit earth - http://bugs.mysql.com/bug.
 			mysqli_free_result($res);
 
 			if ($meta != $expected_lib) {
-				printf("[%04d - %s] Metadata differes from expected values\n",
+				printf("[%04d - %s] Metadata differs from expected values\n",
 					$offset + 5, $sql);
 				var_dump($meta);
 				var_dump($expected_lib);

ext/oci8/oci8_statement.c

@@ -1090,7 +1090,7 @@ int php_oci_bind_post_exec(zval *data)
 				break;
 		}
 	} else if ((Z_TYPE_P(zv) == IS_TRUE) || (Z_TYPE_P(zv) == IS_FALSE)) {
-		/* This convetrsion is done on purpose (ext/oci8 uses LVAL as a temorary value) */
+		/* This convetrsion is done on purpose (ext/oci8 uses LVAL as a temporary value) */
 		if (Z_LVAL_P(zv) == 0)
 			ZVAL_BOOL(zv, FALSE);
 		else if (Z_LVAL_P(zv) == 1)
@@ -1409,12 +1409,12 @@ sb4 php_oci_bind_in_callback(
 	} else if (phpbind->statement != 0) {
 		/* RSET */
 		*bufpp = phpbind->statement;
-		*alenp = -1;		/* seems to be allright */
+		*alenp = -1;		/* seems to be alright */
 		*indpp = (dvoid *)&phpbind->indicator;
 	} else {
 		/* descriptor bind */
 		*bufpp = phpbind->descriptor;
-		*alenp = -1;		/* seems to be allright */
+		*alenp = -1;		/* seems to be alright */
 		*indpp = (dvoid *)&phpbind->indicator;
 	}
 

ext/oci8/package.xml

@@ -713,7 +713,7 @@ to conform with the license.
  </stability>
  <license uri="http://www.php.net/license">PHP</license>
  <notes>
-Bump PHP OCI8 2.0 mininum requirements to PHP 5.2 and Oracle client
+Bump PHP OCI8 2.0 minimum requirements to PHP 5.2 and Oracle client
 library 10.2.  (Use OCI8 1.4 for older PHP version support or if only
 Oracle 9.2 client libraries are available.)
 

ext/oci8/tests/bug44113.phpt

@@ -21,7 +21,7 @@ oci8_test_sql_execute($c, $stmtarray);
 
 // Run Test
 // The test can take some time to complete and can exceed PHP's test
-// timout limit on slow networks.
+// timeout limit on slow networks.
 
 for ($x = 0; $x < 70000; $x++) {
 	if (!($var = oci_new_collection($c, 'BUG44113_LIST_T'))) {

ext/oci8/tests/drcp_conn_close1.phpt

@@ -13,7 +13,7 @@ require __DIR__."/details.inc";
 // Test will open a connection
 // Close the connection
 // Open another connection
-// With oci_close() being a no-op, the same conneciton will be returned
+// With oci_close() being a no-op, the same connection will be returned
 
 
 echo "This is with a OCI_CONNECT\n";

ext/oci8/tests/drcp_conn_close2.phpt

@@ -14,7 +14,7 @@ require __DIR__."/details.inc";
 // Close the connection
 // Open another connection
 // With oci_close() the connection is released to the pool and hence the
-// the second conneciton will be different
+// the second connection will be different
 
 
 // OCI_CONNECT

ext/oci8/tests/drcp_pconn_close1.phpt

@@ -13,7 +13,7 @@ require __DIR__."/details.inc";
 // Test will open a persistent connection
 // Close the connection
 // Open another connection
-// With oci_close() being a no-op, the same conneciton will be returned
+// With oci_close() being a no-op, the same connection will be returned
 
 echo "This is with a OCI_PCONNECT\n";
 var_dump($conn1 = oci_pconnect($user,$password,$dbase));

ext/oci8/tests/password_new.phpt

@@ -2,7 +2,7 @@
 oci_password_change()
 --SKIPIF--
 <?php
-$target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on thes
+$target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
 require(__DIR__.'/skipif.inc');
 require(__DIR__.'/connect.inc');
 if (empty($dbase)) die ("skip requires database connection string be set");

ext/oci8/tests/password_old.phpt

@@ -2,7 +2,7 @@
 ocipasswordchange()
 --SKIPIF--
 <?php
-$target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on thes
+$target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
 require(__DIR__.'/skipif.inc');
 require(__DIR__.'/connect.inc');
 if (empty($dbase)) die ("skip requires database connection string be set");

ext/opcache/Optimizer/optimize_temp_vars_5.c

@@ -102,7 +102,7 @@ void zend_optimize_temporary_variables(zend_op_array *op_array, zend_optimizer_c
 				if (!zend_bitset_in(valid_T, currT)) {
 					int use_new_var = 0;
 
-					/* Code in "finally" blocks may modify temorary variables.
+					/* Code in "finally" blocks may modify temporary variables.
 					 * We allocate new temporaries for values that need to
 					 * relive FAST_CALLs.
 					 */

ext/opcache/Optimizer/zend_cfg.c

@@ -93,7 +93,7 @@ static void zend_mark_reachable(zend_op *opcodes, zend_cfg *cfg, zend_basic_bloc
 				b = succ;
 				break;
 			} else {
-				/* Recusively check reachability */
+				/* Recursively check reachability */
 				if (!(succ->flags & ZEND_BB_REACHABLE)) {
 					zend_mark_reachable(opcodes, cfg, succ);
 				}

ext/opcache/Optimizer/zend_ssa.c

@@ -854,7 +854,7 @@ int zend_build_ssa(zend_arena **arena, const zend_script *script, const zend_op_
 	ALLOCA_FLAG(var_use_heap)
 
 	if ((blocks_count * (op_array->last_var + op_array->T)) > 4 * 1024 * 1024) {
-	    /* Don't buld SSA for very big functions */
+	    /* Don't build SSA for very big functions */
 		return FAILURE;
 	}
 

ext/opcache/Optimizer/zend_ssa.h

@@ -215,7 +215,7 @@ static zend_always_inline zend_bool zend_ssa_is_no_val_use(const zend_op *opline
 	if (opline->opcode == ZEND_ASSIGN || opline->opcode == ZEND_UNSET_CV) {
 		return ssa_op->op1_use == var && ssa_op->op2_use != var;
 	}
-	// TODO: Reenable this after changing the SSA structure.
+	// TODO: Re-enable this after changing the SSA structure.
 	/*if (opline->opcode == ZEND_FE_FETCH_R) {
 		return ssa_op->op2_use == var && ssa_op->op1_use != var;
 	}*/