Skip to content

Commit 1368364

Browse files
committed
Fix common typos in the source code (Reported in Bug #54065)
# External libraries were excluded # Thanks eitan at eitanadler dot com for the first patch :)
1 parent 9e05a9a commit 1368364

File tree

19 files changed

+30
-30
lines changed

19 files changed

+30
-30
lines changed

INSTALL

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1527,7 +1527,7 @@ The configuration file
15271527
core directives is available in the appendix. Probably not all PHP
15281528
directives are documented in the manual though. For a complete list of
15291529
directives available in your PHP version, please read your well
1530-
commented php.ini file. Alternatively, you may find the the latest
1530+
commented php.ini file. Alternatively, you may find the latest
15311531
php.ini from SVN helpful too.
15321532

15331533
Example 6-1. php.ini example

ext/imap/php_imap.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4291,7 +4291,7 @@ PHP_FUNCTION(imap_mime_header_decode)
42914291
charset_token = offset;
42924292
}
42934293
/* Return the rest of the data as unencoded, as it was either unencoded or was missing separators
4294-
which rendered the the remainder of the string impossible for us to decode. */
4294+
which rendered the remainder of the string impossible for us to decode. */
42954295
memcpy(text, &string[charset_token], end - charset_token); /* Extract unencoded text from string */
42964296
text[end - charset_token] = 0x00;
42974297
MAKE_STD_ZVAL(myobject);

ext/pcntl/tests/pcntl_fork_basic.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Francesco Fullone ff@ideato.it
1111
?>
1212
--FILE--
1313
<?php
14-
echo "*** Test by calling method or function with its expected arguments, first print the child PID and the the father ***\n";
14+
echo "*** Test by calling method or function with its expected arguments, first print the child PID and the father ***\n";
1515

1616
$pid = pcntl_fork();
1717
if ($pid > 0) {
@@ -22,6 +22,6 @@ if ($pid > 0) {
2222
}
2323
?>
2424
--EXPECTF--
25-
*** Test by calling method or function with its expected arguments, first print the child PID and the the father ***
25+
*** Test by calling method or function with its expected arguments, first print the child PID and the father ***
2626
int(0)
2727
int(%d)

ext/spl/internal/appenditerator.inc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class AppendIterator implements OuterIterator
3131
* @param $it Iterator to append
3232
*
3333
* If the current state is invalid but the appended iterator is valid
34-
* the the AppendIterator itself becomes valid. However there will be no
34+
* the AppendIterator itself becomes valid. However there will be no
3535
* call to $it->rewind(). Also if the current state is invalid the inner
3636
* ArrayIterator will be rewound und forwarded to the appended element.
3737
*/
@@ -119,4 +119,4 @@ class AppendIterator implements OuterIterator
119119
}
120120
}
121121

122-
?>
122+
?>

ext/spl/internal/cachingiterator.inc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ class CachingIterator implements OuterIterator
8686
$this->it->next();
8787
}
8888

89-
/** @return whether teh iterator is valid
89+
/** @return whether the iterator is valid
9090
*/
9191
function valid()
9292
{
@@ -154,4 +154,4 @@ class CachingIterator implements OuterIterator
154154
}
155155
}
156156

157-
?>
157+
?>

