Skip to content

Fix typos discovered by codespell #12228

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Sep 18, 2023
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/release-process.md
Original file line number Diff line number Diff line change
Expand Up @@ -992,7 +992,7 @@ volunteers to begin the selection process for the next release managers.
```shell
cd /path/to/repos/php/web-php
git submodule update
cd distributions # This is the submodule refering to web-php-distributions
cd distributions # This is the submodule referring to web-php-distributions
git pull origin master
cd ..
git add distributions
Expand Down
2 changes: 1 addition & 1 deletion ext/mbstring/tests/data/JISX0212.txt
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
#
# However, JIS X 0212 maintains the distinction between
# the lowercase forms of these two elements at 0x2942 and 0x2943.
# Given the structre of these JIS encodings, it is clear that
# Given the structure of these JIS encodings, it is clear that
# 0x2922 and 0x2942 are intended to be a capital/small pair.
# Consequently, in the Unicode mapping, 0x2922 is treated as
# LATIN CAPITAL LETTER D WITH STROKE.
Expand Down
4 changes: 2 additions & 2 deletions ext/mbstring/tests/data/KSX1001.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
# (at ftp://ftp.unicode.org/Public/MAPPING/EASTASIA/KSC) which is
# actually NOT the mapping between KS X 1001(KS C 5601-1992) and Unicode 2.0
# BUT the mapping table between UHC (Microsoft Unified Hangul Code)
# and Unicode 2.0. Hence, in this pacakge, I renamed it as UHC.TXT
# and Unicode 2.0. Hence, in this package, I renamed it as UHC.TXT
#
# Please, note that there was a change in naming scheme of
# Korean standard for information exchange.
Expand All @@ -50,7 +50,7 @@
# printf ("0x%04X 0x%04X %s\n",$k-0x8080, $u,join(' ',@rest));
# }
#
# Column #1 : KS X 1001(KS C 5601-1992 excluding addtional Hangul
# Column #1 : KS X 1001(KS C 5601-1992 excluding additional Hangul
# syllables defined for Johab encoding in Annex 3)
# in hex as 0xXXXX
# Column #2 : the Unicode (in hex as 0xXXXX)
Expand Down
2 changes: 1 addition & 1 deletion ext/reflection/tests/bug46064.phpt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
--TEST--
Bug #46064 (Exception when creating ReflectionProperty object on dynamicly created property)
Bug #46064 (Exception when creating ReflectionProperty object on dynamically created property)
--FILE--
<?php

Expand Down
2 changes: 1 addition & 1 deletion ext/reflection/tests/bug46064_2.phpt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
--TEST--
Bug #46064.2 (Exception when creating ReflectionProperty object on dynamicly created property)
Bug #46064.2 (Exception when creating ReflectionProperty object on dynamically created property)
--FILE--
<?php

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class MySession extends SessionHandler {
++$this->i;
echo 'Open:', session_id(), "\n";
// This test was written for broken return value handling
// Mimmick what was actually being tested by returning true here
// Mimic what was actually being tested by returning true here
return (null === parent::open());
}
public function read($key): string|false {
Expand Down
2 changes: 1 addition & 1 deletion main/streams/xp_socket.c
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ static ssize_t php_sockop_read(php_stream *stream, char *buf, size_t count)
bool dont_wait = has_buffered_data ||
(sock->timeout.tv_sec == 0 && sock->timeout.tv_usec == 0);
/* Set MSG_DONTWAIT if no wait is needed or there is unlimited timeout which was
* added by fix for #41984 commited in 9343c5404. */
* added by fix for #41984 committed in 9343c5404. */
if (dont_wait || sock->timeout.tv_sec != -1) {
recv_flags = MSG_DONTWAIT;
}
Expand Down
2 changes: 1 addition & 1 deletion sapi/cli/tests/php_cli_server_014.phpt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
--TEST--
Bug #60477: Segfault after two multipart/form-data POST requestes
Bug #60477: Segfault after two multipart/form-data POST requests
--SKIPIF--
<?php
include "skipif.inc";
Expand Down
2 changes: 1 addition & 1 deletion sapi/fpm/fpm/fpm_events.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ int fpm_event_init_main(void);
int fpm_event_set(struct fpm_event_s *ev, int fd, int flags, void (*callback)(struct fpm_event_s *, short, void *), void *arg);
int fpm_event_add(struct fpm_event_s *ev, unsigned long int timeout);
int fpm_event_del(struct fpm_event_s *ev);
int fpm_event_pre_init(char *machanism);
int fpm_event_pre_init(char *mechanism);
const char *fpm_event_mechanism_name(void);
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Careful review please.

Copy link
Contributor

@thg2k thg2k Sep 28, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it's OK, it was already fixed in 462da6e but then probably an erroneus conflict resolution during merge of e2a5428 in 819df03 turned it back to 'machanism', that's why the corresponding variable in the .c file is already correct.

int fpm_event_support_edge_trigger(void);

Expand Down
2 changes: 1 addition & 1 deletion sapi/fpm/tests/response.inc
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ class Response
/**
* Expect error pattern in the response.
*
* @param string $errorMessagePattern Expected error message RegExp patter.
* @param string $errorMessagePattern Expected error message RegExp pattern.
*
* @return Response
*/
Expand Down
6 changes: 3 additions & 3 deletions sapi/fpm/www.conf.in
Original file line number Diff line number Diff line change
Expand Up @@ -229,8 +229,8 @@ pm.max_spare_servers = 3
; it's always 0 if the process is not in Idle state
; because memory calculation is done when the request
; processing has terminated;
; If the process is in Idle state, then informations are related to the
; last request the process has served. Otherwise informations are related to
; If the process is in Idle state, then information is related to the
; last request the process has served. Otherwise information is related to
; the current request being served.
; Example output:
; ************************
Expand Down Expand Up @@ -355,7 +355,7 @@ pm.max_spare_servers = 3

; A list of request_uri values which should be filtered from the access log.
;
; As a security precuation, this setting will be ignored if:
; As a security precaution, this setting will be ignored if:
; - the request method is not GET or HEAD; or
; - there is a request body; or
; - there are query parameters; or
Expand Down
2 changes: 1 addition & 1 deletion win32/build/confutils.js
Original file line number Diff line number Diff line change
Expand Up @@ -3348,7 +3348,7 @@ function toolset_setup_intrinsic_cflags()
if (TARGET_ARCH == 'arm64') {
/* arm64 supports neon */
configure_subst.Add("PHP_SIMD_SCALE", 'NEON');
/* all offically supported arm64 cpu supports crc32 (TODO: to be confirmed) */
/* all officially supported arm64 cpu supports crc32 (TODO: to be confirmed) */
AC_DEFINE('HAVE_ARCH64_CRC32', 1);
return;
}
Expand Down
2 changes: 1 addition & 1 deletion win32/build/mkdist.php
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ function extract_file_from_tarball($pkg, $filename, $dest_dir) /* {{{ */
}

/* include a snapshot identifier */
$branch = "HEAD"; // TODO - determine this from SVN branche name
$branch = "HEAD"; // TODO - determine this from SVN branch name
$fp = fopen("$dist_dir/snapshot.txt", "w");
$now = date("r");
fwrite($fp, <<<EOT
Expand Down