Commit: 8d86597d7368460383a33a4399ea7a8b244cd6fa
Author: Veres Lajos <vla...@gmail.com> Wed, 24 Jul 2013 00:55:43
+0100
Committer: Stanislav Malyshev <s...@php.net> Sun, 4 Aug 2013 16:05:36 -0700
Parents: 5f137d080acfc43ec66cc2a904076972edb5de67
Branches: PHP-5.4 PHP-5.5 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=8d86597d7368460383a33a4399ea7a8b244cd6fa
Log:
non living code related typo fixes
Changed paths:
M Zend/tests/traits/bugs/overridding-conflicting-methods.phpt
M Zend/zend_builtin_functions.c
M Zend/zend_compile.c
M Zend/zend_execute_API.c
M Zend/zend_globals.h
M Zend/zend_language_scanner.h
M configure.in
M ext/date/php_date.c
M ext/date/php_date.h
M ext/dom/tests/bug44648.phpt
M ext/fileinfo/tests/magic
M ext/ftp/ftp.c
M ext/mbstring/oniguruma/HISTORY
M ext/mbstring/tests/mb_http_output.phpt
M ext/mysql/php_mysql.c
M ext/mysqli/tests/mysqli_get_client_stats.phpt
M ext/mysqlnd/mysqlnd_net.c
M ext/pdo_pgsql/tests/bug_33876.phpt
M ext/posix/tests/posix_ctermid.phpt
M ext/reflection/php_reflection.c
M ext/session/tests/020.phpt
M ext/spl/internal/splobjectstorage.inc
M ext/spl/spl.php
M ext/spl/tests/spl_priorityqeue_insert_two_params_error.phpt
M ext/sqlite3/libsqlite/sqlite3.c
M ext/standard/pack.c
M ext/standard/tests/array/array_count_values_variation.phpt
M ext/standard/tests/file/chmod_basic-win32.phpt
M ext/standard/tests/file/chmod_basic.phpt
M ext/standard/tests/strings/lcfirst.phpt
M ext/standard/tests/strings/str_replace.phpt
M ext/standard/tests/strings/str_replace_variation3.phpt
M ext/standard/tests/strings/strcasecmp.phpt
M ext/standard/tests/strings/strcmp.phpt
M ext/standard/tests/strings/strlen.phpt
M ext/standard/tests/strings/strpos.phpt
M ext/standard/tests/strings/strstr.phpt
M ext/standard/tests/strings/ucfirst.phpt
M ext/tidy/tidy.c
M ext/xmlrpc/libxmlrpc/xml_to_soap.c
M sapi/apache/config.m4
M sapi/apache2filter/config.m4
M sapi/apache2handler/config.m4
M sapi/apache_hooks/config.m4
M sapi/fpm/php-fpm.conf.in
M scripts/dev/generate-phpt.phar
M scripts/dev/generate-phpt/src/testcase/gtTestCase.php
M tests/classes/static_properties_004.phpt
diff --git a/Zend/tests/traits/bugs/overridding-conflicting-methods.phpt
b/Zend/tests/traits/bugs/overridding-conflicting-methods.phpt
index fc09a36..0bbea11 100644
--- a/Zend/tests/traits/bugs/overridding-conflicting-methods.phpt
+++ b/Zend/tests/traits/bugs/overridding-conflicting-methods.phpt
@@ -1,5 +1,5 @@
--TEST--
-Overridding Conflicting Methods should not result in a notice/warning about
collisions
+Overriding Conflicting Methods should not result in a notice/warning about
collisions
--FILE--
<?php
error_reporting(E_ALL);
diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c
index dc496e9..72d9058 100644
--- a/Zend/zend_builtin_functions.c
+++ b/Zend/zend_builtin_functions.c
@@ -2396,7 +2396,7 @@ ZEND_API void zend_fetch_debug_backtrace(zval
*return_value, int skip_last, int
MAKE_STD_ZVAL(arg_array);
array_init(arg_array);
- /* include_filename always points to the last
filename of the last last called-fuction.
+ /* include_filename always points to the last
filename of the last last called-function.
if we have called include in the frame above
- this is the file we have included.
*/
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index f5609fe..326d4ef 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -1723,7 +1723,7 @@ void zend_do_begin_function_declaration(znode
*function_token, znode *function_n
}
{
- /* Push a seperator to the switch and foreach stacks */
+ /* Push a separator to the switch and foreach stacks */
zend_switch_entry switch_entry;
switch_entry.cond.op_type = IS_UNUSED;
@@ -1817,7 +1817,7 @@ void zend_do_end_function_declaration(const znode
*function_token TSRMLS_DC) /*
CG(active_op_array) = function_token->u.op_array;
- /* Pop the switch and foreach seperators */
+ /* Pop the switch and foreach separators */
zend_stack_del_top(&CG(switch_cond_stack));
zend_stack_del_top(&CG(foreach_copy_stack));
}
@@ -2584,7 +2584,7 @@ static int generate_free_foreach_copy(const zend_op
*foreach_copy TSRMLS_DC) /*
{
zend_op *opline;
- /* If we reach the seperator then stop applying the stack */
+ /* If we reach the separator then stop applying the stack */
if (foreach_copy->result_type == IS_UNUSED && foreach_copy->op1_type ==
IS_UNUSED) {
return 1;
}
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index 9bffe9e..6fa7e9b 100644
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -1072,7 +1072,7 @@ ZEND_API int zend_lookup_class_ex(const char *name, int
name_length, const zend_
}
/* The compiler is not-reentrant. Make sure we __autoload() only during
run-time
- * (doesn't impact fuctionality of __autoload()
+ * (doesn't impact functionality of __autoload()
*/
if (!use_autoload || zend_is_compiling(TSRMLS_C)) {
if (!key) {
diff --git a/Zend/zend_globals.h b/Zend/zend_globals.h
index 58392c1..646e9c9 100644
--- a/Zend/zend_globals.h
+++ b/Zend/zend_globals.h
@@ -306,7 +306,7 @@ struct _zend_php_scanner_globals {
unsigned char *script_filtered;
size_t script_filtered_size;
- /* input/ouput filters */
+ /* input/output filters */
zend_encoding_filter input_filter;
zend_encoding_filter output_filter;
const zend_encoding *script_encoding;
diff --git a/Zend/zend_language_scanner.h b/Zend/zend_language_scanner.h
index 826ad7a..7045478 100644
--- a/Zend/zend_language_scanner.h
+++ b/Zend/zend_language_scanner.h
@@ -44,7 +44,7 @@ typedef struct _zend_lex_state {
unsigned char *script_filtered;
size_t script_filtered_size;
- /* input/ouput filters */
+ /* input/output filters */
zend_encoding_filter input_filter;
zend_encoding_filter output_filter;
const zend_encoding *script_encoding;
diff --git a/configure.in b/configure.in
index 35e5c3e..3d70758 100644
--- a/configure.in
+++ b/configure.in
@@ -1582,7 +1582,7 @@ cat <<X
| see the file debug.log for error messages. |
| |
| If you are unable to fix this, send the file debug.log to the |
-| php-inst...@lists.php.net mailing list and include appropiate |
+| php-inst...@lists.php.net mailing list and include appropriate |
| information about your setup. |
X
fi
diff --git a/ext/date/php_date.c b/ext/date/php_date.c
index d1f9a7f..270c058 100644
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@ -1352,7 +1352,7 @@ PHPAPI void php_date_set_tzdb(timelib_tzdb *tzdb)
}
/* }}} */
-/* {{{ php_parse_date: Backwards compability function */
+/* {{{ php_parse_date: Backwards compatibility function */
PHPAPI signed long php_parse_date(char *string, signed long *now)
{
timelib_time *parsed_time;
diff --git a/ext/date/php_date.h b/ext/date/php_date.h
index 806c27a..be0df38 100644
--- a/ext/date/php_date.h
+++ b/ext/date/php_date.h
@@ -165,7 +165,7 @@ ZEND_END_MODULE_GLOBALS(date)
#define DATEG(v) (date_globals.v)
#endif
-/* Backwards compability wrapper */
+/* Backwards compatibility wrapper */
PHPAPI signed long php_parse_date(char *string, signed long *now);
PHPAPI void php_mktime(INTERNAL_FUNCTION_PARAMETERS, int gmt);
PHPAPI int php_idate(char format, time_t ts, int localtime TSRMLS_DC);
diff --git a/ext/dom/tests/bug44648.phpt b/ext/dom/tests/bug44648.phpt
index d04f590..4ff7ac3 100644
--- a/ext/dom/tests/bug44648.phpt
+++ b/ext/dom/tests/bug44648.phpt
@@ -1,5 +1,5 @@
--TEST--
-Bug #44648 (Attribute names not checked for wellformedness)
+Bug #44648 (Attribute names not checked for well formedness)
--SKIPIF--
<?php require_once('skipif.inc'); ?>
--FILE--
diff --git a/ext/fileinfo/tests/magic b/ext/fileinfo/tests/magic
index 374734d..aa75fb6 100644
--- a/ext/fileinfo/tests/magic
+++ b/ext/fileinfo/tests/magic
@@ -11969,7 +11969,7 @@
#>65 string ZSYS (Pre-System 7 system file)
#>65 string acf3 (Aldus FreeHand)
#>65 string cdev (control panel)
-#>65 string dfil (Desk Acessory suitcase)
+#>65 string dfil (Desk Accessory suitcase)
#>65 string libr (library)
#>65 string nX^d (WriteNow word processor)
#>65 string nX^w (WriteNow dictionary)
diff --git a/ext/ftp/ftp.c b/ext/ftp/ftp.c
index bde4792..dd41f02 100644
--- a/ext/ftp/ftp.c
+++ b/ext/ftp/ftp.c
@@ -39,7 +39,7 @@
#ifdef PHP_WIN32
#include <winsock2.h>
#elif defined(NETWARE)
-#ifdef USE_WINSOCK /* Modified to use Winsock (NOVSOCK2.H), atleast for now
*/
+#ifdef USE_WINSOCK /* Modified to use Winsock (NOVSOCK2.H), at least for
now */
#include <novsock2.h>
#else
#include <sys/socket.h>
diff --git a/ext/mbstring/oniguruma/HISTORY b/ext/mbstring/oniguruma/HISTORY
index 55c5572..647a460 100644
--- a/ext/mbstring/oniguruma/HISTORY
+++ b/ext/mbstring/oniguruma/HISTORY
@@ -673,7 +673,7 @@ History
2004/10/18: [impl] (thanks Imai Yasumasa)
enclose #include <sys/types.h> by #ifndef __BORLANDC__.
2004/10/18: [bug] (thanks Imai Yasumasa)
- memory acess violation in select_opt_exact_info().
+ memory access violation in select_opt_exact_info().
2004/09/25: [dist] fix doc/API and doc/API.ja.
2004/09/25: [bug] fix OP_SEMI_END_BUF process in match_at() for
the case USE_NEWLINE_AT_END_OF_STRING_HAS_EMPTY_LINE
diff --git a/ext/mbstring/tests/mb_http_output.phpt
b/ext/mbstring/tests/mb_http_output.phpt
index 7fb3335..6f149bf 100644
--- a/ext/mbstring/tests/mb_http_output.phpt
+++ b/ext/mbstring/tests/mb_http_output.phpt
@@ -4,7 +4,7 @@ mb_http_output()
<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
--FILE--
<?php
-//TODO: Add more encoding. Wrong paramter type test.
+//TODO: Add more encoding. Wrong parameter type test.
//$debug = true;
ini_set('include_path', dirname(__FILE__));
include_once('common.inc');
diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c
index adaecd0..078b402 100644
--- a/ext/mysql/php_mysql.c
+++ b/ext/mysql/php_mysql.c
@@ -1918,7 +1918,7 @@ PHP_FUNCTION(mysql_result)
/*
johannes TODO:
-Do 2 zend_parse_paramters calls instead of type "z" and switch below
+Do 2 zend_parse_parameters calls instead of type "z" and switch below
Q: String or long first?
*/
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl|z", &result,
&row, &field) == FAILURE) {
diff --git a/ext/mysqli/tests/mysqli_get_client_stats.phpt
b/ext/mysqli/tests/mysqli_get_client_stats.phpt
index ef5ef6e..a22fc58 100644
--- a/ext/mysqli/tests/mysqli_get_client_stats.phpt
+++ b/ext/mysqli/tests/mysqli_get_client_stats.phpt
@@ -166,7 +166,7 @@ mysqlnd.collect_memory_statistics=1
mysqli_get_client_stats_assert_gt('bytes_sent', $info, $expected,
$test_counter);
mysqli_get_client_stats_assert_gt('bytes_received', $info, $expected,
$test_counter);
- // real_data_* get incremeneted after mysqli_*fetch*()
+ // real_data_* get incremented after mysqli_*fetch*()
mysqli_get_client_stats_assert_eq('bytes_received_real_data_normal',
$info, "0", $test_counter);
mysqli_get_client_stats_assert_eq('bytes_received_real_data_ps', $info,
"0", $test_counter);
diff --git a/ext/mysqlnd/mysqlnd_net.c b/ext/mysqlnd/mysqlnd_net.c
index 21241b3..77e1196 100644
--- a/ext/mysqlnd/mysqlnd_net.c
+++ b/ext/mysqlnd/mysqlnd_net.c
@@ -758,7 +758,7 @@ MYSQLND_METHOD(mysqlnd_net,
consume_uneaten_data)(MYSQLND_NET * const net, enum
/*
Switch to non-blocking mode and try to consume something from
the line, if possible, then continue. This saves us from looking for
- the actuall place where out-of-order packets have been sent.
+ the actual place where out-of-order packets have been sent.
If someone is completely sure that everything is fine, he can switch
it
off.
*/
diff --git a/ext/pdo_pgsql/tests/bug_33876.phpt
b/ext/pdo_pgsql/tests/bug_33876.phpt
index 48618e1..6a93905 100644
--- a/ext/pdo_pgsql/tests/bug_33876.phpt
+++ b/ext/pdo_pgsql/tests/bug_33876.phpt
@@ -82,7 +82,7 @@ else
# false -> "" as string, which pgsql doesn't like
if (!$res->execute(array(false))) {
$err = $res->errorInfo();
- // Strip additional lines ouputted by recent PgSQL versions
+ // Strip additional lines outputted by recent PgSQL versions
$err[2] = trim(current(explode("\n", $err[2])));
print_r($err);
} else {
diff --git a/ext/posix/tests/posix_ctermid.phpt
b/ext/posix/tests/posix_ctermid.phpt
index f77da00..551ed73 100644
--- a/ext/posix/tests/posix_ctermid.phpt
+++ b/ext/posix/tests/posix_ctermid.phpt
@@ -13,7 +13,7 @@ PHP Testfest Berlin 2009-05-10
}
// needed because of #ifdef HAVE_CTERMID in posix.c
if (!function_exists('posix_ctermid')) {
- die('SKIP - Fuction posix_ctermid() not available');
+ die('SKIP - Function posix_ctermid() not available');
}
?>
--FILE--
diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c
index 6c4d806..c4a7c55 100644
--- a/ext/reflection/php_reflection.c
+++ b/ext/reflection/php_reflection.c
@@ -5237,7 +5237,7 @@ ZEND_METHOD(reflection_extension, getVersion)
/* }}} */
/* {{{ proto public ReflectionFunction[] ReflectionExtension::getFunctions()
- Returns an array of this extension's fuctions */
+ Returns an array of this extension's functions */
ZEND_METHOD(reflection_extension, getFunctions)
{
reflection_object *intern;
diff --git a/ext/session/tests/020.phpt b/ext/session/tests/020.phpt
index f43bac5..0141129 100644
--- a/ext/session/tests/020.phpt
+++ b/ext/session/tests/020.phpt
@@ -1,5 +1,5 @@
--TEST--
-rewriter uses arg_seperator.output for modifying URLs
+rewriter uses arg_separator.output for modifying URLs
--SKIPIF--
<?php include('skipif.inc'); ?>
--INI--
diff --git a/ext/spl/internal/splobjectstorage.inc
b/ext/spl/internal/splobjectstorage.inc
index fa16406..ffc6c99 100644
--- a/ext/spl/internal/splobjectstorage.inc
+++ b/ext/spl/internal/splobjectstorage.inc
@@ -16,7 +16,7 @@
* @since PHP 5.1.2
*
* This container allows to store objects uniquly without the need to compare
- * them one by one. This is only possible internally. The code represenation
+ * them one by one. This is only possible internally. The code representation
* here therefore has a complexity of O(n) while the actual implementation has
* complexity O(1).
*/
diff --git a/ext/spl/spl.php b/ext/spl/spl.php
index fdffda3..3638a5a 100755
--- a/ext/spl/spl.php
+++ b/ext/spl/spl.php
@@ -260,7 +260,7 @@ class Exception
/** The exception message */
protected $message;
- /** The string represenations as generated during construction */
+ /** The string representations as generated during construction */
private $string;
/** The code passed to the constructor */
@@ -336,7 +336,7 @@ class Exception
{
}
- /** @return string represenation of exception
+ /** @return string representation of exception
*/
public function __toString()
{
diff --git a/ext/spl/tests/spl_priorityqeue_insert_two_params_error.phpt
b/ext/spl/tests/spl_priorityqeue_insert_two_params_error.phpt
index 659ffb4..076c687 100644
--- a/ext/spl/tests/spl_priorityqeue_insert_two_params_error.phpt
+++ b/ext/spl/tests/spl_priorityqeue_insert_two_params_error.phpt
@@ -1,5 +1,5 @@
--TEST--
-SPL: priorityQueue paramter test on insert method
+SPL: priorityQueue parameter test on insert method
--CREDITS--
Sean Burlington www.practicalweb.co.uk
TestFest London May 2009
diff --git a/ext/sqlite3/libsqlite/sqlite3.c b/ext/sqlite3/libsqlite/sqlite3.c
index bf06ae4..3d71ebb 100644
--- a/ext/sqlite3/libsqlite/sqlite3.c
+++ b/ext/sqlite3/libsqlite/sqlite3.c
@@ -12731,7 +12731,7 @@ struct VdbeFunc {
*/
struct sqlite3_context {
FuncDef *pFunc; /* Pointer to function information. MUST BE FIRST */
- VdbeFunc *pVdbeFunc; /* Auxilary data, if created. */
+ VdbeFunc *pVdbeFunc; /* Auxiliary data, if created. */
Mem s; /* The return value is stored here */
Mem *pMem; /* Memory cell used to store aggregate context */
int isError; /* Error code returned by the function. */
@@ -44929,7 +44929,7 @@ SQLITE_PRIVATE int sqlite3WalOpen(
}
/*
-** Change the size to which the WAL file is trucated on each reset.
+** Change the size to which the WAL file is truncated on each reset.
*/
SQLITE_PRIVATE void sqlite3WalLimit(Wal *pWal, i64 iLimit){
if( pWal ) pWal->mxWalSize = iLimit;
@@ -59355,7 +59355,7 @@ static int vdbeCommit(sqlite3 *db, Vdbe *p){
/* The complex case - There is a multi-file write-transaction active.
** This requires a master journal file to ensure the transaction is
- ** committed atomicly.
+ ** committed atomically.
*/
#ifndef SQLITE_OMIT_DISKIO
else{
@@ -61383,7 +61383,7 @@ SQLITE_API void
*sqlite3_aggregate_context(sqlite3_context *p, int nByte){
}
/*
-** Return the auxilary data pointer, if any, for the iArg'th argument to
+** Return the auxiliary data pointer, if any, for the iArg'th argument to
** the user-function defined by pCtx.
*/
SQLITE_API void *sqlite3_get_auxdata(sqlite3_context *pCtx, int iArg){
@@ -61398,7 +61398,7 @@ SQLITE_API void *sqlite3_get_auxdata(sqlite3_context
*pCtx, int iArg){
}
/*
-** Set the auxilary data pointer and delete function, for the iArg'th
+** Set the auxiliary data pointer and delete function, for the iArg'th
** argument to the user-function defined by pCtx. Any previous value is
** deleted by calling the delete function specified when it was set.
*/
@@ -63408,7 +63408,7 @@ SQLITE_PRIVATE int sqlite3VdbeExec(
}
#endif
- /* On any opcode with the "out2-prerelase" tag, free any
+ /* On any opcode with the "out2-prerelease" tag, free any
** external allocations out of mem[p2] and set mem[p2] to be
** an undefined integer. Opcodes will either fill in the integer
** value or convert mem[p2] to a different type.
diff --git a/ext/standard/pack.c b/ext/standard/pack.c
index a09793e..eb80395 100644
--- a/ext/standard/pack.c
+++ b/ext/standard/pack.c
@@ -503,7 +503,7 @@ static long php_unpack(char *data, int size, int issigned,
int *map)
/* unpack() is based on Perl's unpack(), but is modified a bit from there.
* Rather than depending on error-prone ordered lists or syntactically
- * unpleasant pass-by-reference, we return an object with named paramters
+ * unpleasant pass-by-reference, we return an object with named parameters
* (like *_fetch_object()). Syntax is "f[repeat]name/...", where "f" is the
* formatter char (like pack()), "[repeat]" is the optional repeater argument,
* and "name" is the name of the variable to use.
diff --git a/ext/standard/tests/array/array_count_values_variation.phpt
b/ext/standard/tests/array/array_count_values_variation.phpt
index 89d7f37..1d614b4 100644
--- a/ext/standard/tests/array/array_count_values_variation.phpt
+++ b/ext/standard/tests/array/array_count_values_variation.phpt
@@ -1,5 +1,5 @@
--TEST--
-Test array_count_values() function : Test all normal paramter variations
+Test array_count_values() function : Test all normal parameter variations
--FILE--
<?php
/* Prototype : proto array array_count_values(array input)
@@ -9,7 +9,7 @@ Test array_count_values() function : Test all normal paramter
variations
*/
/*
- * Test behaviour with paramter variations
+ * Test behaviour with parameter variations
*/
echo "*** Testing array_count_values() : parameter variations ***\n";
diff --git a/ext/standard/tests/file/chmod_basic-win32.phpt
b/ext/standard/tests/file/chmod_basic-win32.phpt
index ca224f7..31d44c8 100644
--- a/ext/standard/tests/file/chmod_basic-win32.phpt
+++ b/ext/standard/tests/file/chmod_basic-win32.phpt
@@ -1,5 +1,5 @@
--TEST--
-chmod() basic fuctionality
+chmod() basic functionality
--SKIPIF--
<?php
if (substr(PHP_OS, 0, 3) != 'WIN') {
diff --git a/ext/standard/tests/file/chmod_basic.phpt
b/ext/standard/tests/file/chmod_basic.phpt
index 582f273..fc98307 100644
--- a/ext/standard/tests/file/chmod_basic.phpt
+++ b/ext/standard/tests/file/chmod_basic.phpt
@@ -1,5 +1,5 @@
--TEST--
-chmod() basic fuctionality
+chmod() basic functionality
--SKIPIF--
<?php
if (substr(PHP_OS, 0, 3) == 'WIN') {
diff --git a/ext/standard/tests/strings/lcfirst.phpt
b/ext/standard/tests/strings/lcfirst.phpt
index 4c5bec8..e603f4b 100644
Binary files a/ext/standard/tests/strings/lcfirst.phpt and
b/ext/standard/tests/strings/lcfirst.phpt differ
diff --git a/ext/standard/tests/strings/str_replace.phpt
b/ext/standard/tests/strings/str_replace.phpt
index 830378b..15c1c8e 100644
--- a/ext/standard/tests/strings/str_replace.phpt
+++ b/ext/standard/tests/strings/str_replace.phpt
@@ -120,7 +120,7 @@ var_dump($count);
echo "\n-- Testing objects --\n";
/* we get "Catchable fatal error: saying Object of class could not be converted
to string" by default, when an object is passed instead of string:
-The error can be avoided by chosing the __toString magix method as follows: */
+The error can be avoided by choosing the __toString magix method as follows:
*/
class subject
{
diff --git a/ext/standard/tests/strings/str_replace_variation3.phpt
b/ext/standard/tests/strings/str_replace_variation3.phpt
index 9b19153..7b46f8b 100644
--- a/ext/standard/tests/strings/str_replace_variation3.phpt
+++ b/ext/standard/tests/strings/str_replace_variation3.phpt
@@ -33,7 +33,7 @@ var_dump($count);
echo "\n-- Testing objects --\n";
/* we get "Catchable fatal error: saying Object of class could not be converted
to string" by default, when an object is passed instead of string:
-The error can be avoided by chosing the __toString magix method as follows: */
+The error can be avoided by choosing the __toString magix method as follows:
*/
class subject
{
diff --git a/ext/standard/tests/strings/strcasecmp.phpt
b/ext/standard/tests/strings/strcasecmp.phpt
index 33694f9..b3452cf 100644
Binary files a/ext/standard/tests/strings/strcasecmp.phpt and
b/ext/standard/tests/strings/strcasecmp.phpt differ
diff --git a/ext/standard/tests/strings/strcmp.phpt
b/ext/standard/tests/strings/strcmp.phpt
index 0693880..e77ed6e 100644
Binary files a/ext/standard/tests/strings/strcmp.phpt and
b/ext/standard/tests/strings/strcmp.phpt differ
diff --git a/ext/standard/tests/strings/strlen.phpt
b/ext/standard/tests/strings/strlen.phpt
index 5a1114d..df39f24 100644
Binary files a/ext/standard/tests/strings/strlen.phpt and
b/ext/standard/tests/strings/strlen.phpt differ
diff --git a/ext/standard/tests/strings/strpos.phpt
b/ext/standard/tests/strings/strpos.phpt
index 9b44584..44785ef 100644
Binary files a/ext/standard/tests/strings/strpos.phpt and
b/ext/standard/tests/strings/strpos.phpt differ
diff --git a/ext/standard/tests/strings/strstr.phpt
b/ext/standard/tests/strings/strstr.phpt
index b135258..bdedb7e 100644
Binary files a/ext/standard/tests/strings/strstr.phpt and
b/ext/standard/tests/strings/strstr.phpt differ
diff --git a/ext/standard/tests/strings/ucfirst.phpt
b/ext/standard/tests/strings/ucfirst.phpt
index bae4095..468f7f0 100644
Binary files a/ext/standard/tests/strings/ucfirst.phpt and
b/ext/standard/tests/strings/ucfirst.phpt differ
diff --git a/ext/tidy/tidy.c b/ext/tidy/tidy.c
index 5cfb164..c3b9d8c 100644
--- a/ext/tidy/tidy.c
+++ b/ext/tidy/tidy.c
@@ -1443,7 +1443,7 @@ static PHP_FUNCTION(tidy_get_config)
/* }}} */
/* {{{ proto int tidy_get_status()
- Get status of specfied document. */
+ Get status of specified document. */
static PHP_FUNCTION(tidy_get_status)
{
TIDY_FETCH_OBJECT;
diff --git a/ext/xmlrpc/libxmlrpc/xml_to_soap.c
b/ext/xmlrpc/libxmlrpc/xml_to_soap.c
index 664e8b7..ac103e0 100644
--- a/ext/xmlrpc/libxmlrpc/xml_to_soap.c
+++ b/ext/xmlrpc/libxmlrpc/xml_to_soap.c
@@ -279,7 +279,7 @@ XMLRPC_VALUE
xml_element_to_SOAP_REQUEST_worker(XMLRPC_REQUEST request,
else if (!strcmp(attr_iter->key, TOKEN_MUSTUNDERSTAND))
{
b_must_understand = strchr(attr_iter->val, '1')
? 1 : 0;
}
- /* actor, used in conjuction with must understand. */
+ /* actor, used in conjunction with must understand. */
else if (!strcmp(attr_iter->key, TOKEN_ACTOR)) {
actor = attr_iter->val;
}
diff --git a/sapi/apache/config.m4 b/sapi/apache/config.m4
index af83e9b..1961289 100644
--- a/sapi/apache/config.m4
+++ b/sapi/apache/config.m4
@@ -59,7 +59,7 @@ if test "$PHP_APXS" != "no"; then
# Test that we're trying to configure with apache 1.x
PHP_AP_EXTRACT_VERSION($APXS_HTTPD)
if test "$APACHE_VERSION" -ge 2000000; then
- AC_MSG_ERROR([You have enabled Apache 1.3 support while your server is
Apache 2. Please use the appropiate switch --with-apxs2])
+ AC_MSG_ERROR([You have enabled Apache 1.3 support while your server is
Apache 2. Please use the appropriate switch --with-apxs2])
fi
for flag in $APXS_CFLAGS; do
diff --git a/sapi/apache2filter/config.m4 b/sapi/apache2filter/config.m4
index c49488d..b6524fd 100644
--- a/sapi/apache2filter/config.m4
+++ b/sapi/apache2filter/config.m4
@@ -62,7 +62,7 @@ if test "$PHP_APXS2FILTER" != "no"; then
# Test that we're trying to configure with apache 2.x
PHP_AP_EXTRACT_VERSION($APXS_HTTPD)
if test "$APACHE_VERSION" -le 2000000; then
- AC_MSG_ERROR([You have enabled Apache 2 support while your server is
Apache 1.3. Please use the appropiate switch --with-apxs (without the 2)])
+ AC_MSG_ERROR([You have enabled Apache 2 support while your server is
Apache 1.3. Please use the appropriate switch --with-apxs (without the 2)])
elif test "$APACHE_VERSION" -lt 2000040; then
AC_MSG_ERROR([Please note that Apache version >= 2.0.40 is required])
fi
diff --git a/sapi/apache2handler/config.m4 b/sapi/apache2handler/config.m4
index 702f91f..753de10 100644
--- a/sapi/apache2handler/config.m4
+++ b/sapi/apache2handler/config.m4
@@ -61,7 +61,7 @@ if test "$PHP_APXS2" != "no"; then
# Test that we're trying to configure with apache 2.x
PHP_AP_EXTRACT_VERSION($APXS_HTTPD)
if test "$APACHE_VERSION" -le 2000000; then
- AC_MSG_ERROR([You have enabled Apache 2 support while your server is
Apache 1.3. Please use the appropiate switch --with-apxs (without the 2)])
+ AC_MSG_ERROR([You have enabled Apache 2 support while your server is
Apache 1.3. Please use the appropriate switch --with-apxs (without the 2)])
elif test "$APACHE_VERSION" -lt 2000044; then
AC_MSG_ERROR([Please note that Apache version >= 2.0.44 is required])
fi
diff --git a/sapi/apache_hooks/config.m4 b/sapi/apache_hooks/config.m4
index 4213b7c..672f298 100644
--- a/sapi/apache_hooks/config.m4
+++ b/sapi/apache_hooks/config.m4
@@ -60,7 +60,7 @@ if test "$PHP_APACHE_HOOKS" != "no"; then
# Test that we're trying to configure with apache 1.x
PHP_AP_EXTRACT_VERSION($APXS_HTTPD)
if test "$APACHE_VERSION" -ge 2000000; then
- AC_MSG_ERROR([You have enabled Apache 1.3 support while your server is
Apache 2. Please use the appropiate switch --with-apxs2])
+ AC_MSG_ERROR([You have enabled Apache 1.3 support while your server is
Apache 2. Please use the appropriate switch --with-apxs2])
fi
for flag in $APXS_CFLAGS; do
diff --git a/sapi/fpm/php-fpm.conf.in b/sapi/fpm/php-fpm.conf.in
index 6912477..af4f2fa 100644
--- a/sapi/fpm/php-fpm.conf.in
+++ b/sapi/fpm/php-fpm.conf.in
@@ -401,7 +401,7 @@ pm.max_spare_servers = 3
; - %{megabytes}M
; - %{mega}M
; %n: pool name
-; %o: ouput header
+; %o: output header
; it must be associated with embraces to specify the name of the header:
; - %{Content-Type}o
; - %{X-Powered-By}o
diff --git a/scripts/dev/generate-phpt.phar b/scripts/dev/generate-phpt.phar
index 0112d87..c6268c0 100644
Binary files a/scripts/dev/generate-phpt.phar and
b/scripts/dev/generate-phpt.phar differ
diff --git a/scripts/dev/generate-phpt/src/testcase/gtTestCase.php
b/scripts/dev/generate-phpt/src/testcase/gtTestCase.php
index cc5e19a..60c115a 100644
--- a/scripts/dev/generate-phpt/src/testcase/gtTestCase.php
+++ b/scripts/dev/generate-phpt/src/testcase/gtTestCase.php
@@ -104,7 +104,7 @@ abstract class gtTestCase {
/**
- * Add contructor argument initialisation to test case
+ * Add constructor argument initialisation to test case
*
*/
public function constructorArgInit() {
diff --git a/tests/classes/static_properties_004.phpt
b/tests/classes/static_properties_004.phpt
index ce1d19d..e98c605 100644
--- a/tests/classes/static_properties_004.phpt
+++ b/tests/classes/static_properties_004.phpt
@@ -6,7 +6,7 @@ class C { public static $p = 'original'; }
class D extends C { }
class E extends D { }
-echo "\nInherited static properties refer to the same value accross
classes:\n";
+echo "\nInherited static properties refer to the same value across classes:\n";
var_dump(C::$p, D::$p, E::$p);
echo "\nChanging one changes all the others:\n";
@@ -20,7 +20,7 @@ var_dump(C::$p, D::$p, E::$p);
?>
==Done==
--EXPECTF--
-Inherited static properties refer to the same value accross classes:
+Inherited static properties refer to the same value across classes:
%unicode|string%(8) "original"
%unicode|string%(8) "original"
%unicode|string%(8) "original"--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