ext/spl/internal/regexiterator.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
*/
2020
class RegexIterator extends FilterIterator
2121
{
22-
const USE_KEY = 0x00000001; /**< If present in $flags the the key is
22+
const USE_KEY = 0x00000001; /**< If present in $flags the key is
2323
used rather then the current value. */
2424

2525
const MATCH = 0; /**< Mode: Executed a plain match only */

ext/standard/array.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -606,7 +606,7 @@ static int php_array_user_compare(const void *a, const void *b TSRMLS_DC) /* {{{
606606

607607
/* Clear FCI cache otherwise : for example the same or other array with
608608
* (partly) the same key values has been sorted with uasort() or
609-
* other sorting function the comparison is cached, however the the name
609+
* other sorting function the comparison is cached, however the name
610610
* of the function for comparison is not respected. see bug #28739 AND #33295
611611
*
612612
* Following defines will assist in backup / restore values. */

ext/standard/tests/array/array_shift_variation5.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Test array_shift() function : usage variations - call recursively
99

1010
/*
1111
* Use the result of one call to array_shift
12-
* as the the $stack argument of another call to array_shift()
12+
* as the $stack argument of another call to array_shift()
1313
* When done in one statement causes strict error messages.
1414
*/
1515

@@ -42,4 +42,4 @@ string(4) "zero"
4242

4343
-- Correct Method: --
4444
string(4) "zero"
45-
Done
45+
Done

ext/standard/tests/file/lstat_stat_variation9.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ fclose($file_handle);
3636

3737
$old_stat = stat($dirname);
3838

39-
/* now delete teh surdir and file and record the stat */
39+
/* now delete the surdir and file and record the stat */
4040
unlink("$dirname/lstat_stat_variation9a.tmp");
4141
rmdir("$dirname/lstat_stat_variation9_subdir");
4242

ext/xmlreader/php_xmlreader.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -859,7 +859,7 @@ PHP_METHOD(xmlreader, next)
859859
/* }}} */
860860

861861
/* {{{ proto boolean XMLReader::open(string URI [, string encoding [, int options]])
862-
Sets the URI that the the XMLReader will parse. */
862+
Sets the URI that the XMLReader will parse. */
863863
PHP_METHOD(xmlreader, open)
864864
{
865865
zval *id;
@@ -1020,15 +1020,15 @@ PHP_METHOD(xmlreader, setParserProperty)
10201020
/* }}} */
10211021

10221022
/* {{{ proto boolean XMLReader::setRelaxNGSchema(string filename)
1023-
Sets the string that the the XMLReader will parse. */
1023+
Sets the string that the XMLReader will parse. */
10241024
PHP_METHOD(xmlreader, setRelaxNGSchema)
10251025
{
10261026
php_xmlreader_set_relaxng_schema(INTERNAL_FUNCTION_PARAM_PASSTHRU, XMLREADER_LOAD_FILE);
10271027
}
10281028
/* }}} */
10291029

10301030
/* {{{ proto boolean XMLReader::setRelaxNGSchemaSource(string source)
1031-
Sets the string that the the XMLReader will parse. */
1031+
Sets the string that the XMLReader will parse. */
10321032
PHP_METHOD(xmlreader, setRelaxNGSchemaSource)
10331033
{
10341034
php_xmlreader_set_relaxng_schema(INTERNAL_FUNCTION_PARAM_PASSTHRU, XMLREADER_LOAD_STRING);
@@ -1042,7 +1042,7 @@ XMLPUBFUN int XMLCALL
10421042
*/
10431043

10441044
/* {{{ proto boolean XMLReader::XML(string source [, string encoding [, int options]])
1045-
Sets the string that the the XMLReader will parse. */
1045+
Sets the string that the XMLReader will parse. */
10461046
PHP_METHOD(xmlreader, XML)
10471047
{
10481048
zval *id;

main/streams/php_stream_context.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ typedef void (*php_stream_notification_func)(php_stream_context *context,
3131

3232
/* Attempt to fetch context from the zval passed,
3333
If no context was passed, use the default context
34-
The the default context has not yet been created, do it now. */
34+
The default context has not yet been created, do it now. */
3535
#define php_stream_context_from_zval(zcontext, nocontext) ( \
3636
(zcontext) ? zend_fetch_resource(&(zcontext) TSRMLS_CC, -1, "Stream-Context", NULL, 1, php_le_stream_context(TSRMLS_C)) : \
3737
(nocontext) ? NULL : \

main/streams/php_stream_filter_api.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
*
2828
* Each stream can have a chain of filters for reading and another for writing.
2929
*
30-
* When data is written to the stream, is is placed into a bucket and placed at
30+
* When data is written to the stream, it is placed into a bucket and placed at
3131
* the start of the input brigade.
3232
*
3333
* The first filter in the chain is invoked on the brigade and (depending on

php.ini-development

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -603,7 +603,7 @@ html_errors = On
603603
; starts up. G,P,C,E & S are abbreviations for the following respective super
604604
; globals: GET, POST, COOKIE, ENV and SERVER. There is a performance penalty
605605
: paid for the registration of these arrays and because ENV is not as commonly
606-
; used as the others, ENV is is not recommended on productions servers. You
606+
; used as the others, ENV is not recommended on productions servers. You
607607
; can still get access to the environment variables through getenv() should you
608608
; need to.
609609
; Default Value: "EGPCS"

php.ini-production

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -603,7 +603,7 @@ html_errors = Off
603603
; starts up. G,P,C,E & S are abbreviations for the following respective super
604604
; globals: GET, POST, COOKIE, ENV and SERVER. There is a performance penalty
605605
: paid for the registration of these arrays and because ENV is not as commonly
606-
; used as the others, ENV is is not recommended on productions servers. You
606+
; used as the others, ENV is not recommended on productions servers. You
607607
; can still get access to the environment variables through getenv() should you
608608
; need to.
609609
; Default Value: "EGPCS"

sapi/litespeed/README

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ server configuration to enhance server security when mod_php is used.
2020
usually, FastCGI PHP is not an option in shared hosting environment
2121
due to lacking of this flexibility. LiteSpeed SAPI is carefully designed
2222
to address this issue. PHP configurations can be modified the same way
23-
as that in mod_php with the the same configuration directives.
23+
as that in mod_php with the same configuration directives.
2424

2525
PHP with LiteSpeed SAPI is highly recommended over FastCGI PHP for
2626
PHP scripting with LiteSpeed web server.

scripts/dev/generate-phpt/src/gtTestSubject.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ public function getValidArgumentLists() {
128128

129129

130130
/**
131-
* Returns the argument list with teh greatest possible number of arguments.
131+
* Returns the argument list with the greatest possible number of arguments.
132132
*
133133
* @return string
134134
*/
@@ -163,4 +163,4 @@ public function getInitialisationStatements() {
163163
return $this->initialisationStatements;
164164
}
165165
}
166-
?>
166+
?>

scripts/dev/generate-phpt/src/setup/preconditions/gtIsValidMethod.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22

33
/**
4-
* Check that teh method name is valid
4+
* Check that the method name is valid
55
*
66
*/
77
class gtIsValidMethod extends gtPreCondition {
@@ -25,4 +25,4 @@ public function getMessage() {
2525
return gtText::get('unknownMethod');
2626
}
2727
}
28-
?>
28+
?>

scripts/dev/generate-phpt/src/testcase/gtTestCase.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ abstract class gtTestCase {
2323

2424

2525
/**
26-
* Object containing teh ooptional sections that may be added to the test case
26+
* Object containing the optional sections that may be added to the test case
2727
*
2828
* @var gtOptionalSections
2929
*/
@@ -140,7 +140,7 @@ public function argInit() {
140140

141141

142142
/**
143-
* Add FILE section closing tag to teh test case
143+
* Add FILE section closing tag to the test case
144144
*
145145
*/
146146
public function fileClosing() {
@@ -227,4 +227,4 @@ public function getOpt() {
227227
return $this->optionalSections;
228228
}
229229
}
230-
?>
230+
?>

win32/install.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1419,7 +1419,7 @@ The configuration file
14191419
core directives is available in the appendix. Probably not all PHP
14201420
directives are documented in the manual though. For a complete list of
14211421
directives available in your PHP version, please read your well
1422-
commented php.ini file. Alternatively, you may find the the latest
1422+
commented php.ini file. Alternatively, you may find the latest
14231423
php.ini from SVN helpful too.
14241424

14251425
Example 5-1. php.ini example

0 commit comments

Comments
 (0)