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 :)
Sannis · Apr 3, 2011 · 1368364 · 1368364
1 parent 9e05a9a
commit 1368364
Show file tree

Hide file tree

Showing 19 changed files with 30 additions and 30 deletions.
diff --git 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
@@ -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
@@ -11,7 +11,7 @@ Francesco Fullone [email protected]
 ?>
 --FILE--
 <?php
-echo "*** Test by calling method or function with its expected arguments, first print the child PID and the the father ***\n";
+echo "*** Test by calling method or function with its expected arguments, first print the child PID and the father ***\n";
 
 $pid = pcntl_fork();
 if ($pid > 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
@@ -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
 	}
 }
 
-?>
+?>
diff --git 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
 	}
 }
 
-?>
+?>
diff --git 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
@@ -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
@@ -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
+Done
diff --git 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
@@ -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,15 +1020,15 @@ 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);
 }
 /* }}} */
 
 /* {{{ 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -128,7 +128,7 @@ public function getValidArgumentLists() {
 
 
   /**
-   * 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 @@ public function getInitialisationStatements() {
     return $this->initialisationStatements;
   }
 }
-?>
+?>
diff --git a/scripts/dev/generate-phpt/src/setup/preconditions/gtIsValidMethod.php b/scripts/dev/generate-phpt/src/setup/preconditions/gtIsValidMethod.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Check that teh method name is valid
+ * Check that the method name is valid
  *
  */
 class gtIsValidMethod extends gtPreCondition {
@@ -25,4 +25,4 @@ public function getMessage() {
     return gtText::get('unknownMethod');
   }
 }
-?>
+?>
diff --git 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 @@ public function argInit() {
 
 
   /**
-   * 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 @@ public function getOpt() {
     return $this->optionalSections;
   }
 }
-?>
+?>
diff --git 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