From: Pierrick Charron Date: Sun, 3 Apr 2011 21:46:52 +0000 (+0000) Subject: Fix common typos in the source code (Reported in Bug #54065) X-Git-Tag: php-5.4.0alpha1~191^2~84 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1368364469571507b56358e3fe210aaaaea35a07;p=php 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 :) --- diff --git a/INSTALL b/INSTALL index 9cbf67b9a0..f71768101d 100644 --- a/INSTALL +++ b/INSTALL @@ -1527,7 +1527,7 @@ The configuration file core directives is available in the appendix. Probably not all PHP directives are documented in the manual though. For a complete list of directives available in your PHP version, please read your well - commented php.ini file. Alternatively, you may find the the latest + commented php.ini file. Alternatively, you may find the latest php.ini from SVN helpful too. Example 6-1. php.ini example diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c index 099c383ed2..819ef51b6d 100644 --- a/ext/imap/php_imap.c +++ b/ext/imap/php_imap.c @@ -4291,7 +4291,7 @@ PHP_FUNCTION(imap_mime_header_decode) charset_token = offset; } /* Return the rest of the data as unencoded, as it was either unencoded or was missing separators - which rendered the the remainder of the string impossible for us to decode. */ + which rendered the remainder of the string impossible for us to decode. */ memcpy(text, &string[charset_token], end - charset_token); /* Extract unencoded text from string */ text[end - charset_token] = 0x00; MAKE_STD_ZVAL(myobject); diff --git a/ext/pcntl/tests/pcntl_fork_basic.phpt b/ext/pcntl/tests/pcntl_fork_basic.phpt index 82759ba327..b1e2a9bf68 100644 --- a/ext/pcntl/tests/pcntl_fork_basic.phpt +++ b/ext/pcntl/tests/pcntl_fork_basic.phpt @@ -11,7 +11,7 @@ Francesco Fullone ff@ideato.it ?> --FILE-- 0) { @@ -22,6 +22,6 @@ if ($pid > 0) { } ?> --EXPECTF-- -*** Test by calling method or function with its expected arguments, first print the child PID and the the father *** +*** Test by calling method or function with its expected arguments, first print the child PID and the father *** int(0) int(%d) diff --git a/ext/spl/internal/appenditerator.inc b/ext/spl/internal/appenditerator.inc index 5db080425c..28e32b15f6 100755 --- a/ext/spl/internal/appenditerator.inc +++ b/ext/spl/internal/appenditerator.inc @@ -31,7 +31,7 @@ class AppendIterator implements OuterIterator * @param $it Iterator to append * * If the current state is invalid but the appended iterator is valid - * the the AppendIterator itself becomes valid. However there will be no + * the AppendIterator itself becomes valid. However there will be no * call to $it->rewind(). Also if the current state is invalid the inner * ArrayIterator will be rewound und forwarded to the appended element. */ @@ -119,4 +119,4 @@ class AppendIterator implements OuterIterator } } -?> \ No newline at end of file +?> diff --git a/ext/spl/internal/cachingiterator.inc b/ext/spl/internal/cachingiterator.inc index 7262564f26..33258ab954 100755 --- a/ext/spl/internal/cachingiterator.inc +++ b/ext/spl/internal/cachingiterator.inc @@ -86,7 +86,7 @@ class CachingIterator implements OuterIterator $this->it->next(); } - /** @return whether teh iterator is valid + /** @return whether the iterator is valid */ function valid() { @@ -154,4 +154,4 @@ class CachingIterator implements OuterIterator } } -?> \ No newline at end of file +?> diff --git a/ext/spl/internal/regexiterator.inc b/ext/spl/internal/regexiterator.inc index 4eef7ddcf5..c6addb93d2 100755 --- a/ext/spl/internal/regexiterator.inc +++ b/ext/spl/internal/regexiterator.inc @@ -19,7 +19,7 @@ */ class RegexIterator extends FilterIterator { - const USE_KEY = 0x00000001; /**< If present in $flags the the key is + const USE_KEY = 0x00000001; /**< If present in $flags the key is used rather then the current value. */ const MATCH = 0; /**< Mode: Executed a plain match only */ diff --git a/ext/standard/array.c b/ext/standard/array.c index fd5a86c698..a2dc8c82cb 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -606,7 +606,7 @@ static int php_array_user_compare(const void *a, const void *b TSRMLS_DC) /* {{{ /* Clear FCI cache otherwise : for example the same or other array with * (partly) the same key values has been sorted with uasort() or - * other sorting function the comparison is cached, however the the name + * other sorting function the comparison is cached, however the name * of the function for comparison is not respected. see bug #28739 AND #33295 * * Following defines will assist in backup / restore values. */ diff --git a/ext/standard/tests/array/array_shift_variation5.phpt b/ext/standard/tests/array/array_shift_variation5.phpt index 2ac15da6bb..578b870d92 100644 --- a/ext/standard/tests/array/array_shift_variation5.phpt +++ b/ext/standard/tests/array/array_shift_variation5.phpt @@ -9,7 +9,7 @@ Test array_shift() function : usage variations - call recursively /* * Use the result of one call to array_shift - * as the the $stack argument of another call to array_shift() + * as the $stack argument of another call to array_shift() * When done in one statement causes strict error messages. */ @@ -42,4 +42,4 @@ string(4) "zero" -- Correct Method: -- string(4) "zero" -Done \ No newline at end of file +Done diff --git a/ext/standard/tests/file/lstat_stat_variation9.phpt b/ext/standard/tests/file/lstat_stat_variation9.phpt index b3c1281e61..63c6ff8a76 100644 --- a/ext/standard/tests/file/lstat_stat_variation9.phpt +++ b/ext/standard/tests/file/lstat_stat_variation9.phpt @@ -36,7 +36,7 @@ fclose($file_handle); $old_stat = stat($dirname); -/* now delete teh surdir and file and record the stat */ +/* now delete the surdir and file and record the stat */ unlink("$dirname/lstat_stat_variation9a.tmp"); rmdir("$dirname/lstat_stat_variation9_subdir"); diff --git a/ext/xmlreader/php_xmlreader.c b/ext/xmlreader/php_xmlreader.c index 107d5b09f9..80ce3d7e3a 100644 --- a/ext/xmlreader/php_xmlreader.c +++ b/ext/xmlreader/php_xmlreader.c @@ -859,7 +859,7 @@ PHP_METHOD(xmlreader, next) /* }}} */ /* {{{ proto boolean XMLReader::open(string URI [, string encoding [, int options]]) -Sets the URI that the the XMLReader will parse. */ +Sets the URI that the XMLReader will parse. */ PHP_METHOD(xmlreader, open) { zval *id; @@ -1020,7 +1020,7 @@ PHP_METHOD(xmlreader, setParserProperty) /* }}} */ /* {{{ proto boolean XMLReader::setRelaxNGSchema(string filename) -Sets the string that the the XMLReader will parse. */ +Sets the string that the XMLReader will parse. */ PHP_METHOD(xmlreader, setRelaxNGSchema) { php_xmlreader_set_relaxng_schema(INTERNAL_FUNCTION_PARAM_PASSTHRU, XMLREADER_LOAD_FILE); @@ -1028,7 +1028,7 @@ PHP_METHOD(xmlreader, setRelaxNGSchema) /* }}} */ /* {{{ proto boolean XMLReader::setRelaxNGSchemaSource(string source) -Sets the string that the the XMLReader will parse. */ +Sets the string that the XMLReader will parse. */ PHP_METHOD(xmlreader, setRelaxNGSchemaSource) { php_xmlreader_set_relaxng_schema(INTERNAL_FUNCTION_PARAM_PASSTHRU, XMLREADER_LOAD_STRING); @@ -1042,7 +1042,7 @@ XMLPUBFUN int XMLCALL */ /* {{{ proto boolean XMLReader::XML(string source [, string encoding [, int options]]) -Sets the string that the the XMLReader will parse. */ +Sets the string that the XMLReader will parse. */ PHP_METHOD(xmlreader, XML) { zval *id; diff --git a/main/streams/php_stream_context.h b/main/streams/php_stream_context.h index 6308a6e9f5..51dbd2de62 100644 --- a/main/streams/php_stream_context.h +++ b/main/streams/php_stream_context.h @@ -31,7 +31,7 @@ typedef void (*php_stream_notification_func)(php_stream_context *context, /* Attempt to fetch context from the zval passed, If no context was passed, use the default context - The the default context has not yet been created, do it now. */ + The default context has not yet been created, do it now. */ #define php_stream_context_from_zval(zcontext, nocontext) ( \ (zcontext) ? zend_fetch_resource(&(zcontext) TSRMLS_CC, -1, "Stream-Context", NULL, 1, php_le_stream_context(TSRMLS_C)) : \ (nocontext) ? NULL : \ diff --git a/main/streams/php_stream_filter_api.h b/main/streams/php_stream_filter_api.h index aebe9271d4..a4cefb4ed4 100644 --- a/main/streams/php_stream_filter_api.h +++ b/main/streams/php_stream_filter_api.h @@ -27,7 +27,7 @@ * * Each stream can have a chain of filters for reading and another for writing. * - * When data is written to the stream, is is placed into a bucket and placed at + * When data is written to the stream, it is placed into a bucket and placed at * the start of the input brigade. * * The first filter in the chain is invoked on the brigade and (depending on diff --git a/php.ini-development b/php.ini-development index 1b22f1b818..3c161360b8 100644 --- a/php.ini-development +++ b/php.ini-development @@ -603,7 +603,7 @@ html_errors = On ; starts up. G,P,C,E & S are abbreviations for the following respective super ; globals: GET, POST, COOKIE, ENV and SERVER. There is a performance penalty : paid for the registration of these arrays and because ENV is not as commonly -; used as the others, ENV is is not recommended on productions servers. You +; used as the others, ENV is not recommended on productions servers. You ; can still get access to the environment variables through getenv() should you ; need to. ; Default Value: "EGPCS" diff --git a/php.ini-production b/php.ini-production index 5f0de201d1..869f0c6ceb 100644 --- a/php.ini-production +++ b/php.ini-production @@ -603,7 +603,7 @@ html_errors = Off ; starts up. G,P,C,E & S are abbreviations for the following respective super ; globals: GET, POST, COOKIE, ENV and SERVER. There is a performance penalty : paid for the registration of these arrays and because ENV is not as commonly -; used as the others, ENV is is not recommended on productions servers. You +; used as the others, ENV is not recommended on productions servers. You ; can still get access to the environment variables through getenv() should you ; need to. ; Default Value: "EGPCS" diff --git a/sapi/litespeed/README b/sapi/litespeed/README index 3f138c2163..e548ec97db 100644 --- a/sapi/litespeed/README +++ b/sapi/litespeed/README @@ -20,7 +20,7 @@ server configuration to enhance server security when mod_php is used. usually, FastCGI PHP is not an option in shared hosting environment due to lacking of this flexibility. LiteSpeed SAPI is carefully designed to address this issue. PHP configurations can be modified the same way -as that in mod_php with the the same configuration directives. +as that in mod_php with the same configuration directives. PHP with LiteSpeed SAPI is highly recommended over FastCGI PHP for PHP scripting with LiteSpeed web server. diff --git a/scripts/dev/generate-phpt/src/gtTestSubject.php b/scripts/dev/generate-phpt/src/gtTestSubject.php index 9be1e74509..ccf3caad93 100644 --- a/scripts/dev/generate-phpt/src/gtTestSubject.php +++ b/scripts/dev/generate-phpt/src/gtTestSubject.php @@ -128,7 +128,7 @@ abstract class gtTestSubject { /** - * Returns the argument list with teh greatest possible number of arguments. + * Returns the argument list with the greatest possible number of arguments. * * @return string */ @@ -163,4 +163,4 @@ abstract class gtTestSubject { return $this->initialisationStatements; } } -?> \ No newline at end of file +?> diff --git a/scripts/dev/generate-phpt/src/setup/preconditions/gtIsValidMethod.php b/scripts/dev/generate-phpt/src/setup/preconditions/gtIsValidMethod.php index 5f16d98f30..a52988aa6d 100644 --- a/scripts/dev/generate-phpt/src/setup/preconditions/gtIsValidMethod.php +++ b/scripts/dev/generate-phpt/src/setup/preconditions/gtIsValidMethod.php @@ -1,7 +1,7 @@ \ No newline at end of file +?> diff --git a/scripts/dev/generate-phpt/src/testcase/gtTestCase.php b/scripts/dev/generate-phpt/src/testcase/gtTestCase.php index cb67aa345d..cc5e19a5ae 100644 --- a/scripts/dev/generate-phpt/src/testcase/gtTestCase.php +++ b/scripts/dev/generate-phpt/src/testcase/gtTestCase.php @@ -23,7 +23,7 @@ abstract class gtTestCase { /** - * Object containing teh ooptional sections that may be added to the test case + * Object containing the optional sections that may be added to the test case * * @var gtOptionalSections */ @@ -140,7 +140,7 @@ abstract class gtTestCase { /** - * Add FILE section closing tag to teh test case + * Add FILE section closing tag to the test case * */ public function fileClosing() { @@ -227,4 +227,4 @@ abstract class gtTestCase { return $this->optionalSections; } } -?> \ No newline at end of file +?> diff --git a/win32/install.txt b/win32/install.txt index a97be80deb..b1d4ee5148 100644 --- a/win32/install.txt +++ b/win32/install.txt @@ -1419,7 +1419,7 @@ The configuration file core directives is available in the appendix. Probably not all PHP directives are documented in the manual though. For a complete list of directives available in your PHP version, please read your well - commented php.ini file. Alternatively, you may find the the latest + commented php.ini file. Alternatively, you may find the latest php.ini from SVN helpful too. Example 5-1. php.ini example