summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAyesh Karunaratne <ayesh@ayesh.me>2020-06-26 03:45:29 +0700
committerChristoph M. Becker <cmbecker69@gmx.de>2020-06-25 23:32:40 +0200
commitd114812fafc8f2a7482ccb81ebee39f5d55a7890 (patch)
tree040306b5c135bc16edc29f6c00052bfcb4ce17db
parent7e940823d56670d3b2cc2ed1df5eedade472811e (diff)
downloadphp-git-d114812fafc8f2a7482ccb81ebee39f5d55a7890.tar.gz
[ci skip] Various typo fixes in stub comments and CHANGES file
-rw-r--r--UPGRADING2
-rwxr-xr-xZend/zend_vm_gen.php6
-rw-r--r--ext/mysqli/tests/connect.inc2
-rw-r--r--ext/pdo/tests/pdo_test.inc2
-rw-r--r--ext/spl/tests/recursivecomparedualiterator.inc2
-rw-r--r--ext/zip/tests/utils.inc2
-rw-r--r--tests/lang/023-1.inc2
-rw-r--r--tests/security/open_basedir.inc2
8 files changed, 10 insertions, 10 deletions
diff --git a/UPGRADING b/UPGRADING
index ed8690bf82..8b90d25a41 100644
--- a/UPGRADING
+++ b/UPGRADING
@@ -584,7 +584,7 @@ PHP 8.0 UPGRADE NOTES
OPENSSL_ENCODING_PEM.
- Standard:
- . printf() and friends how support the %h and %H format specifiers. These
+ . printf() and friends now support the %h and %H format specifiers. These
are the same as %g and %G, but always use "." as the decimal separator,
rather than determining it through the LC_NUMERIC locale.
. printf() and friends now support using "*" as width or precision, in which
diff --git a/Zend/zend_vm_gen.php b/Zend/zend_vm_gen.php
index b8f1882ff8..331cd591c3 100755
--- a/Zend/zend_vm_gen.php
+++ b/Zend/zend_vm_gen.php
@@ -635,7 +635,7 @@ function helper_name($name, $spec, $op1, $op2, $extra_spec) {
$extra = "";
if (isset($helpers[$name])) {
- // If we haven't helper with specified spicialized operands then
+ // If we have no helper with specified specialized operands then
// using unspecialized helper
if (!isset($helpers[$name]["op1"][$op1])) {
if (($op1 == 'TMP' || $op1 == 'VAR') &&
@@ -680,7 +680,7 @@ function opcode_name($name, $spec, $op1, $op2, $extra_spec) {
if (isset($opnames[$name])) {
$opcode = $opcodes[$opnames[$name]];
- // If we haven't helper with specified spicialized operands then
+ // If we have no helper with specified specialized operands then
// using unspecialized helper
if (!isset($opcode["op1"][$op1])) {
if (($op1 == 'TMP' || $op1 == 'VAR') &&
@@ -1648,7 +1648,7 @@ function read_order_file($fn) {
return $order;
}
-// Generates all opcode handlers and helpers (specialized or unspecilaized)
+// Generates all opcode handlers and helpers (specialized or unspecialized)
function gen_executor_code($f, $spec, $kind, $prolog, &$switch_labels = array()) {
global $list, $opcodes, $helpers, $op_types_ex, $gen_order;
diff --git a/ext/mysqli/tests/connect.inc b/ext/mysqli/tests/connect.inc
index 439a7ab8f1..43bb3c4153 100644
--- a/ext/mysqli/tests/connect.inc
+++ b/ext/mysqli/tests/connect.inc
@@ -21,7 +21,7 @@
ini_set('mysqli.default_socket', $socket);
}
- /* Development setting: test experimal features and/or feature requests that never worked before? */
+ /* Development setting: test experimental features and/or feature requests that never worked before? */
$TEST_EXPERIMENTAL = (in_array(getenv("MYSQL_TEST_EXPERIMENTAL"), array(0, 1))) ?
((1 == getenv("MYSQL_TEST_EXPERIMENTAL")) ? true : false) :
false;
diff --git a/ext/pdo/tests/pdo_test.inc b/ext/pdo/tests/pdo_test.inc
index aa1d1eadcb..ba9f159228 100644
--- a/ext/pdo/tests/pdo_test.inc
+++ b/ext/pdo/tests/pdo_test.inc
@@ -37,7 +37,7 @@ class PDOTest {
if (!$db) {
die("Could not create PDO object (DSN=$dsn, user=$user)\n");
}
- // Ignore errors about non-existant tables
+ // Ignore errors about non-existent tables
$db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_SILENT);
// clean up any crufty test tables we might have left behind
diff --git a/ext/spl/tests/recursivecomparedualiterator.inc b/ext/spl/tests/recursivecomparedualiterator.inc
index ad0657b9bd..15f8b177c0 100644
--- a/ext/spl/tests/recursivecomparedualiterator.inc
+++ b/ext/spl/tests/recursivecomparedualiterator.inc
@@ -32,7 +32,7 @@ class RecursiveCompareDualIterator extends RecursiveIteratorIterator
parent::__construct($it);
}
- /** Rewind iteration andcomparison process. Starting with $equal = true.
+ /** Rewind iteration and comparison process. Starting with $equal = true.
*/
function rewind()
{
diff --git a/ext/zip/tests/utils.inc b/ext/zip/tests/utils.inc
index 1076cf8bf2..c796437dd4 100644
--- a/ext/zip/tests/utils.inc
+++ b/ext/zip/tests/utils.inc
@@ -27,7 +27,7 @@ function verify_entries($zip, $entries = []) {
return $verified;
}
-/* recursively remove a directoryy */
+/* recursively remove a directory */
function rmdir_rf($dir) {
if ($handle = opendir($dir)) {
while (false !== ($item = readdir($handle))) {
diff --git a/tests/lang/023-1.inc b/tests/lang/023-1.inc
index e4c480c730..548605e696 100644
--- a/tests/lang/023-1.inc
+++ b/tests/lang/023-1.inc
@@ -3,7 +3,7 @@
<?php
/* the point of this file is to intensively test various aspects of
* the parser. right now, each test focuses in one aspect only
- * (e.g. variable aliasing, arithemtic operator, various control
+ * (e.g. variable aliasing, arithmetic operator, various control
* structures), while trying to combine code from other parts of the
* parser as well.
*/
diff --git a/tests/security/open_basedir.inc b/tests/security/open_basedir.inc
index b97071bfbd..21338ef1cf 100644
--- a/tests/security/open_basedir.inc
+++ b/tests/security/open_basedir.inc
@@ -11,7 +11,7 @@
//
// For this reason we set the open_basedir to . (current directory) and then
// move around to various directories for testing using chdir(). This is NOT
-// recommended for production use as . bypasses all semblence of security..!
+// recommended for production use as . bypasses all semblances of security..!
//
// Although safe mode has been removed in php 6.0, open_basedir is still valid.
// See http://www.php.net/features.safe-mode for more information