From 0b4778c377a5753a0deb9cfc697d4f62acf93a29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1t=C3=A9=20Kocsis?= Date: Thu, 16 Jan 2020 09:46:47 +0100 Subject: [PATCH] Fix #78880: Another bunch of spelling errors --- Zend/tests/019.phpt | 2 +- Zend/tests/022.phpt | 2 +- Zend/tests/bug60536_002.phpt | 2 +- Zend/tests/bug60536_004.phpt | 2 +- Zend/tests/bug60536_005.phpt | 2 +- Zend/tests/bug64960.phpt | 2 +- Zend/tests/bug71930.phpt | 2 +- Zend/tests/bug76869.phpt | 2 +- Zend/tests/closures/closure_from_callable.inc | 2 +- .../closures/closure_from_callable_basic.phpt | 6 +++--- Zend/tests/closures/closure_instantiate.phpt | 2 +- Zend/tests/constant_expressions_classes.phpt | 4 ++-- Zend/tests/ns_094.phpt | 2 +- Zend/tests/traits/bugs/alias-semantics02.phpt | 2 +- Zend/tests/traits/conflict002.phpt | 2 +- Zend/tests/traits/inheritance001.phpt | 2 +- Zend/tests/traits/property009.phpt | 2 +- .../strict_include_explicit_weak.phpt | 2 +- .../typed_properties_025.phpt | 2 +- .../typed_properties_036.phpt | 2 +- Zend/zend_types.h | 2 +- ext/dom/dom_fe.h | 2 +- .../tests/DOMNode_hasChildNodes_basic.phpt | 2 +- ext/filter/tests/022.phpt | 4 ++-- ext/gmp/tests/003.phpt | 2 +- ext/imap/php_imap.stub.php | 2 +- ext/mysqli/tests/bug49442.phpt | 2 +- ext/mysqli/tests/bug51647.phpt | 4 ++-- .../mysqli_stmt_result_metadata_sqltests.phpt | 2 +- ext/oci8/oci8_statement.c | 6 +++--- ext/oci8/package.xml | 2 +- ext/oci8/tests/bug44113.phpt | 2 +- ext/oci8/tests/drcp_conn_close1.phpt | 2 +- ext/oci8/tests/drcp_conn_close2.phpt | 2 +- ext/oci8/tests/drcp_pconn_close1.phpt | 2 +- ext/oci8/tests/password_new.phpt | 2 +- ext/oci8/tests/password_old.phpt | 2 +- ext/opcache/Optimizer/optimize_temp_vars_5.c | 2 +- ext/opcache/Optimizer/zend_cfg.c | 2 +- ext/opcache/Optimizer/zend_ssa.c | 2 +- ext/opcache/Optimizer/zend_ssa.h | 2 +- ext/opcache/ZendAccelerator.c | 2 +- ext/opcache/jit/zend_jit_x86.dasc | 2 +- ext/opcache/tests/opt/sccp_017.phpt | 2 +- ext/opcache/tests/opt/sccp_018.phpt | 2 +- ext/opcache/tests/opt/sccp_019.phpt | 2 +- ext/opcache/tests/opt/sccp_020.phpt | 2 +- ext/pcntl/php_signal.c | 2 +- ext/pcntl/tests/001.phpt | 4 ++-- ext/pcre/pcre2lib/sljit/sljitExecAllocator.c | 4 ++-- ext/pcre/pcre2lib/sljit/sljitLir.c | 2 +- .../pcre2lib/sljit/sljitNativeTILEGX_64.c | 8 ++++---- ext/pcre/pcre2lib/sljit/sljitUtils.c | 4 ++-- ext/pcre/tests/bug41638.phpt | 2 +- ext/pdo_mysql/tests/pdo_mysql_fetch_both.phpt | 2 +- .../tests/pdo_mysql_stmt_bindparam_types.phpt | 6 +++--- .../tests/pdo_oci_stmt_getcolumnmeta.phpt | 4 ++-- ext/pdo_pgsql/pgsql_driver.c | 2 +- ext/phar/tests/011.phpt | 2 +- ext/phar/tests/pharfileinfo_getcrc32.phpt | 2 +- ext/reflection/tests/closures_002.phpt | 2 +- ext/spl/spl_directory.c | 2 +- ext/spl/spl_observer.c | 2 +- ext/spl/tests/class_uses_basic2.phpt | 2 +- ext/spl/tests/fixedarray_009.phpt | 2 +- ext/spl/tests/spl_autoload_013.phpt | 2 +- ext/spl/tests/spl_autoload_014.phpt | 2 +- .../spl_cachingiterator___toString_basic.phpt | 2 +- .../tests/array/array_chunk_basic1.phpt | 2 +- .../tests/array/array_map_variation10.phpt | 2 +- .../array/array_multisort_variation10.phpt | 2 +- .../tests/array/array_search_variation4.phpt | 2 +- ext/standard/tests/array/array_values.phpt | Bin 3050 -> 3050 bytes ext/standard/tests/array/count_recursive.phpt | 2 +- .../tests/array/in_array_variation4.phpt | 4 ++-- .../tests/array/krsort_variation8.phpt | Bin 3320 -> 3320 bytes .../tests/array/ksort_variation8.phpt | Bin 3288 -> 3288 bytes .../tests/array/natcasesort_variation6.phpt | 2 +- .../tests/array/sort_variation11.phpt | Bin 3141 -> 3141 bytes .../tests/array/uasort_variation3.phpt | Bin 2568 -> 2569 bytes ext/standard/tests/dir/dir_variation7.phpt | 6 +++--- .../tests/dir/opendir_variation5.phpt | 6 +++--- .../tests/dir/scandir_variation5.phpt | 6 +++--- ext/standard/tests/file/bug77552.phpt | 4 ++-- ext/standard/tests/file/copy_variation14.phpt | 2 +- ext/standard/tests/file/fgetc_basic.phpt | 4 ++-- ext/standard/tests/file/fgets_variation5.phpt | 2 +- ext/standard/tests/file/file.inc | 4 ++-- .../file/file_put_contents_variation4.phpt | 2 +- .../tests/file/filesize_variation4-win32.phpt | 2 +- .../tests/file/filesize_variation4.phpt | 2 +- ext/standard/tests/file/flock_error.phpt | 2 +- ext/standard/tests/file/flock_variation.phpt | 6 +++--- ext/standard/tests/file/fread_basic.phpt | 2 +- .../tests/file/fscanf_variation2.phpt | 2 +- .../tests/file/is_executable_variation2.phpt | 4 ++-- .../tests/file/is_file_variation1.phpt | 2 +- .../tests/file/is_readable_variation2.phpt | 4 ++-- .../tests/file/is_readable_variation3.phpt | 4 ++-- .../tests/file/is_writable_variation2.phpt | 4 ++-- .../tests/file/mkdir_rmdir_variation2.phpt | 4 ++-- .../gettype_settype_variation1.phpt | 2 +- .../gettype_settype_variation2.phpt | 2 +- ext/standard/tests/serialize/max_depth.phpt | 2 +- .../serialize/serialization_arrays_002.phpt | 2 +- .../tests/strings/join_variation2.phpt | 2 +- ext/standard/tests/strings/lcfirst.phpt | Bin 5424 -> 5424 bytes ext/standard/tests/strings/strpos.phpt | Bin 7996 -> 7996 bytes ext/standard/tests/strings/ucfirst.phpt | Bin 4656 -> 4656 bytes ext/standard/tests/strings/ucwords_basic.phpt | 2 +- ext/xml/tests/bug35447.phpt | 2 +- ext/xml/tests/xml009.phpt | 2 +- ext/xml/tests/xml010.phpt | 2 +- ext/zend_test/test.c | 2 +- ext/zip/tests/oo_encryption.phpt | 2 +- main/network.c | 2 +- main/rfc1867.c | 2 +- main/streams/plain_wrapper.c | 2 +- sapi/cgi/cgi_main.c | 2 +- sapi/cli/php_cli.c | 4 ++-- sapi/cli/php_cli_server.c | 2 +- sapi/cli/php_http_parser.h | 2 +- sapi/fpm/fpm/fpm_conf.c | 2 +- sapi/fpm/fpm/fpm_main.c | 2 +- .../tests/bug76601-reload-child-signals.phpt | 6 +++--- sapi/fpm/tests/fcgi.inc | 2 +- sapi/fpm/www.conf.in | 4 ++-- sapi/litespeed/lsapi_main.c | 6 +++--- sapi/phpdbg/phpdbg.c | 4 ++-- sapi/phpdbg/phpdbg.h | 2 +- sapi/phpdbg/phpdbg_help.c | 2 +- sapi/phpdbg/phpdbg_watch.c | 2 +- tests/lang/passByReference_009.phpt | 2 +- win32/sendmail.c | 2 +- 134 files changed, 166 insertions(+), 166 deletions(-) diff --git a/Zend/tests/019.phpt b/Zend/tests/019.phpt index 4ea10e97214..3b3c9238507 100644 --- a/Zend/tests/019.phpt +++ b/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) diff --git a/Zend/tests/022.phpt b/Zend/tests/022.phpt index 1226e2719fb..88a6ec384d3 100644 --- a/Zend/tests/022.phpt +++ b/Zend/tests/022.phpt @@ -1,5 +1,5 @@ --TEST-- -Implementating abstracting methods and optional parameters +Implementing abstracting methods and optional parameters --FILE-- gc.refcount <= 1' failed) --SKIPIF-- --FILE-- diff --git a/Zend/tests/bug76869.phpt b/Zend/tests/bug76869.phpt index ba963d4c4e5..0193bf21028 100644 --- a/Zend/tests/bug76869.phpt +++ b/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-- 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(); } diff --git a/Zend/tests/constant_expressions_classes.phpt b/Zend/tests/constant_expressions_classes.phpt index 89cabc0f914..9deec49561c 100644 --- a/Zend/tests/constant_expressions_classes.phpt +++ b/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 diff --git a/Zend/tests/ns_094.phpt b/Zend/tests/ns_094.phpt index a809437a1bd..06947bb6dd1 100644 --- a/Zend/tests/ns_094.phpt +++ b/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-- --EXPECT-- Success! diff --git a/Zend/tests/type_declarations/typed_properties_025.phpt b/Zend/tests/type_declarations/typed_properties_025.phpt index 65187c1e177..d38d5ddb941 100644 --- a/Zend/tests/type_declarations/typed_properties_025.phpt +++ b/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-- 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 */ diff --git a/ext/dom/dom_fe.h b/ext/dom/dom_fe.h index 30b5396b1fc..ce8e1e4adeb 100644 --- a/ext/dom/dom_fe.h +++ b/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); diff --git a/ext/dom/tests/DOMNode_hasChildNodes_basic.phpt b/ext/dom/tests/DOMNode_hasChildNodes_basic.phpt index cccfff9a65e..b4da4a48aa1 100644 --- a/ext/dom/tests/DOMNode_hasChildNodes_basic.phpt +++ b/ext/dom/tests/DOMNode_hasChildNodes_basic.phpt @@ -8,7 +8,7 @@ include('skipif.inc'); * This is the title * diff --git a/ext/filter/tests/022.phpt b/ext/filter/tests/022.phpt index 91aca3e6326..9621e9a8aba 100644 --- a/ext/filter/tests/022.phpt +++ b/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 diff --git a/ext/gmp/tests/003.phpt b/ext/gmp/tests/003.phpt index 5179b73a1b6..49b69c7d3ad 100644 --- a/ext/gmp/tests/003.phpt +++ b/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"); diff --git a/ext/imap/php_imap.stub.php b/ext/imap/php_imap.stub.php index e1b15340087..06d19318f52 100644 --- a/ext/imap/php_imap.stub.php +++ b/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 {} diff --git a/ext/mysqli/tests/bug49442.phpt b/ext/mysqli/tests/bug49442.phpt index d9093f0347f..4c57a5c48b0 100644 --- a/ext/mysqli/tests/bug49442.phpt +++ b/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 diff --git a/ext/mysqli/tests/bug51647.phpt b/ext/mysqli/tests/bug51647.phpt index cd7ccf8017a..816a612d5a1 100644 --- a/ext/mysqli/tests/bug51647.phpt +++ b/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); } diff --git a/ext/mysqli/tests/mysqli_stmt_result_metadata_sqltests.phpt b/ext/mysqli/tests/mysqli_stmt_result_metadata_sqltests.phpt index 7f858e02169..5e5df14e4d2 100644 --- a/ext/mysqli/tests/mysqli_stmt_result_metadata_sqltests.phpt +++ b/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); diff --git a/ext/oci8/oci8_statement.c b/ext/oci8/oci8_statement.c index 7155e610b3c..9eb0f15efb1 100644 --- a/ext/oci8/oci8_statement.c +++ b/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; } diff --git a/ext/oci8/package.xml b/ext/oci8/package.xml index 4b1981201ab..b9366a17757 100644 --- a/ext/oci8/package.xml +++ b/ext/oci8/package.xml @@ -713,7 +713,7 @@ to conform with the license. PHP -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.) diff --git a/ext/oci8/tests/bug44113.phpt b/ext/oci8/tests/bug44113.phpt index 8a48d6aff08..ec6668db3d0 100644 --- a/ext/oci8/tests/bug44113.phpt +++ b/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'))) { diff --git a/ext/oci8/tests/drcp_conn_close1.phpt b/ext/oci8/tests/drcp_conn_close1.phpt index 18ed1cec72e..71a070eadbe 100644 --- a/ext/oci8/tests/drcp_conn_close1.phpt +++ b/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"; diff --git a/ext/oci8/tests/drcp_conn_close2.phpt b/ext/oci8/tests/drcp_conn_close2.phpt index 4a20c9cf72d..7939e53d9e5 100644 --- a/ext/oci8/tests/drcp_conn_close2.phpt +++ b/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 diff --git a/ext/oci8/tests/drcp_pconn_close1.phpt b/ext/oci8/tests/drcp_pconn_close1.phpt index 83dad880d93..df0caa2433d 100644 --- a/ext/oci8/tests/drcp_pconn_close1.phpt +++ b/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)); diff --git a/ext/oci8/tests/password_new.phpt b/ext/oci8/tests/password_new.phpt index 6e9d2f4780e..c0e53001dff 100644 --- a/ext/oci8/tests/password_new.phpt +++ b/ext/oci8/tests/password_new.phpt @@ -2,7 +2,7 @@ oci_password_change() --SKIPIF-- 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"); diff --git a/ext/oci8/tests/password_old.phpt b/ext/oci8/tests/password_old.phpt index f791e25c3a0..a92dba43667 100644 --- a/ext/oci8/tests/password_old.phpt +++ b/ext/oci8/tests/password_old.phpt @@ -2,7 +2,7 @@ ocipasswordchange() --SKIPIF-- 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"); diff --git a/ext/opcache/Optimizer/optimize_temp_vars_5.c b/ext/opcache/Optimizer/optimize_temp_vars_5.c index 825091bfc30..6f7400159d8 100644 --- a/ext/opcache/Optimizer/optimize_temp_vars_5.c +++ b/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. */ diff --git a/ext/opcache/Optimizer/zend_cfg.c b/ext/opcache/Optimizer/zend_cfg.c index 66c15be3113..c5b1b53a0ec 100644 --- a/ext/opcache/Optimizer/zend_cfg.c +++ b/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); } diff --git a/ext/opcache/Optimizer/zend_ssa.c b/ext/opcache/Optimizer/zend_ssa.c index 0b1f967a93f..64680be7454 100644 --- a/ext/opcache/Optimizer/zend_ssa.c +++ b/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; } diff --git a/ext/opcache/Optimizer/zend_ssa.h b/ext/opcache/Optimizer/zend_ssa.h index ef83b97fcb2..935a3cd9aab 100644 --- a/ext/opcache/Optimizer/zend_ssa.h +++ b/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; }*/ diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c index f6cf7962f19..0e62f376596 100644 --- a/ext/opcache/ZendAccelerator.c +++ b/ext/opcache/ZendAccelerator.c @@ -3133,7 +3133,7 @@ void accel_shutdown(void) #endif if (!_file_cache_only) { - /* Delay SHM dettach */ + /* Delay SHM detach */ orig_post_shutdown_cb = zend_post_shutdown_cb; zend_post_shutdown_cb = accel_post_shutdown; } diff --git a/ext/opcache/jit/zend_jit_x86.dasc b/ext/opcache/jit/zend_jit_x86.dasc index 6c4c316890d..2716434a04f 100644 --- a/ext/opcache/jit/zend_jit_x86.dasc +++ b/ext/opcache/jit/zend_jit_x86.dasc @@ -6870,7 +6870,7 @@ static int zend_jit_do_fcall(dasm_State **Dst, const zend_op *opline, const zend /* Reuse reserved arguments stack */ res_addr = ZEND_ADDR_MEM_ZVAL(ZREG_R4, 0x20); #else - /* CPU stack alocated temorary zval */ + /* CPU stack alocated temporary zval */ res_addr = ZEND_ADDR_MEM_ZVAL(ZREG_R4, 8); #endif } diff --git a/ext/opcache/tests/opt/sccp_017.phpt b/ext/opcache/tests/opt/sccp_017.phpt index c2bc6f35fb0..6e05163b7c3 100644 --- a/ext/opcache/tests/opt/sccp_017.phpt +++ b/ext/opcache/tests/opt/sccp_017.phpt @@ -1,5 +1,5 @@ --TEST-- -SCCP 017: Array assignemnt +SCCP 017: Array assignment --INI-- opcache.enable=1 opcache.enable_cli=1 diff --git a/ext/opcache/tests/opt/sccp_018.phpt b/ext/opcache/tests/opt/sccp_018.phpt index 66a4b6ca150..dd1407dcec7 100644 --- a/ext/opcache/tests/opt/sccp_018.phpt +++ b/ext/opcache/tests/opt/sccp_018.phpt @@ -1,5 +1,5 @@ --TEST-- -SCCP 018: Object assignemnt +SCCP 018: Object assignment --INI-- opcache.enable=1 opcache.enable_cli=1 diff --git a/ext/opcache/tests/opt/sccp_019.phpt b/ext/opcache/tests/opt/sccp_019.phpt index 5a32bd22054..1f7cba7fade 100644 --- a/ext/opcache/tests/opt/sccp_019.phpt +++ b/ext/opcache/tests/opt/sccp_019.phpt @@ -1,5 +1,5 @@ --TEST-- -SCCP 019: Array assignemnt +SCCP 019: Array assignment --INI-- opcache.enable=1 opcache.enable_cli=1 diff --git a/ext/opcache/tests/opt/sccp_020.phpt b/ext/opcache/tests/opt/sccp_020.phpt index 41c694a5911..b3aa82bff50 100644 --- a/ext/opcache/tests/opt/sccp_020.phpt +++ b/ext/opcache/tests/opt/sccp_020.phpt @@ -1,5 +1,5 @@ --TEST-- -SCCP 020: Object assignemnt +SCCP 020: Object assignment --INI-- opcache.enable=1 opcache.enable_cli=1 diff --git a/ext/pcntl/php_signal.c b/ext/pcntl/php_signal.c index ba65996c1db..44d92dabd00 100644 --- a/ext/pcntl/php_signal.c +++ b/ext/pcntl/php_signal.c @@ -19,7 +19,7 @@ #include "Zend/zend.h" #include "Zend/zend_signal.h" -/* php_signal using sigaction is derived from Advanced Programing +/* php_signal using sigaction is derived from Advanced Programming * in the Unix Environment by W. Richard Stevens p 298. */ Sigfunc *php_signal4(int signo, Sigfunc *func, int restart, int mask_all) { diff --git a/ext/pcntl/tests/001.phpt b/ext/pcntl/tests/001.phpt index b9587e13253..fe96d50f04b 100644 --- a/ext/pcntl/tests/001.phpt +++ b/ext/pcntl/tests/001.phpt @@ -61,7 +61,7 @@ function test_stop_signal(){ if ( pcntl_wifstopped($status) ) { $signal_print=pcntl_wstopsig($status); if ($signal_print==SIGSTOP) $signal_print="SIGSTOP"; - print "\nProcess was stoped by signal : ". $signal_print; + print "\nProcess was stopped by signal : ". $signal_print; } posix_kill($pid, SIGCONT); } @@ -82,4 +82,4 @@ Testing pcntl_wifsignaled.... Process was terminated by signal : SIGTERM Testing pcntl_wifstopped and pcntl_wstopsig.... -Process was stoped by signal : SIGSTOP +Process was stopped by signal : SIGSTOP diff --git a/ext/pcre/pcre2lib/sljit/sljitExecAllocator.c b/ext/pcre/pcre2lib/sljit/sljitExecAllocator.c index caaf4385783..7d9684c9cbb 100644 --- a/ext/pcre/pcre2lib/sljit/sljitExecAllocator.c +++ b/ext/pcre/pcre2lib/sljit/sljitExecAllocator.c @@ -114,7 +114,7 @@ static SLJIT_INLINE int get_map_jit_flag() /* The following code is thread safe because multiple initialization sets map_jit_flag to the same value and the code has no side-effects. - Changing the kernel version witout system restart is (very) unlikely. */ + Changing the kernel version without system restart is (very) unlikely. */ if (map_jit_flag == -1) { struct utsname name; @@ -358,7 +358,7 @@ SLJIT_API_FUNC_ATTRIBUTE void sljit_free_unused_memory_exec(void) free_block = free_blocks; while (free_block) { next_free_block = free_block->next; - if (!free_block->header.prev_size && + if (!free_block->header.prev_size && AS_BLOCK_HEADER(free_block, free_block->size)->size == 1) { total_size -= free_block->size; sljit_remove_free_block(free_block); diff --git a/ext/pcre/pcre2lib/sljit/sljitLir.c b/ext/pcre/pcre2lib/sljit/sljitLir.c index ded9541b31b..725d10ec938 100644 --- a/ext/pcre/pcre2lib/sljit/sljitLir.c +++ b/ext/pcre/pcre2lib/sljit/sljitLir.c @@ -325,7 +325,7 @@ #elif (defined SLJIT_DEBUG && SLJIT_DEBUG) -/* Assertion failure occures if an invalid argument is passed. */ +/* Assertion failure occurs if an invalid argument is passed. */ #undef SLJIT_ARGUMENT_CHECKS #define SLJIT_ARGUMENT_CHECKS 1 diff --git a/ext/pcre/pcre2lib/sljit/sljitNativeTILEGX_64.c b/ext/pcre/pcre2lib/sljit/sljitNativeTILEGX_64.c index 003f43a7909..adc6d95b8c7 100644 --- a/ext/pcre/pcre2lib/sljit/sljitNativeTILEGX_64.c +++ b/ext/pcre/pcre2lib/sljit/sljitNativeTILEGX_64.c @@ -59,7 +59,7 @@ static const sljit_u8 reg_map[SLJIT_NUMBER_OF_REGISTERS + 6] = { #define TMP_REG3_mapped 6 #define ADDR_TMP_mapped 7 -/* Flags are keept in volatile registers. */ +/* Flags are kept in volatile registers. */ #define EQUAL_FLAG 8 /* And carry flag as well. */ #define ULESS_FLAG 9 @@ -115,7 +115,7 @@ SLJIT_API_FUNC_ATTRIBUTE const char *sljit_get_platform_name(void) typedef sljit_uw sljit_ins; struct jit_instr { - const struct tilegx_opcode* opcode; + const struct tilegx_opcode* opcode; tilegx_pipeline pipe; unsigned long input_registers; unsigned long output_registers; @@ -896,7 +896,7 @@ static sljit_s32 push_jr_buffer(struct sljit_compiler *compiler, tilegx_mnemonic inst_buf[inst_buf_index].output_registers = 0; inst_buf[inst_buf_index].line = line; inst_buf_index++; - + return flush_buffer(compiler); } @@ -1178,7 +1178,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_enter(struct sljit_compiler *compi { sljit_ins base; sljit_s32 i, tmp; - + CHECK_ERROR(); CHECK(check_sljit_emit_enter(compiler, options, args, scratches, saveds, fscratches, fsaveds, local_size)); set_emit_enter(compiler, options, args, scratches, saveds, fscratches, fsaveds, local_size); diff --git a/ext/pcre/pcre2lib/sljit/sljitUtils.c b/ext/pcre/pcre2lib/sljit/sljitUtils.c index 5c2a8389328..03ed886a99e 100644 --- a/ext/pcre/pcre2lib/sljit/sljitUtils.c +++ b/ext/pcre/pcre2lib/sljit/sljitUtils.c @@ -70,7 +70,7 @@ static HANDLE allocator_mutex = 0; static SLJIT_INLINE void allocator_grab_lock(void) { - /* No idea what to do if an error occures. Static mutexes should never fail... */ + /* No idea what to do if an error occurs. Static mutexes should never fail... */ if (!allocator_mutex) allocator_mutex = CreateMutex(NULL, TRUE, NULL); else @@ -90,7 +90,7 @@ static HANDLE global_mutex = 0; SLJIT_API_FUNC_ATTRIBUTE void SLJIT_FUNC sljit_grab_lock(void) { - /* No idea what to do if an error occures. Static mutexes should never fail... */ + /* No idea what to do if an error occurs. Static mutexes should never fail... */ if (!global_mutex) global_mutex = CreateMutex(NULL, TRUE, NULL); else diff --git a/ext/pcre/tests/bug41638.phpt b/ext/pcre/tests/bug41638.phpt index 8c907f9903a..3ab9a84ac2b 100644 --- a/ext/pcre/tests/bug41638.phpt +++ b/ext/pcre/tests/bug41638.phpt @@ -2,7 +2,7 @@ Bug #41638 (pcre 7.0 regression) --FILE-- closeCursor(); if ($label != $value) { - printf("[%03d/%s + 6] Got %s expecting %s - plase check manually\n", + printf("[%03d/%s + 6] Got %s expecting %s - please check manually\n", $offset, ($native) ? 'native' : 'emulated', var_export($label, true), var_export($value, true)); // fall through @@ -74,14 +74,14 @@ $db = MySQLPDOTest::factory(); } if ($row['label'] != $value) { - printf("[%03d/%s + 8] Got %s expecting %s - plase check manually\n", + printf("[%03d/%s + 8] Got %s expecting %s - please check manually\n", $offset, ($native) ? 'native' : 'emulated', var_export($row['label'], true), var_export($value, true)); return false; } if ($row['label'] != $label) { - printf("[%03d/%s + 9] Got %s from FETCH_ASSOC and %s from FETCH_BOUND- plase check manually\n", + printf("[%03d/%s + 9] Got %s from FETCH_ASSOC and %s from FETCH_BOUND- please check manually\n", $offset, ($native) ? 'native' : 'emulated', var_export($row['label'], true), var_export($value, true)); return false; diff --git a/ext/pdo_oci/tests/pdo_oci_stmt_getcolumnmeta.phpt b/ext/pdo_oci/tests/pdo_oci_stmt_getcolumnmeta.phpt index b56ff9a4f07..1b152c50395 100644 --- a/ext/pdo_oci/tests/pdo_oci_stmt_getcolumnmeta.phpt +++ b/ext/pdo_oci/tests/pdo_oci_stmt_getcolumnmeta.phpt @@ -236,7 +236,7 @@ SQL $db->exec('INSERT INTO test(id, label) VALUES (1, 1)'); $stmt = $db->query('SELECT id, label FROM test'); $meta = $stmt->getColumnMeta(0); - // verify the flags array countains a not_null flag and not nullable flags + // verify the flags array contains a not_null flag and not nullable flags if (!isset($meta['flags'])) { printf("[1001] No flags contained in metadata %s\n", var_export($meta, true)); } else { @@ -252,7 +252,7 @@ SQL printf("[1002] Flags seem wrong %s\n", var_export($meta, true)); } $meta = $stmt->getColumnMeta(1); - // verify the flags array countains a nullable flag and not not_null flags + // verify the flags array contains a nullable flag and not not_null flags if (!isset($meta['flags'])) { printf("[1003] No flags contained in metadata %s\n", var_export($meta, true)); } else { diff --git a/ext/pdo_pgsql/pgsql_driver.c b/ext/pdo_pgsql/pgsql_driver.c index 63eb38c7590..1dfb0bd82ed 100644 --- a/ext/pdo_pgsql/pgsql_driver.c +++ b/ext/pdo_pgsql/pgsql_driver.c @@ -1030,7 +1030,7 @@ static PHP_METHOD(PDO, pgsqlLOBUnlink) /* }}} */ /* {{{ proto mixed PDO::pgsqlGetNotify([ int $result_type = PDO::FETCH_USE_DEFAULT] [, int $ms_timeout = 0 ]]) - Get asyncronous notification */ + Get asynchronous notification */ static PHP_METHOD(PDO, pgsqlGetNotify) { pdo_dbh_t *dbh; diff --git a/ext/phar/tests/011.phpt b/ext/phar/tests/011.phpt index 481086474ca..b35e979d3f0 100644 --- a/ext/phar/tests/011.phpt +++ b/ext/phar/tests/011.phpt @@ -12,7 +12,7 @@ $file = ""; -// compressed file length does not match incompressed lentgh for an uncompressed file +// compressed file length does not match incompressed length for an uncompressed file $files = array(); $files['a'] = array('cont'=>'a','ulen'=>1,'clen'=>2); diff --git a/ext/phar/tests/pharfileinfo_getcrc32.phpt b/ext/phar/tests/pharfileinfo_getcrc32.phpt index b8061280f7d..a7b6dcbf7bb 100644 --- a/ext/phar/tests/pharfileinfo_getcrc32.phpt +++ b/ext/phar/tests/pharfileinfo_getcrc32.phpt @@ -13,7 +13,7 @@ $file = ""; -// compressed file length does not match incompressed lentgh for an uncompressed file +// compressed file length does not match incompressed length for an uncompressed file $files = array(); $files['a/subdir/here'] = array('cont'=>'a','ulen'=>1,'clen'=>1); diff --git a/ext/reflection/tests/closures_002.phpt b/ext/reflection/tests/closures_002.phpt index 27683bcf2b8..4b127810fb3 100644 --- a/ext/reflection/tests/closures_002.phpt +++ b/ext/reflection/tests/closures_002.phpt @@ -1,5 +1,5 @@ --TEST-- -Reflection on invokable objects +Reflection on invocable objects --FILE-- file_name) { efree(intern->file_name); } - /* if there is parent path, ammend it, otherwise just use the given path as is */ + /* if there is parent path, ammnd it, otherwise just use the given path as is */ if (path_len == 0) { intern->file_name_len = spprintf( &intern->file_name, 0, "%s", intern->u.dir.entry.d_name); diff --git a/ext/spl/spl_observer.c b/ext/spl/spl_observer.c index abdf45ef0ff..2e08645d312 100644 --- a/ext/spl/spl_observer.c +++ b/ext/spl/spl_observer.c @@ -539,7 +539,7 @@ SPL_METHOD(SplObjectStorage, removeAllExcept) /* }}} */ /* {{{ proto bool SplObjectStorage::contains(object obj) - Determine whethe an object is contained in the storage */ + Determine whether an object is contained in the storage */ SPL_METHOD(SplObjectStorage, contains) { zval *obj; diff --git a/ext/spl/tests/class_uses_basic2.phpt b/ext/spl/tests/class_uses_basic2.phpt index c358ecccab1..941d967fa73 100644 --- a/ext/spl/tests/class_uses_basic2.phpt +++ b/ext/spl/tests/class_uses_basic2.phpt @@ -20,7 +20,7 @@ class barUser { use bar; } class foobarUser { use foo, bar; } /** There is no semantics for traits in the inheritance chain. - Traits are flattend into a class, and that semantics is nothing + Traits are flattened into a class, and that semantics is nothing like a type, or interface, and thus, not propergated. */ class fooViaBarUser extends barUser { use foo; } diff --git a/ext/spl/tests/fixedarray_009.phpt b/ext/spl/tests/fixedarray_009.phpt index 185b9d1acc7..b885fe99572 100644 --- a/ext/spl/tests/fixedarray_009.phpt +++ b/ext/spl/tests/fixedarray_009.phpt @@ -1,5 +1,5 @@ --TEST-- -SPL: FixedArray: Trying to instantiate passing string to construtor parameter +SPL: FixedArray: Trying to instantiate passing string to constructor parameter --FILE-- __toString() // if conversion to string is done by echo, for example, an exeption is thrown. Invoking __toString explicitly covers different code. +$ci->__toString() // if conversion to string is done by echo, for example, an exception is thrown. Invoking __toString explicitly covers different code. ); ?> --EXPECT-- diff --git a/ext/standard/tests/array/array_chunk_basic1.phpt b/ext/standard/tests/array/array_chunk_basic1.phpt index 63236b2dfec..8bd92eb14e9 100644 --- a/ext/standard/tests/array/array_chunk_basic1.phpt +++ b/ext/standard/tests/array/array_chunk_basic1.phpt @@ -24,7 +24,7 @@ $input_arrays = array ( // associative arrays - key as numeric array(1 => 'one', 2 => "two", 3 => "three"), - // array containing elements with/witout keys + // array containing elements with/without keys array(1 => 'one','two', 3 => 'three', 4, "five" => 5) ); diff --git a/ext/standard/tests/array/array_map_variation10.phpt b/ext/standard/tests/array/array_map_variation10.phpt index df071a414b7..184019cdf19 100644 --- a/ext/standard/tests/array/array_map_variation10.phpt +++ b/ext/standard/tests/array/array_map_variation10.phpt @@ -8,7 +8,7 @@ Test array_map() function : usage variations - anonymous callback function */ /* - * Test array_map() by passing anoymous callback function with following variations + * Test array_map() by passing anonymous callback function with following variations */ echo "*** Testing array_map() : anonymous callback function ***\n"; diff --git a/ext/standard/tests/array/array_multisort_variation10.phpt b/ext/standard/tests/array/array_multisort_variation10.phpt index 2a08156d94e..5452365f370 100644 --- a/ext/standard/tests/array/array_multisort_variation10.phpt +++ b/ext/standard/tests/array/array_multisort_variation10.phpt @@ -1,5 +1,5 @@ --TEST-- -Test array_multisort() function : usage variation - testing with anonymous arrary arguments +Test array_multisort() function : usage variation - testing with anonymous array arguments --FILE-- qrVMTXB{Kyi diff --git a/ext/standard/tests/array/count_recursive.phpt b/ext/standard/tests/array/count_recursive.phpt index 1fd2e8e6caf..501b2cf598d 100644 --- a/ext/standard/tests/array/count_recursive.phpt +++ b/ext/standard/tests/array/count_recursive.phpt @@ -3,7 +3,7 @@ Test count() function --FILE-- >Z2|{hGXRTW5Ig_? delta 44 xcmew%`9pHU2S%pS#Lb@=1({h&6LU%??`3t|?7>>Z2|{hGXRU75Ig_? diff --git a/ext/standard/tests/array/ksort_variation8.phpt b/ext/standard/tests/array/ksort_variation8.phpt index bedbeeed7c148ea68d4b1692478447a40f53fefd..9222e64e19ac2a551396d67aeed8485e71b34271 100644 GIT binary patch delta 44 xcmca1c|&r;4MwKK(#^LR`I%V~OLIylFJyJttjn6m2qaa3YL1XE(^#;77@mc-JWlF5xMcANQFG8ut_n=4t*umJ$%@C+3I delta 35 qcmX>qaa3YL1XF3^#;77@meRzWlF5xMcANQFG8ut_n=4t*umJ$&EDRL@ diff --git a/ext/standard/tests/array/uasort_variation3.phpt b/ext/standard/tests/array/uasort_variation3.phpt index bcb5d41fabdc729493d0876ec0e67b8b617f565d..5db2163e241e43c4b1ba6c76ea107df770f60222 100644 GIT binary patch delta 14 VcmeAW=@gmZGkHBD*T&GzoB$@_1tkCg delta 10 RcmeAa=@6OVv(a}CCjb=e1K9uo diff --git a/ext/standard/tests/dir/dir_variation7.phpt b/ext/standard/tests/dir/dir_variation7.phpt index c2e6519dfed..7993105e36a 100644 --- a/ext/standard/tests/dir/dir_variation7.phpt +++ b/ext/standard/tests/dir/dir_variation7.phpt @@ -42,14 +42,14 @@ chmod($sub_dir_path, 0777); $child_dir_path = $sub_dir_path."/child_dir"; @mkdir($child_dir_path); -// remove the write and execute permisson from sub parent +// remove the write and execute permission from sub parent chmod($sub_dir_path, 0444); echo "-- After restricting 1st level parent directory --\n"; $d = dir($child_dir_path); // try to open, expected failure var_dump( $d ); // dump it -// remove the execute permisson from parent dir, allowing all permission for sub dir -chmod($sub_dir_path, 0777); // all permisson to sub dir +// remove the execute permission from parent dir, allowing all permission for sub dir +chmod($sub_dir_path, 0777); // all permission to sub dir chmod($parent_dir_path, 0666); // restricting parent directory echo "-- After restricting parent directory --\n"; $d = dir($child_dir_path); // try to open, expected failure diff --git a/ext/standard/tests/dir/opendir_variation5.phpt b/ext/standard/tests/dir/opendir_variation5.phpt index 5f123275dad..cbdc5c302c5 100644 --- a/ext/standard/tests/dir/opendir_variation5.phpt +++ b/ext/standard/tests/dir/opendir_variation5.phpt @@ -41,15 +41,15 @@ chmod($sub_dir_path, 0777); $child_dir_path = $sub_dir_path."/child_dir"; mkdir($child_dir_path); -// remove the write and execute permisson from sub parent +// remove the write and execute permission from sub parent chmod($sub_dir_path, 0444); echo "\n-- After restricting 1st level parent directory --\n"; $dir_handle1 = opendir($child_dir_path); var_dump( $dir_handle1 ); -// remove the execute permisson from parent dir, allowing all permission for sub dir -chmod($sub_dir_path, 0777); // all permisson to sub dir +// remove the execute permission from parent dir, allowing all permission for sub dir +chmod($sub_dir_path, 0777); // all permission to sub dir chmod($parent_dir_path, 0666); // restricting parent directory echo "\n-- After restricting parent directory --\n"; diff --git a/ext/standard/tests/dir/scandir_variation5.phpt b/ext/standard/tests/dir/scandir_variation5.phpt index cfd564ca79d..88596c42c50 100644 --- a/ext/standard/tests/dir/scandir_variation5.phpt +++ b/ext/standard/tests/dir/scandir_variation5.phpt @@ -42,14 +42,14 @@ chmod($sub_dir_path, 0777); $child_dir_path = $sub_dir_path."/child_dir"; mkdir($child_dir_path); -// remove the write and execute permisson from sub parent +// remove the write and execute permission from sub parent chmod($sub_dir_path, 0444); echo "\n-- After restricting 1st level parent directory --\n"; var_dump(scandir($child_dir_path)); -// remove the execute permisson from parent dir, allowing all permission for sub dir -chmod($sub_dir_path, 0777); // all permisson to sub dir +// remove the execute permission from parent dir, allowing all permission for sub dir +chmod($sub_dir_path, 0777); // all permission to sub dir chmod($parent_dir_path, 0666); // restricting parent directory echo "\n-- After restricting parent directory --\n"; diff --git a/ext/standard/tests/file/bug77552.phpt b/ext/standard/tests/file/bug77552.phpt index 9404b8e09fb..8e3a8355374 100644 --- a/ext/standard/tests/file/bug77552.phpt +++ b/ext/standard/tests/file/bug77552.phpt @@ -1,5 +1,5 @@ --TEST-- -Bug #77552 Unintialized php_stream_statbuf in stat functions +Bug #77552 Uninitialized php_stream_statbuf in stat functions --SKIPIF-- filesize --\n"; rewind($file_handle); diff --git a/ext/standard/tests/file/file.inc b/ext/standard/tests/file/file.inc index eda2b32c78a..aaa151ac0df 100644 --- a/ext/standard/tests/file/file.inc +++ b/ext/standard/tests/file/file.inc @@ -202,7 +202,7 @@ function change_file_perms($file_path, permissions. File is filled with content of size specified. $file_path = dir where files will be created $name_prefix = prefix to be used for names, name is suffix with a - unqiue numeric value to make the file name unique, default = file + unique numeric value to make the file name unique, default = file $name_suffix = suffix to be used for the name, default = 1 $count = total no. of files to be created, default = 1 $mode = file open mode as specified in fopen() call. Do not use @@ -215,7 +215,7 @@ function change_file_perms($file_path, "empty" = empty file "text_with_new_line" = similar to text fill type, but writes with new line char "alphanumeric" = fill file with alpha numeric text - If imporper $content type is specified, file is created as empty + If improper $content type is specified, file is created as empty $size = size of the fill in terms of kilobyte, i.e size of the file. if $flag is specified as "byte", then then given size is taken in bytes $flag = specify if size has to be treated as no of total bytes or diff --git a/ext/standard/tests/file/file_put_contents_variation4.phpt b/ext/standard/tests/file/file_put_contents_variation4.phpt index 7d63ea4b7d8..722ecd4dd1a 100644 --- a/ext/standard/tests/file/file_put_contents_variation4.phpt +++ b/ext/standard/tests/file/file_put_contents_variation4.phpt @@ -34,7 +34,7 @@ rmdir($thisTestDir); function runtest() { global $filename; - //correct php53 behaviour is to ingnore the FILE_USE_INCLUDE_PATH unless the file alread exists + //correct php53 behaviour is to ignore the FILE_USE_INCLUDE_PATH unless the file already exists // in the include path. In this case it doesn't so the file should be written in the current dir. file_put_contents($filename, "File in include path", FILE_USE_INCLUDE_PATH); $line = file_get_contents($filename); diff --git a/ext/standard/tests/file/filesize_variation4-win32.phpt b/ext/standard/tests/file/filesize_variation4-win32.phpt index 89bb869e313..950f8be1cbb 100644 --- a/ext/standard/tests/file/filesize_variation4-win32.phpt +++ b/ext/standard/tests/file/filesize_variation4-win32.phpt @@ -60,7 +60,7 @@ clearstatcache(); echo "-- writing data after hole and checking the size --\n"; $file_handle = fopen($filename, "a"); -fwrite($file_handle, "Hello\0"); //wrting 6 bytes of data +fwrite($file_handle, "Hello\0"); //writing 6 bytes of data fclose($file_handle); var_dump( filesize($filename) ); //226 bytes clearstatcache(); diff --git a/ext/standard/tests/file/filesize_variation4.phpt b/ext/standard/tests/file/filesize_variation4.phpt index 4abb64dca6d..6a76313af3b 100644 --- a/ext/standard/tests/file/filesize_variation4.phpt +++ b/ext/standard/tests/file/filesize_variation4.phpt @@ -62,7 +62,7 @@ clearstatcache(); echo "-- writing data after hole and checking the size --\n"; $file_handle = fopen($filename, "a"); -fwrite($file_handle, "Hello\0"); //wrting 6 bytes of data +fwrite($file_handle, "Hello\0"); //writing 6 bytes of data fclose($file_handle); var_dump( filesize($filename) ); //226 bytes clearstatcache(); diff --git a/ext/standard/tests/file/flock_error.phpt b/ext/standard/tests/file/flock_error.phpt index 4069dd2aa01..90920943394 100644 --- a/ext/standard/tests/file/flock_error.phpt +++ b/ext/standard/tests/file/flock_error.phpt @@ -15,7 +15,7 @@ echo "*** Testing error conditions ***\n"; $file = preg_replace("~\.phpt?$~", '.tmp', __FILE__); $fp = fopen($file, "w"); -/* array of operatons */ +/* array of operations */ $operations = array( 0, LOCK_NB, diff --git a/ext/standard/tests/file/flock_variation.phpt b/ext/standard/tests/file/flock_variation.phpt index 0c66fca7fb4..49c4a53a3d5 100644 --- a/ext/standard/tests/file/flock_variation.phpt +++ b/ext/standard/tests/file/flock_variation.phpt @@ -8,13 +8,13 @@ Description: PHP supports a portable way of locking complete files in an advisory way */ -echo "*** Testing flock() fun with the various operation and +echo "*** Testing flock() fun with the various operation and wouldblock values ***\n"; $file = preg_replace("~\.phpt?$~", null, __FILE__); $fp = fopen($file, "w"); -/* array of operatons */ +/* array of operations */ $operations = array( LOCK_SH, LOCK_EX, @@ -66,7 +66,7 @@ fclose($fp); echo "\n*** Done ***\n"; ?> --EXPECT-- -*** Testing flock() fun with the various operation and +*** Testing flock() fun with the various operation and wouldblock values *** --- Outer iteration 0 --- bool(true) diff --git a/ext/standard/tests/file/fread_basic.phpt b/ext/standard/tests/file/fread_basic.phpt index 80175ef37f8..c97bc05d35a 100644 --- a/ext/standard/tests/file/fread_basic.phpt +++ b/ext/standard/tests/file/fread_basic.phpt @@ -54,7 +54,7 @@ $file_content_types = array("numeric","text","text_with_new_line","alphanumeric" exit(); } - /* read file by giving the acutal length, check the length and content by calculating the + /* read file by giving the actual length, check the length and content by calculating the hash using md5() function */ /* Reading 1024 bytes from file, expecting 1024 bytes */ ; diff --git a/ext/standard/tests/file/fscanf_variation2.phpt b/ext/standard/tests/file/fscanf_variation2.phpt index 50aba154a93..683ac4faae7 100644 --- a/ext/standard/tests/file/fscanf_variation2.phpt +++ b/ext/standard/tests/file/fscanf_variation2.phpt @@ -8,7 +8,7 @@ Test fscanf() function: usage variations - integer formats with integer values Description: Parses input from a file according to a format */ -/* Test fscanf() to scan different integer values using different interger format types */ +/* Test fscanf() to scan different integer values using different integer format types */ $file_path = __DIR__; diff --git a/ext/standard/tests/file/is_executable_variation2.phpt b/ext/standard/tests/file/is_executable_variation2.phpt index 5b07f683d36..e333b270bce 100644 --- a/ext/standard/tests/file/is_executable_variation2.phpt +++ b/ext/standard/tests/file/is_executable_variation2.phpt @@ -26,7 +26,7 @@ chmod("$file_path/is_executable_variation2", 0444); var_dump( is_executable("$file_path/is_executable_variation2") ); // exp: bool(false) chmod("$file_path/is_executable_variation2", 0777); // chmod to enable deletion of directory -echo "\n*** Testing miscelleneous input for is_executable() function ***\n"; +echo "\n*** Testing miscellaneous input for is_executable() function ***\n"; $name_prefix = "is_executable_variation2"; create_files(__DIR__, 1, "numeric", 0755, 1, "w", $name_prefix, 1); create_files(__DIR__, 1, "text", 0755, 1, "w", $name_prefix, 2); @@ -77,7 +77,7 @@ rmdir(__DIR__."/is_executable_variation2/"); *** Testing is_executable() on directory without execute permission *** bool(false) -*** Testing miscelleneous input for is_executable() function *** +*** Testing miscellaneous input for is_executable() function *** -- Iteration 1 -- bool(true) -- Iteration 2 -- diff --git a/ext/standard/tests/file/is_file_variation1.phpt b/ext/standard/tests/file/is_file_variation1.phpt index c8a26ea7c70..9593b9c495e 100644 --- a/ext/standard/tests/file/is_file_variation1.phpt +++ b/ext/standard/tests/file/is_file_variation1.phpt @@ -15,7 +15,7 @@ $file_path = __DIR__; echo "-- Testing is_file() with file containing data --\n"; $filename = $file_path."/is_file_variation1.tmp"; $file_handle = fopen($filename, "w" ); -fwrite( $file_handle, "Hello, world....." ); // exptected true +fwrite( $file_handle, "Hello, world....." ); // expected true fclose($file_handle); var_dump( is_file($filename) ); clearstatcache(); diff --git a/ext/standard/tests/file/is_readable_variation2.phpt b/ext/standard/tests/file/is_readable_variation2.phpt index 1dd4ffd06a5..28c63a775d4 100644 --- a/ext/standard/tests/file/is_readable_variation2.phpt +++ b/ext/standard/tests/file/is_readable_variation2.phpt @@ -26,7 +26,7 @@ chmod("$file_path/is_readable_variation2", 0001); var_dump( is_readable("$file_path/is_readable_variation2") ); // exp: bool(false) chmod("$file_path/is_readable_variation2", 0777); // chmod to enable deletion of directory -echo "\n*** Testing miscelleneous input for is_readable() function ***\n"; +echo "\n*** Testing miscellaneous input for is_readable() function ***\n"; $name_prefix = "is_readable_variation2"; create_files(__DIR__, 1, "numeric", 0755, 1, "w", $name_prefix, 1); create_files(__DIR__, 1, "text", 0755, 1, "w", $name_prefix, 2); @@ -77,7 +77,7 @@ rmdir(__DIR__."/is_readable_variation2/"); *** Testing is_readable() on directory without read permission *** bool(false) -*** Testing miscelleneous input for is_readable() function *** +*** Testing miscellaneous input for is_readable() function *** -- Iteration 1 -- bool(true) -- Iteration 2 -- diff --git a/ext/standard/tests/file/is_readable_variation3.phpt b/ext/standard/tests/file/is_readable_variation3.phpt index 9a80792c00e..97c794d1b74 100644 --- a/ext/standard/tests/file/is_readable_variation3.phpt +++ b/ext/standard/tests/file/is_readable_variation3.phpt @@ -17,7 +17,7 @@ echo "*** Testing is_readable(): usage variations ***\n"; $file_handle = fopen(__FILE__, "r"); unset($file_handle); -echo "\n*** Testing is_readable() on miscelleneous filenames ***\n"; +echo "\n*** Testing is_readable() on miscellaneous filenames ***\n"; $misc_files = array( 0, 1234, @@ -40,7 +40,7 @@ echo "Done\n"; --EXPECTF-- *** Testing is_readable(): usage variations *** -*** Testing is_readable() on miscelleneous filenames *** +*** Testing is_readable() on miscellaneous filenames *** bool(false) bool(false) bool(false) diff --git a/ext/standard/tests/file/is_writable_variation2.phpt b/ext/standard/tests/file/is_writable_variation2.phpt index def45bd2a0b..0dcce8c6d40 100644 --- a/ext/standard/tests/file/is_writable_variation2.phpt +++ b/ext/standard/tests/file/is_writable_variation2.phpt @@ -29,7 +29,7 @@ var_dump( is_writable("$file_path/is_writable_variation2") ); // exp: bool(fals var_dump( is_writeable("$file_path/is_writable_variation2") ); // exp: bool(false) chmod("$file_path/is_writable_variation2", 0777); // chmod to enable deletion of directory -echo "\n*** Testing miscelleneous input for is_writable() function ***\n"; +echo "\n*** Testing miscellaneous input for is_writable() function ***\n"; $name_prefix = "is_writable_variation2"; create_files(__DIR__, 1, "numeric", 0755, 1, "w", $name_prefix, 1); create_files(__DIR__, 1, "text", 0755, 1, "w", $name_prefix, 2); @@ -83,7 +83,7 @@ rmdir(__DIR__."/is_writable_variation2/"); bool(false) bool(false) -*** Testing miscelleneous input for is_writable() function *** +*** Testing miscellaneous input for is_writable() function *** -- Iteration 1 -- bool(true) bool(true) diff --git a/ext/standard/tests/file/mkdir_rmdir_variation2.phpt b/ext/standard/tests/file/mkdir_rmdir_variation2.phpt index 8712d52604f..bd6a7c56a90 100644 --- a/ext/standard/tests/file/mkdir_rmdir_variation2.phpt +++ b/ext/standard/tests/file/mkdir_rmdir_variation2.phpt @@ -37,7 +37,7 @@ try { echo $e->getMessage(), "\n"; } -echo "\n*** Testing mkdir() with miscelleneous input ***\n"; +echo "\n*** Testing mkdir() with miscellaneous input ***\n"; /* changing mode of mkdir to prevent creating sub-directory under it */ var_dump( chmod("$file_path/mkdir_variation2/", 0000) ); /* creating sub-directory test1 under mkdir, expected: false */ @@ -66,7 +66,7 @@ bool(false) mkdir() expects parameter 1 to be a valid path, string given rmdir() expects parameter 1 to be a valid path, string given -*** Testing mkdir() with miscelleneous input *** +*** Testing mkdir() with miscellaneous input *** bool(true) Warning: mkdir(): Permission denied in %s on line %d diff --git a/ext/standard/tests/general_functions/gettype_settype_variation1.phpt b/ext/standard/tests/general_functions/gettype_settype_variation1.phpt index eb43b85f309..93e69a21492 100644 --- a/ext/standard/tests/general_functions/gettype_settype_variation1.phpt +++ b/ext/standard/tests/general_functions/gettype_settype_variation1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test gettype() & settype() functions : usage variatoins +Test gettype() & settype() functions : usage variations --SKIPIF-- wLxoxEGtKDW^rwLxoxEGvg^W^r<(7| delta 35 icmdmEx5sY7I}Q%t%;MzKoSf9n-#FYv5Ih&zAB+GAR1O~i diff --git a/ext/standard/tests/strings/ucfirst.phpt b/ext/standard/tests/strings/ucfirst.phpt index ea575f6f11e22c3a1d3bbe88442ae26664c85d60..c5c7ce3c87bfad91fc00d5916a6291ea41d2e035 100644 GIT binary patch delta 35 icmdm>vO#5oEGtKDW^rvO#5oEGvg^W^r --FILE-- --FILE-- --FILE-- --FILE-- 4) { - zlog(ZLOG_ERROR, "failed to include more than 5 files recusively"); + zlog(ZLOG_ERROR, "failed to include more than 5 files recursively"); close(fd); return -1; } diff --git a/sapi/fpm/fpm/fpm_main.c b/sapi/fpm/fpm/fpm_main.c index e278e4d8465..1b7472f47ba 100644 --- a/sapi/fpm/fpm/fpm_main.c +++ b/sapi/fpm/fpm/fpm_main.c @@ -890,7 +890,7 @@ static int is_valid_path(const char *path) initializes request_info structure - specificly in this section we handle proper translations + specifically in this section we handle proper translations for: PATH_INFO diff --git a/sapi/fpm/tests/bug76601-reload-child-signals.phpt b/sapi/fpm/tests/bug76601-reload-child-signals.phpt index b4e99b7e4a7..f095ed667ca 100644 --- a/sapi/fpm/tests/bug76601-reload-child-signals.phpt +++ b/sapi/fpm/tests/bug76601-reload-child-signals.phpt @@ -31,14 +31,14 @@ EOT; /* * If a child miss SIGQUIT then reload process should stuck * for at least process_control_timeout that is set greater - * than timout in log reading functions. + * than timeout in log reading functions. * * Alternative way is to set log_level=debug and filter result of * $tester->getLogLines(2000) for lines containing SIGKILL - * + * * [22-Oct-2019 03:28:19.532703] DEBUG: pid 21315, fpm_pctl_kill_all(), line 161: [pool unconfined] sending signal 9 SIGKILL to child 21337 * [22-Oct-2019 03:28:19.533471] DEBUG: pid 21315, fpm_children_bury(), line 259: [pool unconfined] child 21337 exited on signal 9 (SIGKILL) after 1.003055 seconds from start - * + * * but it has less probability of failure detection. Additionally it requires more * $tester->expectLogNotice() around last reload due to presence of debug messages. */ diff --git a/sapi/fpm/tests/fcgi.inc b/sapi/fpm/tests/fcgi.inc index 721b94b5045..38dc3b8518a 100644 --- a/sapi/fpm/tests/fcgi.inc +++ b/sapi/fpm/tests/fcgi.inc @@ -508,7 +508,7 @@ class Client // Pick random number between 1 and max 16 bit unsigned int 65535 $id = mt_rand(1, (1 << 16) - 1); - // Using persistent sockets implies you want them keept alive by server! + // Using persistent sockets implies you want them kept alive by server! $keepAlive = intval($this->_keepAlive || $this->_persistentSocket); $request = $this->buildPacket( diff --git a/sapi/fpm/www.conf.in b/sapi/fpm/www.conf.in index 84b8e62526a..e49bae485d3 100644 --- a/sapi/fpm/www.conf.in +++ b/sapi/fpm/www.conf.in @@ -70,7 +70,7 @@ listen = 127.0.0.1:9000 ; process.priority = -19 ; Set the process dumpable flag (PR_SET_DUMPABLE prctl) even if the process user -; or group is differrent than the master process user. It allows to create process +; or group is different than the master process user. It allows to create process ; core dump and ptrace the process for the pool user. ; Default Value: no ; process.dumpable = yes @@ -269,7 +269,7 @@ pm.max_spare_servers = 3 ; %d: time taken to serve the request ; it can accept the following format: ; - %{seconds}d (default) -; - %{miliseconds}d +; - %{milliseconds}d ; - %{mili}d ; - %{microseconds}d ; - %{micro}d diff --git a/sapi/litespeed/lsapi_main.c b/sapi/litespeed/lsapi_main.c index c7da14f85b1..186558a3258 100644 --- a/sapi/litespeed/lsapi_main.c +++ b/sapi/litespeed/lsapi_main.c @@ -106,7 +106,7 @@ static int php_lsapi_startup(sapi_module_struct *sapi_module) /* {{{ sapi_lsapi_ini_defaults */ -/* overwriteable ini defaults must be set in sapi_cli_ini_defaults() */ +/* overwritable ini defaults must be set in sapi_cli_ini_defaults() */ #define INI_DEFAULT(name,value)\ ZVAL_STRING(tmp, value, 0);\ zend_hash_update(configuration_hash, name, sizeof(name), tmp, sizeof(zval), (void**)&entry);\ @@ -804,7 +804,7 @@ static int alter_ini( const char * pKey, int keyLen, const char * pValue, int va Use ACTIVATE stage in legacy mode only. RUNTIME stage should be used here, - as with ACTIVATE it's impossible to change the option from script with ini_set + as with ACTIVATE it's impossible to change the option from script with ini_set */ if(!mod_lsapi_mode) { @@ -1655,7 +1655,7 @@ static PHP_MINIT_FUNCTION(litespeed) } /* * mod_lsapi always sets this env var, - * so we can detect mod_lsapi mode with its presense. + * so we can detect mod_lsapi mode with its presence. */ mod_lsapi_mode = ( getenv("LSAPI_DISABLE_CPAN_BEHAV") != NULL ); diff --git a/sapi/phpdbg/phpdbg.c b/sapi/phpdbg/phpdbg.c index c185fe75f6d..9e173d40d86 100644 --- a/sapi/phpdbg/phpdbg.c +++ b/sapi/phpdbg/phpdbg.c @@ -1073,7 +1073,7 @@ const char phpdbg_ini_hardcoded[] = "error_log=\n" "output_buffering=off\n\0"; -/* overwriteable ini defaults must be set in phpdbg_ini_defaults() */ +/* overwritable ini defaults must be set in phpdbg_ini_defaults() */ #define INI_DEFAULT(name, value) \ ZVAL_NEW_STR(&tmp, zend_string_init(value, sizeof(value) - 1, 1)); \ zend_hash_str_update(configuration_hash, name, sizeof(name) - 1, &tmp); @@ -1988,7 +1988,7 @@ phpdbg_interact: if ((PHPDBG_G(flags) & PHPDBG_IS_DISCONNECTED)) { if (PHPDBG_G(flags) & PHPDBG_IS_REMOTE) { - /* renegociate connections */ + /* renegotiate connections */ phpdbg_remote_init(address, listen, server, &socket, &stream); /* set streams */ diff --git a/sapi/phpdbg/phpdbg.h b/sapi/phpdbg/phpdbg.h index 9a2efd29dc0..5405155833c 100644 --- a/sapi/phpdbg/phpdbg.h +++ b/sapi/phpdbg/phpdbg.h @@ -314,7 +314,7 @@ ZEND_BEGIN_MODULE_GLOBALS(phpdbg) int input_buflen; /* length of stdin input buffer */ phpdbg_signal_safe_mem sigsafe_mem; /* memory to use in async safe environment (only once!) */ - JMP_BUF *sigsegv_bailout; /* bailout address for accesibility probing */ + JMP_BUF *sigsegv_bailout; /* bailout address for accessibility probing */ uint64_t flags; /* phpdbg flags */ diff --git a/sapi/phpdbg/phpdbg_help.c b/sapi/phpdbg/phpdbg_help.c index e4a4997039f..8b9f10a1601 100644 --- a/sapi/phpdbg/phpdbg_help.c +++ b/sapi/phpdbg/phpdbg_help.c @@ -428,7 +428,7 @@ phpdbg_help_text_t phpdbg_help_text[] = { "This mode is enabled by specifying the **-a** option. Phpdbg will bind only to the loopback " "interface by default, and this can only be overridden by explicitly setting the remote console " -"bind address using the **-a** option. If **-a** is specied without an argument, then phpdbg " +"bind address using the **-a** option. If **-a** is specified without an argument, then phpdbg " "will bind to all available interfaces. You should be aware of the security implications of " "doing this, so measures should be taken to secure this service if bound to a publicly accessible " "interface/port." CR CR diff --git a/sapi/phpdbg/phpdbg_watch.c b/sapi/phpdbg/phpdbg_watch.c index d0515cd14d7..69dff94eb6b 100644 --- a/sapi/phpdbg/phpdbg_watch.c +++ b/sapi/phpdbg/phpdbg_watch.c @@ -1071,7 +1071,7 @@ void phpdbg_reenable_memory_watches(void) { phpdbg_watchpoint_t *watch; ZEND_HASH_FOREACH_NUM_KEY(PHPDBG_G(watchlist_mem), page) { - /* Disble writing again if there are any watchers on that page */ + /* Disable writing again if there are any watchers on that page */ res = phpdbg_btree_find_closest(&PHPDBG_G(watchpoint_tree), page + phpdbg_pagesize - 1); if (res) { watch = res->ptr; diff --git a/tests/lang/passByReference_009.phpt b/tests/lang/passByReference_009.phpt index 7b723d552e9..d51cf9a2cbe 100644 --- a/tests/lang/passByReference_009.phpt +++ b/tests/lang/passByReference_009.phpt @@ -1,5 +1,5 @@ --TEST-- -Assignement as argument +Assignment as argument --FILE--